From 269a53f589d5cfc591d8b5f34f66b67f275bdf99 Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 7 Oct 2001 13:26:37 +0000 Subject: Update "rp-pppoe" package to version 3.3. Changes since version 2.8: - Client works on Solaris again. It was broken in 3.2. - Added DEFAULTROUTE=yes|no option to configuration file. - Server parses address pool file better. - Server address pool allows ranges of addresses on a line: a.b.c.d-e - Added "-d" (=debug) and "-P" (=check pool file syntax) options to pppoe-server. - Client now ignores PADT's if they are from the wrong source MAC address or to the wrong destination MAC address. - Minor fixes to Makefile.in for Turbolinux. - Improved KERNEL-MODE-PPPOE instructions - Works with patched pppd 2.4.1 - Many improvements to server: Added "-u" and "-r" options; server can now respond to request on multiple Ethernet interfaces. - SECURITY BUG FIX: Server now ignores PADT's if they are from the wrong source MAC address. You are STRONGLY RECOMMENDED to upgrade to 3.1 if you use pppoe-server in production. - Many small improvements to server. Server now only makes one discovery socket, systemwide, with addition of "-n" option to pppoe. - Fixes for compilation problems on BSD, Solaris and some Linux platforms. - Added "-p" option to pppoe-server to allow you to specify a pool of IP addresses to assign to clients. - Added GUI system (tkpppoe). This work was funded by Iospan Wireless, Inc. The GUI includes a Set-UID wrapper (pppoe-wrapper) which allows ordinary users to control a link (if so authorized.) I believe the wrapper script is secure, but please audit the source code (gui/wrapper.c) if you have any concerns. - Changes to scripts and pppoe.conf. DNS setup is now dynamic (happens each time adsl-connect runs.) - Made relay.c check packet lengths rigorously; made it throw out Ethernet frame padding on session packets as well as discovery packets. --- net/rp-pppoe/Makefile | 7 ++-- net/rp-pppoe/distinfo | 10 +++--- net/rp-pppoe/patches/patch-aa | 84 ++++++++++++------------------------------- net/rp-pppoe/patches/patch-ad | 33 ++++------------- net/rp-pppoe/pkg/PLIST | 3 +- 5 files changed, 40 insertions(+), 97 deletions(-) (limited to 'net/rp-pppoe') diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile index 3311febdc9b..144b43e0bca 100644 --- a/net/rp-pppoe/Makefile +++ b/net/rp-pppoe/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.15 2001/03/18 18:55:28 tron Exp $ +# $NetBSD: Makefile,v 1.16 2001/10/07 13:26:37 tron Exp $ -DISTNAME= rp-pppoe-2.8 +DISTNAME= rp-pppoe-3.3 CATEGORIES= net -MASTER_SITES= ${HOMEPAGE} +MASTER_SITES= ${HOMEPAGE} \ + http://roaringpenguin.luky.org/pppoe/ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.roaringpenguin.com/pppoe/ diff --git a/net/rp-pppoe/distinfo b/net/rp-pppoe/distinfo index bd6bb0c05a8..7e69ad76e2a 100644 --- a/net/rp-pppoe/distinfo +++ b/net/rp-pppoe/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 11:23:31 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/10/07 13:26:37 tron Exp $ -SHA1 (rp-pppoe-2.8.tar.gz) = a95059cc6e41b11f831f1dbf7f420d63d93ed708 -Size (rp-pppoe-2.8.tar.gz) = 101331 bytes -SHA1 (patch-aa) = 3753fbe6e5a1d62a6adca109391134ead5c037c0 +SHA1 (rp-pppoe-3.3.tar.gz) = cae019911821a493e1da414a03e5ee597980156c +Size (rp-pppoe-3.3.tar.gz) = 171480 bytes +SHA1 (patch-aa) = 57b6fa072ec0a73ce5f83b0a8d42c4596c8de864 SHA1 (patch-ab) = 4a16b96d6b2069fab9efb42c856b71af14f672f1 SHA1 (patch-ac) = 2c76eded4e98fb3564a70dd136f4c66fe41a165f -SHA1 (patch-ad) = b88680e7dd8a15878d40787ab4e3536e687e8081 +SHA1 (patch-ad) = b56e4e664902f0e3518678ac3b1e3c66c602a956 diff --git a/net/rp-pppoe/patches/patch-aa b/net/rp-pppoe/patches/patch-aa index 49280111c9f..1c6bc4cca8c 100644 --- a/net/rp-pppoe/patches/patch-aa +++ b/net/rp-pppoe/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.5 2001/03/18 18:55:29 tron Exp $ +$NetBSD: patch-aa,v 1.6 2001/10/07 13:26:38 tron Exp $ ---- Makefile.in.orig Mon Feb 5 17:34:49 2001 -+++ Makefile.in Sun Mar 18 19:40:17 2001 +--- Makefile.in.orig Fri Sep 14 21:18:53 2001 ++++ Makefile.in Sun Oct 7 14:14:39 2001 @@ -20,7 +20,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -11,31 +11,7 @@ $NetBSD: patch-aa,v 1.5 2001/03/18 18:55:29 tron Exp $ install=@INSTALL@ install_dir=@INSTALL@ -d sbindir=@sbindir@ -@@ -49,7 +49,7 @@ - - CFLAGS= @CFLAGS@ $(DEFINES) $(PATHS) - --all: pppoe pppoe-server pppoe-sniff $(LINUX_KERNELMODE_PLUGIN) $(PPPOE_RELAY) -+all: pppoe pppoe-server $(LINUX_KERNELMODE_PLUGIN) $(PPPOE_RELAY) - @echo "" - @echo "Type 'make install' as root to install the software." - -@@ -117,12 +117,12 @@ - plugin/common.o: common.c - @CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o plugin/common.o -fPIC common.c - --install: pppoe pppoe-server pppoe-sniff -+install: pppoe pppoe-server - -mkdir -p $(RPM_INSTALL_ROOT)$(sbindir) - $(install) -m 755 -s pppoe $(RPM_INSTALL_ROOT)$(sbindir) - $(install) -m 755 -s pppoe-server $(RPM_INSTALL_ROOT)$(sbindir) - if test -x pppoe-relay ; then $(install) -m 755 -s pppoe-relay $(RPM_INSTALL_ROOT)$(sbindir); fi -- $(install) -m 755 -s pppoe-sniff $(RPM_INSTALL_ROOT)$(sbindir) -+# $(install) -m 755 -s pppoe-sniff $(RPM_INSTALL_ROOT)$(sbindir) - $(install) -m 755 ../scripts/adsl-connect $(RPM_INSTALL_ROOT)$(sbindir) - $(install) -m 755 ../scripts/adsl-start $(RPM_INSTALL_ROOT)$(sbindir) - $(install) -m 755 ../scripts/adsl-status $(RPM_INSTALL_ROOT)$(sbindir) -@@ -130,53 +130,53 @@ +@@ -139,7 +139,7 @@ $(install) -m 755 ../scripts/adsl-setup $(RPM_INSTALL_ROOT)$(sbindir) -mkdir -p $(RPM_INSTALL_ROOT)$(docdir) $(install) -m 644 ../doc/CHANGES $(RPM_INSTALL_ROOT)$(docdir) @@ -44,25 +20,14 @@ $NetBSD: patch-aa,v 1.5 2001/03/18 18:55:29 tron 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) - $(install) -m 644 ../configs/pap-secrets $(RPM_INSTALL_ROOT)$(docdir) - -mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man8 - $(install) -m 644 ../man/pppoe.8 $(RPM_INSTALL_ROOT)$(mandir)/man8 -- $(install) -m 644 ../man/pppoe-relay.8 $(RPM_INSTALL_ROOT)$(mandir)/man8 -+# $(install) -m 644 ../man/pppoe-relay.8 $(RPM_INSTALL_ROOT)$(mandir)/man8 - $(install) -m 644 ../man/adsl-start.8 $(RPM_INSTALL_ROOT)$(mandir)/man8 - $(install) -m 644 ../man/adsl-stop.8 $(RPM_INSTALL_ROOT)$(mandir)/man8 - $(install) -m 644 ../man/adsl-status.8 $(RPM_INSTALL_ROOT)$(mandir)/man8 - $(install) -m 644 ../man/adsl-connect.8 $(RPM_INSTALL_ROOT)$(mandir)/man8 +@@ -158,39 +158,39 @@ $(install) -m 644 ../man/adsl-setup.8 $(RPM_INSTALL_ROOT)$(mandir)/man8 - $(install) -m 644 ../man/pppoe-server.8 $(RPM_INSTALL_ROOT)$(mandir)/man8 -- $(install) -m 644 ../man/pppoe-sniff.8 $(RPM_INSTALL_ROOT)$(mandir)/man8 -+# $(install) -m 644 ../man/pppoe-sniff.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 - -mkdir -p $(RPM_INSTALL_ROOT)$(PLUGIN_DIR) - -echo "# Directory created by rp-pppoe for kernel-mode plugin" > $(RPM_INSTALL_ROOT)$(PLUGIN_DIR)/README -- if test -r rp-pppoe.so; then $(install) -m 755 rp-pppoe.so $(RPM_INSTALL_ROOT)$(PLUGIN_DIR); fi +- @if test -r rp-pppoe.so; then $(install) -m 755 rp-pppoe.so $(RPM_INSTALL_ROOT)$(PLUGIN_DIR); fi - @for i in pppoe.conf firewall-standalone firewall-masq ; do \ - if [ ! -f $(RPM_INSTALL_ROOT)/etc/ppp/$$i ] ; then \ - $(install) -m 644 ../configs/$$i $(RPM_INSTALL_ROOT)/etc/ppp ; \ @@ -71,7 +36,12 @@ $NetBSD: patch-aa,v 1.5 2001/03/18 18:55:29 tron Exp $ - $(install) -m 644 ../configs/$$i $(RPM_INSTALL_ROOT)/etc/ppp/$$i-$(VERSION) ;\ - fi ;\ - done -- $(install) -m 644 ../configs/pppoe-server-options $(RPM_INSTALL_ROOT)$(PPPOESERVER_PPPD_OPTIONS) +- @if [ ! -f $(RPM_INSTALL_ROOT)$(PPPOESERVER_PPPD_OPTIONS) ] ; then \ +- $(install) -m 644 ../configs/pppoe-server-options $(RPM_INSTALL_ROOT)$(PPPOESERVER_PPPD_OPTIONS) ; \ +- else \ +- echo "NOT overwriting existing $(RPM_INSTALL_ROOT)$(PPPOESERVER_PPPD_OPTIONS)"; \ +- $(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" ; \ - mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\ @@ -80,19 +50,17 @@ $NetBSD: patch-aa,v 1.5 2001/03/18 18:55:29 tron Exp $ - @if [ -f /etc/turbolinux-release ] ; then \ - echo "Looks like a TurboLinux system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl" ; \ - mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\ -- $(install) -m 755 adsl-init-turbolinux $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl ; \ +- $(install) -m 755 ../scripts/adsl-init-turbolinux $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl ; \ - fi - @if [ -f /etc/SuSE-release ] ; then \ - echo "Looks like a SuSE Linux system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl" ; \ - 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 ; \ - fi -- @echo "" -- @echo "Type 'adsl-setup' to configure the software." +# -mkdir -p $(RPM_INSTALL_ROOT)/etc/ppp +# -mkdir -p $(RPM_INSTALL_ROOT)$(PLUGIN_DIR) +# -echo "# Directory created by rp-pppoe for kernel-mode plugin" > $(RPM_INSTALL_ROOT)$(PLUGIN_DIR)/README -+# if test -r rp-pppoe.so; then $(install) -m 755 rp-pppoe.so $(RPM_INSTALL_ROOT)$(PLUGIN_DIR); fi ++# @if test -r rp-pppoe.so; then $(install) -m 755 rp-pppoe.so $(RPM_INSTALL_ROOT)$(PLUGIN_DIR); fi +# @for i in pppoe.conf firewall-standalone firewall-masq ; do \ +# if [ ! -f $(RPM_INSTALL_ROOT)/etc/ppp/$$i ] ; then \ +# $(install) -m 644 ../configs/$$i $(RPM_INSTALL_ROOT)/etc/ppp ; \ @@ -101,7 +69,12 @@ $NetBSD: patch-aa,v 1.5 2001/03/18 18:55:29 tron Exp $ +# $(install) -m 644 ../configs/$$i $(RPM_INSTALL_ROOT)/etc/ppp/$$i-$(VERSION) ;\ +# fi ;\ +# done -+# $(install) -m 644 ../configs/pppoe-server-options $(RPM_INSTALL_ROOT)$(PPPOESERVER_PPPD_OPTIONS) ++# @if [ ! -f $(RPM_INSTALL_ROOT)$(PPPOESERVER_PPPD_OPTIONS) ] ; then \ ++# $(install) -m 644 ../configs/pppoe-server-options $(RPM_INSTALL_ROOT)$(PPPOESERVER_PPPD_OPTIONS) ; \ ++# else \ ++# echo "NOT overwriting existing $(RPM_INSTALL_ROOT)$(PPPOESERVER_PPPD_OPTIONS)"; \ ++# $(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" ; \ +# mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\ @@ -110,24 +83,13 @@ $NetBSD: patch-aa,v 1.5 2001/03/18 18:55:29 tron Exp $ +# @if [ -f /etc/turbolinux-release ] ; then \ +# echo "Looks like a TurboLinux system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl" ; \ +# mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\ -+# $(install) -m 755 adsl-init-turbolinux $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl ; \ ++# $(install) -m 755 ../scripts/adsl-init-turbolinux $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl ; \ +# fi +# @if [ -f /etc/SuSE-release ] ; then \ +# echo "Looks like a SuSE Linux system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl" ; \ +# 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 ; \ +# fi -+# @echo "" -+# @echo "Type 'adsl-setup' to configure the software." + @echo "" + @echo "Type 'adsl-setup' to configure the software." - distro: - cd ..; \ -@@ -190,7 +190,7 @@ - cp configs/$$i rp-pppoe-$(VERSION)/configs || exit 1; \ - done ; \ - mkdir rp-pppoe-$(VERSION)/doc || exit 1; \ -- for i in CHANGES KERNEL-MODE-PPPOE HOW-TO-CONNECT LICENSE PROBLEMS ; do \ -+ for i in CHANGES HOW-TO-CONNECT LICENSE PROBLEMS ; do \ - cp doc/$$i rp-pppoe-$(VERSION)/doc || exit 1; \ - done; \ - mkdir rp-pppoe-$(VERSION)/man || exit 1; \ diff --git a/net/rp-pppoe/patches/patch-ad b/net/rp-pppoe/patches/patch-ad index b7cb567bb79..758e2358f59 100644 --- a/net/rp-pppoe/patches/patch-ad +++ b/net/rp-pppoe/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1 2001/03/18 18:55:29 tron Exp $ +$NetBSD: patch-ad,v 1.2 2001/10/07 13:26:38 tron Exp $ ---- pppoe.c.orig Mon Feb 5 17:34:49 2001 -+++ pppoe.c Sun Mar 18 19:14:55 2001 -@@ -109,7 +109,7 @@ +--- pppoe.c.orig Fri Sep 14 21:18:53 2001 ++++ pppoe.c Sun Oct 7 14:15:21 2001 +@@ -113,7 +113,7 @@ * packet before passing it here. ***********************************************************************/ void @@ -11,28 +11,7 @@ $NetBSD: patch-ad,v 1.1 2001/03/18 18:55:29 tron Exp $ { /* Sanity check */ if (packet->code != CODE_PADT) { -@@ -117,7 +117,7 @@ - } - - /* It's a PADT, all right. Is it for us? */ -- if (packet->session != Session) { -+ if (packet->session != conn->session) { - /* Nope, ignore it */ - return; - } -@@ -222,9 +222,9 @@ - /* check for buffered session data */ - while (BPF_BUFFER_HAS_DATA) { - if (conn->synchronous) { -- syncReadFromEth(conn->sessionSocket, optClampMSS); -+ syncReadFromEth(conn, conn->sessionSocket, optClampMSS); - } else { -- asyncReadFromEth(conn->sessionSocket, optClampMSS); -+ asyncReadFromEth(conn, conn->sessionSocket, optClampMSS); - } - } - #endif -@@ -642,7 +642,7 @@ +@@ -695,7 +695,7 @@ /* Make sure this is a session packet before processing further */ type = etherType(&packet); if (type == Eth_PPPOE_Discovery) { @@ -41,7 +20,7 @@ $NetBSD: patch-ad,v 1.1 2001/03/18 18:55:29 tron Exp $ } else if (type != Eth_PPPOE_Session) { return; } -@@ -767,7 +767,7 @@ +@@ -822,7 +822,7 @@ /* Make sure this is a session packet before processing further */ type = etherType(&packet); if (type == Eth_PPPOE_Discovery) { diff --git a/net/rp-pppoe/pkg/PLIST b/net/rp-pppoe/pkg/PLIST index 1bec66d12d0..fe74ca60165 100644 --- a/net/rp-pppoe/pkg/PLIST +++ b/net/rp-pppoe/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2001/03/18 18:55:29 tron Exp $ +@comment $NetBSD: PLIST,v 1.7 2001/10/07 13:26:38 tron Exp $ etc/rc.d/pppoe man/man5/pppoe.conf.5 man/man8/adsl-connect.8 @@ -19,6 +19,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/SERVPOET share/doc/rp-pppoe/pap-secrets share/examples/rp-pppoe/pppoe.conf share/examples/rp-pppoe/pppoe-server-options -- cgit v1.2.3