diff options
author | abs <abs@pkgsrc.org> | 2001-07-29 01:18:33 +0000 |
---|---|---|
committer | abs <abs@pkgsrc.org> | 2001-07-29 01:18:33 +0000 |
commit | 26c9923f99ebf55ff203e79303e31052f0c780c2 (patch) | |
tree | e99843e9c1042fdf6f0913666c5956f5cd72dc57 | |
parent | ba4ea6048abef133735c0a13972c98babe79f15c (diff) | |
download | pkgsrc-26c9923f99ebf55ff203e79303e31052f0c780c2.tar.gz |
Import speedtouch-21062001:
Driver for the ALCATEL SpeedTouch USB ADSL modem.
It currently only supports PPPoA encapsulation.
-rw-r--r-- | net/speedtouch/Makefile | 29 | ||||
-rw-r--r-- | net/speedtouch/distinfo | 9 | ||||
-rw-r--r-- | net/speedtouch/files/README | 29 | ||||
-rw-r--r-- | net/speedtouch/files/adsl.sh | 45 | ||||
-rw-r--r-- | net/speedtouch/patches/patch-aa | 45 | ||||
-rw-r--r-- | net/speedtouch/patches/patch-ab | 13 | ||||
-rw-r--r-- | net/speedtouch/patches/patch-ac | 14 | ||||
-rw-r--r-- | net/speedtouch/pkg/DESCR | 2 | ||||
-rw-r--r-- | net/speedtouch/pkg/PLIST | 10 |
9 files changed, 196 insertions, 0 deletions
diff --git a/net/speedtouch/Makefile b/net/speedtouch/Makefile new file mode 100644 index 00000000000..52ef7cb2969 --- /dev/null +++ b/net/speedtouch/Makefile @@ -0,0 +1,29 @@ +# $NetBSD: Makefile,v 1.1.1.1 2001/07/29 01:18:33 abs Exp $ +# + +DISTNAME= speedtouch-21062001 +CATEGORIES= net +MASTER_SITES= http://www.xsproject.org/speedtouch/files/ \ + http://www.alcatel.com/consumer/dsl/ +DISTFILES= ${DISTNAME}.tar.gz speedmgmt.tar.gz + +MAINTAINER= abs@netbsd.org +HOMEPAGE= http://www.xsproject.org/speedtouch/ +COMMENT= Alcatel SpeedTouch USB ADSL modem driver + +DEPENDS+= userppp:../../net/userppp + +MAKE_ENV+= PREFIX=${PREFIX} INSTALL_DATA="${INSTALL_DATA}" +MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" + +post-build: + ${SED} "s:@PREFIX@:${PREFIX}:g" ${FILESDIR}/adsl.sh > ${WRKDIR}/adsl.sh + +post-install: + ${INSTALL_SCRIPT} ${WRKDIR}/adsl.sh ${PREFIX}/etc/rc.d/adsl + ${INSTALL_DATA} ${WRKDIR}/mgmt/mgmt.o ${PREFIX}/libdata/alcaudsl.sys + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/speedtouch + ${INSTALL_DATA} ${WRKSRC}/INSTALL-BSD ${PREFIX}/share/doc/speedtouch/INSTALL-BSD + ${INSTALL_DATA} ${FILESDIR}/README ${PREFIX}/share/doc/speedtouch/README + +.include "../../mk/bsd.pkg.mk" diff --git a/net/speedtouch/distinfo b/net/speedtouch/distinfo new file mode 100644 index 00000000000..f0c763b6d74 --- /dev/null +++ b/net/speedtouch/distinfo @@ -0,0 +1,9 @@ +$NetBSD: distinfo,v 1.1.1.1 2001/07/29 01:18:33 abs Exp $ + +SHA1 (speedtouch-21062001.tar.gz) = 8873286ff1e37c1c7942ea7adf305bc7b1e2fd27 +Size (speedtouch-21062001.tar.gz) = 37261 bytes +SHA1 (speedmgmt.tar.gz) = 15314d3c53b1b4d3af92f247ac1ef8a825da1479 +Size (speedmgmt.tar.gz) = 293547 bytes +SHA1 (patch-aa) = b662f5cc32f823361d4a9e0b30354e90a0738161 +SHA1 (patch-ab) = 2758f49e8f8d993683708c7c4bf0903ae23de1cc +SHA1 (patch-ac) = 7354c58fefed21e9af3b6b6961ede2b37e2715aa diff --git a/net/speedtouch/files/README b/net/speedtouch/files/README new file mode 100644 index 00000000000..c42ed3410fb --- /dev/null +++ b/net/speedtouch/files/README @@ -0,0 +1,29 @@ +$NetBSD: README,v 1.1.1.1 2001/07/29 01:18:33 abs Exp $ + +This is pretty much a distillation of INSTALL-BSD + +In order to use this package: + + - If you are not running a GENERIC kernel from 1.5.1 or later, + ensure your config does not include 'option DIAGNOSTIC', and + does include 'device usb', 'device ugen', 'pseudo-device ppp 1', + and 'pseudo-device tun 2' (the numbers can be higher). + + - Copy /usr/pkg/share/examples/ppp.conf to /usr/pkg/etc/ppp/ppp.conf, + and set: + - authname login@provider (for example : fti/xxx@fti) + - authkey password + - The -vpi and -vci numbers: + * 8.35 or 8.67 for France + * 0.38 in the UK + * 8.48 in the Netherlands + (check the value used under Windows) + - If you have your own DNS, you can also remove the 'enable dns'. + + - Copy /usr/pkg/etc/rc.d/adsl to /etc/rc.d, and set adsl=YES in /etc/rc.conf + + Note: 'adsl start' tries to load the modem firmware and currently fails if + called a second time without a reboot or the modem being disconnected from + the machine. To workaround this use '/etc/rc.d/adsl stop ; ppp -ddial adsl' + if you need to restart the ppp session. + diff --git a/net/speedtouch/files/adsl.sh b/net/speedtouch/files/adsl.sh new file mode 100644 index 00000000000..9c3ef90115f --- /dev/null +++ b/net/speedtouch/files/adsl.sh @@ -0,0 +1,45 @@ +#!/bin/sh +# +# $NetBSD: adsl.sh,v 1.1.1.1 2001/07/29 01:18:33 abs Exp $ +# +# PROVIDE: adsl +# REQUIRE: DAEMON +# +# On systems with rc.d you will need to copy this to /etc/rc.d and set +# 'adsl=YES' in /etc/rc.conf + +adsl_start() +{ + echo "Starting speedtouch adsl." + @PREFIX@/sbin/modem_run -f @PREFIX@/libdata/alcaudsl.sys -m + @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 + fi +} + +if [ ! -d /etc/rc.d ] +then + case "$1" in + start) adsl_start ;; + stop) adsl_stop ;; + rstart) adsl_stop ; adsl_start ;; + esac + exit +fi + +. /etc/rc.subr + +name="adsl" +rcvar=$name +start_cmd="adsl_start" +stop_cmd="adsl_stop" + +load_rc_config $name +run_rc_command "$1" diff --git a/net/speedtouch/patches/patch-aa b/net/speedtouch/patches/patch-aa new file mode 100644 index 00000000000..ef2061e099a --- /dev/null +++ b/net/speedtouch/patches/patch-aa @@ -0,0 +1,45 @@ +$NetBSD: patch-aa,v 1.1.1.1 2001/07/29 01:18:33 abs Exp $ + +--- Makefile.orig Thu Jun 21 21:58:46 2001 ++++ Makefile +@@ -17,6 +17,10 @@ + # The next path is Linux specific + CFLAGS += -I/usr/src/linux/include + ++PREFIX ?= /usr/local ++INSTALL_PROGRAM ?= cp ++INSTALL_DATA ?= cp ++ + COMMON_SRC = pusb.c pool.c + COMMON_OBJ = $(COMMON_SRC:%.c=%.o) + +@@ -44,12 +48,16 @@ + + clean: + $(RM) $(PPPOA_BIN) $(MODEM_BIN) $(PPPOA_OBJ) $(MODEM_OBJ) \ +- $(COMMON_OBJ) $(DEP) ++ $(COMMON_OBJ) $(DEP) ppp.conf.sample.out + + install: +- mkdir -p /usr/local/bin +- cp $(MODEM_BIN) /usr/local/bin/$(MODEM_BIN) +- cp $(PPPOA_BIN) /usr/local/bin/$(PPPOA_BIN) ++ mkdir -p ${PREFIX}/sbin ++ ${INSTALL_PROGRAM} $(MODEM_BIN) ${PREFIX}/sbin/$(MODEM_BIN) ++ ${INSTALL_PROGRAM} $(PPPOA_BIN) ${PREFIX}/sbin/$(PPPOA_BIN) ++ mkdir -p ${PREFIX}/share/examples/speedtouch ++ sed "s:/usr/local:${PREFIX}:g" ppp.conf.sample > ppp.conf.sample.out ++ ${INSTALL_DATA} ppp.conf.sample.out ${PREFIX}/share/examples/speedtouch/ppp.conf ++ ${INSTALL_DATA} INSTALL-BSD ${PREFIX}/share/doc/speedtouch.txt + # mkdir -p /etc/ppp/peers + # cp adsl /etc/ppp/peers/adsl + # mkdir -p /etc/rc.d/init.d +@@ -57,7 +65,7 @@ + # ( cd /etc/rc.d/init.d ; chkconfig adsl.sh on) + + uninstall: +- $(RM) /usr/local/bin/$(MODEM_BIN) /usr/local/bin/$(PPPOA_BIN) ++ $(RM) ${PREFIX}/sbin/$(MODEM_BIN) ${PREFIX}/sbin/$(PPPOA_BIN) + + # The target I used to make the speedtouch-DDMMYYYY.tar.gz + targz: diff --git a/net/speedtouch/patches/patch-ab b/net/speedtouch/patches/patch-ab new file mode 100644 index 00000000000..177aa6a862d --- /dev/null +++ b/net/speedtouch/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1 2001/07/29 01:18:33 abs Exp $ + +--- ppp.conf.sample.orig Sun Jul 29 01:39:43 2001 ++++ ppp.conf.sample +@@ -7,7 +7,7 @@ + accept chap + # These are the value of vpi and vci in france. + # Check in the INSTALL-BSD to see value for uk or netherland +- set device !"/usr/local/bin/pppoa2 -vpi 8 -vci 35" ++ set device !"/usr/local/sbin/pppoa2 -vpi 8 -vci 35" + set speed sync + set authname login@provider + set authkey password diff --git a/net/speedtouch/patches/patch-ac b/net/speedtouch/patches/patch-ac new file mode 100644 index 00000000000..f53f89f6c8c --- /dev/null +++ b/net/speedtouch/patches/patch-ac @@ -0,0 +1,14 @@ +$NetBSD: patch-ac,v 1.1.1.1 2001/07/29 01:18:33 abs Exp $ + +--- pppoa2.c.orig Wed Jun 13 21:56:03 2001 ++++ pppoa2.c +@@ -78,7 +78,9 @@ + #include <termios.h> /* N_HDLC & TIOCSETD */ + #include <sys/resource.h> /* setpriority() */ + #include <string.h> ++#ifndef __NetBSD__ + #include <sched.h> /* for sched_setscheduler */ ++#endif + #include <limits.h> /* for LONG_MAX */ + #include <sys/types.h> + #include <sys/socket.h> diff --git a/net/speedtouch/pkg/DESCR b/net/speedtouch/pkg/DESCR new file mode 100644 index 00000000000..69336ce7f49 --- /dev/null +++ b/net/speedtouch/pkg/DESCR @@ -0,0 +1,2 @@ +Driver for the ALCATEL SpeedTouch USB ADSL modem. +It currently only supports PPPoA encapsulation. diff --git a/net/speedtouch/pkg/PLIST b/net/speedtouch/pkg/PLIST new file mode 100644 index 00000000000..a20df17bb36 --- /dev/null +++ b/net/speedtouch/pkg/PLIST @@ -0,0 +1,10 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2001/07/29 01:18:33 abs Exp $ +etc/rc.d/adsl +libdata/alcaudsl.sys +sbin/modem_run +sbin/pppoa2 +share/doc/speedtouch/INSTALL-BSD +share/doc/speedtouch/README +share/examples/speedtouch/ppp.conf +@dirrm share/examples/speedtouch +@dirrm share/doc/speedtouch |