summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-dialup/speedtouch/ChangeLog8
-rw-r--r--net-dialup/speedtouch/Manifest13
-rw-r--r--net-dialup/speedtouch/files/digest-speedtouch-1.3.1-r31
-rw-r--r--net-dialup/speedtouch/files/speedtouch.initd70
-rw-r--r--net-dialup/speedtouch/speedtouch-1.3.1-r3.ebuild93
5 files changed, 174 insertions, 11 deletions
diff --git a/net-dialup/speedtouch/ChangeLog b/net-dialup/speedtouch/ChangeLog
index 5a4cf424a9de..6421ee4c3a74 100644
--- a/net-dialup/speedtouch/ChangeLog
+++ b/net-dialup/speedtouch/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-dialup/speedtouch
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/ChangeLog,v 1.29 2005/10/04 20:18:07 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/ChangeLog,v 1.30 2005/11/01 04:59:52 mrness Exp $
+
+*speedtouch-1.3.1-r3 (01 Nov 2005)
+
+ 01 Nov 2005; Alin Nastac <mrness@gentoo.org> +files/speedtouch.initd,
+ +speedtouch-1.3.1-r3.ebuild:
+ Remove unreleased semaphore before launching a new modem_run process (#109595).
04 Oct 2005; Alin Nastac <mrness@gentoo.org> speedtouch-1.3.1-r2.ebuild:
Remove COPYING and INSTALL from docs.
diff --git a/net-dialup/speedtouch/Manifest b/net-dialup/speedtouch/Manifest
index e1a90b6dc69b..58ff2af68ad0 100644
--- a/net-dialup/speedtouch/Manifest
+++ b/net-dialup/speedtouch/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 7d713ce138045500e3e40edbad56699a speedtouch-1.3.1-r3.ebuild 2991
MD5 bec36c734bc14f9dbdf142e56b618041 speedtouch-1.3.1-r2.ebuild 3026
MD5 631bc8bd1768690ed565113298a216ea ChangeLog 4381
MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
MD5 3c7d210090e2fed135170292f62e279b files/speedtch-hotplug 396
MD5 4191035925db745944c75e26937c42a3 files/speedtouch-1.3.1-gcc4.patch 279
MD5 be6c41b714f7e55195d93fd478dc5e7e files/digest-speedtouch-1.3.1-r2 69
+MD5 be6c41b714f7e55195d93fd478dc5e7e files/digest-speedtouch-1.3.1-r3 69
MD5 aa0803fb7b3133521df4ee07d7ff141a files/speedtouch.rc7 1655
MD5 e1433d87a19203883aeaa0d4f791f91f files/speedtouch.confd 699
+MD5 4a50336c23547cde7ddeb473d63c8591 files/speedtouch.initd 1766
MD5 d6eb26607fa211c61609dd783ecfdac9 files/adsl.sample 599
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDQuObNSP4Vda7IdsRAsA/AJ9z/vHroLKHMQ0ssGs37zvaAX4ZBwCgguTh
-aGJ/rhyEnkQvZY1iuvyt81Y=
-=0p8m
------END PGP SIGNATURE-----
diff --git a/net-dialup/speedtouch/files/digest-speedtouch-1.3.1-r3 b/net-dialup/speedtouch/files/digest-speedtouch-1.3.1-r3
new file mode 100644
index 000000000000..a2553a2dd249
--- /dev/null
+++ b/net-dialup/speedtouch/files/digest-speedtouch-1.3.1-r3
@@ -0,0 +1 @@
+MD5 0848a120ae0eeab6c8ab378e11dc4fa2 speedtouch-1.3.1.tar.bz2 197709
diff --git a/net-dialup/speedtouch/files/speedtouch.initd b/net-dialup/speedtouch/files/speedtouch.initd
new file mode 100644
index 000000000000..1894378f8d63
--- /dev/null
+++ b/net-dialup/speedtouch/files/speedtouch.initd
@@ -0,0 +1,70 @@
+#!/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/speedtouch/files/speedtouch.initd,v 1.1 2005/11/01 04:59:52 mrness 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
+
+ # Remove unreleased semaphore - previous instance of modem_run left it (bug #109595)
+ (ipcs -s | grep ^0xdeadbeef &>/dev/null) && ipcrm -S 0xdeadbeef
+
+ 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 firmware 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.1-r3.ebuild b/net-dialup/speedtouch/speedtouch-1.3.1-r3.ebuild
new file mode 100644
index 000000000000..563d1463e255
--- /dev/null
+++ b/net-dialup/speedtouch/speedtouch-1.3.1-r3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/speedtouch-1.3.1-r3.ebuild,v 1.1 2005/11/01 04:59:52 mrness Exp $
+
+inherit flag-o-matic eutils
+
+MY_P=${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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
+IUSE="static debug"
+
+DEPEND=""
+RDEPEND=">=net-dialup/ppp-2.4.1"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+ unpack ${A}
+
+ # Patch to fix gcc-4.* compile error (bug #99759)
+ epatch ${FILESDIR}/${P}-gcc4.patch
+
+ #Increase minlevel of reports in atm.c
+ #At least one of the reports could affect performance due to call frequency
+ sed -i -e 's/report(0/report(1/' ${S}/src/atm.c
+}
+
+src_compile() {
+ local myconf=
+ 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() {
+ 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 ChangeLog TODO VERSION
+
+ rm -rf ${D}/usr/bin
+ rm -rf ${D}/usr/share/man/man1
+
+ newinitd ${FILESDIR}/speedtouch.initd speedtouch
+ newconfd ${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
+}