Update "rp-ppoe" package to version 2.0. Change since version 1.9:

- Addition of pppoe-server
- Massive internal code restructuring
- Zealous bounds-checking everywhere.
- adsl-setup now quotes user name and password in /etc/ppp/pap-secrets.
- Ported to OpenBSD, FreeBSD and NetBSD, courtesy of Geoff Mottram
  and Yannis Sismanis.
- Rearranged adsl-* shell scripts, courtesy of Heiko Schlittermann.
- Fixed bug in which Host-Uniq did not work if access concentrator sent
  a cookie.
- Addition of SuSE-specific "init" script, courtesy of Gary Cameron.

3 files changed, 40 insertions, 60 deletions

diff --git a/net/rp-pppoe/patches/patch-aa b/net/rp-pppoe/patches/patch-aa
index 2c4eb02019b..fa49f4a5c5c 100644
--- a/net/rp-pppoe/patches/patch-aa
+++ b/net/rp-pppoe/patches/patch-aa
@@ -1,39 +1,45 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/07/11 21:20:36 tron Exp $
+$NetBSD: patch-aa,v 1.2 2000/07/17 21:11:46 tron Exp $
 
---- Makefile.in.orig	Fri May 26 01:16:22 2000
-+++ Makefile.in	Tue Jul 11 23:15:10 2000
-@@ -32,32 +32,10 @@
- install: pppoe
- 	@INSTALL@ -m 755 -o root -s pppoe @sbindir@
- 	@INSTALL@ -m 755 -o root adsl-connect adsl-start adsl-status adsl-stop adsl-setup @sbindir@
--	-mkdir -p /usr/doc/rp-pppoe-$(VERSION)
--	@INSTALL@ -m 644 CHANGES HOW-TO-CONNECT LICENSE README firewall pap-secrets adsl-state.pl /usr/doc/rp-pppoe-$(VERSION)
-+	-mkdir -p @prefix@/share/doc/rp-pppoe
-+	@INSTALL@ -m 644 CHANGES HOW-TO-CONNECT LICENSE README pap-secrets adsl-state.pl @prefix@/share/doc/rp-pppoe
- 	@INSTALL@ -m 644 pppoe.8 adsl-start.8 adsl-stop.8 adsl-status.8 adsl-connect.8 adsl-setup.8 @mandir@/man8
- 	@INSTALL@ -m 644 pppoe.conf.5 @mandir@/man5
--	@if [ ! -d /etc/ppp ] ; then \
--		if [ -e /etc/ppp ] ; then \
--			echo "/etc/ppp is not a directory, rename /etc/ppp and rerun \"make install\"" ; \
--			exit 1 ; \
--		else \
--			mkdir /etc/ppp ; \
--			chown 0.0 /etc/ppp ; \
--			chmod 755 /etc/ppp ; \
--		fi ; \
--	fi
+--- Makefile.in.orig	Fri Jul 14 04:09:50 2000
++++ Makefile.in	Mon Jul 17 23:07:37 2000
+@@ -20,7 +20,7 @@
+ 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@
+@@ -74,21 +74,21 @@
+ 	$(install) -m 755 -s pppoe-server $(RPM_INSTALL_ROOT)$(sbindir)
+ 	$(install) -m 755 adsl-connect adsl-start adsl-status adsl-stop adsl-setup $(RPM_INSTALL_ROOT)$(sbindir)
+ 	-mkdir -p $(RPM_INSTALL_ROOT)$(docdir)
+-	$(install) -m 644 CHANGES HOW-TO-CONNECT LICENSE README firewall pap-secrets adsl-state.pl $(RPM_INSTALL_ROOT)$(docdir)
++	$(install) -m 644 CHANGES HOW-TO-CONNECT LICENSE README pap-secrets adsl-state.pl $(RPM_INSTALL_ROOT)$(docdir)
+ 	-mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man8
+ 	$(install) -m 644 pppoe.8 adsl-start.8 adsl-stop.8 adsl-status.8 adsl-connect.8 adsl-setup.8 pppoe-server.8 $(RPM_INSTALL_ROOT)$(mandir)/man8
+ 	-mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man5
+ 	$(install) -m 644 pppoe.conf.5 $(RPM_INSTALL_ROOT)$(mandir)/man5
+ 	-mkdir -p $(RPM_INSTALL_ROOT)/etc/ppp
 -	@for i in pppoe.conf firewall-standalone firewall-masq ; do \
--		if [ ! -f /etc/ppp/$$i ] ; then \
--			@INSTALL@ -m 644 -o root $$i /etc/ppp ; \
+-		if [ ! -f $(RPM_INSTALL_ROOT)/etc/ppp/$$i ] ; then \
+-			$(install) -m 644 $$i $(RPM_INSTALL_ROOT)/etc/ppp ; \
 -		else \
--			echo "NOT overwriting existing /etc/ppp/$$i" ;\
--			@INSTALL@ -m 644 -o root $$i /etc/ppp/$$i-$(VERSION) ;\
+-			echo "NOT overwriting existing $(RPM_INSTALL_ROOT)/etc/ppp/$$i" ;\
+-			$(install) -m 644 $$i $(RPM_INSTALL_ROOT)/etc/ppp/$$i-$(VERSION) ;\
 -		fi ;\
 -	done
--	@if [ -f /etc/redhat-release ] ; then \
--		echo "Looks like a Red Hat system; installing /etc/rc.d/init.d/adsl" ; \
--		@INSTALL@ -m 755 -o root adsl-init /etc/rc.d/init.d/adsl ; \
--	fi
- 	-@echo "Before running rp-pppoe, run 'adsl-setup' or edit the file /etc/ppp/pppoe.conf"
- 
- distro:
+-	$(install) -m 644 pppoe-server-options $(RPM_INSTALL_ROOT)$(PPPOESERVER_PPPD_OPTIONS)
++#	@for i in pppoe.conf firewall-standalone firewall-masq ; do \
++#		if [ ! -f $(RPM_INSTALL_ROOT)/etc/ppp/$$i ] ; then \
++#			$(install) -m 644 $$i $(RPM_INSTALL_ROOT)/etc/ppp ; \
++#		else \
++#			echo "NOT overwriting existing $(RPM_INSTALL_ROOT)/etc/ppp/$$i" ;\
++#			$(install) -m 644 $$i $(RPM_INSTALL_ROOT)/etc/ppp/$$i-$(VERSION) ;\
++#		fi ;\
++#	done
++#	$(install) -m 644 pppoe-server-options $(RPM_INSTALL_ROOT)$(PPPOESERVER_PPPD_OPTIONS)
+ 	@if [ -f /etc/redhat-release ] ; then \
+ 		echo "Looks like a Red Hat system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl" ; \
+ 		mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\
diff --git a/net/rp-pppoe/patches/patch-ab b/net/rp-pppoe/patches/patch-ab
deleted file mode 100644
index eddb71ad668..00000000000
--- a/net/rp-pppoe/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2000/07/11 21:32:45 tron Exp $
-
---- adsl-connect.in.orig	Fri May 26 01:16:21 2000
-+++ adsl-connect.in	Tue Jul 11 23:30:24 2000
-@@ -26,7 +26,7 @@
- 
- # Paths to programs
- IFCONFIG=/sbin/ifconfig
--PPPD=/usr/sbin/pppd
-+PPPD=@sbindir@/pppd
- PPPOE=@sbindir@/pppoe
- LOGGER=/usr/bin/logger
- 
diff --git a/net/rp-pppoe/patches/patch-ac b/net/rp-pppoe/patches/patch-ac
deleted file mode 100644
index 274d1f7b359..00000000000
--- a/net/rp-pppoe/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/07/11 21:32:45 tron Exp $
-
---- adsl-setup.in.orig	Fri May 26 01:16:21 2000
-+++ adsl-setup.in	Tue Jul 11 23:30:35 2000
-@@ -16,7 +16,7 @@
- 
- # Paths to programs
- IFCONFIG=/sbin/ifconfig
--PPPD=/usr/sbin/pppd
-+PPPD=@sbindir@/pppd
- PPPOE=@sbindir@/pppoe
- LOGGER=/usr/bin/logger
-