Some changes in the gentoo capi init scripts to support mISDN and CIP(bluetooth) thanks to sbriesen, new revision to depend on it in the mISDN ebuild. Removing old revision.

(Portage version: 1.586-cvs)

5 files changed, 63 insertions, 10 deletions

diff --git a/net-dialup/capi4k-utils/files/capi.blacklist b/net-dialup/capi4k-utils/files/capi.blacklist
index 33e55856d49b..de70fcbcf39c 100644
--- a/net-dialup/capi4k-utils/files/capi.blacklist
+++ b/net-dialup/capi4k-utils/files/capi.blacklist
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/files/capi.blacklist,v 1.2 2005/03/29 22:16:07 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/files/capi.blacklist,v 1.3 2005/04/24 13:31:48 genstef Exp $
 
 # CAPI USB is handled via /etc/hotplug/usb/capi.usermap
 fcusb
@@ -10,7 +10,7 @@ fxusb_CZ
 fcdslusb
 bfusb
 
-# CAPI modules are load from /etc/init.d/capi
+# CAPI modules are loaded via /etc/init.d/capi
 b1isa
 b1pci
 b1pcmcia
@@ -22,3 +22,11 @@ fcclassic
 fcdsl
 fcdsl2
 fcdslsl
+
+# mISDN modules (experimental)
+avmfritz
+hfcpci
+hfcsusb
+hfcmulti
+sedlfax
+w6692pci
diff --git a/net-dialup/capi4k-utils/files/capi.conf b/net-dialup/capi4k-utils/files/capi.conf
index 0f9e6a45586f..1d5acef096dd 100644
--- a/net-dialup/capi4k-utils/files/capi.conf
+++ b/net-dialup/capi4k-utils/files/capi.conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/files/capi.conf,v 1.2 2005/03/29 22:16:07 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/files/capi.conf,v 1.3 2005/04/24 13:31:48 genstef Exp $
 
 # card		file		proto	io	irq	mem	cardnr	options
 #
@@ -13,7 +13,7 @@
 #b1isa		b1.t4		DSS1	0x150	7	-	-	P2P
 #b1pci		b1.t4		DSS1	-	-	-	-
 
-### AVM C2(you also have to install the firmware)
+### AVM C2 (you also have to install the firmware)
 #c2		c2.bin		DSS1	-	-	-	-
 #c2		-		DSS1	-	-	-	-
 
@@ -45,7 +45,7 @@
 
 # If you're using hotplug, you shouldn't configure your devices in this config.
 # USB devices are detected automatically. If you don't want to use hotplug, then
-# set CAPI_HOTPLUG_USB=0 in /etc/conf.d/capi and uncomment your card(s) below.
+# set CAPI_HOTPLUG_USB="no" in /etc/conf.d/capi and uncomment your card(s) below.
 
 ### AVM FRITZCARD!USB
 #fcusb		-		-	-	-	-	-
@@ -71,3 +71,15 @@
 ### AVM FRITZDSL!USB SL (DSL only)
 #fcdslslusb	fdlubase.frm	-	-	-	-	-
 
+
+##############################
+# mISDN (experimental)       #
+##############################
+
+#avmfritz	-		-	-	-	-	-
+#hfcpci		-		-	-	-	-	-
+#hfcsusb	-		-	-	-	-	-
+#hfcmulti	-		-	-	-	-	-
+#sedlfax	ISAR.BIN	-	-	-	-	-
+#w6692pci	-		-	-	-	-	-
+
diff --git a/net-dialup/capi4k-utils/files/capi.hotplug b/net-dialup/capi4k-utils/files/capi.hotplug
index d4d33fef0cb7..91ad874d1d46 100644
--- a/net-dialup/capi4k-utils/files/capi.hotplug
+++ b/net-dialup/capi4k-utils/files/capi.hotplug
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/files/capi.hotplug,v 1.4 2005/04/09 14:35:00 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/files/capi.hotplug,v 1.5 2005/04/24 13:31:48 genstef Exp $
 
 . /etc/conf.d/capi
 
@@ -71,7 +71,9 @@ case "${VENDID}" in
 		DRIVER="fxusb"
 		;;
 	"057c/2200") # BlueFRITZ!USB
+		LOADER="avmusb"
 		DRIVER="bfusb"
+		FIRMWARE="bfubase.frm"
 		;;
 	"057c/2300") # FRITZDSL!USB
 		LOADER="avmusb"
diff --git a/net-dialup/capi4k-utils/files/capi.initd b/net-dialup/capi4k-utils/files/capi.initd
index 005c03f4cbbc..de5364f47baa 100644
--- a/net-dialup/capi4k-utils/files/capi.initd
+++ b/net-dialup/capi4k-utils/files/capi.initd
@@ -1,12 +1,36 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/files/capi.initd,v 1.5 2005/04/09 14:35:00 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/files/capi.initd,v 1.6 2005/04/24 13:31:48 genstef Exp $
 
 opts="info showconfig"
 
 depend() {
-	after coldplug hotplug isapnp pcmcia
+	after hotplug isapnp pcmcia bluetooth
+}
+
+drivers() {  # detecting loaded drivers
+	local DRV MISDN=0
+	while read DRV; do
+		case "$DRV" in
+			mISDN)	MISDN=1;;
+			?*)	echo "$DRV";;
+		esac
+	done < <(/bin/sed 2>/dev/null -n "s:^[0-9]\+ \+\([^ ]\+\).*\$:\1:p" /proc/capi/controller)
+	if [ $MISDN -gt 0 ]; then  # dirty hack to find loaded mISDN modules
+		local IFS=","
+		for DRV in $(/bin/sed 2>/dev/null -n "s:^mISDN_core \+[0-9]\+ \+[0-9]\+ \+\([^ ]\+\).*\$:\1:p" /proc/modules); do
+			case "$DRV" in
+				mISDN_*|l3udss1|faxl3) continue;;
+				?*) echo "$DRV";;
+			esac
+		done
+	fi
+}
+
+bluez_cip() {  # detecting bluetooth CIP connections
+	[ -x /usr/bin/ciptool ] &&  # net-wireless/bluez-utils \
+	/bin/sed 2>/dev/null -n "s:[0-9]\+ \+cmtp \+[^ ]\+ \+\([0-9A-F:]\+\) \+.*\$:\1:p" /proc/capi/controller
 }
 
 start() {
@@ -37,7 +61,7 @@ start() {
 }
 
 stop() {
-	local DRV RET FCNT=0 DRIVERS=$(/bin/cut 2>/dev/null -f1 -d' ' /proc/capi/driver)
+	local DRV CIP RET FCNT=0 DRIVERS=$(/bin/sort -u <(drivers))
 
 	# if some CAPI applications are still running, kill 'em
 	if /bin/fuser 2>/dev/null -s /dev/capi20; then
@@ -50,9 +74,16 @@ stop() {
 		[ $RET -eq 0 ] && eend 1 || eend 0
 	fi
 
+	# relase bluetooth CIP connections
+	for CIP in $(bluez_cip); do
+		ebegin "Release CIP connection to ${CIP}"
+		/usr/bin/ciptool release "$CIP"
+		eend
+	done
+
 	ebegin "Stopping CAPI"
 	[ "$CAPI_LOAD_CAPIDRV" = "yes" ] && /sbin/modprobe -sqr capidrv
-	[ "$CAPI_UNLOAD_CARDS" = "yes" ] && /usr/sbin/capiinit 2>/dev/null stop
+	[ "$CAPI_UNLOAD_CARDS" = "yes" ] && /usr/sbin/capiinit &>/dev/null stop
 	for DRV in $DRIVERS; do	/sbin/modprobe -sqr $DRV; done
 	/sbin/modprobe -sqr capi
 	eend 0
diff --git a/net-dialup/capi4k-utils/files/digest-capi4k-utils-20050322 b/net-dialup/capi4k-utils/files/digest-capi4k-utils-20050322-r1
index 2bd55066b133..2bd55066b133 100644
--- a/net-dialup/capi4k-utils/files/digest-capi4k-utils-20050322
+++ b/net-dialup/capi4k-utils/files/digest-capi4k-utils-20050322-r1