diff options
author | tron <tron@pkgsrc.org> | 2000-07-17 21:11:45 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2000-07-17 21:11:45 +0000 |
commit | 093c1bab337fa840cab61dad4509838ed077163e (patch) | |
tree | 55c4ff9c808857c27c60f4e80b4c4403a8290630 /net | |
parent | 7038dda8e7aa30bba85b271d66dd05780cd11406 (diff) | |
download | pkgsrc-093c1bab337fa840cab61dad4509838ed077163e.tar.gz |
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.
Diffstat (limited to 'net')
-rw-r--r-- | net/rp-pppoe/Makefile | 9 | ||||
-rw-r--r-- | net/rp-pppoe/files/md5 | 4 | ||||
-rw-r--r-- | net/rp-pppoe/files/patch-sum | 6 | ||||
-rw-r--r-- | net/rp-pppoe/patches/patch-aa | 74 | ||||
-rw-r--r-- | net/rp-pppoe/patches/patch-ab | 13 | ||||
-rw-r--r-- | net/rp-pppoe/patches/patch-ac | 13 | ||||
-rw-r--r-- | net/rp-pppoe/pkg/PLIST | 6 |
7 files changed, 52 insertions, 73 deletions
diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile index 011915d552a..17e4a4a06ef 100644 --- a/net/rp-pppoe/Makefile +++ b/net/rp-pppoe/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2000/07/11 21:37:24 tron Exp $ +# $NetBSD: Makefile,v 1.3 2000/07/17 21:11:45 tron Exp $ -DISTNAME= rp-pppoe-1.9 +DISTNAME= rp-pppoe-2.0 CATEGORIES= net -MASTER_SITES= ${HOMEPAGE}src/ +MASTER_SITES= http://www.roaringpenguin.com/pppoe/ MAINTAINER= tron@netbsd.org HOMEPAGE= http://home.sprynet.com/~minaret/pppoe/ @@ -12,8 +12,7 @@ DEPENDS+= ppp>=2.3.10:../ppp CONFLICTS+= mouse_pppoe-* GNU_CONFIGURE= yes - -ALL_TARGET= pppoe +CONFIGURE_ENV= PPPD=${LOCALBASE}/sbin/pppd post-install: ${INSTALL_DATA} ${WRKSRC}/pppoe.conf ${PREFIX}/share/doc/rp-pppoe diff --git a/net/rp-pppoe/files/md5 b/net/rp-pppoe/files/md5 index 703b95a5b10..987352b7720 100644 --- a/net/rp-pppoe/files/md5 +++ b/net/rp-pppoe/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/07/11 21:20:35 tron Exp $ +$NetBSD: md5,v 1.2 2000/07/17 21:11:46 tron Exp $ -MD5 (rp-pppoe-1.9.tar.gz) = 641e1da80b6373cb853525ae3f631607 +MD5 (rp-pppoe-2.0.tar.gz) = 71645f2afb081e28dce72a97fa6d2660 diff --git a/net/rp-pppoe/files/patch-sum b/net/rp-pppoe/files/patch-sum index f2fb5aa2a7d..e9982ccb0d0 100644 --- a/net/rp-pppoe/files/patch-sum +++ b/net/rp-pppoe/files/patch-sum @@ -1,5 +1,3 @@ -$NetBSD: patch-sum,v 1.2 2000/07/11 21:32:44 tron Exp $ +$NetBSD: patch-sum,v 1.3 2000/07/17 21:11:46 tron Exp $ -MD5 (patch-aa) = 084681f0b768377e5a16f74115e096ac -MD5 (patch-ab) = 66dbf91af2f98cd0eebe55092d74c0cf -MD5 (patch-ac) = e56b91896179b4f09e63f21f54eb22b8 +MD5 (patch-aa) = f396ca2121939f5b82cc58953d83057e 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 - diff --git a/net/rp-pppoe/pkg/PLIST b/net/rp-pppoe/pkg/PLIST index 82a6ab074a8..98aec5a82c9 100644 --- a/net/rp-pppoe/pkg/PLIST +++ b/net/rp-pppoe/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2000/07/11 21:20:35 tron Exp $ +@comment $NetBSD: PLIST,v 1.2 2000/07/17 21:11:46 tron Exp $ man/man5/pppoe.conf.5 man/man8/adsl-connect.8 man/man8/adsl-setup.8 @@ -6,12 +6,14 @@ man/man8/adsl-start.8 man/man8/adsl-status.8 man/man8/adsl-stop.8 man/man8/pppoe.8 -sbin/pppoe +man/man8/pppoe-server.8 sbin/adsl-connect sbin/adsl-setup sbin/adsl-start sbin/adsl-status sbin/adsl-stop +sbin/pppoe +sbin/pppoe-server share/doc/rp-pppoe/CHANGES share/doc/rp-pppoe/HOW-TO-CONNECT share/doc/rp-pppoe/LICENSE |