Fix capidrv/isdnlog bug thanks to sbriesen

Package-Manager: portage-1.585-cvs

5 files changed, 29 insertions, 17 deletions

diff --git a/net-dialup/capi4k-utils/ChangeLog b/net-dialup/capi4k-utils/ChangeLog
index 03bcf23a0d3a..7ef50156b0a3 100644
--- a/net-dialup/capi4k-utils/ChangeLog
+++ b/net-dialup/capi4k-utils/ChangeLog
@@ -1,6 +1,10 @@
 # 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.29 2005/03/29 22:16:07 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.30 2005/03/30 20:03:15 genstef Exp $
+
+  30 Mar 2005; Stefan Schweizer <genstef@gentoo.org> files/capi.hotplug,
+  files/capi.initd, capi4k-utils-20050322.ebuild:
+  Fix capidrv/isdnlog bug thanks to sbriesen
 
   29 Mar 2005; Stefan Schweizer <genstef@gentoo.org> files/capi.blacklist,
   files/capi.conf, files/capi.confd, files/capi.hotplug, files/capi.initd,
diff --git a/net-dialup/capi4k-utils/Manifest b/net-dialup/capi4k-utils/Manifest
index ce4a30561ab0..bc986d5b41ed 100644
--- a/net-dialup/capi4k-utils/Manifest
+++ b/net-dialup/capi4k-utils/Manifest
@@ -1,18 +1,18 @@
 MD5 4a0bb8a608304da5ee282b438e6d54c2 capi4k-utils-20041006-r5.ebuild 3741
-MD5 96eb0b07b2a0d30015bad871e3ad42fb capi4k-utils-20050322.ebuild 3896
-MD5 1088a7df858b22862a53389053a5a08b ChangeLog 5741
+MD5 12e2cee7042772716fd30ce77d45fcf2 capi4k-utils-20050322.ebuild 3984
+MD5 a7ed4418a29999230d17bd0502f951c3 ChangeLog 5910
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 e74f9b822b6f485ca6ff834c2699151a files/README.gentoo 1492
 MD5 b5810627ea4dabf7c53540e8f75e348e files/capi.conf 1832
 MD5 a02f80ede6d0cb85cbc625bb33c43df5 files/capi.confd 464
-MD5 41a34277cd6d05a8ddffb6309bc0ac98 files/capi.initd 1431
+MD5 22d0eb7039ce2d60935b08e59fa7a1b1 files/capi.initd 1418
 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 08742e628681165afb2bedecad7427e7 files/capi.hotplug 3393
+MD5 8810eb754c81325ec7541d9ded3ddd3f files/capi.hotplug 3478
 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.ebuild
index 0e402c43e47d..430b9922b6c0 100644
--- a/net-dialup/capi4k-utils/capi4k-utils-20050322.ebuild
+++ b/net-dialup/capi4k-utils/capi4k-utils-20050322.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.2 2005/03/29 22:16:07 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20050322.ebuild,v 1.3 2005/03/30 20:03:15 genstef Exp $
 
 YEAR_PV=${PV:0:4}
 MON_PV=${PV:4:2}
@@ -94,6 +94,10 @@ src_install() {
 	insopts -m 0644
 	newins ${FILESDIR}/rcapid.xinetd rcapid
 
+	# install DSL sample config
+	insinto /etc/ppp/peers
+	doins pppdcapiplugin/peers/t-dsl
+
 	# very useful tool ;-)
 	dobin scripts/isdncause
 }
diff --git a/net-dialup/capi4k-utils/files/capi.hotplug b/net-dialup/capi4k-utils/files/capi.hotplug
index 00be239e424c..d532d63446aa 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.2 2005/03/29 22:16:07 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/files/capi.hotplug,v 1.3 2005/03/30 20:03:15 genstef Exp $
 
 . /etc/conf.d/capi
 
@@ -95,10 +95,8 @@ case "$ACTION" in
 	add)
 		/bin/ln 2>/dev/null -s "$$" "$LOCK" || exit 0
 	
-		# loading capi + capidrv
-		( [ -f /proc/capi/capi20 ] || /sbin/modprobe -sq capi ) && \
-		( [ -f /proc/capi/capidrv -o "$CAPI_LOAD_CAPIDRV" = "0" ] || /sbin/modprobe -sq capidrv )
-		if [ $? -ne 0 ]; then
+		# loading capi
+		if ! ( [ -f /proc/capi/capi20 ] || /sbin/modprobe -sq capi ); then
 			syslog "could not load CAPI!"
 			beep_error; /bin/rm -f "$LOCK"; exit 1
 		fi
@@ -122,9 +120,15 @@ case "$ACTION" in
 				beep_error; /bin/rm -f "$LOCK"; exit 1
 			fi
 		fi
+
+		# loading capidrv (should be loaded *after* card driver)
+		if ! ( [ -f /proc/capi/capidrv -o "$CAPI_LOAD_CAPIDRV" = "0" ] || /sbin/modprobe -sq capidrv ); then
+			syslog "could not load CAPIDRV!"
+		fi
 		
 		beep_ok; /bin/rm -f "$LOCK"
 		;;
+
 	remove)
 		/sbin/modprobe -sqr $DRIVER
 		;;
diff --git a/net-dialup/capi4k-utils/files/capi.initd b/net-dialup/capi4k-utils/files/capi.initd
index 7644eb710a07..a201560fdede 100644
--- a/net-dialup/capi4k-utils/files/capi.initd
+++ b/net-dialup/capi4k-utils/files/capi.initd
@@ -1,7 +1,7 @@
 #!/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.3 2005/03/29 22:16:07 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/files/capi.initd,v 1.4 2005/03/30 20:03:15 genstef Exp $
 
 opts="start stop info"
 
@@ -12,23 +12,23 @@ depend() {
 start() {
 	if [ ! -e /etc/capi.conf ] ; then
 		eerror "You're missing /etc/capi.conf (comes with a capi-driver)."
-		eerror "Emerge net-dialup/fritzcapi if you are having an AVM Fritz!Card"
+		eerror "Emerge net-dialup/fritzcapi if you're having an AVM Fritz!Card"
 		return 1
 	fi
 
 	ebegin "Loading CAPI"
-	( [ -f /proc/capi/capi20 ] || /sbin/modprobe -s capi ) && \
-	( [ -f /proc/capi/capidrv -o "$CAPI_LOAD_CAPIDRV" = "0" ] || /sbin/modprobe -s capidrv )
+	[ -f /proc/capi/capi20 ] || /sbin/modprobe -s capi
 	eend $? || return 1
 
-	ebegin "Starting CAPI"
-
 	local CNT=0  # wait for udev
 	while [ ! -e /dev/capi20 -a $CNT -lt 10 ]; do
 		sleep 1; : $((CNT++))
 	done
 
+	ebegin "Starting CAPI"
+
 	if /usr/sbin/capiinit 2>/dev/null activate ; then
+		[ -f /proc/capi/capidrv -o "$CAPI_LOAD_CAPIDRV" = "0" ] || /sbin/modprobe -s capidrv
 		eindent
 		while read INFO; do einfo "$INFO"; done < /proc/capi/controller
 		eoutdent