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.

Package-Manager: portage-1.586-cvs

8 files changed, 81 insertions, 19 deletions

diff --git a/net-dialup/capi4k-utils/ChangeLog b/net-dialup/capi4k-utils/ChangeLog
index 58e62152e27b..c347ad49f9d2 100644
--- a/net-dialup/capi4k-utils/ChangeLog
+++ b/net-dialup/capi4k-utils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/capi4k-utils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.31 2005/04/09 14:35:00 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.32 2005/04/24 13:31:48 genstef Exp $
+
+*capi4k-utils-20050322-r1 (24 Apr 2005)
+
+  24 Apr 2005; Stefan Schweizer <genstef@gentoo.org> files/capi.blacklist,
+  files/capi.conf, files/capi.hotplug, files/capi.initd,
+  -capi4k-utils-20050322.ebuild, +capi4k-utils-20050322-r1.ebuild:
+  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.
 
   09 Apr 2005; Stefan Schweizer <genstef@gentoo.org> files/capi.confd,
   files/capi.hotplug, files/capi.initd, +files/capi-isdn,
diff --git a/net-dialup/capi4k-utils/Manifest b/net-dialup/capi4k-utils/Manifest
index ef70d2e12c70..00348078b381 100644
--- a/net-dialup/capi4k-utils/Manifest
+++ b/net-dialup/capi4k-utils/Manifest
@@ -1,19 +1,19 @@
 MD5 4a0bb8a608304da5ee282b438e6d54c2 capi4k-utils-20041006-r5.ebuild 3741
-MD5 3a618762750b5d4112dc0553b1b0b459 capi4k-utils-20050322.ebuild 4011
-MD5 5e59c1107ea2f470c003b7e5ba8c6979 ChangeLog 6112
+MD5 03243c209893699ce44a97f2090546fe capi4k-utils-20050322-r1.ebuild 4014
+MD5 811e459524f29afadff33ac2ba495c2b ChangeLog 6533
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 c1f67e98c19fe5ece86b9242a00e6a38 files/README.gentoo 2800
 MD5 bc75ed1e49b13568f93fb63a37c5dc70 files/capi-isdn 287
-MD5 b5810627ea4dabf7c53540e8f75e348e files/capi.conf 1832
+MD5 929cf4d5314e1a0d881e6cca4c71955e files/capi.conf 2073
 MD5 299580849e0827ebd2d7f14758a5b13e files/capi.confd 568
-MD5 8d9d0a05431a8f207b901f64f280bd78 files/capi.initd 2168
+MD5 e893400f587fe8773df3d7903a062609 files/capi.initd 3062
 MD5 5567e0f076f3d1faafcd0d4fa39a1c4e files/digest-capi4k-utils-20041006-r5 156
 MD5 edc50538053b658093927f9fb28c3aff files/config 195
 MD5 fa4cf0be46c4a16a2ef6fd178ed54c01 files/capi.usermap 1504
 MD5 2fe94d2623c5b129780b72bacaf4a7bc files/rcapid.xinetd 236
-MD5 709e4079ecd09537691845755cb9136d files/digest-capi4k-utils-20050322 75
-MD5 fec82196af639d72141823a395298799 files/capi.blacklist 447
-MD5 dcb4433c68cb6f0d606b5a0a7450b81e files/capi.hotplug 3509
+MD5 97a56dd67a012daab67041ed96a6d44d files/capi.blacklist 530
+MD5 1f9c9dd668e97e611d19ce67374c5da8 files/capi.hotplug 3552
+MD5 709e4079ecd09537691845755cb9136d files/digest-capi4k-utils-20050322-r1 75
 MD5 e74f9b822b6f485ca6ff834c2699151a files/20041006/README.gentoo 1492
 MD5 fb9f9b4003d8d1647e23cf7b329386f6 files/20041006/capi.confd 424
 MD5 1954a92bd07c3e2dfcfe1d68d8a290d8 files/20041006/capi.initd 1297
diff --git a/net-dialup/capi4k-utils/capi4k-utils-20050322.ebuild b/net-dialup/capi4k-utils/capi4k-utils-20050322-r1.ebuild
index 0d586f058ff5..f33a7afbfa71 100644
--- a/net-dialup/capi4k-utils/capi4k-utils-20050322.ebuild
+++ b/net-dialup/capi4k-utils/capi4k-utils-20050322-r1.ebuild
@@ -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/capi4k-utils-20050322.ebuild,v 1.4 2005/04/09 14:35:00 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20050322-r1.ebuild,v 1.1 2005/04/24 13:31:48 genstef Exp $
 
 YEAR_PV=${PV:0:4}
 MON_PV=${PV:4:2}
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