Update "rp-pppoe" package to version 2.6. Changes since version 2.4:

- Code should now compile cleanly on Caldera and Slackware Linux
- Fixed rp-pppoe.spec file to work on Mandrake and Red Hat.
- Deleted some obsolete files
- Fixed bug in Solaris/x86 port (thanks to Philippe Levan)
- Made shell scripts nicer under Solaris (again, Philippe Levan)
- Made adsl-status look under /var/run and /etc/ppp for PID files.  Should
  fix problems with NetBSD.
- Added PPPD_EXTRA to pppoe.conf; made the PID file depend on the config
  file name.  This makes it easier to run multiple PPPoE sessions.
- Tested for zero-length TCP option-length field, and for reverse-packing
  of type/code bitfields.  Thanks to Robert Schlabbach for pointing out
  these problems.
- Set umask to 077 in adsl-setup.in to protect created files like
  /etc/ppp/pap-secrets.

5 files changed, 15 insertions, 20 deletions

diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 2230c9a5b91..d09ec23c764 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2000/12/09 09:29:08 tron Exp $
+# $NetBSD: Makefile,v 1.8 2001/01/30 20:33:25 tron Exp $
 
-DISTNAME=	rp-pppoe-2.4
+DISTNAME=	rp-pppoe-2.6
 CATEGORIES=	net
 MASTER_SITES=	${HOMEPAGE}
 
@@ -13,7 +13,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	PPPD=${PPPD}
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/pppoe.conf ${PREFIX}/share/doc/rp-pppoe
+	${INSTALL_DATA} ${WRKSRC}/pppoe.conf ${WRKSRC}/pppoe-server-options \
+	  ${PREFIX}/share/doc/rp-pppoe
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/rp-pppoe/files/md5 b/net/rp-pppoe/files/md5
index cfb242ebbd4..f11a1718a24 100644
--- a/net/rp-pppoe/files/md5
+++ b/net/rp-pppoe/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/12/09 09:29:08 tron Exp $
+$NetBSD: md5,v 1.5 2001/01/30 20:33:25 tron Exp $
 
-MD5 (rp-pppoe-2.4.tar.gz) = b4e066d72618af3efe0bfc28bff085ea
+MD5 (rp-pppoe-2.6.tar.gz) = b0979be9408850acf2d94d6d448efaea
diff --git a/net/rp-pppoe/files/patch-sum b/net/rp-pppoe/files/patch-sum
index 4c8499b7380..3e69e7e3772 100644
--- a/net/rp-pppoe/files/patch-sum
+++ b/net/rp-pppoe/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.4 2000/07/31 19:31:04 tron Exp $
+$NetBSD: patch-sum,v 1.5 2001/01/30 20:33:25 tron Exp $
 
-MD5 (patch-aa) = f9109aa742598588aa93f4717aade22e
+MD5 (patch-aa) = f2720b8feef48d25799a18fe0de93a95
diff --git a/net/rp-pppoe/patches/patch-aa b/net/rp-pppoe/patches/patch-aa
index f6d7206f07a..33d66d424df 100644
--- a/net/rp-pppoe/patches/patch-aa
+++ b/net/rp-pppoe/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2000/07/31 19:31:04 tron Exp $
+$NetBSD: patch-aa,v 1.4 2001/01/30 20:33:25 tron Exp $
 
---- Makefile.in.orig	Mon Jul 31 18:41:18 2000
-+++ Makefile.in	Mon Jul 31 21:27:01 2000
+--- Makefile.in.orig	Mon Jan  8 15:58:35 2001
++++ Makefile.in	Tue Jan 30 21:26:42 2001
 @@ -20,7 +20,7 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
@@ -11,14 +11,8 @@ $NetBSD: patch-aa,v 1.3 2000/07/31 19:31:04 tron Exp $
  install=@INSTALL@
  install_dir=@INSTALL@ -d
  sbindir=@sbindir@
-@@ -81,21 +81,21 @@
- 	$(install) -m 755 -s pppoe-sniff $(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 pppoe-sniff.8 $(RPM_INSTALL_ROOT)$(mandir)/man8
+@@ -101,16 +101,16 @@
+ 	$(install) -m 644 pppoe-sniff.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
diff --git a/net/rp-pppoe/pkg/PLIST b/net/rp-pppoe/pkg/PLIST
index 958196b2333..465cb459a9e 100644
--- a/net/rp-pppoe/pkg/PLIST
+++ b/net/rp-pppoe/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/07/31 19:31:04 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/30 20:33:25 tron Exp $
 man/man5/pppoe.conf.5
 man/man8/adsl-connect.8
 man/man8/adsl-setup.8
@@ -20,7 +20,7 @@ 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/adsl-state.pl
 share/doc/rp-pppoe/pap-secrets
 share/doc/rp-pppoe/pppoe.conf
+share/doc/rp-pppoe/pppoe-server-options
 @dirrm share/doc/rp-pppoe