From d02650250b9e6a28d25da51f154b236169e190e5 Mon Sep 17 00:00:00 2001
From: Martin Schiller <ms@dev.tdt.de>
Date: Thu, 17 Oct 2024 10:36:07 +0200
Subject: [PATCH] rp-pppoe: update to 4.0

This fixes compatibility with ppp-2.5.0 and newer.

We also need to change the PKG_SOURCE_URL since the previous URL is no
longer working and automated downloads from the project homepage are
not desired due to bandwidth restrictions. Have a look at the project
homepage [1] for details.

Signed-off-by: Martin Schiller <ms@dev.tdt.de>

[1] https://dianne.skoll.ca/projects/rp-pppoe/
---
 net/rp-pppoe/Makefile                         |  6 +--
 net/rp-pppoe/patches/110-Makefile.patch       | 11 -----
 .../120-use-linux-ether-not-netinet.patch     | 41 -------------------
 net/rp-pppoe/patches/130-static-lib-fix.patch | 12 ------
 4 files changed, 3 insertions(+), 67 deletions(-)
 delete mode 100644 net/rp-pppoe/patches/110-Makefile.patch
 delete mode 100644 net/rp-pppoe/patches/120-use-linux-ether-not-netinet.patch
 delete mode 100644 net/rp-pppoe/patches/130-static-lib-fix.patch

diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index f062765ca6..18093ac3f7 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rp-pppoe
-PKG_VERSION:=3.15
+PKG_VERSION:=4.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://dianne.skoll.ca/projects/rp-pppoe/download
-PKG_HASH:=b1f318bc7e4e5b0fd8a8e23e8803f5e6e43165245a5a10a7162a92a6cf17829a
+PKG_SOURCE_URL:=https://downloads.uls.co.za/rp-pppoe/
+PKG_HASH:=41ac34e5db4482f7a558780d3b897bdbb21fae3fef4645d2852c3c0c19d81cea
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=LGPL-2.0-or-later
diff --git a/net/rp-pppoe/patches/110-Makefile.patch b/net/rp-pppoe/patches/110-Makefile.patch
deleted file mode 100644
index 013c35b654..0000000000
--- a/net/rp-pppoe/patches/110-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -73,7 +73,7 @@ pppoe-sniff: pppoe-sniff.o if.o common.o
- 	@CC@ -o $@ $^ $(LDFLAGS)
- 
- pppoe-server: pppoe-server.o if.o debug.o common.o md5.o libevent/libevent.a @PPPOE_SERVER_DEPS@
--	@CC@ -o $@ @RDYNAMIC@ $^ $(LDFLAGS) $(PPPOE_SERVER_LIBS) -Llibevent -levent
-+	@CC@ -o $@ @RDYNAMIC@ $^ $(LDFLAGS) $(PPPOE_SERVER_LIBS)
- 
- # Experimental code from Savoir Faire Linux.  I do not consider it
- # production-ready, so not part of the official distribution.
diff --git a/net/rp-pppoe/patches/120-use-linux-ether-not-netinet.patch b/net/rp-pppoe/patches/120-use-linux-ether-not-netinet.patch
deleted file mode 100644
index 19dee48819..0000000000
--- a/net/rp-pppoe/patches/120-use-linux-ether-not-netinet.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/src/if.c
-+++ b/src/if.c
-@@ -33,9 +33,9 @@
- #include <linux/if_packet.h>
- #endif
- 
--#ifdef HAVE_NET_ETHERNET_H
--#include <net/ethernet.h>
--#endif
-+//#ifdef HAVE_NET_ETHERNET_H
-+//#include <net/ethernet.h>
-+//#endif
- 
- #ifdef HAVE_ASM_TYPES_H
- #include <asm/types.h>
---- a/src/plugin.c
-+++ b/src/plugin.c
-@@ -52,7 +52,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <signal.h>
--#include <net/ethernet.h>
-+//#include <net/ethernet.h>
- #include <net/if_arp.h>
- #include <linux/ppp_defs.h>
- #include <linux/if_pppox.h>
---- a/src/pppoe.h
-+++ b/src/pppoe.h
-@@ -129,9 +129,9 @@ typedef unsigned long UINT32_t;
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
--#ifndef HAVE_SYS_DLPI_H
--#include <netinet/if_ether.h>
--#endif
-+//#ifndef HAVE_SYS_DLPI_H
-+//#include <netinet/if_ether.h>
-+//#endif
- #endif
- 
- 
diff --git a/net/rp-pppoe/patches/130-static-lib-fix.patch b/net/rp-pppoe/patches/130-static-lib-fix.patch
deleted file mode 100644
index d9a63da6a4..0000000000
--- a/net/rp-pppoe/patches/130-static-lib-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -141,7 +141,8 @@ plugin/plugin.o: plugin.c
- 	@CC@ -DPLUGIN=1 '-DRP_VERSION="$(RP_VERSION)"' $(CFLAGS) -I$(PPPD_INCDIR) -c -o $@ -fPIC $<
- 
- plugin/libplugin.a: plugin/discovery.o plugin/if.o plugin/common.o plugin/debug.o
--	ar -rc $@ $^
-+	$(AR) -rc $@ $^
-+	@RANLIB@ $@
- 
- plugin/discovery.o: discovery.c
- 	@CC@ -DPLUGIN=1 $(CFLAGS) '-DRP_VERSION="$(RP_VERSION)"' -I$(PPPD_INCDIR) -c -o $@ -fPIC $<
-- 
2.30.2