Adding metadata

11 files changed, 1 insertions, 790 deletions

diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 6cb9d5bfd142..ffd8a1d23cf6 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,6 +1,3 @@
-DIST ppp-2.5.0.tar.gz 1170057 BLAKE2B 6a0e9efcbff3cb499705071cc7d0e3411cf4871fd53b2bfedbb1f2cf3ad80728eb436050cf33b78e36d473be64f15907a21da17f283337455f0af379bc18272d SHA512 094368ea2aa6c6e8dfba4443509857a7c1c7ff839bb6d6657743802477208c01e87db31593cef0932d3725c640e9c103179da6b742825034cda82bd31ddcc2ed
-DIST ppp-2.5.1.tar.gz 991639 BLAKE2B e3ece873ea25bde5ddffd0da168ffe6ba890693f20fb9f1d6a48f365331abdb4cf517fd0b3004d26a0c778ad4d750e39e38486544e2771b23223469db13c239c SHA512 57b3bbf918c302dbc621f56b706efa1b35b2fc45b71c3a309c1cfee22c28fcf98d7f8965fbeba9260c124f2afb9e297885007256ee05469adca73fad032902b9
 DIST ppp-2.5.2.tar.gz 973132 BLAKE2B 5a79bfaf23c2f1cba7b2c4e8f27e6033aa7ee6e119b4d96dfd2870f91524052fe9ed16149e5f76cf93370159f491af828b4103eb04bd4f5dbbecca4a08af9d0d SHA512 2c49d411818632a750f52b187c0ee421e9fcc1530c717abacce61e76aa8b296ce09fb142bc202696c0e0ac5570dd12ee649267921b756b6572ae514ce961d1e6
 DIST ppp-2.5.3.tar.gz 995939 BLAKE2B fe915978f1332c18dc370b5d79d07c55afd006d576168c16034ac368afe138d3e0a41d7a9a05fdc2868b1e30bbd0510aadbf7e9a595c77cacaeb739c9289051c SHA512 4de2af44d56d8629db37a7aa71ea1973020bacd4fe6b8e56b69b4b825445437cf9d5e2caee13e0af09d26b89954a8e08560581f3c5611edb119ea63fc10d2255
 DIST ppp-2.5.4.tar.gz 1013028 BLAKE2B 4b70250f73811a343c87087cac7555f6d7b550c5bce6bf71af7fa585f12437c62d2525f669f6e3306e02adc9f180c0508554e4f04abec4227ff7d181e39f0618 SHA512 078075fc4f9fab07d44fab626d87def8f73c76a50d2bd52e7f84ad874a4bf6e9530d5f59fc77a20857f0049f58f84c3f6af0a17ccc60e0ffe6a34ddaf90159f4
-DIST pppgetpass.8 450 BLAKE2B 4e9805cfecb4d07c302682c1ced42cc5d247d18fae904b909e126874af962cf48bb703cd75b0cefce4e19404f2e757602d3b57f187567fc23d4b93d9598d1486 SHA512 21f6dda908cf73ee27bfa39d2b50e7f76b371e50bd7d5a0586174b30129c119accbd260d7f9e0e6aa6aabfa5ba11a13ba560588a99672c9dd4e9f33254f88836
diff --git a/net-dialup/ppp/files/ppp-2.5.0-openssl-pkgconfig.patch b/net-dialup/ppp/files/ppp-2.5.0-openssl-pkgconfig.patch
deleted file mode 100644
index 893b623a4ea5..000000000000
--- a/net-dialup/ppp/files/ppp-2.5.0-openssl-pkgconfig.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-https://bugs.gentoo.org/905442
-https://github.com/ppp-project/ppp/pull/438
-
-From 9b4bdca70081abbad26277b009ef9c4ab7e276d0 Mon Sep 17 00:00:00 2001
-From: Brahmajit Das <brahmajit.xyz@gmail.com>
-Date: Thu, 2 Nov 2023 11:26:18 +0530
-Subject: [PATCH] Fix linking error with lld linkers (#438)
-
-When using lld linker, build fails with
-
-ld.lld: error: /usr/lib/gcc/x86_64-pc-linux-gnu/12/../../../../lib64/Scrt1.o is incompatible with elf32-i386
-ld.lld: error: /usr/lib/gcc/x86_64-pc-linux-gnu/12/../../../../lib64/crti.o is incompatible with elf32-i386
-ld.lld: error: /usr/lib/llvm/16/bin/../../../../lib/clang/16/lib/linux
-
-The fix is to check pkg-config first, and not force manual -L /usr/lib.
-If pkg-config succeeded, then we don't bother with -L /usr/lib
-
-Our guess is this what the actual intention was based upon the coments
-
-if pkg-config is installed and openssl has installed a .pc file,
-then use that information and don't search ssldirs
-
-First found on gentoo linux with llvm profile, please check out Bug:
-section of the commit for more info and a complete build log.
-
-Bug: https://bugs.gentoo.org/905442
-
-Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
-Co-authored-by: Sam James <sam@gentoo.org>
----
- m4/ax_check_openssl.m4 | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4
-index 8ae39cae6..39154c856 100644
---- a/m4/ax_check_openssl.m4
-+++ b/m4/ax_check_openssl.m4
-@@ -55,6 +55,20 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
-         ])
- 
-     AS_IF([test "${with_openssl}" != "no"], [
-+        # if pkg-config is installed and openssl has installed a .pc file,
-+        # then use that information and don't search ssldirs
-+        AC_PATH_PROG([PKG_CONFIG], [pkg-config])
-+        if test x"$PKG_CONFIG" != x""; then
-+            OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null`
-+            if test $? = 0; then
-+                OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
-+                OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null`
-+                found=true
-+            fi
-+        fi
-+    ])
-+
-+    AS_IF([test "${with_openssl}" != "no" && test ! ${found}], [
-         OPENSSL_INCLUDES=
-         for ssldir in $ssldirs; do
-             AC_MSG_CHECKING([for openssl/ssl.h in $ssldir])
-@@ -69,20 +83,6 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
-                 AC_MSG_RESULT([no])
-             ])
-         done])
--     
--    AS_IF([test "${with_openssl}" != "no" && test ! ${found}], [ 
--        # if pkg-config is installed and openssl has installed a .pc file,
--        # then use that information and don't search ssldirs
--        AC_PATH_PROG([PKG_CONFIG], [pkg-config])
--        if test x"$PKG_CONFIG" != x""; then
--            OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null`
--            if test $? = 0; then
--                OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
--                OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null`
--                found=true
--            fi
--        fi
--    ])
- 
-     AS_IF([test "${with_openssl}" != "no" && test ${found}], [
- 
diff --git a/net-dialup/ppp/files/ppp-2.5.0-pam-pkgconfig.patch b/net-dialup/ppp/files/ppp-2.5.0-pam-pkgconfig.patch
deleted file mode 100644
index 40488fee96b7..000000000000
--- a/net-dialup/ppp/files/ppp-2.5.0-pam-pkgconfig.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-https://github.com/ppp-project/ppp/pull/479
-
-From c73498fad415d99aa566b11256938272e62b22dd Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Tue, 5 Mar 2024 14:41:10 -0500
-Subject: [PATCH] Use pkg-config to detect PAM when possible
-
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- m4/ax_check_pam.m4 | 50 ++++++++++++++++++++--------------------------
- 1 file changed, 22 insertions(+), 28 deletions(-)
-
-diff --git a/m4/ax_check_pam.m4 b/m4/ax_check_pam.m4
-index b17a7573c..7ebd79b61 100644
---- a/m4/ax_check_pam.m4
-+++ b/m4/ax_check_pam.m4
-@@ -26,34 +26,28 @@
- AC_DEFUN([AX_CHECK_PAM], [
-     AC_ARG_WITH([pam],
-         [AS_HELP_STRING([--with-pam=DIR],
--            [With libpam support, see ftp.redhat.com:/pub/pam])],
--        [
--            case "$withval" in
--            "" | y | ye | yes)
--                pamdirs="/usr/local /usr/lib /usr"  
--              ;;
--            n | no)
--                with_pam="no"
--              ;;
--            *)
--                pamdirs="$withval"
--              ;;
--            esac
--        ])
-+            [With libpam support, see ftp.redhat.com:/pub/pam])])
-     
--    if [ test "x${with_pam}" != "xno" ] ; then
--        PAM_LIBS="-lpam"
--        for pamdir in $pamdirs; do
--            AC_MSG_CHECKING([for pam_appl.h in $pamdir])
--            if test -f "$pamdir/include/security/pam_appl.h"; then
--                PAM_CFLAGS="-I$pamdir/include"
--                PAM_LDFLAGS="-L$pamdir/lib"
--                AC_MSG_RESULT([yes])
--                break
--            else
--                AC_MSG_RESULT([no])
--            fi
--        done
-+    AS_IF([test "$with_pam" != "no"], [
-+        AS_CASE(["$with_pam"],
-+            [""|yes], [PKG_CHECK_MODULES([PAM], [pam], [pamdirs=],
-+                        [pamdirs="/usr/local /usr/lib /usr"])],
-+            [pamdirs="$with_pam"])
-+
-+        AS_IF([test -n "$pamdirs"], [
-+            PAM_LIBS="-lpam"
-+            for pamdir in $pamdirs; do
-+                AC_MSG_CHECKING([for pam_appl.h in $pamdir])
-+                if test -f "$pamdir/include/security/pam_appl.h"; then
-+                    PAM_CFLAGS="-I$pamdir/include"
-+                    PAM_LDFLAGS="-L$pamdir/lib"
-+                    AC_MSG_RESULT([yes])
-+                    break
-+                else
-+                    AC_MSG_RESULT([no])
-+                fi
-+            done
-+        ])
- 
-         # try the preprocessor and linker with our new flags,
-         # being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS
-@@ -87,7 +81,7 @@ AC_DEFUN([AX_CHECK_PAM], [
-         AC_SUBST([PAM_CFLAGS])
-         AC_SUBST([PAM_LIBS])
-         AC_SUBST([PAM_LDFLAGS])
--    fi
-+    ])
-     AM_CONDITIONAL(WITH_LIBPAM, test "x${with_pam}" != "xno")
- ])
- 
diff --git a/net-dialup/ppp/files/ppp-2.5.0-passwordfd-read-early.patch b/net-dialup/ppp/files/ppp-2.5.0-passwordfd-read-early.patch
deleted file mode 100644
index 5c7067c5307b..000000000000
--- a/net-dialup/ppp/files/ppp-2.5.0-passwordfd-read-early.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-https://github.com/ppp-project/ppp/pull/420
-
-From df35ecb4ab63e8f89f57aa5d593441765a96ed62 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alin=20N=C4=83stac?= <mrness@gentoo.org>
-Date: Fri, 20 Jun 2008 18:34:06 +0000
-Subject: [PATCH] passwordfd: read password early
-
-Bug: https://bugs.gentoo.org/209294
-Bug: https://bugs.gentoo.org/905112
----
- pppd/plugins/passwordfd.c | 54 ++++++++++++++++++---------------------
- 1 file changed, 25 insertions(+), 29 deletions(-)
-
-diff --git a/pppd/plugins/passwordfd.c b/pppd/plugins/passwordfd.c
-index c1f782e..13aec56 100644
---- a/pppd/plugins/passwordfd.c
-+++ b/pppd/plugins/passwordfd.c
-@@ -24,11 +24,11 @@
- 
- char pppd_version[] = PPPD_VERSION;
- 
--static int passwdfd = -1;
- static char save_passwd[MAXSECRETLEN];
- 
-+static int readpassword (char **);
- static struct option options[] = {
--    { "passwordfd", o_int, &passwdfd,
-+    { "passwordfd", o_special, (void *)readpassword,
-       "Receive password on this file descriptor" },
-     { NULL }
- };
-@@ -38,43 +38,39 @@ static int pwfd_check (void)
-     return 1;
- }
- 
--static int pwfd_passwd (char *user, char *passwd)
-+static int readpassword(char **argv)
- {
--    int readgood, red;
--
--    if (passwdfd == -1)
--	return -1;
-+    char *arg = *argv;
-+    int passwdfd = -1;
-+    int chunk, len;
- 
--    if (passwd == NULL)
--	return 1;
--
--    if (passwdfd == -2) {
--	strcpy (passwd, save_passwd);
--	return 1;
-+    if (sscanf(arg, "%d", &passwdfd) != 1 || passwdfd < 0)
-+    {
-+	error ("\"%s\" is not a valid file descriptor number", arg);
-+	return 0;
-     }
- 
--    readgood = 0;
-+    len = 0;
-     do {
--	red = read (passwdfd, passwd + readgood, MAXSECRETLEN - 1 - readgood);
--	if (red == 0)
--	    break;
--	if (red < 0) {
--	    error ("Can't read secret from fd\n");
--	    readgood = -1;
-+	chunk = read (passwdfd, save_passwd + len, MAXSECRETLEN - 1 - len);
-+	if (chunk == 0)
- 	    break;
-+	if (chunk < 0) {
-+	    error ("Can't read secret from fd %d", passwdfd);
-+	    return 0;
- 	}
--	readgood += red;
--    } while (readgood < MAXSECRETLEN - 1);
--
-+	len += chunk;
-+    } while (len < MAXSECRETLEN - 1);
-+    save_passwd[len] = 0;
-     close (passwdfd);
- 
--    if (readgood < 0)
--	return 0;
--
--    passwd[readgood] = 0;
--    strcpy (save_passwd, passwd);
--    passwdfd = -2;
-+    return 1;
-+}
- 
-+static int pwfd_passwd (char *user, char *passwd)
-+{
-+    if (passwd != NULL)
-+	strcpy (passwd, save_passwd);
-     return 1;
- }
- 
--- 
-2.40.1
-
diff --git a/net-dialup/ppp/files/ppp-2.5.0-pidfile.patch b/net-dialup/ppp/files/ppp-2.5.0-pidfile.patch
deleted file mode 100644
index 538ddfb0a2c1..000000000000
--- a/net-dialup/ppp/files/ppp-2.5.0-pidfile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://github.com/ppp-project/ppp/pull/427
-
-From 0c9f2cb93f56d2a14ffcc97f53f4665b7728d8e4 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 28 May 2023 17:01:12 -0400
-Subject: [PATCH] Ensure there is a '/' between PPP_PATH_VARRUN and the PID
- filename
-
-Bug: https://bugs.gentoo.org/907311
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- pppd/main.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pppd/main.c b/pppd/main.c
-index 4455199..c207d10 100644
---- a/pppd/main.c
-+++ b/pppd/main.c
-@@ -888,7 +888,7 @@ create_pidfile(int pid)
- {
-     FILE *pidfile;
- 
--    slprintf(pidfilename, sizeof(pidfilename), "%s%s.pid",
-+    slprintf(pidfilename, sizeof(pidfilename), "%s/%s.pid",
- 	     PPP_PATH_VARRUN, ifname);
-     if ((pidfile = fopen(pidfilename, "w")) != NULL) {
- 	fprintf(pidfile, "%d\n", pid);
-@@ -907,7 +907,7 @@ create_linkpidfile(int pid)
-     if (linkname[0] == 0)
- 	return;
-     ppp_script_setenv("LINKNAME", linkname, 1);
--    slprintf(linkpidfile, sizeof(linkpidfile), "%sppp-%s.pid",
-+    slprintf(linkpidfile, sizeof(linkpidfile), "%s/ppp-%s.pid",
- 	     PPP_PATH_VARRUN, linkname);
-     if ((pidfile = fopen(linkpidfile, "w")) != NULL) {
- 	fprintf(pidfile, "%d\n", pid);
--- 
-2.40.1
-
diff --git a/net-dialup/ppp/files/ppp-2.5.0-radius-mppe.patch b/net-dialup/ppp/files/ppp-2.5.0-radius-mppe.patch
deleted file mode 100644
index 7bb63c964605..000000000000
--- a/net-dialup/ppp/files/ppp-2.5.0-radius-mppe.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-https://github.com/ppp-project/ppp/pull/463
-https://bugs.gentoo.org/915686
-
-From 77693b89fed6d4110184789f8e7dfd31710f3190 Mon Sep 17 00:00:00 2001
-From: Jaco Kroon <jaco@uls.co.za>
-Date: Thu, 23 Nov 2023 14:54:42 +0200
-Subject: [PATCH] radius: fix the MPPE key decryption for the second-half of
- the key block.
-
-During he refactor in commit 4cb90c1 the key material used to decrypt
-the second-half of the encrypted block was accidentally updated from:
-
-MD5(radius_secret + crypt[0..15]); to:
-
-MD5(radius_secret + crypt[0..15] + salt)
-
-Which would obviously mismatch.
-
-This also refactors back into what I believe to be a more readable block
-with lower nesting and more comprehensive error reporting.
-
-Closes: #453
-Signed-off-by: Jaco Kroon <jaco@uls.co.za>
----
- pppd/plugins/radius/radius.c | 115 +++++++++++++++++------------------
- 1 file changed, 55 insertions(+), 60 deletions(-)
-
-diff --git a/pppd/plugins/radius/radius.c b/pppd/plugins/radius/radius.c
-index c73ca0b53..e99bc7511 100644
---- a/pppd/plugins/radius/radius.c
-+++ b/pppd/plugins/radius/radius.c
-@@ -897,80 +897,75 @@ radius_setmppekeys2(VALUE_PAIR *vp, REQUEST_INFO *req_info)
-     memcpy(plain, crypt, 32);
- 
-     ctx = PPP_MD_CTX_new();
--    if (ctx) {
--
--        if (PPP_DigestInit(ctx, PPP_md5())) {
--
--            if (PPP_DigestUpdate(ctx, req_info->secret, strlen(req_info->secret))) {
--
--                if (PPP_DigestUpdate(ctx, req_info->request_vector, AUTH_VECTOR_LEN)) {
--
--                    if (PPP_DigestUpdate(ctx, salt, 2)) {
--
--                        buflen = sizeof(buf);
--                        if (PPP_DigestFinal(ctx, buf, &buflen)) {
--
--                            status = 1;
--                        }
--                    }
--                }
--            }
--        }
--
--        PPP_MD_CTX_free(ctx);
-+    if (!ctx) {
-+	error("RADIUS: Error creating PPP_MD_CTX for MS-MPPE-%s-Key attribute", type);
-+	return -1;
-     }
- 
--    if (status) {
--
--        for (i = 0; i < 16; i++) {
--            plain[i] ^= buf[i];
--        }
-+    buflen = sizeof(buf);
-+    if (!PPP_DigestInit(ctx, PPP_md5())) {
-+	error("RADIUS: Error setting hash algorithm to MD5 for MS-MPPE-%s-Key attribute", type);
-+    } else if (!PPP_DigestUpdate(ctx, req_info->secret, strlen(req_info->secret))) {
-+	error("RADIUS: Error mixing in radius secret for MS-MPPE-%s-Key attribute", type);
-+    } else if (!PPP_DigestUpdate(ctx, req_info->request_vector, AUTH_VECTOR_LEN)) {
-+	error("RADIUS: Error mixing in request vector for MS-MPPE-%s-Key attribute", type);
-+    } else if (!PPP_DigestUpdate(ctx, salt, 2)) {
-+	error("RADIUS: Error mixing in salt for MS-MPPE-%s-Key attribute", type);
-+    } else if (!PPP_DigestFinal(ctx, buf, &buflen)) {
-+	error("RADIUS: Error finalizing key buffer for MS-MPPE-%s-Key attribute", type);
-+    } else {
-+	status = 1;
-+    }
- 
--        if (plain[0] != 16) {
--            error("RADIUS: Incorrect key length (%d) for MS-MPPE-%s-Key attribute",
--                  (int) plain[0], type);
--            return -1;
--        }
-+    PPP_MD_CTX_free(ctx);
- 
--        status = 0;
--        ctx = PPP_MD_CTX_new();
--        if (ctx) {
--
--            if (PPP_DigestInit(ctx, PPP_md5())) {
-+    if (!status)
-+	return -1;
- 
--                if (PPP_DigestUpdate(ctx, req_info->secret, strlen(req_info->secret))) {
-+    for (i = 0; i < 16; i++) {
-+	plain[i] ^= buf[i];
-+    }
- 
--                    if (PPP_DigestUpdate(ctx, crypt, 16)) {
-+    if (plain[0] != 16) {
-+	error("RADIUS: Incorrect key length (%d) for MS-MPPE-%s-Key attribute",
-+		(int) plain[0], type);
-+	return -1;
-+    }
- 
--                        if (PPP_DigestUpdate(ctx, salt, 2)) {
-+    status = 0;
-+    ctx = PPP_MD_CTX_new();
-+    if (!ctx) {
-+	error("RADIUS: Error creating PPP_MD_CTX for MS-MPPE-%s-Key(2) attribute", type);
-+	return -1;
-+    }
- 
--                            buflen = sizeof(buf);
--                            if (PPP_DigestFinal(ctx, buf, &buflen)) {
-+    buflen = sizeof(buf);
- 
--                                status = 1;
--                            }
--                        }
--                    }
--                }
--            }
-+    if (!PPP_DigestInit(ctx, PPP_md5())) {
-+	error("RADIUS: Error setting hash algorithm to MD5 for MS-MPPE-%s-Key(2) attribute", type);
-+    } else if (!PPP_DigestUpdate(ctx, req_info->secret, strlen(req_info->secret))) {
-+	error("RADIUS: Error mixing in radius secret for MS-MPPE-%s-Key(2) attribute", type);
-+    } else if (!PPP_DigestUpdate(ctx, crypt, 16)) {
-+	error("RADIUS: Error mixing in crypt vector for MS-MPPE-%s-Key(2) attribute", type);
-+    } else if (!PPP_DigestFinal(ctx, buf, &buflen)) {
-+	error("RADIUS: Error finalizing key buffer for MS-MPPE-%s-Key(2) attribute", type);
-+    } else {
-+	status = 1;
-+    }
- 
--            PPP_MD_CTX_free(ctx);
--        }
-+    PPP_MD_CTX_free(ctx);
- 
--        if (status) {
-+    if (!status)
-+	return -1;
- 
--            plain[16] ^= buf[0]; /* only need the first byte */
-+    plain[16] ^= buf[0]; /* only need the first byte */
- 
--            if (vp->attribute == PW_MS_MPPE_SEND_KEY) {
--                mppe_set_keys(plain + 1, NULL, 16);
--            } else {
--                mppe_set_keys(NULL, plain + 1, 16);
--            }
--            return 0;
--        }
-+    if (vp->attribute == PW_MS_MPPE_SEND_KEY) {
-+	mppe_set_keys(plain + 1, NULL, 16);
-+    } else {
-+	mppe_set_keys(NULL, plain + 1, 16);
-     }
--
--    return -1;
-+    return 0;
- }
- #endif /* PPP_WITH_MPPE */
- 
diff --git a/net-dialup/ppp/files/ppp-2.5.0-radiusclient.conf-parsing.patch b/net-dialup/ppp/files/ppp-2.5.0-radiusclient.conf-parsing.patch
deleted file mode 100644
index 9916f766c7af..000000000000
--- a/net-dialup/ppp/files/ppp-2.5.0-radiusclient.conf-parsing.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://github.com/ppp-project/ppp/issues/411
-https://github.com/ppp-project/ppp/commit/7f89208b860ea0c41636410bfdb6a609b2772f47
-https://bugs.gentoo.org/908396
-
-From 7f89208b860ea0c41636410bfdb6a609b2772f47 Mon Sep 17 00:00:00 2001
-From: Eivind Naess <eivnaes@yahoo.com>
-Date: Sun, 23 Apr 2023 11:37:01 -0700
-Subject: [PATCH] Closes #411, Fixing up parsing in radiusclient.conf
-
-Adding curly braces to fix the code.
-
-Signed-off-by: Eivind Naess <eivnaes@yahoo.com>
---- a/pppd/plugins/radius/config.c
-+++ b/pppd/plugins/radius/config.c
-@@ -235,24 +235,28 @@ int rc_read_config(char *filename)
- 
- 		switch (option->type) {
- 			case OT_STR:
--				 if (set_option_str(filename, line, option, p) < 0)
-+				if (set_option_str(filename, line, option, p) < 0) {
- 					fclose(configfd);
- 					return (-1);
-+				}
- 				break;
- 			case OT_INT:
--				 if (set_option_int(filename, line, option, p) < 0)
-+				if (set_option_int(filename, line, option, p) < 0) {
- 					fclose(configfd);
- 					return (-1);
-+				}
- 				break;
- 			case OT_SRV:
--				 if (set_option_srv(filename, line, option, p) < 0)
-+				if (set_option_srv(filename, line, option, p) < 0) {
- 					fclose(configfd);
- 					return (-1);
-+				}
- 				break;
- 			case OT_AUO:
--				 if (set_option_auo(filename, line, option, p) < 0)
-+				if (set_option_auo(filename, line, option, p) < 0) {
- 					fclose(configfd);
- 					return (-1);
-+				}
- 				break;
- 			default:
- 				fatal("rc_read_config: impossible case branch!");
-
diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml
index 56b784b9a30d..8b9dd85e2b29 100644
--- a/net-dialup/ppp/metadata.xml
+++ b/net-dialup/ppp/metadata.xml
@@ -11,9 +11,6 @@
   </maintainer>
   <use>
     <flag name="activefilter">Enables active filter support</flag>
-    <flag name="gtk">Installs GTK+ password prompting program that can be used
-		by passprompt.so PPP plugin for reading the password from a X11 input
-		terminal</flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:samba:ppp</remote-id>
diff --git a/net-dialup/ppp/ppp-2.5.0-r7.ebuild b/net-dialup/ppp/ppp-2.5.0-r7.ebuild
deleted file mode 100644
index 3bdf1eda3c85..000000000000
--- a/net-dialup/ppp/ppp-2.5.0-r7.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools linux-info pam tmpfiles
-
-DESCRIPTION="Point-to-Point Protocol (PPP)"
-HOMEPAGE="https://ppp.samba.org/"
-SRC_URI="
-	https://download.samba.org/pub/ppp/${P}.tar.gz
-	https://raw.githubusercontent.com/ppp-project/ppp/${P}/contrib/pppgetpass/pppgetpass.8
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="activefilter atm gtk pam selinux systemd"
-
-DEPEND="
-	dev-libs/openssl:0=
-	virtual/libcrypt:=
-	activefilter? ( net-libs/libpcap )
-	atm? ( net-dialup/linux-atm )
-	gtk? ( x11-libs/gtk+:2 )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="
-	${DEPEND}
-	!<net-misc/netifrc-0.7.1-r2
-	selinux? ( sec-policy/selinux-ppp )
-"
-BDEPEND="virtual/pkgconfig"
-PDEPEND="net-dialup/ppp-scripts"
-
-PATCHES=(
-	"${FILESDIR}"/ppp-2.5.0-passwordfd-read-early.patch
-	"${FILESDIR}"/ppp-2.5.0-pidfile.patch
-	"${FILESDIR}"/ppp-2.5.0-radiusclient.conf-parsing.patch
-	"${FILESDIR}"/ppp-2.5.0-openssl-pkgconfig.patch
-	"${FILESDIR}"/ppp-2.5.0-pam-pkgconfig.patch
-	"${FILESDIR}"/ppp-2.5.0-radius-mppe.patch
-)
-
-pkg_setup() {
-	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
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# Set the right paths in radiusclient.conf
-	sed -e "s:/usr/local/etc:/etc:" \
-		-e "s:/usr/local/sbin:/usr/sbin:" \
-		-i pppd/plugins/radius/etc/radiusclient.conf || die
-	# Set config dir to /etc/ppp/radius
-	sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
-		pppd/plugins/radius/{*.8,*.c,*.h} \
-		pppd/plugins/radius/etc/* || die
-}
-
-src_configure() {
-	local args=(
-		--localstatedir="${EPREFIX}"/var
-		--runstatedir="${EPREFIX}"/run
-		$(use_enable systemd)
-		$(use_with atm)
-		$(use_with pam)
-		$(use_with activefilter pcap)
-		$(use_with gtk)
-		--enable-cbcp
-		--enable-multilink
-	)
-	econf "${args[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	if use pam; then
-		pamd_mimic_system ppp auth account session
-	fi
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}/modules.ppp" ppp.conf
-
-	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
-
-	if use gtk ; then
-		dosbin contrib/pppgetpass/pppgetpass.{gtk,vt}
-		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
-	else
-		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
-	fi
-
-	newtmpfiles "${FILESDIR}/pppd.tmpfiles" pppd.conf
-
-	# Missing from upstream tarball
-	# https://github.com/ppp-project/ppp/pull/412
-	#doman contrib/pppgetpass/pppgetpass.8
-	doman "${DISTDIR}/pppgetpass.8"
-
-	insinto /etc/ppp/radius
-	doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
-}
-
-pkg_postinst() {
-	tmpfiles_process pppd.conf
-}
diff --git a/net-dialup/ppp/ppp-2.5.1-r1.ebuild b/net-dialup/ppp/ppp-2.5.1-r1.ebuild
deleted file mode 100644
index c73dc2c82e81..000000000000
--- a/net-dialup/ppp/ppp-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info pam tmpfiles
-
-DESCRIPTION="Point-to-Point Protocol (PPP)"
-HOMEPAGE="https://ppp.samba.org/"
-SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="activefilter atm gtk pam selinux systemd"
-
-DEPEND="
-	dev-libs/openssl:0=
-	virtual/libcrypt:=
-	activefilter? ( net-libs/libpcap )
-	atm? ( net-dialup/linux-atm )
-	gtk? ( x11-libs/gtk+:2 )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-ppp )
-"
-BDEPEND="virtual/pkgconfig"
-PDEPEND="net-dialup/ppp-scripts"
-
-pkg_setup() {
-	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
-}
-
-src_prepare() {
-	default
-
-	# Set the right paths in radiusclient.conf
-	sed -e "s:/usr/local/etc:/etc:" \
-		-e "s:/usr/local/sbin:/usr/sbin:" \
-		-i pppd/plugins/radius/etc/radiusclient.conf || die
-	# Set config dir to /etc/ppp/radius
-	sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
-		pppd/plugins/radius/{*.8,*.c,*.h} \
-		pppd/plugins/radius/etc/* || die
-}
-
-src_configure() {
-	# https://bugs.gentoo.org/943931
-	append-cflags -std=gnu17
-
-	local args=(
-		--localstatedir="${EPREFIX}"/var
-		--runstatedir="${EPREFIX}"/run
-		$(use_enable systemd)
-		$(use_with atm)
-		$(use_with pam)
-		$(use_with activefilter pcap)
-		$(use_with gtk)
-		--enable-cbcp
-		--enable-multilink
-	)
-	econf "${args[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	if use pam; then
-		pamd_mimic_system ppp auth account session
-	fi
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}/modules.ppp" ppp.conf
-
-	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
-
-	if use gtk ; then
-		dosbin contrib/pppgetpass/pppgetpass.{gtk,vt}
-		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
-	else
-		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
-	fi
-
-	doman contrib/pppgetpass/pppgetpass.8
-
-	newtmpfiles "${FILESDIR}/pppd.tmpfiles-r1" pppd.conf
-
-	insinto /etc/ppp/radius
-	doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
-}
-
-pkg_postinst() {
-	tmpfiles_process pppd.conf
-}
diff --git a/net-dialup/ppp/ppp-2.5.4.ebuild b/net-dialup/ppp/ppp-2.5.4.ebuild
index 6334c5facbbd..6aa12055fd50 100644
--- a/net-dialup/ppp/ppp-2.5.4.ebuild
+++ b/net-dialup/ppp/ppp-2.5.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ppp-project/ppp.git"
 else
 	SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="BSD GPL-2"