pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update speedtouch to 1.3.1.
details: https://anonhg.NetBSD.org/pkgsrc/rev/dce0a703495c
branches: trunk
changeset: 486129:dce0a703495c
user: skrll <skrll%pkgsrc.org@localhost>
date: Thu Dec 23 18:11:18 2004 +0000
description:
Update speedtouch to 1.3.1.
The main changes is to support revision 4 modems (silver cycle
helmet/beetle) and to use the threaded pppo3 if native threads are
available.
Tested on:
- stringray by David Brownlee (abs@) and me
- purple cycle helmet/beetle by David Brownlee
- silver cycle helment/beetle by me
diffstat:
licenses/speedtouch-firmware-license | 96 ++++++++++++++++++++++++++++++++++++
net/speedtouch/Makefile | 44 ++++++++++-----
net/speedtouch/PLIST | 28 +++++++---
net/speedtouch/distinfo | 16 +++--
net/speedtouch/files/adsl.sh | 66 ++++++++++++++++--------
net/speedtouch/patches/patch-aa | 31 ++++-------
net/speedtouch/patches/patch-ab | 16 ++++++
net/speedtouch/patches/patch-ac | 86 ++++++++++++++++++++++++++++++++
net/speedtouch/patches/patch-ad | 27 ++++++++++
net/speedtouch/patches/patch-ae | 13 ++++
10 files changed, 352 insertions(+), 71 deletions(-)
diffs (truncated from 516 to 300 lines):
diff -r b03494928f37 -r dce0a703495c licenses/speedtouch-firmware-license
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/licenses/speedtouch-firmware-license Thu Dec 23 18:11:18 2004 +0000
@@ -0,0 +1,96 @@
+Developer License Agreement
+SOFTWARE LICENSE AGREEMENT
+
+CAREFULLY READ ALL OF THE TERMS AND CONDITIONS OF THIS SOFTWARE LICENSE
+AGREEMENT BEFORE YOU USE THE SOFTWARE
+[SpeedTouch USB FIRMWARE].
+
+THIS SOFTWARE LICENSE AGREEMENT (THIS "AGREEMENT") IS A LEGALLY BINDING
+AGREEMENT BETWEEN THE DEVELOPER OF THE SOFTWARE (THE "DEVELOPER") AND THOMSON
+MULTIMEDIA BROADBAND BELGIUM N.V. ("THOMSON"). BY USING OR INSTALLING THE
+SOFTWARE (AS UPDATED BY THOMSON FROM TIME TO TIME, THE "SOFTWARE") THE DEVELOPER
+IS ACCEPTING TO BE BOUND BY ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT.
+
+1. Grant of License. The Software and all accompanying documentation, including
+but not limited to the Interface Specification (the "Documentation) are licensed
+to the Developer under the terms and conditions set forth in this Agreement.
+Subject to such terms and conditions, Thomson hereby grants to the Developer a
+non-exclusive, nontransferable right to use the Software and the Documentation
+solely in combination with Thomson's line of SpeedTouch USB ADSL modem products;
+which are rightfully acquired and/or used by the Developer (Licensee).
+
+2. Limitations on Use. The Developer will not modify or translate the Software
+or the Documentation without the prior written consent of Thomson. The Developer
+will not reverse engineer, decompile, disassemble or otherwise attempt to
+recreate the source code of the Software. The Developer will not separate from
+the Software any of the component parts of the Software.
+
+3. Limitations on Duplication. The Developer will not make any copies of the
+Software or the Documentation; provided, however, that the Developer may make
+one complete copy of the Software or the Documentation solely for backup
+purposes if such copy of the Software or Documentation contains the notation
+"Copyright Thomson". The Developer will not print any on-line or electronic
+documentation other than solely for developing, servicing, operating or training
+purposes.
+
+4. Limitations on Transfer. The Developer will not sell, rent, lease or
+otherwise transfer any or all of the Software, the Documentation or any copies
+thereof, without the prior written consent of Thomson. The Developer will not
+sublicense, assign, delegate, rent, lease or otherwise transfer any or all of
+its rights under this Agreement.
+
+5. Ownership and Copyright. The Developer has not acquired, by virtue of this
+Agreement, any right of ownership in or to the Software, the Documentation or
+any related patent, copyright, trademark or other intellectual property right.
+By virtue of this Agreement, the Developer has acquired a right of ownership
+solely in and to the physical media on which the Software and the Documentation
+are recorded or fixed. Thomson, its licensors and their respective licensors
+retain all right, title and interest in and to the Software, the Documentation
+and any and all copies thereof, except for the rights expressly granted to the
+Developer pursuant to this Agreement and as may be granted by Thomson from time
+to time. Such right, title and interest of Thomson is, and such right, title and
+interest of Thomson's licensors and their respective licensors may be, protected
+by applicable copyright laws and international treaties.
+
+6. Term and Termination. The term of this Agreement commences upon the first use
+by the Developer of the Software and expires upon the termination of this
+Agreement which shall automatically occur in case the Licensee stops using the
+SpeedTouch USB ADSL modem products. If the Developer fails to comply with any of
+the terms and conditions set forth in this Agreement, then (a) this Agreement
+will automatically terminate, (b) in the event of such termination, the
+Developer will (i) destroy or permanently erase the Software and any and all
+copies thereof and (ii) destroy the Documentation and any and all copies
+thereof, and (c) Thomson may exercise any or all remedies available to it under
+applicable laws. In addition, the Developer may terminate this Agreement at any
+time by (a) destroying or permanently erasing the Software and any and all
+copies thereof and (b) destroying the Documentation and any and all copies
+thereof.
+
+7. NO WARRANTIES. THE SOFTWARE IS MADE AVAILABLE TO THE DEVELOPER ON AN "AS IS"
+BASIS WITHOUT ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES WHATSOEVER, INCLUDING
+WITHOUT LIMITATION ANY IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR A
+PARTICULAR PURPOSE. Some jurisdictions may not permit the exclusion of implied
+warranties; so the above exclusion may not apply to the Developer. The Developer
+may have other rights that vary from jurisdiction to jurisdiction. Thomson may
+from time to time, in its sole discretion, make available to the Developer, with
+or without charge, updates to the Software or the Documentation. No such action
+will create any warranty obligation on the part of Thomson.
+
+8. LIMITATION OF REMEDIES. IN NO EVENT WILL THOMSON, ITS LICENSORS OR THEIR
+RESPECTIVE LICENSORS BE LIABLE FOR ANY DAMAGES OR OTHER RELIEF WHATSOEVER
+ARISING OUT OF DEVELOPER'S USE OR INABILITY TO USE THE SOFTWARE OR THE
+DOCUMENTATION, INCLUDING WITHOUT LIMITATION LOST PROFITS, LOST BUSINESS OR LOST
+OPPORTUNITY OR ANY SPECIAL, INCIDENTAL OR CONSEQUENTIAL OR EXEMPLARY DAMAGES OR
+LEGAL FEES ARISING OUT OF SUCH USE OR INABILITY TO USE THE SOFTWARE, EVEN IF
+THOMSON, ITS LICENSORS OR THEIR RESPECTIVE LICENSORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES. Some jurisdictions may not permit the exclusion or
+limitation of incidental or consequential damages; so the above exclusion or
+limitation may not apply to the Developer.
+
+9. Governing Law. This Agreement will be governed by and construed in accordance
+with the laws of Belgium, without giving effect to the conflicts of laws
+principles thereof.
+
+10. Other Terms. Additional or different terms and conditions may be applicable
+to the Developer if so agreed in writing by the vendor of the Software, Thomson,
+its licensors and/or their respective licensors.
diff -r b03494928f37 -r dce0a703495c net/speedtouch/Makefile
--- a/net/speedtouch/Makefile Thu Dec 23 18:08:16 2004 +0000
+++ b/net/speedtouch/Makefile Thu Dec 23 18:11:18 2004 +0000
@@ -1,23 +1,35 @@
-# $NetBSD: Makefile,v 1.12 2004/12/19 16:48:36 abs Exp $
+# $NetBSD: Makefile,v 1.13 2004/12/23 18:11:18 skrll Exp $
#
-DISTNAME= speedtouch-1.2-beta2
-PKGREVISION= 3
-CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=speedtouch/} \
- http://www.alcatel.com/consumer/dsl/
-DISTFILES= ${DISTNAME}.tar.bz2 speedmgmt.tar.gz
+DISTNAME= speedtouch-1.3.1
+CATEGORIES= net
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=speedtouch/}
+DISTFILES= ${DISTNAME}.tar.bz2
+
+#
+# Firmware license and link from:
+# http://www.speedtouch.com/driver_upgrade_lx_3.0.1.2.htm
+#
+FIRMWARE_SRCS= SpeedTouch330_firmware_3012.zip
+SITES_${FIRMWARE_SRCS}= http://www.speedtouch.com/download/drivers/USB/
+DISTFILES+= ${FIRMWARE_SRCS}
+EXTRACT_CMD_OPTS.zip= -Laqo -d ${WRKDIR}/firmware
-MAINTAINER= abs%NetBSD.org@localhost
-HOMEPAGE= http://www.xsproject.org/speedtouch/
-COMMENT= Alcatel SpeedTouch USB ADSL modem driver
+LICENSE= speedtouch-firmware-license
+
+MAINTAINER= abs%NetBSD.org@localhost
+HOMEPAGE= http://www.xsproject.org/speedtouch/
+COMMENT= Alcatel SpeedTouch USB ADSL modem driver
+
+DEPENDS+= userppp>=001107:../../net/userppp
-DEPENDS+= userppp>=001107:../../net/userppp
+USE_PKGINSTALL= yes
+GNU_CONFIGURE= yes
-USE_PKGINSTALL= yes
-GNU_CONFIGURE= yes
+RCD_SCRIPTS= adsl
-RCD_SCRIPTS= adsl
+pre-extract:
+ ${MKDIR} ${WRKDIR}/firmware
SAMPLECONF= ${WRKSRC}/doc-bsd/ppp.conf.sample
@@ -26,6 +38,8 @@
${SED} 's:/usr/local:${PREFIX}:' ${SAMPLECONF}.pre > ${SAMPLECONF}
post-install:
- ${INSTALL_DATA} ${WRKDIR}/mgmt/mgmt.o ${PREFIX}/libdata/alcaudsl.sys
+ ${INSTALL_DATA_DIR} ${PREFIX}/libdata/speedtouch
+ ${INSTALL_DATA} ${WRKDIR}/firmware/kqd6_3.012 ${PREFIX}/libdata/speedtouch
+ ${INSTALL_DATA} ${WRKDIR}/firmware/zzzl_3.012 ${PREFIX}/libdata/speedtouch
.include "../../mk/bsd.pkg.mk"
diff -r b03494928f37 -r dce0a703495c net/speedtouch/PLIST
--- a/net/speedtouch/PLIST Thu Dec 23 18:08:16 2004 +0000
+++ b/net/speedtouch/PLIST Thu Dec 23 18:11:18 2004 +0000
@@ -1,10 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 2003/11/07 11:06:17 abs Exp $
-libdata/alcaudsl.sys
-man/man1/modem_run.1
-man/man1/pppoa2.1
-man/man1/pppoa3.1
+@comment $NetBSD: PLIST,v 1.4 2004/12/23 18:11:18 skrll Exp $
+bin/speedtouch-setup
+bin/speedtouch-start
+bin/speedtouch-stop
+libdata/speedtouch/kqd6_3.012
+libdata/speedtouch/zzzl_3.012
+man/man1/speedtouch-setup.1
+man/man1/speedtouch-start.1
+man/man1/speedtouch-stop.1
+man/man8/modem_run.8
+man/man8/pppoa2.8
+man/man8/pppoa3.8
sbin/modem_run
sbin/pppoa2
+sbin/pppoa3
share/doc/speedtouch/FAQ
share/doc/speedtouch/FAQ-fr
share/doc/speedtouch/INSTALL
@@ -12,7 +20,11 @@
share/doc/speedtouch/INSTALL-fr
share/doc/speedtouch/INSTALL-it
share/doc/speedtouch/INSTALL-nl
-share/examples/speedtouch/adsl.sh
-share/examples/speedtouch/ppp.conf
+share/doc/speedtouch/ppp.conf.sample
+share/examples/speedtouch/adsl.sh.sample
+share/examples/speedtouch/ppp.conf.sample
+share/speedtouch/boot.v123.bin
+@dirrm share/speedtouch
+@dirrm share/examples/speedtouch
@dirrm share/doc/speedtouch
-@dirrm share/examples/speedtouch
+@dirrm libdata/speedtouch
diff -r b03494928f37 -r dce0a703495c net/speedtouch/distinfo
--- a/net/speedtouch/distinfo Thu Dec 23 18:08:16 2004 +0000
+++ b/net/speedtouch/distinfo Thu Dec 23 18:11:18 2004 +0000
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.5 2003/11/07 11:06:17 abs Exp $
+$NetBSD: distinfo,v 1.6 2004/12/23 18:11:18 skrll Exp $
-SHA1 (speedtouch-1.2-beta2.tar.bz2) = 7a09eaf3f462a735dc5cf261b7668b7582d86663
-Size (speedtouch-1.2-beta2.tar.bz2) = 170497 bytes
-SHA1 (speedmgmt.tar.gz) = 15314d3c53b1b4d3af92f247ac1ef8a825da1479
-Size (speedmgmt.tar.gz) = 293547 bytes
-SHA1 (patch-aa) = 6c8524fc7f462055803d2cc4833c3aa7293b339b
+SHA1 (speedtouch-1.3.1.tar.bz2) = 9f2bd1d2800686fa96b38bb3de8283fcf5b39a5c
+Size (speedtouch-1.3.1.tar.bz2) = 197709 bytes
+SHA1 (SpeedTouch330_firmware_3012.zip) = 4fd2eefda958fd34ab4df43cffdda4e7757fbd34
+Size (SpeedTouch330_firmware_3012.zip) = 769125 bytes
+SHA1 (patch-aa) = 65102f1f6ee9839003765538d83a34472d9804e7
+SHA1 (patch-ab) = dd6e17f0ad153cbe57055ff843467617dae0c311
+SHA1 (patch-ac) = 38988d90e2827dddff0d52b1bf8c987574a96cf8
+SHA1 (patch-ad) = 14cb77ff43a7df73791920eb883b32805ff25cc9
+SHA1 (patch-ae) = ef41e43b28ce7b9310d37f6babf36cf22971d664
diff -r b03494928f37 -r dce0a703495c net/speedtouch/files/adsl.sh
--- a/net/speedtouch/files/adsl.sh Thu Dec 23 18:08:16 2004 +0000
+++ b/net/speedtouch/files/adsl.sh Thu Dec 23 18:11:18 2004 +0000
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: adsl.sh,v 1.5 2003/11/07 11:17:58 abs Exp $
+# $NetBSD: adsl.sh,v 1.6 2004/12/23 18:11:18 skrll Exp $
#
# PROVIDE: adsl
# REQUIRE: NETWORKING
@@ -9,40 +9,60 @@
# On systems with rc.d you will need to copy this to /etc/rc.d and set
# 'adsl=YES' in /etc/rc.conf
+if [ -f /etc/rc.subr ]; then
+ . /etc/rc.subr
+fi
+
+name="adsl"
+rcvar=${name}
+required_files="@PKG_SYSCONFDIR@/ppp/ppp.conf"
+start_cmd="adsl_start"
+stop_cmd="adsl_stop"
+
adsl_start()
{
echo "Starting speedtouch adsl."
+ #
+ # Make sure we can see a modem and determine which revision
+ # it is.
+ #
+ case `usbdevs -v | awk '/Speed Touch.*rev/ {print $NF}'` in
+ 0.00|2.00)
+ firmware=kqd6_3.012 ;;
+ 4.00)
+ firmware=zzzl_3.012 ;;
+ *)
+ echo "No Speed Touch modem found."
+ exit 1 ;;
+ esac
+
# Ensure we have at least tun0 - NetBSD 1.6 and later
ifconfig tun0 >/dev/null 2>&1 || ifconfig tun0 create
- @PREFIX@/sbin/modem_run -f @PREFIX@/libdata/alcaudsl.sys -m
+ if ! @PREFIX@/sbin/modem_run -f @PREFIX@/libdata/speedtouch/$firmware; then
+ echo "Couldn't download firmware to modem."
+ exit 1
+ fi
+
@PREFIX@/sbin/ppp -ddial adsl
}
adsl_stop()
{
- PID=`ps ax | awk '/ppp -ddial adsl $/{print $1}'`
- if [ -n "$PID" ]; then
- echo "Stopping speedtouch adsl."
- kill $PID
+ PPID="`ps ax | awk '/ppp -ddial adsl$/{print $1}'`
+ MPID="`ps ax | awk '/modem_run -f /{print $1}'`
+ if [ -n "$PPID $MPID" ]; then
+ echo "Stopping speedtouch adsl."
+ for pid in $PPID $MPID; do
+ kill $pid
+ done
fi
}
-if [ ! -d /etc/rc.d ]
+if [ -f /etc/rc.subr ]
then
- case "$1" in
- start) adsl_start ;;
Home |
Main Index |
Thread Index |
Old Index