From 6d263ef950fea74e7f1bcd42d58d7017bfe974d4 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 13 Apr 2009 21:03:27 +0200 Subject: [PATCH 1/4] Add lcr default config (route over asterisk) and backup include --- config/backup/includes/lcr | 7 +++++++ config/lcr/routing.conf | 4 ++++ config/rootfiles/packages/lcr | 2 ++ lfs/lcr | 5 +++++ 4 files changed, 18 insertions(+) create mode 100644 config/backup/includes/lcr create mode 100644 config/lcr/routing.conf diff --git a/config/backup/includes/lcr b/config/backup/includes/lcr new file mode 100644 index 000000000..7c1346e9d --- /dev/null +++ b/config/backup/includes/lcr @@ -0,0 +1,7 @@ +/var/ipfire/lcr/extensions +/var/ipfire/lcr/directory.list +/var/ipfire/lcr/interface.conf +/var/ipfire/lcr/options.conf +/var/ipfire/lcr/routing.conf + + diff --git a/config/lcr/routing.conf b/config/lcr/routing.conf new file mode 100644 index 000000000..b540e7fb6 --- /dev/null +++ b/config/lcr/routing.conf @@ -0,0 +1,4 @@ +# Linux-Call-Router routing configuration route all over asterisk + +[main] + : remote application=asterisk diff --git a/config/rootfiles/packages/lcr b/config/rootfiles/packages/lcr index 0f0fdc045..1b47ae745 100644 --- a/config/rootfiles/packages/lcr +++ b/config/rootfiles/packages/lcr @@ -3,12 +3,14 @@ usr/bin/gentones usr/bin/genwave usr/bin/lcradmin usr/lib/asterisk/modules/chan_lcr.so +var/ipfire/backup/addons/includes/lcr #var/ipfire/lcr var/ipfire/lcr/directory.list var/ipfire/lcr/extensions var/ipfire/lcr/interface.conf var/ipfire/lcr/options.conf var/ipfire/lcr/routing.conf +var/ipfire/lcr/routing.conf.org #var/ipfire/lcr/tones_american var/ipfire/lcr/tones_american/activated_loop.isdn var/ipfire/lcr/tones_american/busy_loop.isdn diff --git a/lfs/lcr b/lfs/lcr index 287d9014a..b85344f2b 100644 --- a/lfs/lcr +++ b/lfs/lcr @@ -82,5 +82,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_SRC)/lcr.git && ./configure --prefix=/usr cd $(DIR_SRC)/lcr.git && make $(MAKETUNING) cd $(DIR_SRC)/lcr.git && make install + mv /var/ipfire/lcr/routing.conf /var/ipfire/lcr/routing.conf.org + install -v -m 644 $(DIR_SRC)/config/lcr/routing.conf \ + /var/ipfire/lcr/routing.conf + install -v -m 644 $(DIR_SRC)/config/backup/includes/lcr \ + /var/ipfire/backup/addons/includes/lcr @rm -rf $(DIR_APP) @$(POSTBUILD) From 1f97e648e56434117187163679e49de20354f9e3 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 13 Apr 2009 21:04:34 +0200 Subject: [PATCH 2/4] Add scan and config parameters without function (for installer) --- src/initscripts/init.d/mISDN | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/initscripts/init.d/mISDN b/src/initscripts/init.d/mISDN index 1d599ae4b..4c2ef1240 100644 --- a/src/initscripts/init.d/mISDN +++ b/src/initscripts/init.d/mISDN @@ -52,6 +52,16 @@ case "${1}" in exit 0; ;; + config) + boot_mesg "mISDNv2 - config not needed!" + exit 0; + ;; + + scan) + boot_mesg "mISDNv2 - scan not supported!" + exit 0; + ;; + *) echo "Usage: ${0} {start}{stop}" exit 1 From 6fb50aee43cc9de7b3ddf7284b8b77d5971be39e Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 13 Apr 2009 21:05:30 +0200 Subject: [PATCH 3/4] Rootfile updates. (initscripts, libtorrent, net-snmp) --- config/rootfiles/common/initscripts | 1 + config/rootfiles/common/libtorrent | 6 ++---- config/rootfiles/packages/net-snmp | 4 ++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts index baf1e852b..e634f6e6f 100644 --- a/config/rootfiles/common/initscripts +++ b/config/rootfiles/common/initscripts @@ -33,6 +33,7 @@ etc/rc.d/init.d/halt #etc/rc.d/init.d/hostapd #etc/rc.d/init.d/ipfireseeder etc/rc.d/init.d/ipsec +#etc/rc.d/init.d/lcr etc/rc.d/init.d/localnet #etc/rc.d/init.d/mediatomb #etc/rc.d/init.d/messagebus diff --git a/config/rootfiles/common/libtorrent b/config/rootfiles/common/libtorrent index 2d93265ee..fcfe7f4be 100644 --- a/config/rootfiles/common/libtorrent +++ b/config/rootfiles/common/libtorrent @@ -40,11 +40,9 @@ #usr/include/torrent/tracker_list.h #usr/lib/libtorrent.la #usr/lib/libtorrent.so -#usr/lib/libtorrent.so.10 -#usr/lib/libtorrent.so.10.0.8 +#usr/lib/libtorrent.so.11 +#usr/lib/libtorrent.so.11.0.4 #usr/lib/pkgconfig/libtorrent.pc #usr/include/torrent/dht_manager.h #usr/include/torrent/peer/connection_list.h #usr/include/torrent/throttle.h -#usr/lib/libtorrent.so.9 -#usr/lib/libtorrent.so.9.2.0 diff --git a/config/rootfiles/packages/net-snmp b/config/rootfiles/packages/net-snmp index 00001eb95..2b09abc69 100644 --- a/config/rootfiles/packages/net-snmp +++ b/config/rootfiles/packages/net-snmp @@ -586,3 +586,7 @@ usr/share/snmp/snmpconf-data/snmptrapd-data/logging usr/share/snmp/snmpconf-data/snmptrapd-data/runtime usr/share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config usr/share/snmp/snmpconf-data/snmptrapd-data/traphandle +#usr/man/man3/snprint_value.3 +#usr/man/man3/snprint_variable.3 +#usr/man/man3/sprint_realloc_objid.3 +#usr/man/man3/sprint_realloc_value.3 From f8f8581351f63235173613ab510ecbe4fc878ec4 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 13 Apr 2009 21:17:01 +0200 Subject: [PATCH 4/4] Fix lcr backupinclude --- config/backup/includes/lcr | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/backup/includes/lcr b/config/backup/includes/lcr index 7c1346e9d..71f4cacc0 100644 --- a/config/backup/includes/lcr +++ b/config/backup/includes/lcr @@ -3,5 +3,3 @@ /var/ipfire/lcr/interface.conf /var/ipfire/lcr/options.conf /var/ipfire/lcr/routing.conf - -