summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/rp-pppoe/Makefile4
-rw-r--r--net/rp-pppoe/distinfo10
-rw-r--r--net/rp-pppoe/patches/patch-aa40
-rw-r--r--net/rp-pppoe/patches/patch-af29
-rw-r--r--net/rp-pppoe/patches/patch-ag14
5 files changed, 78 insertions, 19 deletions
diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 21b565ada8c..804f3209a2a 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2002/10/07 20:05:53 tron Exp $
+# $NetBSD: Makefile,v 1.19 2002/10/09 08:30:40 tron Exp $
-DISTNAME= rp-pppoe-3.3
+DISTNAME= rp-pppoe-3.5
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE} \
http://roaringpenguin.luky.org/pppoe/
diff --git a/net/rp-pppoe/distinfo b/net/rp-pppoe/distinfo
index d5687503964..264cfc61f92 100644
--- a/net/rp-pppoe/distinfo
+++ b/net/rp-pppoe/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.4 2001/12/07 18:35:50 martin Exp $
+$NetBSD: distinfo,v 1.5 2002/10/09 08:30:41 tron Exp $
-SHA1 (rp-pppoe-3.3.tar.gz) = cae019911821a493e1da414a03e5ee597980156c
-Size (rp-pppoe-3.3.tar.gz) = 171480 bytes
-SHA1 (patch-aa) = 680b6b0c507f8c512949a7acbf005f4cfc7cb779
+SHA1 (rp-pppoe-3.5.tar.gz) = f81f351e8559b4c861c9b99adc4ef9756cecab83
+Size (rp-pppoe-3.5.tar.gz) = 189321 bytes
+SHA1 (patch-aa) = d01a245850e077d10c6219eb441911e1f5d40cdb
SHA1 (patch-ab) = 4a16b96d6b2069fab9efb42c856b71af14f672f1
SHA1 (patch-ac) = 2c76eded4e98fb3564a70dd136f4c66fe41a165f
SHA1 (patch-ad) = b56e4e664902f0e3518678ac3b1e3c66c602a956
SHA1 (patch-ae) = 5fa68935a3dc116a26062730cc00e56399575bd6
+SHA1 (patch-af) = 9a8a5973a99faa5fcc315c231c81d4d87f7b0955
+SHA1 (patch-ag) = 596d461b78fff37fdbd66d820db1b75bcb4c4315
diff --git a/net/rp-pppoe/patches/patch-aa b/net/rp-pppoe/patches/patch-aa
index 240494e298f..68f5d2d949b 100644
--- a/net/rp-pppoe/patches/patch-aa
+++ b/net/rp-pppoe/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2001/12/07 18:35:51 martin Exp $
+$NetBSD: patch-aa,v 1.8 2002/10/09 08:30:42 tron Exp $
---- Makefile.in.orig Fri Sep 14 21:18:53 2001
-+++ Makefile.in Fri Dec 7 19:26:39 2001
-@@ -20,7 +20,7 @@
+--- Makefile.in.orig Mon Jul 8 16:38:24 2002
++++ Makefile.in Mon Oct 7 21:56:42 2002
+@@ -22,7 +22,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
mandir=@mandir@
@@ -11,28 +11,28 @@ $NetBSD: patch-aa,v 1.7 2001/12/07 18:35:51 martin Exp $
install=@INSTALL@
install_dir=@INSTALL@ -d
sbindir=@sbindir@
-@@ -64,8 +64,8 @@
+@@ -69,8 +69,8 @@
pppoe-sniff: pppoe-sniff.o if.o common.o debug.o
@CC@ -o pppoe-sniff pppoe-sniff.o if.o common.o debug.o
--pppoe-server: pppoe-server.o if.o debug.o common.o md5.o @PPPOE_SERVER_DEPS@
-- @CC@ -o pppoe-server pppoe-server.o if.o debug.o common.o md5.o $(PPPOE_SERVER_LIBS)
-+pppoe-server: pppoe-server.o if.o debug.o common.o @PPPOE_SERVER_DEPS@
-+ @CC@ -o pppoe-server pppoe-server.o if.o debug.o common.o $(PPPOE_SERVER_LIBS)
+-pppoe-server: pppoe-server.o if.o debug.o common.o md5.o libevent/libevent.a @PPPOE_SERVER_DEPS@
+- @CC@ -o pppoe-server @RDYNAMIC@ pppoe-server.o if.o debug.o common.o md5.o $(PPPOE_SERVER_LIBS) -Llibevent -levent
++pppoe-server: pppoe-server.o if.o debug.o common.o libevent/libevent.a @PPPOE_SERVER_DEPS@
++ @CC@ -o pppoe-server @RDYNAMIC@ pppoe-server.o if.o debug.o common.o $(PPPOE_SERVER_LIBS) -Llibevent -levent
pppoe: pppoe.o if.o debug.o common.o ppp.o discovery.o
@CC@ -o pppoe pppoe.o if.o debug.o common.o ppp.o discovery.o
-@@ -82,9 +82,6 @@
+@@ -87,9 +87,6 @@
ppp.o: ppp.c pppoe.h
@CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o ppp.o ppp.c
-md5.o: md5.c md5.h
- @CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o md5.o md5.c
-
- pppoe-server.o: pppoe-server.c pppoe.h
+ pppoe-server.o: pppoe-server.c pppoe.h @PPPOE_SERVER_DEPS@
@CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe-server.o pppoe-server.c
-@@ -139,7 +136,7 @@
+@@ -147,7 +144,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)
@@ -41,7 +41,7 @@ $NetBSD: patch-aa,v 1.7 2001/12/07 18:35:51 martin 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)
-@@ -158,39 +155,39 @@
+@@ -166,47 +163,47 @@
$(install) -m 644 ../man/adsl-setup.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
@@ -111,6 +111,20 @@ $NetBSD: patch-aa,v 1.7 2001/12/07 18:35:51 martin Exp $
+# 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
+
+ # L2TP
+- @if [ -f l2tp/handlers/sync-pppd.so ] ; then \
+- mkdir -p $(RPM_INSTALL_ROOT)/usr/lib/l2tp/plugins ; \
+- $(install) -m 755 l2tp/handlers/sync-pppd.so $(RPM_INSTALL_ROOT)/usr/lib/l2tp/plugins ; \
+- mkdir -p $(RPM_INSTALL_ROOT)/etc/l2tp ; \
+- $(install) -m 600 l2tp/l2tp.conf $(RPM_INSTALL_ROOT)/etc/l2tp/l2tp.conf.example ; \
+- fi
++# @if [ -f l2tp/handlers/sync-pppd.so ] ; then \
++# mkdir -p $(RPM_INSTALL_ROOT)/usr/lib/l2tp/plugins ; \
++# $(install) -m 755 l2tp/handlers/sync-pppd.so $(RPM_INSTALL_ROOT)/usr/lib/l2tp/plugins ; \
++# mkdir -p $(RPM_INSTALL_ROOT)/etc/l2tp ; \
++# $(install) -m 600 l2tp/l2tp.conf $(RPM_INSTALL_ROOT)/etc/l2tp/l2tp.conf.example ; \
++# fi
@echo ""
@echo "Type 'adsl-setup' to configure the software."
diff --git a/net/rp-pppoe/patches/patch-af b/net/rp-pppoe/patches/patch-af
new file mode 100644
index 00000000000..81613fffc60
--- /dev/null
+++ b/net/rp-pppoe/patches/patch-af
@@ -0,0 +1,29 @@
+$NetBSD: patch-af,v 1.1 2002/10/09 08:30:43 tron Exp $
+
+--- ../scripts/adsl-connect.in.orig Mon Jul 8 16:38:24 2002
++++ ../scripts/adsl-connect.in Mon Oct 7 22:31:42 2002
+@@ -218,12 +218,20 @@
+
+ # Jigger DNS if required...
+ if test "$DNSTYPE" = "SERVER" ; then
+- # Sorry, dude...
+- rm -f /etc/resolv.conf
++ if test -f /etc/resolv.conf -a ! -f /etc/resolv.conf.rp-pppoe-save
++ then
++ mv /etc/resolv.conf /etc/resolv.conf.rp-pppoe-save
++ else
++ rm -f /etc/resolv.conf
++ fi
+ ln -s /etc/ppp/resolv.conf /etc/resolv.conf
+ elif test "$DNSTYPE" = "SPECIFY" ; then
+- # Sorry, dude...
+- rm -f /etc/resolv.conf
++ if test -f /etc/resolv.conf -a ! -f /etc/resolv.conf.rp-pppoe-save
++ then
++ mv /etc/resolv.conf /etc/resolv.conf.rp-pppoe-save
++ else
++ rm -f /etc/resolv.conf
++ fi
+ echo "nameserver $DNS1" > /etc/resolv.conf
+ if test -n "$DNS2" ; then
+ echo "nameserver $DNS2" >> /etc/resolv.conf
diff --git a/net/rp-pppoe/patches/patch-ag b/net/rp-pppoe/patches/patch-ag
new file mode 100644
index 00000000000..d1128db605c
--- /dev/null
+++ b/net/rp-pppoe/patches/patch-ag
@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.1 2002/10/09 08:30:43 tron Exp $
+
+--- common.c.orig Mon Jul 8 16:38:24 2002
++++ common.c Tue Oct 8 16:56:44 2002
+@@ -18,7 +18,9 @@
+ static char const RCSID[] =
+ "$Id: patch-ag,v 1.1 2002/10/09 08:30:43 tron Exp $";
+ /* For vsnprintf prototype */
++#ifndef __NetBSD__
+ #define _ISOC99_SOURCE 1
++#endif
+
+ #include "pppoe.h"
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 10:54:37 +0000