Date: Thu, 27 Dec 2018 13:06:13 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488538 - in head/net/rp-pppoe: . files Message-ID: <201812271306.wBRD6DW4085365@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Thu Dec 27 13:06:13 2018 New Revision: 488538 URL: https://svnweb.freebsd.org/changeset/ports/488538 Log: Update to new upstream release 3.13. While here, update port, add LICENSE, update WWW:, and refresh patches to remove portlint warnings. Changelog: <https://dianne.skoll.ca/pipermail/rp-pppoe/2018q4/000565.html>; Modified: head/net/rp-pppoe/Makefile head/net/rp-pppoe/distinfo head/net/rp-pppoe/files/patch-configure head/net/rp-pppoe/files/patch-if.c head/net/rp-pppoe/files/patch-pppoe.h head/net/rp-pppoe/files/patch-relay.c head/net/rp-pppoe/files/patch-relay.h head/net/rp-pppoe/pkg-descr head/net/rp-pppoe/pkg-plist Modified: head/net/rp-pppoe/Makefile ============================================================================== --- head/net/rp-pppoe/Makefile Thu Dec 27 12:53:34 2018 (r488537) +++ head/net/rp-pppoe/Makefile Thu Dec 27 13:06:13 2018 (r488538) @@ -2,12 +2,14 @@ # $FreeBSD$ PORTNAME= rp-pppoe -PORTVERSION= 3.12 +PORTVERSION= 3.13 CATEGORIES= net -MASTER_SITES= http://www.roaringpenguin.com/files/download/ +MASTER_SITES= https://dianne.skoll.ca/projects/rp-pppoe/download/ MAINTAINER= mandree@FreeBSD.org -COMMENT= The popular Roaring Penguin's PPPoE software +COMMENT= Roaring Penguin's PPPoE software + +LICENSE= GPLv2+ GNU_CONFIGURE= yes PATCH_WRKSRC= ${WRKSRC}/src Modified: head/net/rp-pppoe/distinfo ============================================================================== --- head/net/rp-pppoe/distinfo Thu Dec 27 12:53:34 2018 (r488537) +++ head/net/rp-pppoe/distinfo Thu Dec 27 13:06:13 2018 (r488538) @@ -1,2 +1,3 @@ -SHA256 (rp-pppoe-3.12.tar.gz) = 00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2 -SIZE (rp-pppoe-3.12.tar.gz) = 224125 +TIMESTAMP = 1545915011 +SHA256 (rp-pppoe-3.13.tar.gz) = 8cd6bc71ba46bd5f6eb4daf60220ccdcd991a8525111dee466501b1b9717e676 +SIZE (rp-pppoe-3.13.tar.gz) = 224204 Modified: head/net/rp-pppoe/files/patch-configure ============================================================================== --- head/net/rp-pppoe/files/patch-configure Thu Dec 27 12:53:34 2018 (r488537) +++ head/net/rp-pppoe/files/patch-configure Thu Dec 27 13:06:13 2018 (r488538) @@ -1,6 +1,6 @@ ---- ./configure.orig 2012-08-17 20:31:25.000000000 +0200 -+++ ./configure 2012-09-23 17:27:26.000000000 +0200 -@@ -4672,7 +4672,7 @@ +--- configure.orig 2018-11-25 22:25:28 UTC ++++ configure +@@ -4715,7 +4715,7 @@ eval "WRAPPER=${WRAPPER}" # Determine what targets to build Modified: head/net/rp-pppoe/files/patch-if.c ============================================================================== --- head/net/rp-pppoe/files/patch-if.c Thu Dec 27 12:53:34 2018 (r488537) +++ head/net/rp-pppoe/files/patch-if.c Thu Dec 27 13:06:13 2018 (r488538) @@ -1,6 +1,6 @@ ---- ./if.c.orig 2012-08-17 20:31:25.000000000 +0200 -+++ ./if.c 2012-09-23 17:27:26.000000000 +0200 -@@ -274,7 +274,7 @@ +--- if.c.orig 2018-11-25 22:25:28 UTC ++++ if.c +@@ -276,7 +276,7 @@ initFilter(int fd, UINT16_t type, unsigned char *hwadd * traffic on this network. ***********************************************************************/ int @@ -9,7 +9,7 @@ { static int fd = -1; char bpfName[32]; -@@ -285,7 +285,12 @@ +@@ -287,7 +287,12 @@ openInterface(char const *ifname, UINT16_t type, unsig int i; /* BSD only opens one socket for both Discovery and Session packets */ @@ -22,12 +22,12 @@ return fd; } -@@ -395,6 +400,8 @@ +@@ -396,6 +401,8 @@ openInterface(char const *ifname, UINT16_t type, unsig + ifname); rp_fatal(buffer); } - -+ if (mtu) *mtu = ifr.ifr_mtu; + ++ if (mtu) *mtu = ifr.ifr_mtu; + syslog(LOG_INFO, "Interface=%.16s HWaddr=%02X:%02X:%02X:%02X:%02X:%02X Device=%.32s Buffer size=%d", ifname, - hwaddr[0], hwaddr[1], hwaddr[2], Modified: head/net/rp-pppoe/files/patch-pppoe.h ============================================================================== --- head/net/rp-pppoe/files/patch-pppoe.h Thu Dec 27 12:53:34 2018 (r488537) +++ head/net/rp-pppoe/files/patch-pppoe.h Thu Dec 27 13:06:13 2018 (r488538) @@ -1,6 +1,6 @@ ---- ./pppoe.h.orig 2012-08-17 20:31:25.000000000 +0200 -+++ ./pppoe.h 2012-09-23 17:27:26.000000000 +0200 -@@ -72,10 +72,14 @@ +--- pppoe.h.orig 2018-11-25 22:25:28 UTC ++++ pppoe.h +@@ -65,10 +65,14 @@ extern int IsSetID; #include <net/if_ppp.h> #endif Modified: head/net/rp-pppoe/files/patch-relay.c ============================================================================== --- head/net/rp-pppoe/files/patch-relay.c Thu Dec 27 12:53:34 2018 (r488537) +++ head/net/rp-pppoe/files/patch-relay.c Thu Dec 27 13:06:13 2018 (r488538) @@ -1,6 +1,6 @@ ---- ./relay.c.orig 2012-08-17 20:31:25.000000000 +0200 -+++ ./relay.c 2012-09-23 17:27:26.000000000 +0200 -@@ -751,6 +751,11 @@ +--- relay.c.orig 2018-11-25 22:25:28 UTC ++++ relay.c +@@ -754,6 +754,11 @@ void relayLoop() { fd_set readable, readableCopy; @@ -12,7 +12,7 @@ int maxFD; int i, r; int sock; -@@ -780,6 +785,27 @@ +@@ -783,6 +788,27 @@ relayLoop() continue; } @@ -40,7 +40,7 @@ /* Handle session packets first */ for (i=0; i<NumInterfaces; i++) { if (FD_ISSET(Interfaces[i].sessionSock, &readableCopy)) { -@@ -794,6 +820,7 @@ +@@ -797,6 +823,7 @@ relayLoop() } } @@ -48,12 +48,12 @@ /* Handle the session-cleaning process */ if (FD_ISSET(CleanPipe[0], &readableCopy)) { char dummy; -@@ -813,6 +840,46 @@ +@@ -816,7 +843,47 @@ relayLoop() *%DESCRIPTION: * Receives and processes a discovery packet. ***********************************************************************/ +#if defined(__FreeBSD__) -+void + void +relayGotDiscoveryPacket(PPPoEInterface const *iface, + PPPoEPacket *packet, + int size) @@ -92,10 +92,11 @@ + } +} +#else - void ++void relayGotDiscoveryPacket(PPPoEInterface const *iface) { -@@ -860,6 +927,7 @@ + PPPoEPacket packet; +@@ -863,6 +930,7 @@ relayGotDiscoveryPacket(PPPoEInterface const *iface) iface->name, (int) packet.code); } } @@ -103,12 +104,12 @@ /********************************************************************** *%FUNCTION: relayGotSessionPacket -@@ -870,6 +938,65 @@ +@@ -873,7 +941,66 @@ relayGotDiscoveryPacket(PPPoEInterface const *iface) *%DESCRIPTION: * Receives and processes a session packet. ***********************************************************************/ +#if defined(__FreeBSD__) -+void + void +relayGotSessionPacket(PPPoEInterface const *iface, + PPPoEPacket *packet, + int size) @@ -166,10 +167,11 @@ + sendPacket(NULL, sh->interface->sessionSock, packet, size); +} +#else - void ++void relayGotSessionPacket(PPPoEInterface const *iface) { -@@ -936,6 +1063,7 @@ + PPPoEPacket packet; +@@ -939,6 +1066,7 @@ relayGotSessionPacket(PPPoEInterface const *iface) #endif sendPacket(NULL, sh->interface->sessionSock, &packet, size); } Modified: head/net/rp-pppoe/files/patch-relay.h ============================================================================== --- head/net/rp-pppoe/files/patch-relay.h Thu Dec 27 12:53:34 2018 (r488537) +++ head/net/rp-pppoe/files/patch-relay.h Thu Dec 27 13:06:13 2018 (r488538) @@ -1,6 +1,6 @@ ---- ./relay.h.orig 2012-08-17 20:31:25.000000000 +0200 -+++ ./relay.h 2012-09-23 17:27:26.000000000 +0200 -@@ -51,8 +51,13 @@ +--- relay.h.orig 2018-11-25 22:25:28 UTC ++++ relay.h +@@ -51,8 +51,13 @@ typedef struct SessionHashStruct { /* Function prototypes */ Modified: head/net/rp-pppoe/pkg-descr ============================================================================== --- head/net/rp-pppoe/pkg-descr Thu Dec 27 12:53:34 2018 (r488537) +++ head/net/rp-pppoe/pkg-descr Thu Dec 27 13:06:13 2018 (r488538) @@ -7,4 +7,4 @@ Note that this port has had little testing (it works o to access T-Online in Germany from the client side) and the server side is entirely untested. -WWW: http://www.roaringpenguin.com/products/pppoe +WWW: https://dianne.skoll.ca/projects/rp-pppoe/ Modified: head/net/rp-pppoe/pkg-plist ============================================================================== --- head/net/rp-pppoe/pkg-plist Thu Dec 27 12:53:34 2018 (r488537) +++ head/net/rp-pppoe/pkg-plist Thu Dec 27 13:06:13 2018 (r488538) @@ -1,4 +1,4 @@ -@unexec for i in ppp/pppoe.conf rc.d/04pppoe-server.sh rc.d/04pppoe-relay.sh ; do if cmp -s %D/etc/$i.sample %D/etc/$i ; then rm %D/etc/$i ; fi ; done +@postunexec for i in ppp/pppoe.conf rc.d/04pppoe-server.sh rc.d/04pppoe-relay.sh ; do if cmp -s %D/etc/$i.sample %D/etc/$i ; then rm %D/etc/$i ; fi ; done etc/ppp/firewall-masq.sample etc/ppp/firewall-standalone.sample etc/ppp/pap-secrets.sample @@ -24,4 +24,4 @@ sbin/pppoe-stop sbin/pppoe sbin/pppoe-relay sbin/pppoe-server -@unexec rmdir %D/etc/ppp 2>/dev/null || echo "If you are permanently removing pppoe, you should also ``rm -Rf ${PKG_PREFIX}/etc/ppp'' removing any configuration and password files left." | /usr/bin/fmt +@postunexec rmdir %D/etc/ppp 2>/dev/null || echo "If you are permanently removing pppoe, you should also ``rm -Rf ${PKG_PREFIX}/etc/ppp'' removing any configuration and password files left." | /usr/bin/fmt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812271306.wBRD6DW4085365>