Update rp-pppoe to 3.8: various internal changes, some of them bogus

and reverted by patches, some of them were already present in (now
removed) patches; plus:

- Changed the names of commands from adsl-* to pppoe-* to more logically
  name the scripts.

- Make the userland pppoe daemon run as "nobody" if possible, once session
  has started.

- Make userland pppoe program somewhat safe if it is installed SUID or
  SGID.  Note that I still do *NOT* recommend a SUID/SGID pppoe.

- Fix long-standing bug in pppoe-server that passed arguments to pppd in the
  wrong order.

11 files changed, 88 insertions, 170 deletions

diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index b6274f74433..92e6d826595 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2006/10/04 21:53:18 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2006/11/01 15:17:13 martin Exp $
 
-DISTNAME=	rp-pppoe-3.5
-PKGREVISION=	2
+DISTNAME=	rp-pppoe-3.8
+# PKGREVISION=	0
 CATEGORIES=	net
-MASTER_SITES=	http://www.roaringpenguin.com/penguin/pppoe/ \
-		http://roaringpenguin.luky.org/pppoe/
+MASTER_SITES=	http://www.roaringpenguin.com/files/download/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.roaringpenguin.com/penguin/open_source_rp-pppoe.php
@@ -19,6 +18,7 @@ GNU_CONFIGURE=	YES
 CONFIGURE_DIRS=	src
 CONFIGURE_ENV+=	PPPD=${PPPD:Q}
 CONFIGURE_ENV+=	ID=${TOOLS_ID:Q}
+MAKE_ENV+=	OPSYS=${OPSYS}
 BUILD_DIRS=	src
 
 RCD_SCRIPTS=	pppoe
diff --git a/net/rp-pppoe/PLIST b/net/rp-pppoe/PLIST
index eb6e9972dea..00dbcbdec93 100644
--- a/net/rp-pppoe/PLIST
+++ b/net/rp-pppoe/PLIST
@@ -1,27 +1,27 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/02 20:34:03 reed Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/11/01 15:17:13 martin Exp $
 man/man5/pppoe.conf.5
-man/man8/adsl-connect.8
-man/man8/adsl-setup.8
-man/man8/adsl-start.8
-man/man8/adsl-status.8
-man/man8/adsl-stop.8
-man/man8/pppoe.8
+man/man8/pppoe-connect.8
 man/man8/pppoe-server.8
-sbin/adsl-connect
-sbin/adsl-setup
-sbin/adsl-start
-sbin/adsl-status
-sbin/adsl-stop
+man/man8/pppoe-setup.8
+man/man8/pppoe-start.8
+man/man8/pppoe-status.8
+man/man8/pppoe-stop.8
+man/man8/pppoe.8
 sbin/pppoe
+sbin/pppoe-connect
 sbin/pppoe-server
-share/doc/rp-pppoe/CHANGES
-share/doc/rp-pppoe/HOW-TO-CONNECT
-share/doc/rp-pppoe/LICENSE
-share/doc/rp-pppoe/README
-share/doc/rp-pppoe/SERVPOET
-share/doc/rp-pppoe/pap-secrets
+sbin/pppoe-setup
+sbin/pppoe-start
+sbin/pppoe-status
+sbin/pppoe-stop
+share/doc/${PKGNAME}/CHANGES
+share/doc/${PKGNAME}/HOW-TO-CONNECT
+share/doc/${PKGNAME}/LICENSE
+share/doc/${PKGNAME}/README
+share/doc/${PKGNAME}/SERVPOET
+share/doc/${PKGNAME}/pap-secrets
 share/examples/rc.d/pppoe
-share/examples/rp-pppoe/pppoe.conf
 share/examples/rp-pppoe/pppoe-server-options
+share/examples/rp-pppoe/pppoe.conf
 @dirrm share/examples/rp-pppoe
-@dirrm share/doc/rp-pppoe
+@dirrm share/doc/${PKGNAME}
diff --git a/net/rp-pppoe/distinfo b/net/rp-pppoe/distinfo
index 2e074ca5946..6feb5025fda 100644
--- a/net/rp-pppoe/distinfo
+++ b/net/rp-pppoe/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.10 2006/03/14 02:49:03 joerg Exp $
+$NetBSD: distinfo,v 1.11 2006/11/01 15:17:13 martin Exp $
 
-SHA1 (rp-pppoe-3.5.tar.gz) = f81f351e8559b4c861c9b99adc4ef9756cecab83
-RMD160 (rp-pppoe-3.5.tar.gz) = 2746444a209fec0fcca23bcafa5ba884cbeeb7e4
-Size (rp-pppoe-3.5.tar.gz) = 189321 bytes
-SHA1 (patch-aa) = 3f806e96d3c89d9d0850d6692fd8b14778bc46c4
-SHA1 (patch-ab) = 2c2287a02383d611b42c026d4ac66a5c48ad52e1
-SHA1 (patch-ac) = 04f8bcfb039305d580265c27321bcb4aa15cdb54
-SHA1 (patch-ad) = 555943ea178124ac17bbbd223da77f0e89b07632
-SHA1 (patch-ae) = 0ad70a1320c5a1d56b8b6781c9187566534e8968
-SHA1 (patch-af) = b6e6371a021916b127a474ca6ee7c9212627fd96
+SHA1 (rp-pppoe-3.8.tar.gz) = d9a4346701e580b4a6049a940557b38533f9e8f7
+RMD160 (rp-pppoe-3.8.tar.gz) = 039798154acae9e7a066172f23904d766ba68a9a
+Size (rp-pppoe-3.8.tar.gz) = 212931 bytes
+SHA1 (patch-aa) = 38ccb1eea4a76ba93cdbf205c35271758e4e8e44
+SHA1 (patch-ab) = a3b409352334ca11c9716a864404ccce90511051
+SHA1 (patch-af) = a44803519081769250af1f15d64cfd9a9b3834ca
 SHA1 (patch-ag) = 6ee706683df96ff7fb0aa5a93626265c2177d543
+SHA1 (patch-ah) = 35cf47b00ad6df122de6e84f36eb844201c0d16b
+SHA1 (patch-ai) = 81568491692492c3ee564199882247004c4c47d7
diff --git a/net/rp-pppoe/patches/patch-aa b/net/rp-pppoe/patches/patch-aa
index a1c84ed9d3a..944eb41ee8e 100644
--- a/net/rp-pppoe/patches/patch-aa
+++ b/net/rp-pppoe/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2006/03/14 02:49:03 joerg Exp $
+$NetBSD: patch-aa,v 1.11 2006/11/01 15:17:13 martin Exp $
 
---- src/Makefile.in.orig	Mon Jul  8 16:38:24 2002
-+++ src/Makefile.in	Mon Oct  7 21:56:42 2002
-@@ -22,7 +22,7 @@ DEFINES=
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- mandir=@mandir@
--docdir=@prefix@/doc/rp-pppoe-$(VERSION)
-+docdir=@prefix@/share/doc/rp-pppoe
- install=@INSTALL@
- install_dir=@INSTALL@ -d
- sbindir=@sbindir@
-@@ -61,6 +61,9 @@ PATHS='-DPPPOE_PATH="$(PPPOE_PATH)"' '-D
+--- src/Makefile.in.orig	2006-04-02 16:29:42.000000000 +0200
++++ src/Makefile.in	2006-11-01 12:32:04.000000000 +0100
+@@ -61,6 +61,9 @@
  CFLAGS= @CFLAGS@ $(LIC_INCDIR) $(DEFINES) $(LIC_DEFINE) $(PATHS) -Ilibevent
  TARGETS=@TARGETS@
  PPPOE_SERVER_LIBS=$(LIC_LIBDIR) $(LIC_LIB)
@@ -21,18 +12,7 @@ $NetBSD: patch-aa,v 1.10 2006/03/14 02:49:03 joerg Exp $
  
  all: $(TARGETS)
  	@echo ""
-@@ -69,8 +72,8 @@ all: $(TARGETS)
- pppoe-sniff: pppoe-sniff.o if.o common.o debug.o
- 	@CC@ -o pppoe-sniff pppoe-sniff.o if.o common.o debug.o
- 
--pppoe-server: pppoe-server.o if.o debug.o common.o md5.o libevent/libevent.a @PPPOE_SERVER_DEPS@
--	@CC@ -o pppoe-server @RDYNAMIC@ pppoe-server.o if.o debug.o common.o md5.o $(PPPOE_SERVER_LIBS) -Llibevent -levent
-+pppoe-server: pppoe-server.o if.o debug.o common.o libevent/libevent.a @PPPOE_SERVER_DEPS@
-+	@CC@ -o pppoe-server @RDYNAMIC@ pppoe-server.o if.o debug.o common.o $(PPPOE_SERVER_LIBS) -Llibevent -levent
- 
- pppoe: pppoe.o if.o debug.o common.o ppp.o discovery.o
- 	@CC@ -o pppoe pppoe.o if.o debug.o common.o ppp.o discovery.o
-@@ -87,9 +90,6 @@ discovery.o: discovery.c pppoe.h
+@@ -87,9 +90,6 @@
  ppp.o: ppp.c pppoe.h
  	@CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o ppp.o ppp.c
  
@@ -42,8 +22,8 @@ $NetBSD: patch-aa,v 1.10 2006/03/14 02:49:03 joerg Exp $
  pppoe-server.o: pppoe-server.c pppoe.h @PPPOE_SERVER_DEPS@
  	@CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe-server.o pppoe-server.c
  
-@@ -147,7 +147,7 @@ install: all
- 	$(install) -m 755 ../scripts/adsl-setup $(RPM_INSTALL_ROOT)$(sbindir)
+@@ -147,7 +147,7 @@
+ 	$(install) -m 755 ../scripts/pppoe-setup $(RPM_INSTALL_ROOT)$(sbindir)
  	-mkdir -p $(RPM_INSTALL_ROOT)$(docdir)
  	$(install) -m 644 ../doc/CHANGES $(RPM_INSTALL_ROOT)$(docdir)
 -	$(install) -m 644 ../doc/KERNEL-MODE-PPPOE $(RPM_INSTALL_ROOT)$(docdir)
@@ -51,8 +31,8 @@ $NetBSD: patch-aa,v 1.10 2006/03/14 02:49:03 joerg Exp $
  	$(install) -m 644 ../doc/HOW-TO-CONNECT $(RPM_INSTALL_ROOT)$(docdir)
  	$(install) -m 644 ../doc/LICENSE $(RPM_INSTALL_ROOT)$(docdir)
  	$(install) -m 644 ../README $(RPM_INSTALL_ROOT)$(docdir)
-@@ -166,47 +166,47 @@ install: all
- 	$(install) -m 644 ../man/adsl-setup.8 $(RPM_INSTALL_ROOT)$(mandir)/man8
+@@ -166,47 +166,47 @@
+ 	$(install) -m 644 ../man/pppoe-setup.8 $(RPM_INSTALL_ROOT)$(mandir)/man8
  	-mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man5
  	$(install) -m 644 ../man/pppoe.conf.5 $(RPM_INSTALL_ROOT)$(mandir)/man5
 -	-mkdir -p $(RPM_INSTALL_ROOT)/etc/ppp
@@ -74,19 +54,19 @@ $NetBSD: patch-aa,v 1.10 2006/03/14 02:49:03 joerg Exp $
 -		$(install) -m 644 ../configs/pppoe-server-options $(RPM_INSTALL_ROOT)$(PPPOESERVER_PPPD_OPTIONS)-example ; \
 -	fi
 -	@if [ -f /etc/redhat-release ] ; then \
--		echo "Looks like a Red Hat system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl" ; \
+-		echo "Looks like a Red Hat system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe" ; \
 -		mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\
--		$(install) -m 755 ../scripts/adsl-init $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl ; \
+-		$(install) -m 755 ../scripts/pppoe-init $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe ; \
 -	fi
 -	@if [ -f /etc/turbolinux-release ] ; then \
--		echo "Looks like a TurboLinux system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl" ; \
+-		echo "Looks like a TurboLinux system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe" ; \
 -		mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\
--		$(install) -m 755 ../scripts/adsl-init-turbolinux $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl ; \
+-		$(install) -m 755 ../scripts/pppoe-init-turbolinux $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe ; \
 -	fi
 -	@if [ -f /etc/SuSE-release ] ; then \
--		echo "Looks like a SuSE Linux system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl" ; \
+-		echo "Looks like a SuSE Linux system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe" ; \
 -		mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\
--		$(install) -m 755 ../scripts/adsl-init-suse $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl ; \
+-		$(install) -m 755 ../scripts/pppoe-init-suse $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe ; \
 -	fi
 +#	-mkdir -p $(RPM_INSTALL_ROOT)/etc/ppp
 +#	-mkdir -p $(RPM_INSTALL_ROOT)$(PLUGIN_DIR)
@@ -107,19 +87,19 @@ $NetBSD: patch-aa,v 1.10 2006/03/14 02:49:03 joerg Exp $
 +#		$(install) -m 644 ../configs/pppoe-server-options $(RPM_INSTALL_ROOT)$(PPPOESERVER_PPPD_OPTIONS)-example ; \
 +#	fi
 +#	@if [ -f /etc/redhat-release ] ; then \
-+#		echo "Looks like a Red Hat system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl" ; \
++#		echo "Looks like a Red Hat system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe" ; \
 +#		mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\
-+#		$(install) -m 755 ../scripts/adsl-init $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl ; \
++#		$(install) -m 755 ../scripts/pppoe-init $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe ; \
 +#	fi
 +#	@if [ -f /etc/turbolinux-release ] ; then \
-+#		echo "Looks like a TurboLinux system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl" ; \
++#		echo "Looks like a TurboLinux system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe" ; \
 +#		mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\
-+#		$(install) -m 755 ../scripts/adsl-init-turbolinux $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl ; \
++#		$(install) -m 755 ../scripts/pppoe-init-turbolinux $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe ; \
 +#	fi
 +#	@if [ -f /etc/SuSE-release ] ; then \
-+#		echo "Looks like a SuSE Linux system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl" ; \
++#		echo "Looks like a SuSE Linux system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe" ; \
 +#		mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\
-+#		$(install) -m 755 ../scripts/adsl-init-suse $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl ; \
++#		$(install) -m 755 ../scripts/pppoe-init-suse $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe ; \
 +#	fi
  
  	# L2TP
@@ -136,5 +116,5 @@ $NetBSD: patch-aa,v 1.10 2006/03/14 02:49:03 joerg Exp $
 +#		$(install) -m 600 l2tp/l2tp.conf $(RPM_INSTALL_ROOT)/etc/l2tp/l2tp.conf.example ; \
 +#	fi
  	@echo ""
- 	@echo "Type 'adsl-setup' to configure the software."
+ 	@echo "Type 'pppoe-setup' to configure the software."
  
diff --git a/net/rp-pppoe/patches/patch-ab b/net/rp-pppoe/patches/patch-ab
index 94d8fa664fc..36c9289b1d6 100644
--- a/net/rp-pppoe/patches/patch-ab
+++ b/net/rp-pppoe/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2005/11/03 22:49:41 rillig Exp $
+$NetBSD: patch-ab,v 1.6 2006/11/01 15:17:14 martin Exp $
 
---- scripts/adsl-setup.in.orig	Mon Jan  8 15:58:35 2001
-+++ scripts/adsl-setup.in	Mon Feb 19 22:23:47 2001
-@@ -304,6 +304,7 @@
+--- scripts/pppoe-setup.in.orig	2006-04-02 16:29:42.000000000 +0200
++++ scripts/pppoe-setup.in	2006-11-01 12:34:32.000000000 +0100
+@@ -320,6 +320,7 @@
  	if [ "$DNS2" != "" ] ; then
  	    $ECHO "nameserver $DNS2" >> /etc/resolv.conf
  	fi
diff --git a/net/rp-pppoe/patches/patch-ac b/net/rp-pppoe/patches/patch-ac
deleted file mode 100644
index 983d509171d..00000000000
--- a/net/rp-pppoe/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/11/03 22:49:41 rillig Exp $
-
---- src/pppoe.h.orig	Mon Feb  5 17:34:49 2001
-+++ src/pppoe.h	Sun Mar 18 19:11:33 2001
-@@ -72,7 +72,9 @@
- #ifdef USE_BPF
- extern int bpfSize;
- struct PPPoEPacketStruct;
--void sessionDiscoveryPacket(struct PPPoEPacketStruct *packet);
-+struct PPPoEConnectionStruct;
-+void sessionDiscoveryPacket(struct PPPoEConnectionStruct *conn,
-+			    struct PPPoEPacketStruct *packet);
- #define BPF_BUFFER_IS_EMPTY (bpfSize <= 0)
- #define BPF_BUFFER_HAS_DATA (bpfSize > 0)
- #define ethhdr ether_header
diff --git a/net/rp-pppoe/patches/patch-ad b/net/rp-pppoe/patches/patch-ad
deleted file mode 100644
index 0ac3f0c0814..00000000000
--- a/net/rp-pppoe/patches/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/11/03 22:49:41 rillig Exp $
-
---- src/pppoe.c.orig	Fri Sep 14 21:18:53 2001
-+++ src/pppoe.c	Sun Oct  7 14:15:21 2001
-@@ -113,7 +113,7 @@
- * packet before passing it here.
- ***********************************************************************/
- void
--sessionDiscoveryPacket(PPPoEPacket *packet)
-+sessionDiscoveryPacket(PPPoEConnection *conn, PPPoEPacket *packet)
- {
-     /* Sanity check */
-     if (packet->code != CODE_PADT) {
-@@ -695,7 +695,7 @@
-     /* Make sure this is a session packet before processing further */
-     type = etherType(&packet);
-     if (type == Eth_PPPOE_Discovery) {
--	sessionDiscoveryPacket(&packet);
-+	sessionDiscoveryPacket(conn, &packet);
-     } else if (type != Eth_PPPOE_Session) {
- 	return;
-     }
-@@ -822,7 +822,7 @@
-     /* Make sure this is a session packet before processing further */
-     type = etherType(&packet);
-     if (type == Eth_PPPOE_Discovery) {
--	sessionDiscoveryPacket(&packet);
-+	sessionDiscoveryPacket(conn, &packet);
-     } else if (type != Eth_PPPOE_Session) {
- 	return;
-     }
diff --git a/net/rp-pppoe/patches/patch-ae b/net/rp-pppoe/patches/patch-ae
deleted file mode 100644
index 6ef77ecf30e..00000000000
--- a/net/rp-pppoe/patches/patch-ae
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2005/11/03 22:49:41 rillig Exp $
-
---- src/pppoe-server.c.orig	Fri Sep 14 21:18:53 2001
-+++ src/pppoe-server.c	Fri Dec  7 19:24:14 2001
-@@ -25,7 +25,7 @@
- #define _BSD_SOURCE 1 /* for gethostname */
- 
- #include "pppoe-server.h"
--#include "md5.h"
-+#include <md5.h>
- 
- #ifdef HAVE_SYSLOG_H
- #include <syslog.h>
-@@ -1249,7 +1249,7 @@
-     if (addressPoolFname) {
- 	NumSessionSlots = parseAddressPool(addressPoolFname, 0);
- 	if (CheckPoolSyntax) {
--	    printf("%d\n", NumSessionSlots);
-+	    printf("%d\n", (int)NumSessionSlots);
- 	    exit(0);
- 	}
-     }
-@@ -1674,7 +1674,7 @@
-     }
-     if (PassUnitOptionToPPPD) {
- 	argv[c++] = "unit";
--	sprintf(buffer, "%d", ntohs(session->sess) - 1 - SessOffset);
-+	sprintf(buffer, "%d", ntohs(session->sess) - 1 - (int)SessOffset);
- 	argv[c++] = buffer;
-     }
-     argv[c++] = NULL;
-@@ -1747,7 +1747,7 @@
-     argv[c++] = "default-asyncmap";
-     if (PassUnitOptionToPPPD) {
- 	argv[c++] = "unit";
--	sprintf(buffer, "%d", ntohs(session->sess) - 1 - SessOffset);
-+	sprintf(buffer, "%d", ntohs(session->sess) - 1 - (int)SessOffset);
- 	argv[c++] = buffer;
-     }
-     argv[c++] = NULL;
diff --git a/net/rp-pppoe/patches/patch-af b/net/rp-pppoe/patches/patch-af
index 5f31f4abf41..e64658b9cd0 100644
--- a/net/rp-pppoe/patches/patch-af
+++ b/net/rp-pppoe/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.2 2005/11/03 22:49:41 rillig Exp $
+$NetBSD: patch-af,v 1.3 2006/11/01 15:17:14 martin Exp $
 
---- scripts/adsl-connect.in.orig	Mon Jul  8 16:38:24 2002
-+++ scripts/adsl-connect.in	Mon Oct  7 22:31:42 2002
+--- scripts/pppoe-connect.in.orig	Mon Jul  8 16:38:24 2002
++++ scripts/pppoe-connect.in	Mon Oct  7 22:31:42 2002
 @@ -218,12 +218,20 @@
  
  # Jigger DNS if required...
diff --git a/net/rp-pppoe/patches/patch-ah b/net/rp-pppoe/patches/patch-ah
new file mode 100644
index 00000000000..5d1e32b487b
--- /dev/null
+++ b/net/rp-pppoe/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2006/11/01 15:17:14 martin Exp $
+
+--- src/pppoe.h.orig	2006-11-01 12:10:00.000000000 +0100
++++ src/pppoe.h	2006-11-01 12:14:59.000000000 +0100
+@@ -75,7 +75,6 @@
+ #ifdef USE_BPF
+ extern int bpfSize;
+ struct PPPoEPacketStruct;
+-void sessionDiscoveryPacket(struct PPPoEPacketStruct *packet);
+ #define BPF_BUFFER_IS_EMPTY (bpfSize <= 0)
+ #define BPF_BUFFER_HAS_DATA (bpfSize > 0)
+ #define ethhdr ether_header
diff --git a/net/rp-pppoe/patches/patch-ai b/net/rp-pppoe/patches/patch-ai
new file mode 100644
index 00000000000..c244e625c87
--- /dev/null
+++ b/net/rp-pppoe/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2006/11/01 15:17:14 martin Exp $
+
+--- src/if.c.orig	2006-04-02 16:29:42.000000000 +0200
++++ src/if.c	2006-11-01 12:15:52.000000000 +0100
+@@ -99,7 +99,7 @@
+ 
+ static unsigned char *bpfBuffer;	/* Packet filter buffer */
+ static int bpfLength = 0;		/* Packet filter buffer length */
+-static int bpfSize = 0;		        /* Number of unread bytes in buffer */
++int bpfSize = 0;		        /* Number of unread bytes in buffer */
+ static int bpfOffset = 0;		/* Current offset in bpfBuffer */
+ #endif
+