version bump because of security issues, bug #68436

4 files changed, 101 insertions, 20 deletions

diff --git a/net-dialup/speedtouch/ChangeLog b/net-dialup/speedtouch/ChangeLog
index 63ad4379832b..4b3445fbc70f 100644
--- a/net-dialup/speedtouch/ChangeLog
+++ b/net-dialup/speedtouch/ChangeLog
@@ -1,6 +1,11 @@
 # 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.20 2004/09/28 01:23:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/ChangeLog,v 1.21 2004/10/27 16:31:04 lanius Exp $
+
+*speedtouch-1.3.1 (27 Oct 2004)
+
+  27 Oct 2004; <heino@gentoo.org> +speedtouch-1.3.1.ebuild:
+  version bump because of security issues, bug #68436
 
   28 Sep 2004; Sven Wegener <swegener@gentoo.org> files/speedtouch.confd,
   files/speedtouch.rc7:
diff --git a/net-dialup/speedtouch/Manifest b/net-dialup/speedtouch/Manifest
index b173d1008032..a1061e8b6223 100644
--- a/net-dialup/speedtouch/Manifest
+++ b/net-dialup/speedtouch/Manifest
@@ -1,25 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6e765b05290d79bc3fe70c2d10b210e2 ChangeLog 2979
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 f381ca3fb212230f03e9ed8297457c01 speedtouch-1.1.ebuild 2104
 MD5 155b1c40da16772c5bc6ec45c04537e9 speedtouch-1.2.ebuild 2421
 MD5 9cd1bc9f313b9164f7e3f10157301da7 speedtouch-1.2_beta2.ebuild 2261
+MD5 1ce4316f31977609dbb7e47970bb7d00 speedtouch-1.3.1.ebuild 2779
+MD5 f381ca3fb212230f03e9ed8297457c01 speedtouch-1.1.ebuild 2104
 MD5 4600f02658dba0e66cdf7a48796d42a1 speedtouch-1.3.ebuild 2783
-MD5 d6eb26607fa211c61609dd783ecfdac9 files/adsl.sample 599
+MD5 c79e5046ab8aec92bb1be99bd487e40e ChangeLog 3125
+MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 3c7d210090e2fed135170292f62e279b files/speedtch-hotplug 396
+MD5 83e6f2ae7a2c4a9fe6d68d3c051e31c9 files/speedtouch.rc6 2339
+MD5 aa0803fb7b3133521df4ee07d7ff141a files/speedtouch.rc7 1655
+MD5 e1433d87a19203883aeaa0d4f791f91f files/speedtouch.confd 699
 MD5 c622ee14e155b3897e6a069306d1c88b files/digest-speedtouch-1.1 67
 MD5 da45576edbdb9ba3d5d9b0043cd4777b files/digest-speedtouch-1.2 67
-MD5 b1033785b6ac1ed25eb1c9dfdf95e379 files/digest-speedtouch-1.2_beta2 73
-MD5 e1433d87a19203883aeaa0d4f791f91f files/speedtouch.confd 699
-MD5 83e6f2ae7a2c4a9fe6d68d3c051e31c9 files/speedtouch.rc6 2339
 MD5 a136338c0454c68c160d7bf1b4dbc4b2 files/digest-speedtouch-1.3 67
-MD5 3c7d210090e2fed135170292f62e279b files/speedtch-hotplug 396
-MD5 aa0803fb7b3133521df4ee07d7ff141a files/speedtouch.rc7 1655
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBWL0ZI1lqEGTUzyQRAitiAKCfqbDOQKXQkSnQc72sSkESXGoruwCgy3G6
-OZRL5tJyUGCm4A1mlZx48kI=
-=VTsl
------END PGP SIGNATURE-----
+MD5 d6eb26607fa211c61609dd783ecfdac9 files/adsl.sample 599
+MD5 be6c41b714f7e55195d93fd478dc5e7e files/digest-speedtouch-1.3.1 69
+MD5 b1033785b6ac1ed25eb1c9dfdf95e379 files/digest-speedtouch-1.2_beta2 73
diff --git a/net-dialup/speedtouch/files/digest-speedtouch-1.3.1 b/net-dialup/speedtouch/files/digest-speedtouch-1.3.1
new file mode 100644
index 000000000000..a2553a2dd249
--- /dev/null
+++ b/net-dialup/speedtouch/files/digest-speedtouch-1.3.1
@@ -0,0 +1 @@
+MD5 0848a120ae0eeab6c8ab378e11dc4fa2 speedtouch-1.3.1.tar.bz2 197709
diff --git a/net-dialup/speedtouch/speedtouch-1.3.1.ebuild b/net-dialup/speedtouch/speedtouch-1.3.1.ebuild
new file mode 100644
index 000000000000..a66b3e124030
--- /dev/null
+++ b/net-dialup/speedtouch/speedtouch-1.3.1.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.1.ebuild,v 1.1 2004/10/27 16:31:05 lanius 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 ""
+}