gentoo auto-resync : 06:03:2024 - 01:06:16

6 files changed, 172 insertions, 7 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 8f217904e78a..7f5a8164cc5b 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index f15d22ba6a09..a4c71b4cbefa 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -4,6 +4,8 @@ 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-openssl-pkgconfig.patch 3183 BLAKE2B c628ab91a1b564b27c50a9cc10dc7d4ba1f62dc280fb25c32f4d7d4857cf2d20eb72f3419a8dd36a86836605ee6c6869155981b2ee17b8d3774e13ae1a595634 SHA512 4c6110541de741bc17906f49df7a89ea9591cc7590f28713b847efc6fdf5deab1bdd30660d3fdb3895e56c19880c5f282e55da7702817abcfa7d0355fa726df0
+AUX ppp-2.5.0-pam-pkgconfig.patch 2754 BLAKE2B ecb36f0e1ca3aebfd8a8c5d4d91a0c1d41ccebf9ee90fdbb842331bdd4d4d43269d12c405872d5d110c614d6410a228983bfa87cb7c0bd1fd48763541ae84be6 SHA512 e962f9c37830b5702ae10d833dc6eadac377b4de66517c5976812927e2b983c75e33a1617622f022a585ac7acfe131cfb12a18fa5d4e90b2afcc9c0e2a9ac731
 AUX ppp-2.5.0-passwordfd-read-early.patch 2423 BLAKE2B e0393149fcd0468be000ab125c8318a4f295c5343525b1cad17ec8eb4f87b2b759bdb898bf1fc56304ed6f06418f1536e15209df18dfe719ff9865a3ff3f02c6 SHA512 52fc5d0e7f2540c7eb01101cd8e10abd5b0eaacde007b3480c27136d439527c70c568f63139590d00cab5450edfa1a63d06b7aac078f7d4ed9d0cddad106bc66
 AUX ppp-2.5.0-pidfile.patch 1257 BLAKE2B 220ada7acaf45c2cd614d2ce8883fb91c282d18a729e871316dae5209b8c97a5a7990e7c673a7ca80dd8a8116782eb46efcd94ee4d27c111b839750fd0be9d0a SHA512 cedce4514bd055b5c0600c012b87312d30f24e086750d81d218db2eb5a8a509904de99f5e1cfa7fd018533cdd45ebbe86ebbdfdfda8fa8109128ae857f3e38ec
 AUX ppp-2.5.0-radiusclient.conf-parsing.patch 1466 BLAKE2B 48bd7ac24e2988f7346d4d01209ed04f37a82569a4085d7389c139755642515c6f607d3f73d57c4856aab23cba8ee4f1d0fd612be445b610948e3ce3d8dbbe60 SHA512 3f36c68e480600ea590844cd46176e7597a8bba0d8bf977c4aa697269872a493cd9ec3317a32ccc8a76f1b65b208df0deddd18f651b275164c44b052923c448f
@@ -14,7 +16,7 @@ DIST ppp-2.5.0.tar.gz 1170057 BLAKE2B 6a0e9efcbff3cb499705071cc7d0e3411cf4871fd5
 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
 DIST pppgetpass.8 450 BLAKE2B 4e9805cfecb4d07c302682c1ced42cc5d247d18fae904b909e126874af962cf48bb703cd75b0cefce4e19404f2e757602d3b57f187567fc23d4b93d9598d1486 SHA512 21f6dda908cf73ee27bfa39d2b50e7f76b371e50bd7d5a0586174b30129c119accbd260d7f9e0e6aa6aabfa5ba11a13ba560588a99672c9dd4e9f33254f88836
 EBUILD ppp-2.4.9-r9.ebuild 7866 BLAKE2B e2f6012eb93f27271c775b75fa52e0d1307adee4afdcb09bf8ae78e1ddefe451bd7782c4f5412ef264366c8db4e20bb3621c4c032c1261166c70473a94552880 SHA512 a3931bedeac10a6facc0fe354eee0e26e6c237f21f9e4d69196d657d388d1624e4bf8054c670568c0ba689d859bca87a21410da08f35baf33fc12d39cfe2263e
-EBUILD ppp-2.5.0-r3.ebuild 3489 BLAKE2B 3a0eab803000ef507d175ae4c5d1d2b04028b5bd8083678d15f3856b426b91b716b7887c8c5c8e7c783ddece5db026b2727666b34e85ad4a30554b35b12e8ec7 SHA512 7ae193c9392ba7127e001725fa991f01fafd06bc01f2a099a1507d308e938e0fb0692f7f92f3c8a7895e52dc126b26d1526dee2480900fe7029390ccf3fa1551
+EBUILD ppp-2.5.0-r3.ebuild 3490 BLAKE2B 5a436cfccf9cb9e52cb4d5c0673ee7e457953feddd61cfe929e782d7ad0cb82ee9bb8a8e31479c2cb5a006e13c12188bf8618fb964e182be1ed3cfe7b5ce3a93 SHA512 f0eb1db737e70402053a79b76678bf47a5abb4a6adf0a66c5e244e01ca68227a4e6d31dd011b1b8f8d8395897587a76c3ef4467d9d33c46da039374a4f2e0a58
 EBUILD ppp-2.5.0-r4.ebuild 3550 BLAKE2B 1de650e0ee621f7f6f241ed5bb874201c91ee1502dd1e16481737204d22dcf0add58f87dc1096a7ee4896da429fbb43a683f4ff1549feac622309ff8dd848ec6 SHA512 92b82b0d9a363a50806fac3647d63bd6144a185e2845ddd5174ab6296cf72143b395e16b9a5170b3d9ae7d0affacd25ef3c284398d7b7b71fac18536c68efa25
-EBUILD ppp-2.5.0-r6.ebuild 4061 BLAKE2B f468cb4bf5a101e5ce6c3d343b9c547c72f2a6fa11139fe191420b2b840d84149079f8109ea291fe33d2018dda053b8e59759a111e4cb5f81455315be09395e1 SHA512 b40cc9847f4578d215d86cbbe380927a538b11d8bb7f2c12ebc92e0730f88de6e2ed98739644f46c3a5afae05e059e820478bcf7e4f3666f2d2bc23552bc4d4d
+EBUILD ppp-2.5.0-r6.ebuild 4172 BLAKE2B da5e5cf1e1f969da6e9b21c80d8db93e00bad52438f928172c9a7bd371d2c1c89cdf70de7beb7f5b212d262b32674b3cb69d5b4b89602850ea70c3d6c95cd5f8 SHA512 aede7f09c9a3e716ab84af2d64d645b3447115af03c2816f0c6fa9c3a0d18c777a4f8d6a3af9a57dc932252e754d0a270640031e50f2746a5e7bf95300b8a258
 MISC metadata.xml 1002 BLAKE2B 9ce1dcb685ed4f0d6dfe2e6c885b8feca8d81fd1fea5bde44a40900d65b2f9e9a45bd03f3708d4969c51880bb7ffb791bfbc972d4ec06a3124c4215e2b66424b SHA512 cdfa0b69fab5a530b36093bc84c352da1f8acbdf3d31e2b9a4d58bde7dc7bbbce9c54000d9f874eac2ddcc803bafc89ea2a74b03cac23dca295815ece6cb2157
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
new file mode 100644
index 000000000000..893b623a4ea5
--- /dev/null
+++ b/net-dialup/ppp/files/ppp-2.5.0-openssl-pkgconfig.patch
@@ -0,0 +1,79 @@
+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
new file mode 100644
index 000000000000..40488fee96b7
--- /dev/null
+++ b/net-dialup/ppp/files/ppp-2.5.0-pam-pkgconfig.patch
@@ -0,0 +1,81 @@
+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/ppp-2.5.0-r3.ebuild b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
index f1649c66765c..eb638501c713 100644
--- a/net-dialup/ppp/ppp-2.5.0-r3.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="activefilter atm gtk pam systemd"
 
 DEPEND="
diff --git a/net-dialup/ppp/ppp-2.5.0-r6.ebuild b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
index 17550d021c06..12bcb53cc006 100644
--- a/net-dialup/ppp/ppp-2.5.0-r6.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit linux-info pam tmpfiles
+inherit autotools linux-info pam tmpfiles
 
 DESCRIPTION="Point-to-Point Protocol (PPP)"
 HOMEPAGE="https://ppp.samba.org/"
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="activefilter atm gtk pam selinux systemd"
 
 DEPEND="
@@ -38,6 +38,8 @@ PATCHES=(
 	"${FILESDIR}"/ppp-2.5.0-passwordfd-read-early.patch
 	"${FILESDIR}"/ppp-2.5.0-pidfile.patch
 	"${FILESDIR}"/${P}-radiusclient.conf-parsing.patch
+	"${FILESDIR}"/ppp-2.5.0-openssl-pkgconfig.patch
+	"${FILESDIR}"/ppp-2.5.0-pam-pkgconfig.patch
 )
 
 pkg_setup() {
@@ -68,6 +70,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
+	eautoreconf
 
 	# Set the right paths in radiusclient.conf
 	sed -e "s:/usr/local/etc:/etc:" \