Merge branch 'master' of ssh://stevee@git.ipfire.org/pub/git/ipfire-2.x

config/backup/includes/lcr

@@ -0,0 +1,5 @@
+/var/ipfire/lcr/extensions
+/var/ipfire/lcr/directory.list
+/var/ipfire/lcr/interface.conf
+/var/ipfire/lcr/options.conf
+/var/ipfire/lcr/routing.conf

config/lcr/routing.conf

@@ -0,0 +1,4 @@
+# Linux-Call-Router routing configuration route all over asterisk
+
+[main]
+	: remote application=asterisk

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

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

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

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

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)

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