net/rp-pppoe: Remove expired port

2023-12-31 net/rp-pppoe: Upstream restricting future OS support to Linux. Use net/mpd5 or pppoed instead. https://dianne.skoll.ca/pipermail/rp-pppoe/2023q2/000639.html

14 files changed, 1 insertions, 466 deletions

diff --git a/MOVED b/MOVED
index 29dcc91121ac..e390004c56a5 100644
--- a/MOVED
+++ b/MOVED
@@ -8194,3 +8194,4 @@ x11-fonts/fontmatrix||2023-12-31|Has expired: Depends on deprecated www/qt5-webk
 cad/jspice3||2023-12-31|Has expired: BROKEN for more than 2 years on all supported versions after the EOL of 12
 emulators/rtc||2023-12-31|Has expired: Driver doesn't actually work with current FreeBSD versions
 emulators/gngeo||2023-12-31|Has expired: BROKEN for more that 2 years after the EOL of 12
+net/rp-pppoe||2023-12-31|Has expired: Upstream restricting future OS support to Linux. Use net/mpd5 or pppoed instead. https://dianne.skoll.ca/pipermail/rp-pppoe/2023q2/000639.html
diff --git a/net/Makefile b/net/Makefile
index 0be5fab0581d..acc7cb60053c 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1227,7 +1227,6 @@
     SUBDIR += rosenpass
     SUBDIR += rospo
     SUBDIR += routinator
-    SUBDIR += rp-pppoe
     SUBDIR += rpki-client
     SUBDIR += rscsi
     SUBDIR += rsplib
diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
deleted file mode 100644
index f3e7115a8b49..000000000000
--- a/net/rp-pppoe/Makefile
+++ /dev/null
@@ -1,97 +0,0 @@
-PORTNAME=	rp-pppoe
-PORTVERSION=	3.15
-PORTREVISION=	0
-CATEGORIES=	net
-MASTER_SITES=	https://dianne.skoll.ca/projects/rp-pppoe/download/
-
-MAINTAINER=	mandree@FreeBSD.org
-COMMENT=	Roaring Penguin's PPPoE software
-WWW=		https://dianne.skoll.ca/projects/rp-pppoe/
-
-LICENSE=	GPLv2+
-
-DEPRECATED=	Upstream restricting future OS support to Linux. Use net/mpd5 or pppoed instead. https://dianne.skoll.ca/pipermail/rp-pppoe/2023q2/000639.html
-EXPIRATION_DATE=2023-12-31
-PORTSCOUT=	limit:3\.
-
-GNU_CONFIGURE=	yes
-PATCH_WRKSRC=	${WRKSRC}/src
-CONFIGURE_WRKSRC=	${WRKSRC}/src
-BUILD_WRKSRC=	${WRKSRC}/src
-
-man5=	pppoe.conf.5
-man8=	pppoe-connect.8 pppoe-setup.8 pppoe-start.8 pppoe-status.8 \
-	pppoe-stop.8 pppoe-relay.8 pppoe-server.8 pppoe.8
-
-CONFIG_FILES=	firewall-masq firewall-standalone pap-secrets \
-		pppoe-server-options pppoe.conf
-DOC_FILES=	CHANGES HOW-TO-CONNECT LICENSE PROBLEMS
-SCRIPT_FILES=	pppoe-connect pppoe-init pppoe-setup pppoe-start \
-		pppoe-status pppoe-stop
-
-OPTIONS_DEFINE=	DOCS
-
-# work around "Present But Cannot Be Compiled" issue in GNU configure:
-CFLAGS+=	-include sys/types.h -include sys/socket.h -include netinet/in.h
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	*
-.endif
-
-post-patch:
-	@${SED} -i '' -e "s!/etc/ppp!${PREFIX}/etc/ppp!g" \
-		${WRKSRC}/man/* \
-		${WRKSRC}/configs/* \
-		${WRKSRC}/doc/HOW-TO-CONNECT
-	@${REINPLACE_CMD} -e 's!/etc/ppp!$$(prefix)/etc/ppp!g' \
-		${WRKSRC}/src/Makefile.in
-.for file in pppoe-connect pppoe-setup pppoe-start
-	@${REINPLACE_CMD} -e 's!/etc/ppp!$${prefix}/etc/ppp!g' \
-		${WRKSRC}/scripts/${file}.in
-.endfor
-	@${REINPLACE_CMD} -e 's!pty!tty!g' ${WRKSRC}/scripts/pppoe-connect.in
-.for f in pppoe-status pppoe-stop.in
-	@${REINPLACE_CMD} -e "s!/etc/ppp!${PREFIX}/etc/ppp!g" \
-		${WRKSRC}/scripts/${f}
-.endfor
-	@${REINPLACE_CMD} -e "s/\$$^/\$$>/g" ${WRKSRC}/src/Makefile.in
-
-do-install:
-# Binaries
-	${MKDIR} ${STAGEDIR}${PREFIX}/sbin
-.for f in pppoe pppoe-server pppoe-relay
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${f} ${STAGEDIR}${PREFIX}/sbin
-.endfor
-# Configurations
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ppp
-.for f in ${CONFIG_FILES}
-	${INSTALL_DATA} ${WRKSRC}/configs/${f} \
-		${STAGEDIR}${PREFIX}/etc/ppp/${f}.sample
-.endfor
-# Manual pages
-	${MKDIR} ${STAGEDIR}${MAN5PREFIX}/man/man5
-.for f in ${man5}
-	${INSTALL_MAN} ${WRKSRC}/man/${f} ${STAGEDIR}${MAN5PREFIX}/man/man5
-.endfor
-	${MKDIR} ${STAGEDIR}${MAN8PREFIX}/man/man8
-.for f in ${man8}
-	${INSTALL_MAN} ${WRKSRC}/man/${f} ${STAGEDIR}${MAN8PREFIX}/man/man8
-.endfor
-# Scripts
-.for f in ${SCRIPT_FILES}
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/${f} ${STAGEDIR}${PREFIX}/sbin
-.endfor
-# Startup scripts
-.for f in 04pppoe-relay.sh.sample 04pppoe-server.sh.sample
-	${INSTALL_SCRIPT} ${FILESDIR}/${f} ${STAGEDIR}${PREFIX}/etc/rc.d/
-.endfor
-
-# Documentation
-post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
-	${RM} ${STAGEDIR}${DOCSDIR}/KERNEL-MODE-PPPOE
-
-.include <bsd.port.mk>
diff --git a/net/rp-pppoe/distinfo b/net/rp-pppoe/distinfo
deleted file mode 100644
index f68d121bfbeb..000000000000
--- a/net/rp-pppoe/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1620464376
-SHA256 (rp-pppoe-3.15.tar.gz) = b1f318bc7e4e5b0fd8a8e23e8803f5e6e43165245a5a10a7162a92a6cf17829a
-SIZE (rp-pppoe-3.15.tar.gz) = 224966
diff --git a/net/rp-pppoe/files/04pppoe-relay.sh.sample b/net/rp-pppoe/files/04pppoe-relay.sh.sample
deleted file mode 100644
index 8a397dd5c92c..000000000000
--- a/net/rp-pppoe/files/04pppoe-relay.sh.sample
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-
-# use a subshell to support new -CURRENT rc.d structure
-(
-daemon=pppoe-relay
-daemon_path=/usr/local/sbin
-#daemon_flags=
-
-case $1 in
-    start)
-        if [ -x ${daemon_path}/$daemon ]; then
-            ${daemon_path}/$daemon $daemon_flags
-            echo -n " $daemon"
-        fi
-        ;;
-    stop)
-        killall $daemon && echo -n " $daemon"
-        ;;
-    restart)
-        $0 stop
-        sleep 1
-        $0 start
-        ;;
-    *)
-        echo "Usage: `basename $0` {start|stop|restart}" >&2
-        exit 64
-        ;;
-esac
-exit 0
-)
diff --git a/net/rp-pppoe/files/04pppoe-server.sh.sample b/net/rp-pppoe/files/04pppoe-server.sh.sample
deleted file mode 100644
index 6ed429c200b0..000000000000
--- a/net/rp-pppoe/files/04pppoe-server.sh.sample
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-
-# use a subshell to support new -CURRENT rc.d structure
-(
-daemon=pppoe-server
-daemon_path=/usr/local/sbin
-#daemon_flags=
-
-case $1 in
-    start)
-        if [ -x ${daemon_path}/$daemon ]; then
-            ${daemon_path}/$daemon $daemon_flags
-            echo -n " $daemon"
-        fi
-        ;;
-    stop)
-        killall $daemon && echo -n " $daemon"
-        ;;
-    restart)
-        $0 stop
-        sleep 1
-        $0 start
-        ;;
-    *)
-        echo "Usage: `basename $0` {start|stop|restart}" >&2
-        exit 64
-        ;;
-esac
-
-exit 0
-)
diff --git a/net/rp-pppoe/files/patch-configure b/net/rp-pppoe/files/patch-configure
deleted file mode 100644
index 296f0a5c5d31..000000000000
--- a/net/rp-pppoe/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2020-05-27 00:29:37 UTC
-+++ configure
-@@ -4620,7 +4620,7 @@ eval "WRAPPER=${WRAPPER}"
- 
- 
- # Determine what targets to build
--TARGETS="pppoe pppoe-server"
-+TARGETS="pppoe pppoe-server pppoe-relay"
- 
- # pppoe-sniff is built only on Linux and Solaris
- if test "$ac_cv_header_linux_if_packet_h" = "yes" -o "$ac_cv_header_sys_dlpi_h" = "yes" ; then
diff --git a/net/rp-pppoe/files/patch-if.c b/net/rp-pppoe/files/patch-if.c
deleted file mode 100644
index cf9dc48817f5..000000000000
--- a/net/rp-pppoe/files/patch-if.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- if.c.orig	2020-05-27 00:29:37 UTC
-+++ if.c
-@@ -277,7 +277,7 @@ initFilter(int fd, UINT16_t type, unsigned char *hwadd
- * traffic on this network.
- ***********************************************************************/
- int
--openInterface(char const *ifname, UINT16_t type, unsigned char *hwaddr)
-+openInterface(char const *ifname, UINT16_t type, unsigned char *hwaddr, UINT16_t *mtu)
- {
-     static int fd = -1;
-     char bpfName[32];
-@@ -288,7 +288,12 @@ openInterface(char const *ifname, UINT16_t type, unsig
-     int i;
- 
-     /* BSD only opens one socket for both Discovery and Session packets */
-+#if defined(__FreeBSD__)
-+    /* Confirmed for FreeBSD 4.8-R [SeaD] */
-+    if (!hwaddr) {
-+#else
-     if (fd >= 0) {
-+#endif
- 	return fd;
-     }
- 
-@@ -397,6 +402,8 @@ openInterface(char const *ifname, UINT16_t type, unsig
- 		ifname);
- 	rp_fatal(buffer);
-     }
-+
-+    if (mtu) *mtu = ifr.ifr_mtu;
- 
-     syslog(LOG_INFO, "Interface=%.16s HWaddr=%02X:%02X:%02X:%02X:%02X:%02X Device=%.32s Buffer size=%d",
- 	   ifname,
diff --git a/net/rp-pppoe/files/patch-pppoe.h b/net/rp-pppoe/files/patch-pppoe.h
deleted file mode 100644
index 7fc144786d2e..000000000000
--- a/net/rp-pppoe/files/patch-pppoe.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- pppoe.h.orig	2020-05-27 00:29:37 UTC
-+++ pppoe.h
-@@ -62,10 +62,14 @@ extern int IsSetID;
- #include <net/if_ppp.h>
- #endif
- 
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <net/ethernet.h>
-+#endif
-+
- #ifdef USE_BPF
- extern int bpfSize;
- struct PPPoEPacketStruct;
--void sessionDiscoveryPacket(struct PPPoEPacketStruct *packet);
- #define BPF_BUFFER_IS_EMPTY (bpfSize <= 0)
- #define BPF_BUFFER_HAS_DATA (bpfSize > 0)
- #define ethhdr ether_header
diff --git a/net/rp-pppoe/files/patch-relay.c b/net/rp-pppoe/files/patch-relay.c
deleted file mode 100644
index e94c2533b57c..000000000000
--- a/net/rp-pppoe/files/patch-relay.c
+++ /dev/null
@@ -1,181 +0,0 @@
---- relay.c.orig	2020-05-27 00:29:37 UTC
-+++ relay.c
-@@ -756,6 +756,11 @@ void
- relayLoop()
- {
-     fd_set readable, readableCopy;
-+#if defined(__FreeBSD__)
-+    PPPoEPacket packet;
-+    int size;
-+    int type;
-+#endif
-     int maxFD;
-     int i, r;
-     int sock;
-@@ -785,6 +790,27 @@ relayLoop()
- 	    continue;
- 	}
- 
-+#if defined(__FreeBSD__)
-+        for (i=0; i<NumInterfaces; i++) {
-+            /* Because FreeBSD use one interface for both Discovery and
-+            Session types we use first socket for packet receiving [SeaD] */
-+            if (!FD_ISSET(Interfaces[i].discoverySock, &readableCopy))
-+                continue;
-+            if (receivePacket(Interfaces[i].discoverySock, &packet, &size) < 0)
-+                continue;
-+
-+            /* Ignore unknown code/version */
-+            if (PPPOE_VER(packet.vertype) != 1 || PPPOE_TYPE(packet.vertype) != 1)
-+                continue;
-+
-+            type = etherType(&packet);
-+            if (type == Eth_PPPOE_Discovery) {
-+                relayGotDiscoveryPacket(&Interfaces[i], &packet, size);
-+            } else if (type == Eth_PPPOE_Session) {
-+                relayGotSessionPacket(&Interfaces[i], &packet, size);
-+            }
-+        }
-+#else
- 	/* Handle session packets first */
- 	for (i=0; i<NumInterfaces; i++) {
- 	    if (FD_ISSET(Interfaces[i].sessionSock, &readableCopy)) {
-@@ -799,6 +825,7 @@ relayLoop()
- 	    }
- 	}
- 
-+#endif
- 	/* Handle the session-cleaning process */
- 	if (FD_ISSET(CleanPipe[0], &readableCopy)) {
- 	    char dummy;
-@@ -818,7 +845,47 @@ relayLoop()
- *%DESCRIPTION:
- * Receives and processes a discovery packet.
- ***********************************************************************/
-+#if defined(__FreeBSD__)
- void
-+relayGotDiscoveryPacket(PPPoEInterface const *iface,
-+                        PPPoEPacket *packet,
-+                        int size)
-+{
-+
-+    if (ntohs(packet->length) + HDR_SIZE > size) {
-+	syslog(LOG_ERR, "Bogus PPPoE length field (%u)",
-+	       (unsigned int) ntohs(packet->length));
-+	return;
-+    }
-+
-+    /* Drop Ethernet frame padding */
-+    if (size > ntohs(packet->length) + HDR_SIZE) {
-+	size = ntohs(packet->length) + HDR_SIZE;
-+    }
-+
-+    switch(packet->code) {
-+    case CODE_PADT:
-+	relayHandlePADT(iface, packet, size);
-+	break;
-+    case CODE_PADI:
-+	relayHandlePADI(iface, packet, size);
-+	break;
-+    case CODE_PADO:
-+	relayHandlePADO(iface, packet, size);
-+	break;
-+    case CODE_PADR:
-+	relayHandlePADR(iface, packet, size);
-+	break;
-+    case CODE_PADS:
-+	relayHandlePADS(iface, packet, size);
-+	break;
-+    default:
-+	syslog(LOG_ERR, "Discovery packet on %s with unknown code %d",
-+	       iface->name, (int) packet->code);
-+    }
-+}
-+#else
-+void
- relayGotDiscoveryPacket(PPPoEInterface const *iface)
- {
-     PPPoEPacket packet;
-@@ -865,6 +932,7 @@ relayGotDiscoveryPacket(PPPoEInterface const *iface)
- 	       iface->name, (int) packet.code);
-     }
- }
-+#endif
- 
- /**********************************************************************
- *%FUNCTION: relayGotSessionPacket
-@@ -875,7 +943,66 @@ relayGotDiscoveryPacket(PPPoEInterface const *iface)
- *%DESCRIPTION:
- * Receives and processes a session packet.
- ***********************************************************************/
-+#if defined(__FreeBSD__)
- void
-+relayGotSessionPacket(PPPoEInterface const *iface,
-+                        PPPoEPacket *packet,
-+                        int size)
-+{
-+    SessionHash *sh;
-+    PPPoESession *ses;
-+
-+    /* Must be a session packet */
-+    if (packet->code != CODE_SESS) {
-+	syslog(LOG_ERR, "Session packet with code %d", (int) packet->code);
-+	return;
-+    }
-+
-+    /* Ignore session packets whose destination address isn't ours */
-+    if (memcmp(packet->ethHdr.h_dest, iface->mac, ETH_ALEN)) {
-+	return;
-+    }
-+
-+    /* Validate length */
-+    if (ntohs(packet->length) + HDR_SIZE > size) {
-+	syslog(LOG_ERR, "Bogus PPPoE length field (%u)",
-+	       (unsigned int) ntohs(packet->length));
-+	return;
-+    }
-+
-+    /* Drop Ethernet frame padding */
-+    if (size > ntohs(packet->length) + HDR_SIZE) {
-+	size = ntohs(packet->length) + HDR_SIZE;
-+    }
-+
-+    /* We're in business!  Find the hash */
-+    sh = findSession(packet->ethHdr.h_source, packet->session);
-+    if (!sh) {
-+	/* Don't log this.  Someone could be running the client and the
-+	   relay on the same box. */
-+	return;
-+    }
-+
-+    /* Relay it */
-+    ses = sh->ses;
-+    ses->epoch = Epoch;
-+    sh = sh->peer;
-+    packet->session = sh->sesNum;
-+    memcpy(packet->ethHdr.h_source, sh->interface->mac, ETH_ALEN);
-+    memcpy(packet->ethHdr.h_dest, sh->peerMac, ETH_ALEN);
-+#if 0
-+    fprintf(stderr, "Relaying %02x:%02x:%02x:%02x:%02x:%02x(%s:%d) to %02x:%02x:%02x:%02x:%02x:%02x(%s:%d)\n",
-+	    sh->peer->peerMac[0], sh->peer->peerMac[1], sh->peer->peerMac[2],
-+	    sh->peer->peerMac[3], sh->peer->peerMac[4], sh->peer->peerMac[5],
-+	    sh->peer->interface->name, ntohs(sh->peer->sesNum),
-+	    sh->peerMac[0], sh->peerMac[1], sh->peerMac[2],
-+	    sh->peerMac[3], sh->peerMac[4], sh->peerMac[5],
-+	    sh->interface->name, ntohs(sh->sesNum));
-+#endif
-+    sendPacket(NULL, sh->interface->sessionSock, packet, size);
-+}
-+#else
-+void
- relayGotSessionPacket(PPPoEInterface const *iface)
- {
-     PPPoEPacket packet;
-@@ -941,6 +1068,7 @@ relayGotSessionPacket(PPPoEInterface const *iface)
- #endif
-     sendPacket(NULL, sh->interface->sessionSock, &packet, size);
- }
-+#endif
- 
- /**********************************************************************
- *%FUNCTION: relayHandlePADT
diff --git a/net/rp-pppoe/files/patch-relay.h b/net/rp-pppoe/files/patch-relay.h
deleted file mode 100644
index a5ba7a92f646..000000000000
--- a/net/rp-pppoe/files/patch-relay.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- relay.h.orig	2020-05-27 00:29:37 UTC
-+++ relay.h
-@@ -52,8 +52,13 @@ typedef struct SessionHashStruct {
- 
- /* Function prototypes */
- 
-+#if defined(__FreeBSD__)
-+void relayGotSessionPacket(PPPoEInterface const *iface, PPPoEPacket *packet, int size);
-+void relayGotDiscoveryPacket(PPPoEInterface const *iface, PPPoEPacket *packet, int size);
-+#else
- void relayGotSessionPacket(PPPoEInterface const *i);
- void relayGotDiscoveryPacket(PPPoEInterface const *i);
-+#endif
- PPPoEInterface *findInterface(int sock);
- unsigned int hash(unsigned char const *mac, UINT16_t sesNum);
- SessionHash *findSession(unsigned char const *mac, UINT16_t sesNum);
diff --git a/net/rp-pppoe/pkg-descr b/net/rp-pppoe/pkg-descr
deleted file mode 100644
index 33330956c9f7..000000000000
--- a/net/rp-pppoe/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-PPPoE (Point-to-Point Protocol over Ethernet) is a protocol used
-by many ADSL service providers. Roaring Penguin's PPPoE software
-is a reliable program for connecting Unix systems to PPPoE service
-providers without requiring any kernel patches.
-
-Note that this port has had little testing (it works on 5-CURRENT
-to access T-Online in Germany from the client side) and the server side
-is entirely untested.
diff --git a/net/rp-pppoe/pkg-message b/net/rp-pppoe/pkg-message
deleted file mode 100644
index e9ee1bc9557b..000000000000
--- a/net/rp-pppoe/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Note that many of the scripts that this port installs have not been tested in
-a long time and the components tested are pppoe and pppoe-relay for the
-major part. Use the adsl-* configuration scripts at your own risk.
-Feedback about success and failure to the port maintainer is appreciated.
-EOM
-}
-]
diff --git a/net/rp-pppoe/pkg-plist b/net/rp-pppoe/pkg-plist
deleted file mode 100644
index 9daaabaa7412..000000000000
--- a/net/rp-pppoe/pkg-plist
+++ /dev/null
@@ -1,27 +0,0 @@
-@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
-etc/ppp/pppoe-server-options.sample
-etc/ppp/pppoe.conf.sample
-etc/rc.d/04pppoe-server.sh.sample
-etc/rc.d/04pppoe-relay.sh.sample
-man/man5/pppoe.conf.5.gz
-man/man8/pppoe-connect.8.gz
-man/man8/pppoe-relay.8.gz
-man/man8/pppoe-server.8.gz
-man/man8/pppoe-setup.8.gz
-man/man8/pppoe-start.8.gz
-man/man8/pppoe-status.8.gz
-man/man8/pppoe-stop.8.gz
-man/man8/pppoe.8.gz
-sbin/pppoe-connect
-sbin/pppoe-init
-sbin/pppoe-setup
-sbin/pppoe-start
-sbin/pppoe-status
-sbin/pppoe-stop
-sbin/pppoe
-sbin/pppoe-relay
-sbin/pppoe-server
-@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