Updated speedtouch to 1.1 [abs 2002-07-18]

	New version works fully under NetBSD 1.6_BETA, and also works on
	some systems which failed to communicate with the USB modem correctlyt
	under earlier versions. Additional fix to pkg/17531

8 files changed, 64 insertions, 236 deletions

diff --git a/net/speedtouch/Makefile b/net/speedtouch/Makefile
index 6048f3b0ac1..5108aef87f3 100644
--- a/net/speedtouch/Makefile
+++ b/net/speedtouch/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2001/08/06 21:32:39 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/07/18 00:10:07 abs Exp $
 #
 
-DISTNAME=	speedtouch-21062001
+DISTNAME=	speedtouch-1.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.xsproject.org/speedtouch/files/ \
 		http://www.alcatel.com/consumer/dsl/
-DISTFILES=	${DISTNAME}.tar.gz speedmgmt.tar.gz
+DISTFILES=	${DISTNAME}.tar.bz2 speedmgmt.tar.gz
 
 MAINTAINER=	abs@netbsd.org
 HOMEPAGE=	http://www.xsproject.org/speedtouch/
@@ -13,17 +13,16 @@ COMMENT=	Alcatel SpeedTouch USB ADSL modem driver
 
 DEPENDS+=	userppp-001107:../../net/userppp
 
-MAKE_ENV+=	PREFIX=${PREFIX} INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+GNU_CONFIGURE=	yes
 
-post-build:
-	${SED} "s:@PREFIX@:${PREFIX}:g" ${FILESDIR}/adsl.sh > ${WRKDIR}/adsl.sh
+RCD_SCRIPTS=	adsl
+
+pre-install:
+	@${SED} ${FILES_SUBST_SED} ${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
+	${INSTALL_SCRIPT} ${WRKDIR}/adsl.sh ${PREFIX}/etc/rc.d/adsl
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/speedtouch/PLIST b/net/speedtouch/PLIST
index ef75cb80310..bd07100c077 100644
--- a/net/speedtouch/PLIST
+++ b/net/speedtouch/PLIST
@@ -1,10 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:08 zuntum Exp $
-etc/rc.d/adsl
+@comment $NetBSD: PLIST,v 1.2 2002/07/18 00:10:07 abs Exp $
 libdata/alcaudsl.sys
+man/man1/modem_run.1
+man/man1/pppoa2.1
+man/man1/pppoa3.1
 sbin/modem_run
 sbin/pppoa2
-share/doc/speedtouch/INSTALL-BSD
-share/doc/speedtouch/README
+share/doc/speedtouch/FAQ
+share/doc/speedtouch/FAQ-fr
+share/doc/speedtouch/INSTALL
+share/doc/speedtouch/INSTALL-de
+share/doc/speedtouch/INSTALL-fr
+share/doc/speedtouch/INSTALL-it
+share/examples/speedtouch/adsl.sh
 share/examples/speedtouch/ppp.conf
-@dirrm share/examples/speedtouch
 @dirrm share/doc/speedtouch
+@dirrm share/examples/speedtouch
diff --git a/net/speedtouch/distinfo b/net/speedtouch/distinfo
index 46805301675..5f82d0881ef 100644
--- a/net/speedtouch/distinfo
+++ b/net/speedtouch/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.2 2002/07/09 14:38:18 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/07/18 00:10:07 abs Exp $
 
-SHA1 (speedtouch-21062001.tar.gz) = 8873286ff1e37c1c7942ea7adf305bc7b1e2fd27
-Size (speedtouch-21062001.tar.gz) = 37261 bytes
+SHA1 (speedtouch-1.1.tar.bz2) = 78e96817a782c3d65bf42f483ede4b210e970523
+Size (speedtouch-1.1.tar.bz2) = 137412 bytes
 SHA1 (speedmgmt.tar.gz) = 15314d3c53b1b4d3af92f247ac1ef8a825da1479
 Size (speedmgmt.tar.gz) = 293547 bytes
-SHA1 (patch-aa) = b662f5cc32f823361d4a9e0b30354e90a0738161
-SHA1 (patch-ab) = 2758f49e8f8d993683708c7c4bf0903ae23de1cc
-SHA1 (patch-ac) = 7354c58fefed21e9af3b6b6961ede2b37e2715aa
-SHA1 (patch-ad) = e2d8ea8b576e8ad9ea4e22902378a25bd8509beb
+SHA1 (patch-aa) = cff08e6bf4eadee9880962a50b3a18c8a7316646
+SHA1 (patch-ab) = f9e53c87c0775ec938fc8e7cf45e02b6b1cbb209
diff --git a/net/speedtouch/files/adsl.sh b/net/speedtouch/files/adsl.sh
index 9c3ef90115f..a27e1bee410 100644
--- a/net/speedtouch/files/adsl.sh
+++ b/net/speedtouch/files/adsl.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# $NetBSD: adsl.sh,v 1.1.1.1 2001/07/29 01:18:33 abs Exp $
+# $NetBSD: adsl.sh,v 1.2 2002/07/18 00:10:07 abs Exp $
 #
 # PROVIDE: adsl
-# REQUIRE: DAEMON
+# REQUIRE: ipnat
 #
 # On systems with rc.d you will need to copy this to /etc/rc.d and set
 # 'adsl=YES' in /etc/rc.conf
@@ -11,6 +11,8 @@
 adsl_start()
 {
 	echo "Starting speedtouch adsl."
+	# Ensure we have at least tun0 - NetBSD 1.6 and later
+	ifconfig tun0 2>/dev/null || ifconfig tun0 create
 	@PREFIX@/sbin/modem_run -f @PREFIX@/libdata/alcaudsl.sys -m
 	@PREFIX@/sbin/ppp -ddial adsl
 }
diff --git a/net/speedtouch/patches/patch-aa b/net/speedtouch/patches/patch-aa
index ef2061e099a..332f9ae74dd 100644
--- a/net/speedtouch/patches/patch-aa
+++ b/net/speedtouch/patches/patch-aa
@@ -1,45 +1,21 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/07/29 01:18:33 abs Exp $
+$NetBSD: patch-aa,v 1.2 2002/07/18 00:10:07 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
+--- doc-bsd/Makefile.in.orig	Tue Jul  9 23:45:35 2002
++++ doc-bsd/Makefile.in
+@@ -87,13 +87,13 @@
  
-+PREFIX ?= /usr/local
-+INSTALL_PROGRAM ?= cp
-+INSTALL_DATA ?= cp
-+
- COMMON_SRC = pusb.c pool.c
- COMMON_OBJ = $(COMMON_SRC:%.c=%.o)
+ install : install-man
+ 	@test -d $(datadir)/doc/speedtouch || $(INSTALL) -c -d $(datadir)/doc/speedtouch
+-	@test -d $(prefix)/etc/rc.d || $(INSTALL) -c -d $(prefix)/etc/rc.d
+-	$(INSTALL) -m 0744 -o $(installuser) adsl.sh.sample $(prefix)/etc/rc.d
++	@test -d $(datadir)/examples/speedtouch || $(INSTALL) -c -d $(datadir)/examples/speedtouch
++	$(INSTALL) -m 0744 -o $(installuser) adsl.sh.sample $(datadir)/examples/speedtouch/adsl.sh
+ 	$(INSTALL) -m 0444 -o $(installuser) INSTALL $(datadir)/doc/speedtouch
+ 	$(INSTALL) -m 0444 -o $(installuser) INSTALL-de $(datadir)/doc/speedtouch
+ 	$(INSTALL) -m 0444 -o $(installuser) INSTALL-fr $(datadir)/doc/speedtouch
+ 	$(INSTALL) -m 0444 -o $(installuser) INSTALL-it $(datadir)/doc/speedtouch
+-	$(INSTALL) -m 0444 -o $(installuser) ppp.conf.sample $(datadir)/doc/speedtouch
++	$(INSTALL) -m 0444 -o $(installuser) ppp.conf.sample $(datadir)/examples/speedtouch/ppp.conf
+ 	$(INSTALL) -m 0444 -o $(installuser) FAQ $(datadir)/doc/speedtouch
+ 	$(INSTALL) -m 0444 -o $(installuser) FAQ-fr $(datadir)/doc/speedtouch
  
-@@ -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
index 177aa6a862d..ea9d82561ce 100644
--- a/net/speedtouch/patches/patch-ab
+++ b/net/speedtouch/patches/patch-ab
@@ -1,13 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/07/29 01:18:33 abs Exp $
+$NetBSD: patch-ab,v 1.2 2002/07/18 00:10:07 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
+--- src/pusb-bsd.c.orig	Sat Jun  1 00:34:26 2002
++++ src/pusb-bsd.c
+@@ -40,9 +40,9 @@
+ /******************************************************************************
+ * Patch USB structures for the change in early 2002 
+ ******************************************************************************/
+-#if ((defined (__FreeBSD__)) && (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001)) || (defined (__NetBSD__) && (__NetBSD_version__ < 105280000)) || (defined (__OpenBSD__))
++#if ((defined (__FreeBSD__)) && ((__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001))) || (defined (__NetBSD__) && __NetBSD_Version__ < 105280000) || (defined (__OpenBSD__))
+ 
+-/* strcut usb_ctl_request */
++/* struct usb_ctl_request */
+ #define ucr_actlen  actlen
+ #define ucr_flags   flags
+ #define ucr_data    data
diff --git a/net/speedtouch/patches/patch-ac b/net/speedtouch/patches/patch-ac
deleted file mode 100644
index f53f89f6c8c..00000000000
--- a/net/speedtouch/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$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/patches/patch-ad b/net/speedtouch/patches/patch-ad
deleted file mode 100644
index 4c32e38235f..00000000000
--- a/net/speedtouch/patches/patch-ad
+++ /dev/null
@@ -1,143 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/07/09 14:38:19 wiz Exp $
-
---- pusb-bsd.c.orig	Sat Jun  9 23:15:54 2001
-+++ pusb-bsd.c
-@@ -9,6 +9,12 @@
- #include <string.h>		/* for strerror */
- #include <dev/usb/usb.h>
- #include <sys/ioctl.h>
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#if __NetBSD_Version__ > 105270000
-+#define USB_need_prefix	1
-+#endif
-+#endif
- 
- #include "pusb.h"
- 
-@@ -79,7 +85,11 @@
- 	{
- 	    struct usb_device_info di;
- 
-+#ifdef USB_need_prefix
-+	    di.udi_addr = device;
-+#else
- 	    di.addr = device;
-+#endif
- 	    if(ioctl(cfd, USB_DEVICEINFO, &di) < 0)
- 		continue;
- 
-@@ -88,22 +98,41 @@
- 		int j;
- 		fprintf(stderr, "something on controller %d device %d\n",
- 		       controller, device);
-+#ifdef USB_need_prefix
-+		fprintf(stderr, "vendor %s product %s\n", 
-+			di.udi_vendor, di.udi_product);
-+		for(j=0; j<4; j++)
-+		    fprintf(stderr, "name %s\n", di.udi_devnames[j]);
-+#else
- 		fprintf(stderr, "vendor %s product %s\n", 
- 			di.vendor, di.product);
- 		for(j=0; j<4; j++)
- 		    fprintf(stderr, "name %s\n", di.devnames[j]);
-+#endif
- 	    }
- #endif
- 
-+#ifdef USB_need_prefix
-+	    if(di.udi_vendorNo == vendorID && di.udi_productNo == productID)
-+#else
- 	    if(di.vendorNo == vendorID && di.productNo == productID)
-+#endif
- 	    {
-+#ifdef USB_need_prefix
-+		if(strncmp(di.udi_devnames[0], "ugen", 4) != 0)
-+#else
- 		if(strncmp(di.devnames[0], "ugen", 4) != 0)
-+#endif
- 		{
- 		    /* Has a real driver, don't mess with it */
- 		    continue;
- 		}
- 
-+#ifdef USB_need_prefix
-+		sprintf(prefix, "/dev/%s", di.udi_devnames[0]);
-+#else
- 		sprintf(prefix, "/dev/%s", di.devnames[0]);
-+#endif
- #if defined(__FreeBSD__)
- 		sprintf(buf, "%s", prefix);
- #else		
-@@ -160,6 +189,16 @@
- {
-     struct usb_ctl_request req;
- 
-+#ifdef USB_need_prefix
-+    req.ucr_request.bmRequestType = request_type;
-+    req.ucr_request.bRequest = request;
-+    USETW(req.ucr_request.wValue, value);
-+    USETW(req.ucr_request.wIndex, index);
-+    USETW(req.ucr_request.wLength, size);
-+
-+    req.ucr_data = buf;
-+    req.ucr_flags = USBD_SHORT_XFER_OK;
-+#else
-     req.request.bmRequestType = request_type;
-     req.request.bRequest = request;
-     USETW(req.request.wValue, value);
-@@ -168,6 +207,7 @@
- 
-     req.data = buf;
-     req.flags = USBD_SHORT_XFER_OK;
-+#endif
- 
-     /* !!! If your kernel is built with DIAGNOSTIC (which it is by
-        !!! default under some versions of NetBSD) this ioctl will fail.
-@@ -188,7 +228,11 @@
-     if(ioctl(dev->fd, USB_DO_REQUEST, &req) < 0)
- 	return -1;
-     else
-+#ifdef USB_need_prefix
-+	return req.ucr_actlen;
-+#else
- 	return req.actlen;
-+#endif
- }
- 
- int pusb_set_configuration(pusb_device_t dev, int config)
-@@ -210,8 +254,13 @@
-     struct usb_alt_interface intf;
-     int config;
- 
-+#ifdef USB_need_prefix
-+    intf.uai_interface_index = interface;
-+    intf.uai_alt_no = alternate;
-+#else
-     intf.interface_index = interface;
-     intf.alt_no = alternate;
-+#endif
- 
-     if(ioctl(dev->fd, USB_SET_ALTINTERFACE, &intf) < 0)
-     {
-@@ -239,12 +288,20 @@
- {
-     struct usb_alt_interface intf;
- 
-+#ifdef USB_need_prefix
-+    intf.uai_interface_index = interface;
-+#else
-     intf.interface_index = interface;
-+#endif
- 
-     if(ioctl(dev->fd, USB_GET_ALTINTERFACE, &intf) < 0)
- 	return -1;
- 
-+#ifdef USB_need_prefix
-+    return intf.uai_alt_no;
-+#else
-     return intf.alt_no;
-+#endif
- }
- 
- pusb_endpoint_t pusb_endpoint_open(pusb_device_t dev, int epnum, int flags)