fix undefined symbols for kernels >= 2.6.9 and add hotplug script (#

4 files changed, 160 insertions, 15 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index ffaeac9fe9c3..d224ca1fc964 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.29 2004/12/05 09:28:29 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.30 2004/12/14 18:15:29 mrness Exp $
+
+*slmodem-2.9.10-r2 (14 Dec 2004)
+
+  14 Dec 2004; Alin Nastac <mrness@gentoo.org>
+  -files/slmodem-2.9.10-makefile-fixup.patch,
+  +files/slmodem-2.9.10-usb_endpoint_halted-gentoo.patch,
+  +files/slusb.hotplug, +slmodem-2.9.10-r2.ebuild:
+  Solve undefined symbol error for slusb when is compiled against kernel
+  versions >= 2.69. See bug #74073.
 
   05 Dec 2004; Daniel Black <dragonheart@gentoo.org> metadata.xml,
   -files/slmodem-2.9.9-makefile-fixup.patch, files/slmodem-2.9.conf,
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index e1ead18e9574..bd3536d1cbcc 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 93dd8a9d0c0f815e8445d9f0c1fc0910 metadata.xml 578
 MD5 fb6edd095f9b847ae8970e7ad2cf9351 ChangeLog 7194
+MD5 93dd8a9d0c0f815e8445d9f0c1fc0910 metadata.xml 578
 MD5 af384e4b91c105bbdc4837764112e3d7 slmodem-2.9.10-r1.ebuild 3969
+MD5 22e8b789a245c21f1158182d2d9e1ae6 slmodem-2.9.10-r2.ebuild 4098
+MD5 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10-r1 66
 MD5 67543ad2e41e6dbc2150057340bb82b1 files/slmodem-2.9.conf 752
+MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786
 MD5 64d03a3c87a5330faa6b8dd9d344b6a3 files/slmodem-2.9.init 2657
 MD5 8834a62c67909059cef10887bfbcc853 files/slmodem-2.9.modules 494
-MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786
-MD5 a358a1ca75aad86c0d7a059da089bc58 files/slmodem-2.9.10-makefile-fixup.patch 6229
-MD5 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10-r1 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBstgvmdTrptrqvGERAuEpAJ9U3tChwsP5y7u58/QJxDEr1u6qQwCfSoaV
-B6Q8itNHAyp2XpTATHUfd3A=
-=X7I0
------END PGP SIGNATURE-----
+MD5 026f2e2fae1fbd999455b36630164a88 files/slmodem-2.9.10-usb_endpoint_halted-gentoo.patch 830
+MD5 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10-r2 66
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.10-r2 b/net-dialup/slmodem/files/digest-slmodem-2.9.10-r2
new file mode 100644
index 000000000000..b6aff29497e8
--- /dev/null
+++ b/net-dialup/slmodem/files/digest-slmodem-2.9.10-r2
@@ -0,0 +1 @@
+MD5 cbc4918f2ee9ed4952d3f4309d364b35 slmodem-2.9.10.tar.gz 806884
diff --git a/net-dialup/slmodem/slmodem-2.9.10-r2.ebuild b/net-dialup/slmodem/slmodem-2.9.10-r2.ebuild
new file mode 100644
index 000000000000..71bcc240fb1d
--- /dev/null
+++ b/net-dialup/slmodem/slmodem-2.9.10-r2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.10-r2.ebuild,v 1.1 2004/12/14 18:15:29 mrness Exp $
+
+inherit eutils linux-info
+
+DESCRIPTION="Driver for Smart Link modem"
+HOMEPAGE="http://www.smlink.com/"
+SRC_URI="http://www.smlink.com/main/down/${P}.tar.gz"
+LICENSE="Smart-Link"
+SLOT="0"
+KEYWORDS="~x86 -*"
+IUSE="alsa usb"
+
+DEPEND="virtual/libc
+	alsa? ( media-libs/alsa-lib )
+	virtual/os-headers
+	>=sys-apps/sed-4"
+
+RDEPEND="virtual/libc
+	alsa? ( media-libs/alsa-lib )"
+
+pkg_setup() {
+	check_modules_supported
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-usb_endpoint_halted-gentoo.patch || die "failed to patch"
+}
+
+src_compile() {
+	if use alsa
+	then
+		export SUPPORT_ALSA=1
+	else
+		unset SUPPORT_ALSA
+	fi
+
+	# http://marc.theaimsgroup.com/?l=gentoo-dev&m=109672618708314&w=2
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ];	then
+		sed -i 's:SUBDIRS=:M=:g' drivers/Makefile
+	fi
+
+	unset ARCH
+
+	emake \
+		KERNEL_DIR="${ROOT}/usr/src/linux" \
+	 	modem drivers || die "Failed to compile driver"
+}
+
+src_install() {
+	if kernel_is 2 6 ; then
+		KV_OBJ="ko"
+	else
+		KV_OBJ="o"
+	fi
+
+	insinto /lib/modules/${KV}/extra
+	doins drivers/slamr.${KV_OBJ}
+	doins drivers/slusb.${KV_OBJ}
+
+	newsbin modem/modem_test slmodem_test
+	dosbin modem/slmodemd
+	dodir /var/lib/slmodem
+	fowners root:dialout /var/lib/slmodem
+
+	dodoc COPYING Changes README
+
+	# 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}
+	sed -i -e "s/ALSACONF//g" -e "s/PCICONF//g" -e "s/USBCONF//g" ${D}/etc/conf.d/slmodem
+
+	# 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}
+		chmod 644 ${D}/etc/modules.d/slmodem
+	elif [ -e ${ROOT}/dev/.udev ] ; then
+		# udev
+		# check Symlink
+		dodir /etc/udev/rules.d/
+		echo 'KERNEL="slamr", NAME="slamr0"' > \
+			 ${D}/etc/udev/rules.d/55-${PN}.rules
+		echo 'KERNEL="slusb", NAME="slusb0"' >> \
+			 ${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
+		make -C drivers DESTDIR=${D} KERNEL_DIR="${ROOT}/usr/src/linux" install-devices
+	fi
+
+	# Install hotplug script
+	insinto /etc/hotplug/usb; insopts -m0755; newins ${FILESDIR}/slusb.hotplug slusb
+
+	dodir /etc/hotplug/blacklist.d
+	echo -e "slusb\nslamr\nsnd-intel8x0m" >> ${D}/etc/hotplug/blacklist.d/55-${PN}
+}
+
+pkg_postinst() {
+	# 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
+		ebegin "Restarting udev to reread udev rules"
+			udevstart
+		eend 0
+	fi
+
+	echo
+
+	einfo "You must edit /etc/conf.d/${PN} for your configuration"
+
+	ewarn "To avoid problems add slusb/slamr to /etc/hotplug/blacklist"
+
+	einfo "To add slmodem to your startup - type : rc-update add slmodem default"
+
+	if use alsa;
+	then
+		einfo "I hope you have already added alsa to your startup: "
+		einfo "otherwise type: rc-update add alsasound boot"
+		einfo
+		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
+
+	einfo "Checking kernel module dependencies"
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+}