Upgrade to 1.1b.

2 files changed, 13 insertions, 115 deletions

diff --git a/net/pppoa/files/patch-ab b/net/pppoa/files/patch-ab
index 5fcc777670e4..b6a029a16008 100644
--- a/net/pppoa/files/patch-ab
+++ b/net/pppoa/files/patch-ab
@@ -1,113 +1,11 @@
---- src/pusb-bsd.c.orig	Wed Nov  7 19:45:26 2001
-+++ src/pusb-bsd.c	Tue Apr 30 09:50:20 2002
-@@ -100,7 +100,11 @@
- 	{
- 	    struct usb_device_info di;
- 
-+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001)
- 	    di.addr = device;
-+#else
-+	    di.udi_addr = device;
-+#endif
- 	    if(ioctl(cfd, USB_DEVICEINFO, &di) < 0)
- 		continue;
- 
-@@ -116,15 +120,25 @@
- 	    }
- #endif
- 
-+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001)
- 	    if(di.vendorNo == vendorID && di.productNo == productID)
- 	    {
- 		if(strncmp(di.devnames[0], "ugen", 4) != 0)
-+#else
-+	    if(di.udi_vendorNo == vendorID && di.udi_productNo == productID)
-+	    {
-+		if(strncmp(di.udi_devnames[0], "ugen", 4) != 0)
-+#endif
- 		{
- 		    /* Has a real driver, don't mess with it */
- 		    continue;
- 		}
- 
-+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001)
- 		sprintf(prefix, "/dev/%s", di.devnames[0]);
-+#else
-+		sprintf(prefix, "/dev/%s", di.udi_devnames[0]);
-+#endif
- #if defined(__FreeBSD__)
- 		sprintf(buf, "%s", prefix);
- #else		
-@@ -199,6 +213,7 @@
- {
-     struct usb_ctl_request req;
- 
-+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001)
-     req.request.bmRequestType = request_type;
-     req.request.bRequest = request;
-     USETW(req.request.wValue, value);
-@@ -206,7 +221,16 @@
-     USETW(req.request.wLength, size);
- 
-     req.data = buf;
--    req.flags = USBD_SHORT_XFER_OK;
-+#else
-+    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;
-+#endif
- 
-     /* !!! If your kernel is built with DIAGNOSTIC (which it is by
-        !!! default under some versions of NetBSD) this ioctl will fail.
-@@ -227,7 +251,11 @@
-     if(ioctl(dev->fd, USB_DO_REQUEST, &req) < 0)
- 	return -1;
-     else
-+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001)
- 	return req.actlen;
-+#else
-+	return req.ucr_actlen;
-+#endif
- }
- 
- int pusb_set_configuration(pusb_device_t dev, int config)
-@@ -249,8 +277,13 @@
-     struct usb_alt_interface intf;
-     int config;
- 
-+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001)
-     intf.interface_index = interface;
-     intf.alt_no = alternate;
-+#else
-+    intf.uai_interface_index = interface;
-+    intf.uai_alt_no = alternate;
-+#endif
- 
-     if(ioctl(dev->fd, USB_SET_ALTINTERFACE, &intf) < 0)
-     {
-@@ -278,12 +311,20 @@
- {
-     struct usb_alt_interface intf;
- 
-+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001)
-     intf.interface_index = interface;
-+#else
-+    intf.uai_interface_index = interface;
-+#endif
- 
-     if(ioctl(dev->fd, USB_GET_ALTINTERFACE, &intf) < 0)
- 	return -1;
- 
-+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001)
-     return intf.alt_no;
-+#else
-+    return intf.uai_alt_no;
-+#endif
- }
- 
- pusb_endpoint_t pusb_endpoint_open(pusb_device_t dev, int epnum, int flags)
+--- doc-bsd/ppp.conf.sample.orig	Sat Jun  1 00:34:26 2002
++++ doc-bsd/ppp.conf.sample	Thu Jun 20 23:23:47 2002
+@@ -22,7 +22,7 @@
+ adsl:
+  set authname <login>
+  set authkey <password>
+- set device !"pppoa2 -vpi <VPI> -vci <VCI> -v 1"
++ set device !"/usr/local/sbin/pppoa2 -vpi <VPI> -vci <VCI> -v 1"
+  accept chap
+  set speed sync
+  set timeout 0
diff --git a/net/pppoa/files/quick-install b/net/pppoa/files/quick-install
index a67508bd75a7..fc49f3740726 100644
--- a/net/pppoa/files/quick-install
+++ b/net/pppoa/files/quick-install
@@ -6,8 +6,8 @@
     this software.
 
     To activate this port, create a new profile in /etc/ppp/ppp.conf
-    called ``adsl'' using /usr/local/share/speedtouch/ppp.conf.sample
-    as a template, then copy /usr/local/etc/rc.d/asdl.sh.sample to
+    called ``adsl'' using /usr/local/share/doc/speedtouch/ppp.conf.sample
+    as a template, then copy /usr/local/etc/rc.d/adsl.sh.sample to
     /usr/local/etc/rc.d/adsl.sh.
 
     You may need to change the value of MODE in adsl.sh.