Update "rp-pppoe" package to version 2.2. Changes since version 2.0:

- Added "-f" option to pppoe to allow use of any Ethernet frame type
  for PPPoE.  USE WITH CAUTION -- this is a workaround for broken DSL
  providers, not something you should monkey with freely!
- Added pppoe-sniff program to help expose non-standard PPPoE
  implementations.
- Fixed minor bugs in bounds-checking
- Modified adsl-status to use output of "netstat -r -n" to determine
  whether or not link is up.  This should make it independent of locale,
  I hope!
- Added "-k" and "-d" options to pppoe.

5 files changed, 17 insertions, 14 deletions

diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index eecfbd38439..4189c9d16f1 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2000/07/18 18:42:48 tron Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/31 19:31:03 tron Exp $
 
-DISTNAME=	rp-pppoe-2.0
+DISTNAME=	rp-pppoe-2.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.roaringpenguin.com/pppoe/
 
diff --git a/net/rp-pppoe/files/md5 b/net/rp-pppoe/files/md5
index 987352b7720..16031c6afe2 100644
--- a/net/rp-pppoe/files/md5
+++ b/net/rp-pppoe/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/07/17 21:11:46 tron Exp $
+$NetBSD: md5,v 1.3 2000/07/31 19:31:04 tron Exp $
 
-MD5 (rp-pppoe-2.0.tar.gz) = 71645f2afb081e28dce72a97fa6d2660
+MD5 (rp-pppoe-2.2.tar.gz) = 9777dde66eb04d1517868cb899d7221b
diff --git a/net/rp-pppoe/files/patch-sum b/net/rp-pppoe/files/patch-sum
index e9982ccb0d0..4c8499b7380 100644
--- a/net/rp-pppoe/files/patch-sum
+++ b/net/rp-pppoe/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.3 2000/07/17 21:11:46 tron Exp $
+$NetBSD: patch-sum,v 1.4 2000/07/31 19:31:04 tron Exp $
 
-MD5 (patch-aa) = f396ca2121939f5b82cc58953d83057e
+MD5 (patch-aa) = f9109aa742598588aa93f4717aade22e
diff --git a/net/rp-pppoe/patches/patch-aa b/net/rp-pppoe/patches/patch-aa
index fa49f4a5c5c..f6d7206f07a 100644
--- a/net/rp-pppoe/patches/patch-aa
+++ b/net/rp-pppoe/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2000/07/17 21:11:46 tron Exp $
+$NetBSD: patch-aa,v 1.3 2000/07/31 19:31:04 tron Exp $
 
---- Makefile.in.orig	Fri Jul 14 04:09:50 2000
-+++ Makefile.in	Mon Jul 17 23:07:37 2000
+--- Makefile.in.orig	Mon Jul 31 18:41:18 2000
++++ Makefile.in	Mon Jul 31 21:27:01 2000
 @@ -20,7 +20,7 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
@@ -11,17 +11,17 @@ $NetBSD: patch-aa,v 1.2 2000/07/17 21:11:46 tron Exp $
  install=@INSTALL@
  install_dir=@INSTALL@ -d
  sbindir=@sbindir@
-@@ -74,21 +74,21 @@
- 	$(install) -m 755 -s pppoe-server $(RPM_INSTALL_ROOT)$(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 $(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
  	-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
+-	-mkdir -p $(RPM_INSTALL_ROOT)/etc/ppp
 -	@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 ; \
@@ -31,6 +31,7 @@ $NetBSD: patch-aa,v 1.2 2000/07/17 21:11:46 tron Exp $
 -		fi ;\
 -	done
 -	$(install) -m 644 pppoe-server-options $(RPM_INSTALL_ROOT)$(PPPOESERVER_PPPD_OPTIONS)
++#	-mkdir -p $(RPM_INSTALL_ROOT)/etc/ppp
 +#	@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 ; \
diff --git a/net/rp-pppoe/pkg/PLIST b/net/rp-pppoe/pkg/PLIST
index 98aec5a82c9..958196b2333 100644
--- a/net/rp-pppoe/pkg/PLIST
+++ b/net/rp-pppoe/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/07/17 21:11:46 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/07/31 19:31:04 tron Exp $
 man/man5/pppoe.conf.5
 man/man8/adsl-connect.8
 man/man8/adsl-setup.8
@@ -7,6 +7,7 @@ man/man8/adsl-status.8
 man/man8/adsl-stop.8
 man/man8/pppoe.8
 man/man8/pppoe-server.8
+man/man8/pppoe-sniff.8
 sbin/adsl-connect
 sbin/adsl-setup
 sbin/adsl-start
@@ -14,6 +15,7 @@ sbin/adsl-status
 sbin/adsl-stop
 sbin/pppoe
 sbin/pppoe-server
+sbin/pppoe-sniff
 share/doc/rp-pppoe/CHANGES
 share/doc/rp-pppoe/HOW-TO-CONNECT
 share/doc/rp-pppoe/LICENSE