version bump thanks to bug #45788

7 files changed, 204 insertions, 12 deletions

diff --git a/net-dialup/speedtouch/ChangeLog b/net-dialup/speedtouch/ChangeLog
index 7d20b59b9c03..921fac557488 100644
--- a/net-dialup/speedtouch/ChangeLog
+++ b/net-dialup/speedtouch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/speedtouch
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/ChangeLog,v 1.18 2004/06/24 22:32:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/ChangeLog,v 1.19 2004/09/27 13:56:33 dragonheart Exp $
+
+*speedtouch-1.3 (27 Sep 2004)
+
+  27 Sep 2004; Daniel Black <dragonheart@gentoo.org> +files/speedtch-hotplug,
+  files/speedtouch.confd, +files/speedtouch.rc7, +speedtouch-1.3.ebuild:
+  version bump thanks to bug #45788 by stan <stan@saticed.me.uk>
 
   15 Jun 2004; Travis Tilley <lv@gentoo.org> speedtouch-1.2.ebuild:
   stable on amd64
diff --git a/net-dialup/speedtouch/Manifest b/net-dialup/speedtouch/Manifest
index c181adc43c15..80d84722e774 100644
--- a/net-dialup/speedtouch/Manifest
+++ b/net-dialup/speedtouch/Manifest
@@ -1,11 +1,15 @@
-MD5 155b1c40da16772c5bc6ec45c04537e9 speedtouch-1.2.ebuild 2421
-MD5 9cd1bc9f313b9164f7e3f10157301da7 speedtouch-1.2_beta2.ebuild 2261
-MD5 f381ca3fb212230f03e9ed8297457c01 speedtouch-1.1.ebuild 2104
 MD5 12ae9442261d501e2118b79de0a405f0 ChangeLog 2583
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 83e6f2ae7a2c4a9fe6d68d3c051e31c9 files/speedtouch.rc6 2339
-MD5 ada737a44de0c80d4278d2cc7f5e95cd files/speedtouch.confd 571
-MD5 c622ee14e155b3897e6a069306d1c88b files/digest-speedtouch-1.1 67
-MD5 da45576edbdb9ba3d5d9b0043cd4777b files/digest-speedtouch-1.2 67
+MD5 f381ca3fb212230f03e9ed8297457c01 speedtouch-1.1.ebuild 2104
+MD5 7c0527603b22f0a9a2b01e66864e602d speedtouch-1.3.ebuild 2780
+MD5 9cd1bc9f313b9164f7e3f10157301da7 speedtouch-1.2_beta2.ebuild 2261
+MD5 155b1c40da16772c5bc6ec45c04537e9 speedtouch-1.2.ebuild 2421
+MD5 d255e0a1058c2db404e6012484c86dc3 files/speedtouch.rc7 1661
 MD5 d6eb26607fa211c61609dd783ecfdac9 files/adsl.sample 599
+MD5 c622ee14e155b3897e6a069306d1c88b files/digest-speedtouch-1.1 67
+MD5 3c7d210090e2fed135170292f62e279b files/speedtch-hotplug 396
 MD5 b1033785b6ac1ed25eb1c9dfdf95e379 files/digest-speedtouch-1.2_beta2 73
+MD5 a136338c0454c68c160d7bf1b4dbc4b2 files/digest-speedtouch-1.3 67
+MD5 f6e63495bb08f14ce31f1b39b706433d files/speedtouch.confd 705
+MD5 83e6f2ae7a2c4a9fe6d68d3c051e31c9 files/speedtouch.rc6 2339
+MD5 da45576edbdb9ba3d5d9b0043cd4777b files/digest-speedtouch-1.2 67
diff --git a/net-dialup/speedtouch/files/digest-speedtouch-1.3 b/net-dialup/speedtouch/files/digest-speedtouch-1.3
new file mode 100644
index 000000000000..7ac030c31d78
--- /dev/null
+++ b/net-dialup/speedtouch/files/digest-speedtouch-1.3
@@ -0,0 +1 @@
+MD5 51012dc3f19297d2fd31bb79e3e2040f speedtouch-1.3.tar.bz2 195549
diff --git a/net-dialup/speedtouch/files/speedtch-hotplug b/net-dialup/speedtouch/files/speedtch-hotplug
new file mode 100644
index 000000000000..20325894c546
--- /dev/null
+++ b/net-dialup/speedtouch/files/speedtch-hotplug
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+echo "${REMOVER}" | grep '0$'
+
+if [ $? -eq 0 ]; then
+
+	case "$ACTION" in
+		add)
+			cat > "${REMOVER}" <<-EOF
+			#!/bin/sh
+
+			/etc/init.d/speedtouch stop
+			/sbin/lsmod | grep -q "^speedtch"
+			if [ \$? -eq 0 ]; then
+				#wait for pppd to exit
+				sleep 20
+				/sbin/rmmod speedtch
+			fi
+			EOF
+
+			/bin/chmod +x "${REMOVER}"
+			/etc/init.d/speedtouch start
+    	;;
+	esac
+
+fi
+
+exit 0
+
diff --git a/net-dialup/speedtouch/files/speedtouch.confd b/net-dialup/speedtouch/files/speedtouch.confd
index 8e01278afba1..2e771c1a7799 100644
--- a/net-dialup/speedtouch/files/speedtouch.confd
+++ b/net-dialup/speedtouch/files/speedtouch.confd
@@ -1,11 +1,11 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/files/speedtouch.confd,v 1.4 2004/07/14 23:11:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/files/speedtouch.confd,v 1.5 2004/09/27 13:56:33 dragonheart Exp $
 
 # Config file for the speedtouch ebuild
 
 # Set the microcode path
-# MICROCODE="/usr/share/speedtouch/mgmt.o"
+#MICROCODE="/usr/share/speedtouch/mgmt.o"
 
 # Set verbose level for modem_run
 VERBOSE="0"
@@ -15,5 +15,7 @@ VERBOSE="0"
 PEER="adsl"
 
 # Extra options to modem_run
-# Some modems will need -s, if in doubt then leave blank
+# Some modems will need "-s", if in doubt then leave blank
+# add "-k" for use with the kernel mode driver
+# add "-a /usr/share/speedtouch/boot.v123.bin" if your modem is green or purple
 #MODEM_RUN_EXTRAOPTS="-s"
diff --git a/net-dialup/speedtouch/files/speedtouch.rc7 b/net-dialup/speedtouch/files/speedtouch.rc7
new file mode 100644
index 000000000000..a9c2f6f3306b
--- /dev/null
+++ b/net-dialup/speedtouch/files/speedtouch.rc7
@@ -0,0 +1,67 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/files/speedtouch.rc7,v 1.1 2004/09/27 13:56:33 dragonheart Exp $
+
+depend() {
+	need localmount modules
+}
+
+start() {
+	ebegin "Starting Speedtouch ADSL Modem..."
+
+	ps -e | grep -q modem_run
+	if [ $? -eq 0 ]; then
+		einfo "Firmware already loaded, skipping load"
+	else
+
+		einfo "Loading firmware..."
+
+		if [ -z "${MICROCODE}" ]; then
+			eend 1 "Please define \$MICROCODE in /etc/conf.d/speedtouch"
+			return 1
+		fi
+		if [ ! -f ${MICROCODE} ]; then
+			eend 1 "Failed to find the microcode."
+			return 1
+		fi
+		# usbdevfs is up ?
+		if [ ! -f /proc/bus/usb/devices ]; then
+			eend 1 "usbdevfs not mounted"
+			return 1
+		fi
+
+		modem_run -v $VERBOSE $MODEM_RUN_EXTRAOPTS -f $MICROCODE
+		if [ $? -ne 0 ]; then		# modem_run CAN'T run
+			eerror "Can't load the microcode !!" 
+			eerror "Please detach and attach again your modem to the USB port to unload the microcode."
+			eerror "Then run '/etc/init.d/speedtouch start'"
+			eend 1 "Speedtouch firmward load failed"
+			return 1 
+		fi
+
+		
+		einfo "Speedtouch firmware loaded"
+		eend 0
+	fi
+
+	if [ ! -f "/etc/ppp/peers/$PEER" ]; then
+		eend 1 "Failed to find peer configuration"
+		return 1
+	fi
+
+	einfo "Launching the PPP daemon..."
+	rm -f /var/run/pppoa*.pid
+	start-stop-daemon --start \
+		--exec /usr/sbin/pppd call $PEER &>/dev/null
+
+	eend $? "Failed to start the PPP daemon"
+}
+
+stop() {
+	ebegin "Shutting down the SpeedTouch ADSL Modem..."
+
+	start-stop-daemon --stop --pidfile /var/run/ppp0.pid pppd
+
+	eend $? "Failed to stop 'pppd'."
+}
diff --git a/net-dialup/speedtouch/speedtouch-1.3.ebuild b/net-dialup/speedtouch/speedtouch-1.3.ebuild
new file mode 100644
index 000000000000..3ae4dfbf1ff1
--- /dev/null
+++ b/net-dialup/speedtouch/speedtouch-1.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/speedtouch-1.3.ebuild,v 1.1 2004/09/27 13:56:33 dragonheart Exp $
+
+inherit flag-o-matic
+
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="GPL Driver for the Alcatel Speedtouch USB under *nix"
+HOMEPAGE="http://speedtouch.sf.net/"
+SRC_URI="mirror://sourceforge/speedtouch/${MY_P}.tar.bz2"
+
+IUSE="static debug"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~hppa ~amd64"
+
+DEPEND=""
+RDEPEND=">=net-dialup/ppp-2.4.1"
+
+src_compile() {
+	use debug && myconf="--enable-debug"
+	use static && myconf="${myconf} --enable-static"
+
+	filter-flags -mpowerpc-gfxopt -mpowerpc-gpopt
+	econf --enable-syslog  \
+		${myconf} || die "./configure failed"
+
+	emake || die "make failed"
+}
+
+src_install () {
+
+	use debug && RESTRICT="${RESTRICT} nostrip"
+
+	einstall || die
+
+	# twp 2003-12-25 install *.html correctly
+	find ${D}/usr/share/doc/speedtouch/ -type f -name '*.html' | xargs dohtml
+	find ${D}/usr/share/doc/speedtouch/ -type f -name '*.html' | xargs rm
+	echo $(find ${D}/usr/share/doc/speedtouch/ -type f) | xargs dodoc
+	rm -rf ${D}/usr/share/doc/speedtouch/
+	dodoc AUTHORS COPYING ChangeLog INSTALL TODO VERSION
+
+	rm -rf ${D}/usr/bin
+	rm -rf ${D}/usr/share/man/man1
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/speedtouch.rc7 speedtouch
+
+	insinto /etc/conf.d ; newins ${FILESDIR}/speedtouch.confd speedtouch
+
+	insopts -m 600 ; insinto /etc/ppp/peers ; doins ${FILESDIR}/adsl.sample
+
+	dosbin doc-linux/adsl-conf-pppd
+
+	#allows hotplug to modprobe the speedtch module automatically
+	mv ${D}/etc/hotplug/usb/speedtouch.usermap ${D}/etc/hotplug/usb/speedtch.usermap
+	exeinto /etc/hotplug/usb ; newexe ${FILESDIR}/speedtch-hotplug speedtch
+	rm ${D}/etc/hotplug/usb/speedtouch
+}
+
+pkg_postinst() {
+	echo ""
+	ewarn "Make sure you have kernel support for USB, HDCL and PPP"
+	ewarn "NB: kernels >= 2.4.18 include the hdlc patch"
+	echo ""
+	ewarn "Read and subscribe vendor's licence to download the microcode"
+	ewarn "You can get it from: "
+	ewarn "  1) vendor's site: http://www.speedtouchdsl.com/dvrreg_lx.htm"
+	ewarn "  2) a windows system: c:\windows\system\alcaudsl.sys"
+	ewarn "  3) the CD provided: X:\Driver\alcaudsl.sys"
+	ewarn "Then you should set its path in the /etc/conf.d/speedtouch file"
+	ewarn "edit and rename 'adsl.sample' to 'adsl' in /etc/ppp/peers/adsl and"
+	ewarn "bring up your adsl line using the /etc/init.d/speedtouch script"
+	echo ""
+	einfo "More info in the documentation in /usr/share/doc/${PF}"
+	echo ""
+	einfo "You need to pass -a /usr/share/speedtouch/boot.v123.bin to"
+	einfo "modem_run with this version. The URL for firmware is:"
+	einfo "http://www.speedtouchdsl.com/driver_upgrade_lx_3.0.1.2.htm"
+	echo ""
+}