gentoo auto-resync : 23:04:2023 - 00:06:15

7 files changed, 34 insertions, 396 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 6969ae49e87d..f10d9ed12b9d 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index cca5c34a3316..93701eccb11a 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -4,15 +4,11 @@ AUX ppp-2.4.9-fix-MPPE-sstpc.patch 1008 BLAKE2B 255ac4374ef4845220c8c0709a0582fb
 AUX ppp-2.4.9-fix-clang-nested-functions.patch 2439 BLAKE2B 834d675ebcb4a3af7350d4206c546b89c92f914931db81e07e7997196d86dee6703260e9c603819d6fb72aec518dc5dbcc240f2a074043837d8d17356a483da3 SHA512 0d8faec40b0d3ea1a96a66bb4d96d129c7c0af14e76c222fc997c2eebeba80918a1681929a844d0d17713f124b862364ca1bf7cd70d2d7be46fb37458b3fb62d
 AUX ppp-2.4.9-fix-openssl-sysroot-clang.patch 377 BLAKE2B 9919669d6707394600c2b04f49dab212e220549395f34c52f641e6a87c2133eeaad00992fca5c3a9d84f60d7c17f1078aab78b8579906c93ee5cad4264a2569b SHA512 d816cbf65f1845851f8bd673fbe374987afbe6e3c0eb425455d0cc7269e96f5315caf1e38c320121650b088621c099c36f6b1c8d80ada0dbff07ab4e8151d42b
 AUX ppp-2.4.9-pppol2tp-ipv6.patch 1008 BLAKE2B 7c4ad1ce6ba6277c1d0fa8afa7491bdc3f0afba450c3d2ade39a9d0b555dd35e578abc5df24f7b0b011634bc020292ad6b2510ffbc8f03b1e3eabbf37cdb6e20 SHA512 071ef66e5ab9e08037100f2d6cdbdc452ea30d4a2241ef2abc2a7acc23ce21a5f90e5753a4790af5ed8e21baf976010a340ac4d4368adb8a9f5b42d52b519702
-AUX ppp-2.5.0-add-dhcp-plugin.patch 1014 BLAKE2B 65d8dcbc6419699068c6c19bd34881e96cf070a5349b34a785e2e6da7042dff02b968719b8d52f6f39a8e2b276adfcbcf9fcba7f8c35f21732a176f3c326137f SHA512 ea209cfb0fe66961bb760c23578d408aadebaa3160be20924827aff7925cf9a2cace8a60dab0dd4e089e406edc5374c0a38b558d5a17ce8cbef303fa3f31d59a
-AUX ppp-2.5.0-dhcp/0001-Convert-sys_errlist-to-strerror.patch 5578 BLAKE2B b2c53a2ec99cec24ac46c36af0b42996553d930b73272332a4d84ac44bc1e9f449223b1ea55bd5a1faa49f162ff8eee9cc579aa28eca87eaaaec19ffa8d4c605 SHA512 02c6c65f474950bc073fa280100255f5eb11032dded9551f7bc40006e0cb61411f1fc7f0b27fd263ccde3ffec22e33ab9794f9cf073ad4c398ba0a65c6db41d0
-AUX ppp-2.5.0-dhcp/0002-Add-Makefile.am.patch 882 BLAKE2B 2862a989660ab91439457c4fccb00dcb2b88fb63c42347f3018ca68327381eb3be921898dd0fa2f701ebe8de837862c55a6fac45a0aef7a45438831bf0854000 SHA512 408ff2f43510e1876ea1c91db242a8ca5e24892da0a64ba80316e19f4fd46f65f1244e0e921ebd6eea4ba2a2bc44155ac4a22d8419bc764d6d80c04388432973
-AUX ppp-2.5.0-dhcp/0003-Fix-build-with-ppp-2.5.0.patch 3654 BLAKE2B a6875d6b5fa59f828426f4a100305a612f6cf004ca7d2543b5d4e702f76adf101293cfcdbc41d5126a02792ae4894aa297dab15686ddca58b835903a754da342 SHA512 7ee9f2e57a67741f5bf4e4f3be80b4da49f70dfcee2603d5ff09cea305b8da8225b42a10ee7e033cb9d895e8f10168b96eaf332a00aaeb35b8b79ebd8a596844
 DIST ppp-2.4.9-patches-03.tar.xz 18520 BLAKE2B b3da095672fa57727ba11a5dba761ea3f24ee330f27252f0379dab5761d5381809176faafed86d97a6b89cc8a4cb958baa07f4900e22fe6e76b6c852e0703f0c SHA512 9a035acf1915225340c12e6242f0c5db399b5f5970888d7f1799a5f125cf97b95d9fcb8c9aa2f6bd56c1544d2b10585f772d4fc1025002e3e8403011e3d2c029
 DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 7ba3eb8c98fec5599635dbd302399617e1075f3a1df090f1a94ce2bb8a5c7631e6eea82246adc33711aba5fe95e7ba7c982e2cbf1fb0d71e45f877d9b092ffb7 SHA512 c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a
 DIST ppp-2.5.0.tar.gz 1170057 BLAKE2B 6a0e9efcbff3cb499705071cc7d0e3411cf4871fd53b2bfedbb1f2cf3ad80728eb436050cf33b78e36d473be64f15907a21da17f283337455f0af379bc18272d SHA512 094368ea2aa6c6e8dfba4443509857a7c1c7ff839bb6d6657743802477208c01e87db31593cef0932d3725c640e9c103179da6b742825034cda82bd31ddcc2ed
 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
 DIST pppgetpass.8 154398 BLAKE2B 0e74b96df6171b7382874ce08375d0122df2b564ce8c3e8081022c38ef433e22d15ad13a51d553c6e18ee6277d9c67302b50afa59126bf74a6e3dcd1b03a2b2b SHA512 aca33e489d3e78a7accced4d3c33c03d933cf4c0b6607e8a6bbefef202c853248fa85caa36b53b9cbaf8b21ae60bb00fb3f95577418112630dfa6d67ad700359
 EBUILD ppp-2.4.9-r9.ebuild 7866 BLAKE2B e2f6012eb93f27271c775b75fa52e0d1307adee4afdcb09bf8ae78e1ddefe451bd7782c4f5412ef264366c8db4e20bb3621c4c032c1261166c70473a94552880 SHA512 a3931bedeac10a6facc0fe354eee0e26e6c237f21f9e4d69196d657d388d1624e4bf8054c670568c0ba689d859bca87a21410da08f35baf33fc12d39cfe2263e
-EBUILD ppp-2.5.0.ebuild 4187 BLAKE2B dcc85c47894b980552ea472b4fc682f7c5575b6cf357e432977eb25643fa1b78796de408eb73ab848fb8393971efd3acf8270fab0d016d33d7c1f14696e2c968 SHA512 aef6d5557f625da8de089bdfd232ef1dfdf4055b413dd11cc8a01e362cb8f44e33b422d0f850287512ee5a5094dd23f6476bf2e5c3887a73856d7d99e5d46c51
+EBUILD ppp-2.5.0.ebuild 3561 BLAKE2B 10ac7275f3f07846f38f93e9f639bd9b03609e9175688a852447f298a991451395c2f2dace3534070cc38b8a82311b8bc1231e773972f787fca97d8ed4092b3e SHA512 1192ac4fa7d34e38af6a9a89ce7ae392b98b5fdbca9a8e6bb7b33aa2dee1c27821ac4b3a26937e3579ddfb039f9b0479218915a5580a27fba8bcd5670d18f79c
 MISC metadata.xml 1002 BLAKE2B 9ce1dcb685ed4f0d6dfe2e6c885b8feca8d81fd1fea5bde44a40900d65b2f9e9a45bd03f3708d4969c51880bb7ffb791bfbc972d4ec06a3124c4215e2b66424b SHA512 cdfa0b69fab5a530b36093bc84c352da1f8acbdf3d31e2b9a4d58bde7dc7bbbce9c54000d9f874eac2ddcc803bafc89ea2a74b03cac23dca295815ece6cb2157
diff --git a/net-dialup/ppp/files/ppp-2.5.0-add-dhcp-plugin.patch b/net-dialup/ppp/files/ppp-2.5.0-add-dhcp-plugin.patch
deleted file mode 100644
index d5ad7a76138c..000000000000
--- a/net-dialup/ppp/files/ppp-2.5.0-add-dhcp-plugin.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From de05f72948317b40c19b1c113e18713816010dd9 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 13 Apr 2023 16:26:56 -0400
-Subject: [PATCH] Add dhcp plugin
-
----
- configure.ac             | 1 +
- pppd/plugins/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1180f64..5db4197 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -329,6 +329,7 @@ AC_CONFIG_FILES([
-     pppd/Makefile
-     pppd/pppd.pc
-     pppd/plugins/Makefile
-+    pppd/plugins/dhcp/Makefile
-     pppd/plugins/pppoe/Makefile
-     pppd/plugins/pppoatm/Makefile
-     pppd/plugins/pppol2tp/Makefile
-diff --git a/pppd/plugins/Makefile.am b/pppd/plugins/Makefile.am
-index 2826148..9708ab1 100644
---- a/pppd/plugins/Makefile.am
-+++ b/pppd/plugins/Makefile.am
-@@ -21,5 +21,5 @@ winbind_la_LDFLAGS = $(PLUGIN_LDFLAGS)
- winbind_la_SOURCES = winbind.c
- 
- if !SUNOS
--SUBDIRS = pppoe pppoatm pppol2tp radius
-+SUBDIRS = dhcp pppoe pppoatm pppol2tp radius
- endif
--- 
-2.40.0
-
diff --git a/net-dialup/ppp/files/ppp-2.5.0-dhcp/0001-Convert-sys_errlist-to-strerror.patch b/net-dialup/ppp/files/ppp-2.5.0-dhcp/0001-Convert-sys_errlist-to-strerror.patch
deleted file mode 100644
index 193e90b78a9a..000000000000
--- a/net-dialup/ppp/files/ppp-2.5.0-dhcp/0001-Convert-sys_errlist-to-strerror.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From e21d256cded13a625bc28d3fe812141a202be696 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 13 Apr 2023 14:59:35 -0400
-Subject: [PATCH 1/3] Convert sys_errlist to strerror
-
----
- dhcpc.c  |  8 ++++----
- packet.c |  6 +++---
- socket.c | 14 +++++++-------
- 3 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/dhcpc.c b/dhcpc.c
-index fcff8b9..ff83b53 100644
---- a/dhcpc.c
-+++ b/dhcpc.c
-@@ -144,7 +144,7 @@ void change_mode(int new_mode)
-     fd = raw_socket(client_config.ifindex);
-   
-   if (listen_mode != LISTEN_NONE && fd < 0) {
--    fatal("DHCPC: couldn't listen on socket, %s", sys_errlist[errno]);
-+    fatal("DHCPC: couldn't listen on socket, %s", strerror(errno));
-   }
-   
- }
-@@ -208,7 +208,7 @@ void dhcp_rx(void *dummy) {
-     len = get_packet(&packet, fd);
-     
-     if (len == -1 && errno != EINTR) {
--      dbglog("DHCPC: error on read, %s, reopening socket", sys_errlist[errno]);
-+      dbglog("DHCPC: error on read, %s, reopening socket", strerror(errno));
-       change_mode(LISTEN_KERNEL);
-     }
-     if (len < 0) continue;
-@@ -380,7 +380,7 @@ void dhcp_request_new() {
-       else len = get_raw_packet(&packet, fd);
-       
-       if (len == -1 && errno != EINTR) {
--	dbglog("DHCPC: error on read, %s, reopening socket", sys_errlist[errno]);
-+	dbglog("DHCPC: error on read, %s, reopening socket", strerror(errno));
- 	change_mode(listen_mode); /* just close and reopen */
-       }
-       if (len < 0) continue;
-@@ -445,7 +445,7 @@ void dhcp_request_new() {
-       
-     } else {
-       /* An error occured */
--        dbglog("DHCPC: error on select, %s, reopening socket", sys_errlist[errno]);
-+        dbglog("DHCPC: error on select, %s, reopening socket", strerror(errno));
-         change_mode(listen_mode); /* just close and reopen */
-     }
-     
-diff --git a/packet.c b/packet.c
-index 00b5202..07a1aac 100644
---- a/packet.c
-+++ b/packet.c
-@@ -125,7 +125,7 @@ int raw_packet(struct dhcpMessage *payload, u_int32_t source_ip, int source_port
- 	    return kernel_packet(payload,payload->giaddr,CLIENT_PORT,dest_ip,dest_port);
- 	
- 	if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) {
--		DEBUG(LOG_ERR, "socket call failed: %s", sys_errlist[errno]);
-+		DEBUG(LOG_ERR, "socket call failed: %s", strerror(errno));
- 		return -1;
- 	}
- 	
-@@ -138,7 +138,7 @@ int raw_packet(struct dhcpMessage *payload, u_int32_t source_ip, int source_port
- 	dest.sll_halen = 6;
- 	memcpy(dest.sll_addr, dest_arp, 6);
- 	if (bind(fd, (struct sockaddr *)&dest, sizeof(struct sockaddr_ll)) < 0) {
--		DEBUG(LOG_ERR, "bind call failed: %s", sys_errlist[errno]);
-+		DEBUG(LOG_ERR, "bind call failed: %s", strerror(errno));
- 		close(fd);
- 		return -1;
- 	}
-@@ -161,7 +161,7 @@ int raw_packet(struct dhcpMessage *payload, u_int32_t source_ip, int source_port
- 
- 	result = sendto(fd, &packet, sizeof(struct udp_dhcp_packet), 0, (struct sockaddr *) &dest, sizeof(dest));
- 	if (result <= 0) {
--		DEBUG(LOG_ERR, "write on socket failed: %s", sys_errlist[errno]);
-+		DEBUG(LOG_ERR, "write on socket failed: %s", strerror(errno));
- 	}
- 	close(fd);
- 	return result;
-diff --git a/socket.c b/socket.c
-index 0234350..a6799d5 100644
---- a/socket.c
-+++ b/socket.c
-@@ -60,7 +60,7 @@ int read_interface(char *interface, int *ifindex, u_int32_t *addr, unsigned char
- 				*addr = sin->sin_addr.s_addr;
- 				DEBUG(LOG_INFO, "%s (our ip) = %s", ifr.ifr_name, inet_ntoa(sin->sin_addr));
- 			} else {
--				LOG(LOG_ERR, "SIOCGIFADDR failed!: %s", sys_errlist[errno]);
-+				LOG(LOG_ERR, "SIOCGIFADDR failed!: %s", strerror(errno));
- 				return -1;
- 			}
- 		}
-@@ -69,7 +69,7 @@ int read_interface(char *interface, int *ifindex, u_int32_t *addr, unsigned char
- 			DEBUG(LOG_INFO, "adapter index %d", ifr.ifr_ifindex);
- 			*ifindex = ifr.ifr_ifindex;
- 		} else {
--			LOG(LOG_ERR, "SIOCGIFINDEX failed!: %s", sys_errlist[errno]);
-+			LOG(LOG_ERR, "SIOCGIFINDEX failed!: %s", strerror(errno));
- 			return -1;
- 		}
- 		if (ioctl(fd, SIOCGIFHWADDR, &ifr) == 0) {
-@@ -77,11 +77,11 @@ int read_interface(char *interface, int *ifindex, u_int32_t *addr, unsigned char
- 			DEBUG(LOG_INFO, "adapter hardware address %02x:%02x:%02x:%02x:%02x:%02x",
- 				arp[0], arp[1], arp[2], arp[3], arp[4], arp[5]);
- 		} else {
--			LOG(LOG_ERR, "SIOCGIFHWADDR failed!: %s", sys_errlist[errno]);
-+			LOG(LOG_ERR, "SIOCGIFHWADDR failed!: %s", strerror(errno));
- 			return -1;
- 		}
- 	} else {
--		LOG(LOG_ERR, "socket failed!: %s", sys_errlist[errno]);
-+		LOG(LOG_ERR, "socket failed!: %s", strerror(errno));
- 		return -1;
- 	}
- 	close(fd);
-@@ -98,7 +98,7 @@ int listen_socket(unsigned int ip, int port, char *inf)
- 
- 	DEBUG(LOG_INFO, "Opening listen socket on 0x%08x:%d %s\n", ip, port, inf ? inf : "*");
- 	if ((fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
--		DEBUG(LOG_ERR, "socket call failed: %s", sys_errlist[errno]);
-+		DEBUG(LOG_ERR, "socket call failed: %s", strerror(errno));
- 		return -1;
- 	}
- 
-@@ -144,7 +144,7 @@ int raw_socket(int ifindex)
- 
- 	DEBUG(LOG_INFO, "Opening raw socket on ifindex %d\n", ifindex);
- 	if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) {
--		DEBUG(LOG_ERR, "socket call failed: %s", sys_errlist[errno]);
-+		DEBUG(LOG_ERR, "socket call failed: %s", strerror(errno));
- 		return -1;
- 	}
- 	
-@@ -152,7 +152,7 @@ int raw_socket(int ifindex)
- 	sock.sll_protocol = htons(ETH_P_IP);
- 	sock.sll_ifindex = ifindex;
- 	if (bind(fd, (struct sockaddr *) &sock, sizeof(sock)) < 0) {
--		DEBUG(LOG_ERR, "bind call failed: %s", sys_errlist[errno]);
-+		DEBUG(LOG_ERR, "bind call failed: %s", strerror(errno));
- 		close(fd);
- 		return -1;
- 	}
--- 
-2.40.0
-
diff --git a/net-dialup/ppp/files/ppp-2.5.0-dhcp/0002-Add-Makefile.am.patch b/net-dialup/ppp/files/ppp-2.5.0-dhcp/0002-Add-Makefile.am.patch
deleted file mode 100644
index 5009c4eb3469..000000000000
--- a/net-dialup/ppp/files/ppp-2.5.0-dhcp/0002-Add-Makefile.am.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9fa2696fa7348e647289e08ce299bb27ab97356d Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 13 Apr 2023 15:20:30 -0400
-Subject: [PATCH 2/3] Add Makefile.am
-
----
- Makefile    | 1 -
- Makefile.am | 6 ++++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
- delete mode 120000 Makefile
- create mode 100644 Makefile.am
-
-diff --git a/Makefile b/Makefile
-deleted file mode 120000
-index 8bad27d..0000000
---- a/Makefile
-+++ /dev/null
-@@ -1 +0,0 @@
--Makefile.linux
-\ No newline at end of file
-diff --git a/Makefile.am b/Makefile.am
-new file mode 100644
-index 0000000..195435a
---- /dev/null
-+++ b/Makefile.am
-@@ -0,0 +1,6 @@
-+pppd_plugin_LTLIBRARIES = dhcpc.la
-+pppd_plugindir = $(PPPD_PLUGIN_DIR)
-+
-+dhcpc_la_CPPFLAGS = -I${top_srcdir}
-+dhcpc_la_LDFLAGS = -module -avoid-version
-+dhcpc_la_SOURCES = dhcpc.c clientpacket.c options.c packet.c socket.c
--- 
-2.40.0
-
diff --git a/net-dialup/ppp/files/ppp-2.5.0-dhcp/0003-Fix-build-with-ppp-2.5.0.patch b/net-dialup/ppp/files/ppp-2.5.0-dhcp/0003-Fix-build-with-ppp-2.5.0.patch
deleted file mode 100644
index 9d3585dbb6ac..000000000000
--- a/net-dialup/ppp/files/ppp-2.5.0-dhcp/0003-Fix-build-with-ppp-2.5.0.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From f3707ff09fb17e6d6b851f6cda66e2bdfa4b9108 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 13 Apr 2023 16:09:45 -0400
-Subject: [PATCH 3/3] Fix build with ppp-2.5.0
-
----
- debug.h |  1 +
- dhcpc.c | 26 +++++++++++++++-----------
- 2 files changed, 16 insertions(+), 11 deletions(-)
-
-diff --git a/debug.h b/debug.h
-index e01bd0b..674dffb 100644
---- a/debug.h
-+++ b/debug.h
-@@ -2,6 +2,7 @@
- #define _DEBUG_H
- 
- #include <stdio.h>
-+#include <pppd/pppd.h>
- 
- #define DEBUG
- #ifdef DEBUG
-diff --git a/dhcpc.c b/dhcpc.c
-index ff83b53..d383793 100644
---- a/dhcpc.c
-+++ b/dhcpc.c
-@@ -33,7 +33,6 @@
- #include <sys/types.h>
- #include <sys/file.h>
- #include <unistd.h>
--#include <getopt.h>
- #include <stdlib.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-@@ -44,9 +43,12 @@
- #include <net/if.h>
- #include <errno.h>
- 
--#include "pppd.h"
-+#include <pppd/pppd.h>
-+#include <pppd/options.h>
-+#include <pppd/fsm.h>
-+#include <pppd/ipcp.h>
- 
--char pppd_version[] = VERSION;
-+char pppd_version[] = PPPD_VERSION;
- 
- #include "dhcpd.h"
- #include "dhcpc.h"
-@@ -237,8 +239,8 @@ void dhcp_rx(void *dummy) {
- 	if (requested_ip != assigned_ip) {
- 	  fatal("DHCPC: Terminating because address has changed!");
- 	}
--       	untimeout(&dhcp_renew,NULL);
--	timeout(&dhcp_renew, NULL, lease / 2,0);
-+	ppp_untimeout(&dhcp_renew,NULL);
-+	ppp_timeout(&dhcp_renew, NULL, lease / 2,0);
- 	return;
-       } else if (*message == DHCPNAK) {
- 	/* return to init state */
-@@ -248,7 +250,7 @@ void dhcp_rx(void *dummy) {
-       }
-     }
-   }
--  timeout(&dhcp_rx,NULL,DHCP_RX_POLL_INTERVAL,0);
-+  ppp_timeout(&dhcp_rx,NULL,DHCP_RX_POLL_INTERVAL,0);
-   
- }
- 
-@@ -272,7 +274,7 @@ void dhcp_renew(void *dummy) {
-   if (dhcp_state == BOUND) {
-     dhcp_state = RENEWING;
-     change_mode(LISTEN_KERNEL);
--    timeout(&dhcp_rx,NULL,3,0);
-+    ppp_timeout(&dhcp_rx,NULL,3,0);
-     dbglog("DHCPC: Entering renew state");
-     /* 1/2 of lease used on entry, timeout renew after another 3/8 of lease */
-     dhcp_renew_timeout = (lease * 0x3) >> 3;
-@@ -299,7 +301,7 @@ void dhcp_renew(void *dummy) {
-   send_renew(xid, dhcp_state==REBINDING ? client_config.siaddr : server_addr, requested_ip); 
-   
-   dhcp_renew_timeout-=dhcp_packet_interval;
--  timeout(&dhcp_renew, NULL, dhcp_packet_interval,0);
-+  ppp_timeout(&dhcp_renew, NULL, dhcp_packet_interval,0);
- }
- 
- void dhcp_request_new() {
-@@ -312,6 +314,7 @@ void dhcp_request_new() {
-   int c, len;
-   struct dhcpMessage packet;
-   time_t now;
-+  const char *peer_authname = ppp_peer_authname(NULL, 0);
-   
-   if (dhcp_state == BOUND || dhcp_state == RENEWING || dhcp_state == REBINDING)
-     return;
-@@ -426,7 +429,7 @@ void dhcp_request_new() {
- 	  dhcp_process_ack(&packet);
- 	  assigned_ip = requested_ip;
- 	  dbglog("DHCPC: Setting renewal timer for %d seconds", lease /2);
--  	  timeout(&dhcp_renew, NULL, lease / 2,0);
-+	  ppp_timeout(&dhcp_renew, NULL, lease / 2,0);
- 	  return;
- 	} else if (*message == DHCPNAK) {
- 	  /* return to init state */
-@@ -455,6 +458,7 @@ void dhcp_request_new() {
- 
- void dhcp_ip_choose(u_int32_t *addrp) {
-   u_int32_t entryvalue;
-+  const char *peer_authname = ppp_peer_authname(NULL, 0);
- 
-   dbglog("DHCPC: ip_choose_hook entered with peer name %s",peer_authname);
- 
-@@ -489,8 +493,8 @@ void plugin_init(void)
-   /* we save pointer to ip_choose_hook so we can defer to other modules
-      that may specify an IP, e.g. radius */
-   ip_choose_hook= dhcp_ip_choose;
--  add_options(dhcpc_options);
--  add_notifier(&exitnotify, dhcp_release, NULL);
-+  ppp_add_options(dhcpc_options);
-+  ppp_add_notify(NF_EXIT, dhcp_release, NULL);
-   info("DHCPC: plugin initialized");
- 
- }
--- 
-2.40.0
-
diff --git a/net-dialup/ppp/ppp-2.5.0.ebuild b/net-dialup/ppp/ppp-2.5.0.ebuild
index 1994d63f1948..8df0af957ebd 100644
--- a/net-dialup/ppp/ppp-2.5.0.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0.ebuild
@@ -2,22 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-AUTOTOOLS_AUTO_DEPEND=no
 
-inherit autotools linux-info pam
+inherit linux-info pam
 
 PATCH_TARBALL_NAME="${PN}-2.4.9-patches-03"
 DESCRIPTION="Point-to-Point Protocol (PPP)"
 HOMEPAGE="https://ppp.samba.org/"
 SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
-	https://github.com/ppp-project/ppp/blob/${P}/contrib/pppgetpass/pppgetpass.8
-	dhcp? ( http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz )"
-#https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz
+	https://github.com/ppp-project/ppp/blob/${P}/contrib/pppgetpass/pppgetpass.8"
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="activefilter atm dhcp gtk pam systemd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="activefilter atm gtk pam systemd"
 
 DEPEND="
 	dev-libs/openssl:0=
@@ -30,22 +27,12 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!<net-misc/netifrc-0.7.1-r2"
-BDEPEND="virtual/pkgconfig
-	dhcp? ( ${AUTOTOOLS_DEPEND} )"
+BDEPEND="virtual/pkgconfig"
 PDEPEND="net-dialup/ppp-scripts"
 
-src_prepare() {
-	if use dhcp; then
-		eapply "${FILESDIR}/ppp-2.5.0-add-dhcp-plugin.patch"
-		cd "${WORKDIR}/dhcp" || die
-		eapply "${FILESDIR}/ppp-2.5.0-dhcp"
-		cd "${S}" || die
-		mv "${WORKDIR}/dhcp" "${S}/pppd/plugins/dhcp" || die
-	fi
-	default
-	if use dhcp; then
-		eautoreconf
-	fi
+pkg_setup() {
+	# Avoid linux-info_pkg_setup
+	:
 }
 
 src_configure() {
@@ -78,8 +65,10 @@ src_install() {
 	insinto /etc/modprobe.d
 	newins "${FILESDIR}/modules.ppp" ppp.conf
 
-	dobin scripts/p{on,off,log}
+	dosbin scripts/p{on,off,log}
 	doman scripts/pon.1
+	dosym pon.1 /usr/share/man/man1/poff.1
+	dosym pon.1 /usr/share/man/man1/plog.1
 
 	# Adding misc. specialized scripts to doc dir
 	dodoc -r scripts
@@ -97,31 +86,29 @@ src_install() {
 }
 
 pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists ; then
-		echo
-		ewarn "If the following test report contains a missing kernel configuration option that you need,"
-		ewarn "you should reconfigure and rebuild your kernel before running pppd."
-		CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
-		local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
-		local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
-		local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
-		if use activefilter ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
-			local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
-		fi
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
-		local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
-		local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
-		local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
-		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by pppoe plugin)"
-		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by pppoe plugin)"
-		if use atm ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
-			local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
-		fi
-		check_extra_config
+	local CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
+	local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
+	local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline"
+	ERROR_PPP_ASYNC+=" (optional, but highly recommended)"
+	local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline"
+	WARNING_PPP_SYNC_TTY+=" (optional; used by 'sync' pppd option)"
+	if use activefilter ; then
+		CONFIG_CHECK+=" ~PPP_FILTER"
+		local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
 	fi
+	CONFIG_CHECK+=" ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
+	local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
+	local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
+	local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
+	CONFIG_CHECK+=" ~PPPOE ~PACKET"
+	local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by pppoe plugin)"
+	local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by pppoe plugin)"
+	if use atm ; then
+		CONFIG_CHECK+=" ~PPPOATM"
+		local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
+	fi
+
+	linux-info_pkg_setup
 
 	echo
 	elog "pon, poff and plog scripts have been supplied for experienced users."