improved init scripts & actualized dependencies

6 files changed, 163 insertions, 15 deletions

diff --git a/net-dialup/isdn4k-utils/ChangeLog b/net-dialup/isdn4k-utils/ChangeLog
index 635b0233a5c7..b6ff9436a98c 100644
--- a/net-dialup/isdn4k-utils/ChangeLog
+++ b/net-dialup/isdn4k-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/isdn4k-utils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.26 2004/11/09 17:24:18 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.27 2004/11/10 21:30:05 mrness Exp $
+
+*isdn4k-utils-3.5_p20041024-r1 (10 Nov 2004)
+
+  10 Nov 2004; Alin Nastac <mrness@gentoo.org> +isdn4k-utils-3.5_p20041024-r1.ebuild, 
+  files/3.5_p20041024/isdn4linux.conf, files/3.5_p20041024/isdn4linux.init:
+  Actualize dependencies. Improved isdn4linux script. 
+  Thank you Stefan Briesenick <sbriesen@gmx.de> for your help. Closing #65168.
 
   09 Nov 2004; Alin Nastac <mrness@gentoo.org>
   files/3.5_p20041024/ip-down, files/3.5_p20041024/ip-up:
diff --git a/net-dialup/isdn4k-utils/Manifest b/net-dialup/isdn4k-utils/Manifest
index d750d1a3be35..442b31c08c3f 100644
--- a/net-dialup/isdn4k-utils/Manifest
+++ b/net-dialup/isdn4k-utils/Manifest
@@ -1,18 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 449d0e99c31a499c4b1854304bd2d4c3 ChangeLog 5426
 MD5 9f4187355b91c0dabfca1b251589f527 isdn4k-utils-3.2_p1-r2.ebuild 2808
 MD5 5bfcbc27dc20e18327b61f5df2bbec60 isdn4k-utils-3.2_p1-r3.ebuild 3070
 MD5 f18a68edbe338cae044acc49ae9fdd2b isdn4k-utils-3.2_p1-r4.ebuild 3553
 MD5 25e734017cd86e4def771bbfd2954306 isdn4k-utils-3.5_p20041024.ebuild 3414
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 4575f89271c05b29b8bb6e89163fcc9b isdn4k-utils-3.5_p20041024-r1.ebuild 3401
 MD5 e2cc85397eb8ff285f383213ab00cdad files/digest-isdn4k-utils-3.2_p1-r2 73
 MD5 12a790e7cfe579394ff02019abcdf95d files/digest-isdn4k-utils-3.2_p1-r3 136
 MD5 12a790e7cfe579394ff02019abcdf95d files/digest-isdn4k-utils-3.2_p1-r4 136
 MD5 73d16856e5d4ae2a30bfb77fbd2ab017 files/digest-isdn4k-utils-3.5_p20041024 144
 MD5 2dbc97316fbe5d721b9701347464e22c files/gcc33-multiline.patch 1977
 MD5 adcc3c0ef100b737b0af224401812a4b files/local.start 564
+MD5 73d16856e5d4ae2a30bfb77fbd2ab017 files/digest-isdn4k-utils-3.5_p20041024-r1 144
 MD5 2f4c186b729606b475e17a0ea54189c9 files/3.2_p1-r2/config 2405
 MD5 7ce4e9c2bb9dee4d231ae8da54a06b9f files/3.2_p1-r2/gentoo.patch 2383
 MD5 92412760dfacc81cfac908d522ac8e39 files/3.2_p1-r2/ioptions 86
@@ -30,16 +29,9 @@ MD5 76e9b700a1600d4b74dea30751934c83 files/3.5_p20041024/gentoo.patch 2383
 MD5 92412760dfacc81cfac908d522ac8e39 files/3.5_p20041024/ioptions 86
 MD5 9ba5a5507c109df722fcad7ab21279ac files/3.5_p20041024/ip-down 952
 MD5 7db378ace284707286fc611e41579f2d files/3.5_p20041024/ip-up 1095
-MD5 115bcf317b18a9c362ef37acf5cd4c4b files/3.5_p20041024/isdn4linux.conf 105
-MD5 5be734aa0bdd1a4817775806a6c50b54 files/3.5_p20041024/isdn4linux.init 717
+MD5 4cd4db641466668b0e04c6c3c9ff4ce7 files/3.5_p20041024/isdn4linux.conf 189
+MD5 8ccca78981dda092121971c2bc612e17 files/3.5_p20041024/isdn4linux.init 962
 MD5 786c52d03809635b0a5617d7608c54a5 files/3.5_p20041024/net.ippp0 2428
 MD5 48266d44ebe70519d3fc67a6b0e260ff files/3.5_p20041024/options.ippp0 443
 MD5 56b93c0cc4cc17b12c6add0237283271 files/3.5_p20041024/pathfix.patch 641
 MD5 15ef676fec91271f9a48dc7a1b7e82a2 files/3.5_p20041024/vbox-makefile.am.patch 1211
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBkP1xjtv59x0+BrURAvsYAKDAQiJX3s4qfJ2BdijGp7OBeyAPIQCfZlkk
-nKyLbOObjlL2TWqoC7zY4oo=
-=6pag
------END PGP SIGNATURE-----
diff --git a/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.conf b/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.conf
index 9c37494ca519..b81d7173c1ed 100644
--- a/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.conf
+++ b/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.conf
@@ -1,3 +1,6 @@
 # Location where isdnctrl will save its configuration
-
 ISDNCTRL_SAVE="/var/lib/isdn4linux/isdnctrl.conf"
+
+# ISDN drivers to load via modprobe
+# comment out to disable
+ISDN_DRIVERS="capidrv"
diff --git a/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.init b/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.init
index e65c5826e5a9..428e2830f74a 100644
--- a/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.init
+++ b/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.init
@@ -1,15 +1,25 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.init,v 1.1 2004/11/09 16:40:56 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.init,v 1.2 2004/11/10 21:30:05 mrness Exp $
 
 opts="start stop save reload"
 
 depend() {
 	use pcmcia
+	after capi
 }
 
 start() {
+	# set this variable if you want to load drivers
+	for DRIVER in ${ISDN_DRIVERS} ; do
+		if ! /bin/grep -q "^${DRIVER} " /proc/modules ; then
+			ebegin "Loading ISDN driver ${DRIVER}"
+			/sbin/modprobe ${DRIVER}
+			eend $?
+		fi
+	done
+
 	ebegin "Loading isdnctrl configuration"
 
 	# This variable is set in /etc/conf.d/isdn4linux
diff --git a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_p20041024-r1 b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_p20041024-r1
new file mode 100644
index 000000000000..50734554dc2d
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_p20041024-r1
@@ -0,0 +1,2 @@
+MD5 453e6ca8812555d96fe3e840c89b15a8 isdn4k-utils-CVS-2004-10-24.tar.bz2 5508166
+MD5 dec7c96a6b3e8aa524bf0bcbae1f8af7 vbox3_0.1.9.tar.gz 105619
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.5_p20041024-r1.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.5_p20041024-r1.ebuild
new file mode 100644
index 000000000000..4df09aec03cc
--- /dev/null
+++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.5_p20041024-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.5_p20041024-r1.ebuild,v 1.1 2004/11/10 21:30:05 mrness Exp $
+
+inherit eutils
+
+MY_V=${PV/*_p/}
+MY_PV=${PN}-CVS-${MY_V:0:4}-${MY_V:4:2}-${MY_V:6:2}
+VBOX_V=0.1.9
+S=${WORKDIR}/${MY_PV}
+DESCRIPTION="ISDN-4-Linux Utils"
+SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/${MY_PV}.tar.bz2
+	http://smarden.org/pape/vbox3/vbox3_${VBOX_V}.tar.gz"
+HOMEPAGE="http://www.isdn4linux.de/"
+
+KEYWORDS="~x86 ~amd64 ~alpha"
+LICENSE="GPL-2"
+IUSE="X"
+SLOT="0"
+
+RDEPEND="virtual/modutils
+	virtual/libc
+	sys-libs/ncurses
+	sys-libs/gdbm
+	dev-lang/tcl
+	X? (
+		virtual/x11
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/linux-sources
+	sys-devel/libtool
+	sys-devel/automake"
+
+src_unpack() {
+	unpack ${A}
+
+	# Get country code from I4L_CC variable
+	# default country: DE (Germany)
+	export I4L_CC=`echo -n "${I4L_CC}" | tr "[:lower:]" "[:upper:]"`
+	[ "X${I4L_CC}" == "X" ] && export I4L_CC=DE
+	export I4L_CC_LOW=`echo -n "${I4L_CC}" | tr "[:upper:]" "[:lower:]"`
+	cd ${S}
+
+	# fix for 2.6 headers
+	find . -name \*.c | xargs sed -i -e 's:linux/capi.h>$:linux/compiler.h>\n#include <linux/capi.h>:g'
+
+	# Patch .config file to suit our needs
+	cat ${FILESDIR}/${PV}/config | { \
+		if use X >/dev/null; then
+			cat
+		else
+			sed -e s/CONFIG_BUILDX11=y/#/ -e s/CONFIG_XISDNLOAD=y/#/ -e s/CONFIG_XMONISDN=y/#/;
+		fi; } | { \
+		case "${I4L_CC}" in
+			DE|AT|CH|NL)
+				# These countries are specially supported in the isdnlog source.
+				sed -e s/CONFIG_ISDN_LOG_XX=y/CONFIG_ISDN_LOG_${I4L_CC}=y/ -e s/CONFIG_ISDN_LOG_CC=\'\'/#/
+				;;
+			*)
+				# Others get a generic isdnlog.
+				sed s/CONFIG_ISDN_LOG_CC=\'\'/CONFIG_ISDN_LOG_CC=\'${I4L_CC_LOW}\'/
+				;;
+		esac } \
+		> .config || die
+
+	# Patch in order to make generic config for countries which are not known to isdnlog source
+	epatch ${FILESDIR}/${PV}/gentoo.patch
+
+	for x in capi20 capiinfo capiinit ../vbox3-${VBOX_V}
+	do
+		cd ${S}/${x}
+		[ -f ltmain.sh ] && libtoolize --force
+		rm -f missing
+		aclocal
+		automake --add-missing
+		autoconf
+	done
+
+	cd ${WORKDIR}/vbox3-${VBOX_V}
+	epatch ${FILESDIR}/${PV}/vbox-makefile.am.patch || die "failed to patch vbox"
+}
+
+src_compile() {
+	make subconfig || die
+	make || die
+
+	cd ${S}/../vbox3-${VBOX_V}
+	econf || die "econf failed"
+	emake || die
+}
+
+src_install() {
+	dodir /dev /sbin /usr/bin
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc COPYING NEWS README Mini-FAQ/isdn-faq.txt scripts/makedev.sh
+
+	cd ${FILESDIR}/${PV}
+	dodir /etc/init.d /etc/conf.d /etc/ppp /var/lib/isdn4linux
+
+	exeinto /etc/init.d
+	doexe net.ippp0
+	newexe isdn4linux.init isdn4linux
+
+	insinto /etc/conf.d
+	newins isdn4linux.conf isdn4linux
+
+	exeinto /etc/ppp
+	insinto /etc/ppp
+	doexe ip-up ip-down
+	doins ioptions
+	doins options.ippp0
+
+	cd ${S}/../vbox3-${VBOX_V}
+	einstall || die "cannot install vbox3"
+
+	cd ${D}/etc/isdn
+	epatch ${FILESDIR}/${PV}/pathfix.patch || die
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please edit:"
+	einfo
+	einfo "- /etc/modules.autoload to contain your ISDN kernel modules"
+	einfo "- /etc/isdn/* (critical)"
+	einfo "- /etc/ppp/* (critical)"
+	einfo
+	einfo "/etc/init.d/isdn4linux will save and restore your isdnctrl config."
+	einfo "/etc/init.d/net.ippp0 will start synchronous PPP connections which"
+	einfo "you need to set up using isdnctrl first!"
+	einfo
+
+}