Fixes and updates as per bug #47947 comments 31,35,36

7 files changed, 155 insertions, 9 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 27b41447eb56..e6da2051ed9d 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.10 2004/06/05 12:11:00 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.11 2004/06/08 05:37:52 dragonheart Exp $
+
+  08 Jun 2004; Daniel Black <dragonheart@gentoo.org> files/slmodem-2.9.conf,
+  files/slmodem-2.9.devfs, files/slmodem-2.9.init, +slmodem-2.9.7-r2.ebuild:
+  Fixes and updates as per bug #47947 comments 31,35,36. Thanks to Tod 
+  Morrison, Miroslaw Mieszczak and Simon Cooper.
 
   05 Jun 2004; Daniel Black <dragonheart@gentoo.org> slmodem-2.9.7-r1.ebuild:
   Fix according to bug #47947 comment 29 - Thanks Simon.
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index 9493e86c6eb3..cf063bc92d10 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -1,9 +1,10 @@
-MD5 82fb0f95142ae6bd81f81fd95736bb67 ChangeLog 1971
+MD5 ef60617498f9fd7345c2598e22aa2939 ChangeLog 2247
 MD5 8114f79f8735648770d8f37c32861c88 metadata.xml 252
 MD5 226b1bc187c6609edaf3609999d74a39 slmodem-2.7.14.ebuild 1519
 MD5 d40a7267241405ad63af465dfaf83941 slmodem-2.9.7.ebuild 2112
 MD5 2b5a18d7cdb27c9ddf944e9179cd9479 slmodem-2.9.7-r1.ebuild 2776
-MD5 79ac0b66f1485e624b8af61332ebb8e3 files/slmodem-2.9.conf 369
+MD5 1d9253ddbc9ab371e0df2f7a54abff50 slmodem-2.9.7-r2.ebuild 3371
+MD5 cda432a065dd7b5dfbc2b3f3d7821c67 files/slmodem-2.9.conf 421
 MD5 04150d1eddd9774a7d1a70df93600e3c files/digest-slmodem-2.7.14 64
 MD5 5565553c8ddd949c38070e59ce64b90c files/slmodem-2.7.14-makefile-fixup.patch 1626
 MD5 df926a828ac12650f7a841e67a7f1ee4 files/slmodem-2.7.devfs 430
@@ -11,6 +12,7 @@ MD5 151e4ab854bcb09dc6af750b37d7dd9f files/slmodem-2.7.modules 665
 MD5 8834a62c67909059cef10887bfbcc853 files/slmodem-2.9.modules 494
 MD5 31efdce45dc6665bfc2c6cb50048d714 files/slmodem-2.9.7-makefile-fixup.patch 3476
 MD5 0391d6463fed235e6038d9048a7e5251 files/digest-slmodem-2.9.7 65
-MD5 754491f89e447d8bb3f1c52f559e1172 files/slmodem-2.9.devfs 479
-MD5 0de27bf9bd4165e137e845898658e7e6 files/slmodem-2.9.init 846
+MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786
+MD5 04d3da7ead4817e8b9b1a9b7f73e622f files/slmodem-2.9.init 866
 MD5 0391d6463fed235e6038d9048a7e5251 files/digest-slmodem-2.9.7-r1 65
+MD5 0391d6463fed235e6038d9048a7e5251 files/digest-slmodem-2.9.7-r2 65
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.7-r2 b/net-dialup/slmodem/files/digest-slmodem-2.9.7-r2
new file mode 100644
index 000000000000..45a1ca010886
--- /dev/null
+++ b/net-dialup/slmodem/files/digest-slmodem-2.9.7-r2
@@ -0,0 +1 @@
+MD5 741aec69a9cdb95fbce21105b4f1924c slmodem-2.9.7.tar.gz 648986
diff --git a/net-dialup/slmodem/files/slmodem-2.9.conf b/net-dialup/slmodem/files/slmodem-2.9.conf
index f03438aac742..659e8748cbd9 100644
--- a/net-dialup/slmodem/files/slmodem-2.9.conf
+++ b/net-dialup/slmodem/files/slmodem-2.9.conf
@@ -3,6 +3,10 @@
 MODULE=slamr
 # or MODULE=slusb
 
+# Raise priority to reduce modem dropouts
+NICE=-6
+
+
 DEV=/dev/slamr0
 LN_DEV=/dev/modem
 #MODEM_DAEMON=/usr/sbin/slmodemd
diff --git a/net-dialup/slmodem/files/slmodem-2.9.devfs b/net-dialup/slmodem/files/slmodem-2.9.devfs
index 16e49322c72c..719f95f303d2 100644
--- a/net-dialup/slmodem/files/slmodem-2.9.devfs
+++ b/net-dialup/slmodem/files/slmodem-2.9.devfs
@@ -1,8 +1,15 @@
 # slmodem kernel modules' devfs configuration file
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.9.devfs,v 1.2 2004/06/05 10:41:21 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.9.devfs,v 1.3 2004/06/08 05:38:04 dragonheart Exp $
 
 # Create /dev/modem for /dev/slamr0 (Change to suit your setup)
 LOOKUP          ^slamr0$   MODLOAD ACTION slamr
-LOOKUP          ^slamr0$   CFUNCTION GLOBAL mksymlink slamr0 modem
+LOOKUP          ^slamr0$   CFUNCTION GLOBAL mksymlink ttySL0 modem
 REGISTER        ^slamr0$   CFUNCTION GLOBAL mksymlink $devname modem
 UNREGISTER      ^slamr0$   CFUNCTION GLOBAL unlink modem
+
+# Create /dev/modem for /dev/slusb0 (Change to suit your setup)
+LOOKUP          ^slusb0$   MODLOAD ACTION slusb
+LOOKUP          ^slusb0$   CFUNCTION GLOBAL mksymlink ttySL0 modem
+REGISTER        ^slusb0$   CFUNCTION GLOBAL mksymlink $devname modem
+UNREGISTER      ^slusb0$   CFUNCTION GLOBAL unlink modem
+
diff --git a/net-dialup/slmodem/files/slmodem-2.9.init b/net-dialup/slmodem/files/slmodem-2.9.init
index fa1236e90cdc..1dbf188eb38c 100644
--- a/net-dialup/slmodem/files/slmodem-2.9.init
+++ b/net-dialup/slmodem/files/slmodem-2.9.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.9.init,v 1.2 2004/06/05 10:41:21 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.9.init,v 1.3 2004/06/08 05:38:04 dragonheart Exp $
 
 depend() {
     need logger
@@ -18,7 +18,7 @@ checkconfig() {
 start() {
 	ebegin "Starting slmodemd for ${DEV}"
 	modprobe ${MODULE}
-	start-stop-daemon --start --background --make-pidfile \
+	start-stop-daemon --start --background --nicelevel=${NICE} --make-pidfile \
 		--pidfile /var/run/slmodemd.pid --startas /usr/sbin/slmodemd \
 		-- -country=${COUNTRY} -g=${GROUP} ${DEV}
 	eend $?
diff --git a/net-dialup/slmodem/slmodem-2.9.7-r2.ebuild b/net-dialup/slmodem/slmodem-2.9.7-r2.ebuild
new file mode 100644
index 000000000000..402bd5d48cc1
--- /dev/null
+++ b/net-dialup/slmodem/slmodem-2.9.7-r2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.7-r2.ebuild,v 1.1 2004/06/08 05:38:04 dragonheart Exp $
+
+IUSE="alsa"
+
+inherit eutils
+
+DESCRIPTION="Driver for Smart Link modem"
+HOMEPAGE="http://www.smlink.com/"
+MY_P="${P}"
+SRC_URI="ftp://ftp.smlink.com/linux/unsupported/${MY_P}.tar.gz"
+LICENSE="Smart-Link"
+SLOT="0"
+KEYWORDS="~x86"
+RDEPEND="virtual/glibc"
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-makefile-fixup.patch
+}
+
+src_compile() {
+	#if has sandbox ${FEATURES} || has userpriv ${FEATURES} || has usersandbox ${FEATURES}; then
+	#	ewarn "Users emerging this with a 2.6 kernel still need to disable"
+	#	ewarn "sandbox, usersandbox, userpriv from FEATURES."
+	#	einfo 'use: env FEATURES="-userpriv -usersandbox -sandbox" emerge slmodem'
+	#	die "bad FEATURES - sandbox, usersandbox and/or userpriv "
+	#fi
+
+	unset ARCH
+	emake MODVERDIR=${T}/.tmp_versions drivers
+
+	cd modem;
+	if use alsa ; then
+		emake SUPPORT_ALSA=1 MODVERDIR=${T}/.tmp_versions \
+			|| die 'Alsa support failed, try USE="-alsa"'
+	else
+		emake || die "Could not compile"
+	fi
+}
+
+src_install() {
+	unset ARCH
+	emake DESTDIR=${D} install || die
+
+	dodoc COPYING Changes README README.1st
+
+	# Install /etc/{devfs,modules,init,conf}.d/slmodem files
+	insinto /etc/conf.d/; newins ${FILESDIR}/${PN}-2.9.conf ${PN}
+	insopts -m0755; insinto /etc/init.d/; newins ${FILESDIR}/${PN}-2.9.init ${PN}
+
+	# Make some devices if we aren't using devfs
+	# If we are using devfs, restart it
+	if [ -e ${ROOT}/dev/.devfsd ] ; then
+	# devfs
+		insinto /etc/devfs.d/; newins ${FILESDIR}/${PN}-2.9.devfs ${PN}
+		insinto /etc/modules.d/; newins ${FILESDIR}/${PN}-2.9.modules ${PN}
+	elif [ -e ${ROOT}/dev/.udev ] ; then
+	# udev
+		dodir /etc/udev/rules.d/
+		echo 'KERNEL="slamr", NAME="slamr0", SYMLINK="modem"' > \
+			 ${D}/etc/udev/rules.d/55-${PN}.rules
+		dodir /etc/udev/permissions.d
+		echo 'slamr*:root:dialout:0660' > \
+			${D}/etc/udev/permissions.d/55-${PN}.permissions
+	else
+	# simple raw devs
+		dodir /dev
+		cd ${D}/dev
+		ebegin "Creating /dev/slamr* devices"
+		local C="0"
+		while [ "${C}" -lt "4" ]
+		do
+			if [ ! -c ${ROOT}/dev/slamr${C} ]
+			then
+				mknod ${D}/dev/slamr${C} c 212 ${C}
+			#	doco suggests that the slmodemd creates these
+			#	ln -s slamr${C} ttySL${C}
+			fi
+			if [ ! -c ${ROOT}/dev/slamr${C} ]
+			then
+				mknod ${D}/dev/slusb${C} c 213 ${C}
+			#TODO usb or slamr (AMR/CNR/PCI) version for symlinks???
+			#	ln -s sl${C} ttySL${C}
+			fi
+
+			C="`expr $C + 1`"
+		done
+		eend 0
+		ln -s ttySL0 modem
+	fi
+
+}
+
+pkg_postinst() {
+	depmod -a
+	# Make some devices if we aren't using devfs
+	# If we are using devfs, restart it
+	if [ -e ${ROOT}/dev/.devfsd ]
+	then
+
+		ebegin "Restarting devfsd to reread devfs rules"
+			killall -HUP devfsd
+		eend 0
+		einfo "modules-update to complete configuration."
+
+	elif [ -e ${ROOT}/dev/.udev ]
+	then
+		#doesn't work - looking for fix.
+		ebegin "Restarting udevd to reread udev rules"
+		#	killall -HUP udevd &>/dev/null
+		eend 0
+	fi
+
+	echo
+
+	einfo "You must edit /etc/conf.d/${PN} for your configuration"
+
+	if use alsa; then
+		echo
+		einfo "If you need to use snd-intel8x0m from the kernel"
+		einfo "compile it as a module and edit etc/module.d/alsa"
+		einfo 'to: "alias snd-card-(number) snd-intel8x0m"'
+	fi
+}