package/rp-pppoe: bump version to 4.0

Release notes:
https://dianne.skoll.ca/pipermail/rp-pppoe/2023q2/000640.html

Updated license hash due to SPDX-License-Identifier addition:
https://github.com/dfskoll/rp-pppoe/commit/e51f1cea3bb40b1a79b7256ef0ea81c318e97edb

Removed non-existing files from RP_PPPOE_INSTALL_TARGET_CMDS.

Removed patch which was applied upstream:
https://github.com/dfskoll/rp-pppoe/commit/bbf5b2759cff0c65b47fd6dbe5fe7341f205ad03

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

.checkpackageignore

@@ -1138,7 +1138,6 @@ package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch l
 package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch lib_patch.Upstream
 package/rng-tools/S21rngd Shellcheck lib_sysv.Variables
 package/rocksdb/0001-build_tools-build_detect_platform-fix-C-tests.patch lib_patch.Upstream
-package/rp-pppoe/0001-src-pppoe.h-fix-build-with-musl-libc.patch lib_patch.Upstream
 package/rpcbind/0001-Remove-yellow-pages-support.patch lib_patch.Upstream
 package/rpcbind/S30rpcbind lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables
 package/rpi-userland/0001-Add-.pc-files-for-the-OpenGLESv2-EGL-and-bcm_host-li.patch lib_patch.Upstream

package/rp-pppoe/0001-src-pppoe.h-fix-build-with-musl-libc.patch

@@ -1,60 +0,0 @@
-From bbf5b2759cff0c65b47fd6dbe5fe7341f205ad03 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sat, 11 Dec 2021 22:03:16 +0100
-Subject: [PATCH] src/pppoe.h: fix build with musl libc
-
-musl libc defines its own struct ethhdr that conflicts with the kernel
-define one. The kernel headers provide a way to suppress its struct
-ethhdr. For that to work the libc headers must precede the kernel. Move
-the kernel linux/if_ether.h include below libc netinet/if_ether.h. That
-fixes the following build failure:
-
-In file included from pppoe.h:133,
-                 from debug.c:19:
-/home/giuliobenetti/autobuild/run/instance-0/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/include/netinet/if_ether.h:116:8: error: redefinition of 'struct ethhdr'
-  116 | struct ethhdr {
-      |        ^~~~~~
-In file included from pppoe.h:121,
-                 from debug.c:19:
-/home/giuliobenetti/autobuild/run/instance-0/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/include/linux/if_ether.h:163:8: note: originally defined here
-  163 | struct ethhdr {
-      |        ^~~~~~
-
-Fixes:
- - http://autobuild.buildroot.org/results/ccca18fcbcde65cb6784f5559eac68ca17ab14a3
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/dfskoll/rp-pppoe/pull/4]
----
- src/pppoe.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/pppoe.h b/src/pppoe.h
-index 4780092..2b08111 100644
---- a/src/pppoe.h
-+++ b/src/pppoe.h
-@@ -117,10 +117,6 @@ typedef unsigned long UINT32_t;
- #error Could not find a 32-bit integer type
- #endif
- 
--#ifdef HAVE_LINUX_IF_ETHER_H
--#include <linux/if_ether.h>
--#endif
--
- #include <netinet/in.h>
- 
- #ifdef HAVE_NETINET_IF_ETHER_H
-@@ -134,6 +130,10 @@ typedef unsigned long UINT32_t;
- #endif
- #endif
- 
-+#ifdef HAVE_LINUX_IF_ETHER_H
-+#include <linux/if_ether.h>
-+#endif
-+
- 
- 
- /* Ethernet frame types according to RFC 2516 */
--- 
-2.33.0
-

package/rp-pppoe/rp-pppoe.hash

@@ -1,4 +1,3 @@
-# Locally calculated after checking pgp signature
-sha256  b1f318bc7e4e5b0fd8a8e23e8803f5e6e43165245a5a10a7162a92a6cf17829a  rp-pppoe-3.15.tar.gz
 # Locally computed
-sha256  464006ba771074f4022db14f58a29a0b447b6fdde9529cf0331be396b6279162  doc/LICENSE
+sha256  17d45712778f2bf6b0859ff610a3dacd24bc4462e9f53bb1466d47af391701d3  rp-pppoe-4.0.tar.gz
+sha256  d2767e7ffc6dc9477812f6238551fe4b29a889df6f23c3922e7b9cec92bc278d  doc/LICENSE

package/rp-pppoe/rp-pppoe.mk

@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-RP_PPPOE_VERSION = 3.15
-RP_PPPOE_SITE = https://downloads.uls.co.za/rp-pppoe
+RP_PPPOE_VERSION = 4.0
+RP_PPPOE_SITE = $(call github,dfskoll,rp-pppoe,$(RP_PPPOE_VERSION))
 RP_PPPOE_LICENSE = GPL-2.0
 RP_PPPOE_LICENSE_FILES = doc/LICENSE
 RP_PPPOE_CPE_ID_VALID = YES
@@ -13,8 +13,6 @@ RP_PPPOE_CPE_ID_VALID = YES
 RP_PPPOE_DEPENDENCIES = pppd
 RP_PPPOE_SUBDIR = src
 RP_PPPOE_TARGET_FILES = pppoe pppoe-server pppoe-relay pppoe-sniff
-RP_PPPOE_TARGET_SCRIPTS = pppoe-connect pppoe-init pppoe-setup pppoe-start \
-	pppoe-status pppoe-stop
 RP_PPPOE_MAKE_OPTS = PLUGIN_DIR=/usr/lib/pppd/$(PPPD_VERSION)
 RP_PPPOE_CONF_OPTS = --disable-debugging
 
@@ -30,14 +28,9 @@ RP_PPPOE_CONF_ENV = \
 	PPPD_H=$(PPPD_DIR)/pppd/pppd.h
 
 define RP_PPPOE_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0644 $(@D)/configs/pppoe.conf \
-		$(TARGET_DIR)/etc/ppp/pppoe.conf
 	for ff in $(RP_PPPOE_TARGET_FILES); do \
 		$(INSTALL) -m 0755 $(@D)/src/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
 	done
-	for ff in $(RP_PPPOE_TARGET_SCRIPTS); do \
-		$(INSTALL) -m 0755 $(@D)/scripts/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
-	done
 endef
 
 $(eval $(autotools-package))