gentoo auto-resync : 10:05:2023 - 23:44:41

2 files changed, 31 insertions, 25 deletions

diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 43c65fae1ba8..28777e9e30bc 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -2,6 +2,8 @@ AUX pam-1.5.1-musl.patch 626 BLAKE2B 2fe46e9aa8ceaee40308277ab5eddc63d4d188c53fe
 AUX pam-1.5.2-clang-15-configure-implicit-func.patch 965 BLAKE2B 8ce9f8c52eed90da7015a297ab5a86f2946536e3f7f672de5dd4aecc1c73b2eddf8b0d0a64199765799ca60b90b7ce3a9a863de8a863f94a88199b63e097a8a8 SHA512 e62bc7ae278d4494bbd7ba11d1fcb01fd3d10a1954d39161a6dad0c30ebc52db723a9c99016635f7f1c2a0b380280d2d4990b4950f3ceeb8d8f5f78eb038ce01
 DIST Linux-PAM-1.5.2-docs.tar.xz 443276 BLAKE2B eb0376022bd17d472cfbb7d757acd9a7743d68929ac604bc7fbc27e87b35f0424e9459afff8110ee094c6914cef6e6f483e6eeb2fc2ec24909477ec53f600fa2 SHA512 69bbb52b3855a1ff3066ffe3ae1890440516311260ddfb20a7a7ea7beeb42484ea085080e3206f23933edf4a695a13f2317e33dffcab2b29f6e9e210d493e1f0
 DIST Linux-PAM-1.5.2.tar.xz 988784 BLAKE2B a835034cd239bc9377419c13dda45276e8e64a33fcf714a1957ff41112fbb6dce0be8e9773afc82458a04d54bf146a0c26117d7170521fecdc0c98184cef5f4f SHA512 fa16350c132d3e5fb82b60d991768fb596582639841b8ece645c684705467305ccf1302a0147ec222ab78c01b2c9114c5496dc1ca565d2b56bf315f29a815144
-EBUILD pam-1.5.2-r2.ebuild 4208 BLAKE2B 8d3a99649cd5a4827b6b8371917243dce9d16c226db49afabf10d14ff6d809268657535af1f9f302ca34c23b42934d2589336932c95fdddf9f3338089f7660e3 SHA512 88ad708e4c3eee179685fb25a1f90942aaf80a1b493de1b5f22fc2296ff23b2ec00cffa1601917ba74ecbfc4c60cf40555fb0f618f6e896fd5999a70fee13f90
+DIST Linux-PAM-1.5.3-docs.tar.xz 466340 BLAKE2B 6bade3c63ebe6b6ca7a86d7385850bb87bf1d6526add3ac5aad140533516c1d27b594a17d09c4127ff985c42e6c571618785d6b2a2913e6575678c4dcf947dc0 SHA512 a9082823da88e0054d74e13aef872519ced5fbef25c8cc1a7e3a99160f835aa09c9ef701b6ec507acd3b540da0019288424bb4c8ebd828181ea90450db1494a9
+DIST Linux-PAM-1.5.3.tar.xz 1020076 BLAKE2B 362c939f3afc343e6f4e78e7f6ba6f7a9c6ee0a9948bb5a4fc34cecfd29e9fa974082534d4ceedd04d8d3e34c7b3ef43d2a07ba5f41d26da04ec8330fc3790fb SHA512 af88e8c1b6a9b737ffaffff7dd9ed8eec996d1fbb5804fb76f590bed66d8a1c2c6024a534d7a7b6d18496b300f3d6571a08874cf406cd2e8cea1d5eff49c136a
 EBUILD pam-1.5.2-r3.ebuild 4274 BLAKE2B 348f6a36bee14c91966d1c628eaebf227b1c75384ddd68c6038811383888173d35634a1fcf722d21b3a585e34f80e3342b1e2d26c5dc265f8eb27d9b5081f4b8 SHA512 19c7b5889f1af2720e6d330171168a6d2a884c441a440a68f4966e5d7bba088fd680e93681121f5ebb4f0bd4892c0348484cdba1e83564b48387cf8b5759f3f5
+EBUILD pam-1.5.3.ebuild 4442 BLAKE2B 29481124e3fdf7d1acacb1272f32ca7ea424037c973f961ba8b54fd7ee230771f4d5034ce84349a6db2130a733238800c01a38d77e56d0bcd2f8f3861497ea62 SHA512 ef2c13c6f3a1e9e7bfa8dc253a460c7a822f3c7140bd8658aeedbbf44725d7a63b05468a4a720714f596a11dc3226d5ae87ab826c23839fc15e1733fe68bcfb2
 MISC metadata.xml 846 BLAKE2B e236bd8c7a53097d96164d9063d1dbb9372cef4ec92731dc43df6731cc7f4fc2935aeeb2e069b6da1d4bce3f1cc6a657e0361208581da615f3f41ec72c02261e SHA512 e2e28deadb2c941f8fa31447ec20c95ccb340d638f8b1e742a89ccc2dbb3c8d88e764f750d6e13c5a6320a612d6f2447689c02862a5e897919d1e9bca7857089
diff --git a/sys-libs/pam/pam-1.5.2-r2.ebuild b/sys-libs/pam/pam-1.5.3.ebuild
index a0d259a65eed..6ac576c5eb0b 100644
--- a/sys-libs/pam/pam-1.5.2-r2.ebuild
+++ b/sys-libs/pam/pam-1.5.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_P="Linux-${PN^^}-${PV}"
 
@@ -9,54 +9,49 @@ MY_P="Linux-${PN^^}-${PV}"
 # Can reconsider w/ EAPI 8 and IDEPEND, bug #810979
 TMPFILES_OPTIONAL=1
 
-inherit autotools db-use fcaps flag-o-matic toolchain-funcs usr-ldscript multilib-minimal
+inherit db-use fcaps flag-o-matic toolchain-funcs usr-ldscript multilib-minimal
 
 DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
 HOMEPAGE="https://github.com/linux-pam/linux-pam"
-
-SRC_URI="https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}.tar.xz
-	https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}-docs.tar.xz"
+SRC_URI="
+	https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}.tar.xz
+	https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}-docs.tar.xz
+"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="audit berkdb debug nis selinux"
 
 BDEPEND="
+	app-alternatives/yacc
 	dev-libs/libxslt
 	sys-devel/flex
 	sys-devel/gettext
 	virtual/pkgconfig
-	app-alternatives/yacc
 "
-
 DEPEND="
 	virtual/libcrypt:=[${MULTILIB_USEDEP}]
 	>=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
 	audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
 	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	nis? ( net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	>=net-libs/libtirpc-0.2.4-r2:=[${MULTILIB_USEDEP}] )"
-
+	nis? (
+		net-libs/libnsl:=[${MULTILIB_USEDEP}]
+		>=net-libs/libtirpc-0.2.4-r2:=[${MULTILIB_USEDEP}]
+	)
+"
 RDEPEND="${DEPEND}"
-
 PDEPEND=">=sys-auth/pambase-20200616"
 
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-musl.patch
-)
-
 src_prepare() {
 	default
 	touch ChangeLog || die
-	eautoreconf
 }
 
 multilib_src_configure() {
-	# Do not let user's BROWSER setting mess us up. #549684
+	# Do not let user's BROWSER setting mess us up, bug #549684
 	unset BROWSER
 
 	# This whole weird has_version libxcrypt block can go once
@@ -86,13 +81,23 @@ multilib_src_configure() {
 		--disable-regenerate-docu
 		--disable-static
 		--disable-Werror
+		# TODO: wire this up now it's more useful as of 1.5.3
+		--disable-econf
+
+		# TODO: add elogind support
+		# lastlog is enabled again for now by us until logind support
+		# is handled. Even then, disabling lastlog will probably need
+		# a news item.
+		--disable-logind
+		--enable-lastlog
+
 		$(use_enable audit)
 		$(use_enable berkdb db)
 		$(use_enable debug)
 		$(use_enable nis)
 		$(use_enable selinux)
-		--enable-isadir='.' #464016
-		)
+		--enable-isadir='.' # bug #464016
+	)
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
@@ -112,7 +117,6 @@ multilib_src_install_all() {
 
 	# tmpfiles.eclass is impossible to use because
 	# there is the pam -> tmpfiles -> systemd -> pam dependency loop
-
 	dodir /usr/lib/tmpfiles.d
 
 	cat ->>  "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}.conf <<-_EOF_