gentoo auto-resync : 04:05:2024 - 00:00:19

3 files changed, 12 insertions, 15 deletions

diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index ec3171172ef7..8924f1281699 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,6 +1,8 @@
 AUX pam-1.5.3-termios.patch 913 BLAKE2B 3fdb9c6320c56fd2c10b76b58700263a1c190dde4a62bb33fdfe2e59e2aebedffe87bd14fb7f02ca9c3df8f9ca21af13a1e5b42cd4eb0b112bb03f311e975288 SHA512 c432af010b188ff8a3f1fb08cc7e68b12651f8a2592fa43c5aec8c60e938c04a62ae67bc0fdb6704df3ec39aa3b40a56c1abbf07e0e5105a7b7ca4af7e44c715
 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.3-r1.ebuild 4434 BLAKE2B 2cbae80c11bce368612d2017aefb427658955413aac256643ff217cb51566e5b24f3ed6dac871c1c56250f55b9e8b6db42fd997367ede47a928d42cda5cc27bc SHA512 ede5e5a287f03daa9fb576c55583cd32534496d58561eaff8d76d9ebd5afe29a016f133c44c8c65d8ede3edd671e6f31835af08111ed6515367fed756dd7cab9
-EBUILD pam-1.5.3.ebuild 4487 BLAKE2B df92ac6e275d0e1b5c881eeca87a10aade04fcfe7f4db37d7da72ace5c878be0858272a5eba57da2237662b674f8e7eb8c810cb2e48c1bf41944dccdddc86b87 SHA512 0fee84d5efab16672b8cbb2eee4802b2d12020ca6b07186f1510f05467dfebfbaf627733fcb67eb2cf04acb5f935ce5ebe26e467e17d349e57b17f8065438272
+DIST Linux-PAM-1.6.1-docs.tar.xz 465516 BLAKE2B c39dfba2e327120edc1f30be6ea7f8e6cf20d1f4dd17752cc34e0ae1c0bd22b3d19b94ab665bf3df5bd6ecc7fc358dbbedd8a3069df95ff6189580e538aa3547 SHA512 c6054ec6832f604c0654cf074e4e241c44037fd41cd37cca7da94abe008ff72adc4466d31bd254517eda083c7ec3f6aefd37785b3ee3d0d4553250bd29963855
+DIST Linux-PAM-1.6.1.tar.xz 1054152 BLAKE2B 649b4ff892fbd3eb90adcbd9ccc5b3f5df51bf1c79b9084c7a1613c432587b13b81761d1eb4f31ef12d58843d16af24a3c441d0b6f5d2f2a1db9c8da15a61e2f SHA512 ddb5a5f296f564b76925324550d29f15d342841a97815336789c7bb922a8663e831edeb54f3dcd1eaf297e3325c9e2e6c14b8740def5c43cf3f160a8a14fa2ea
+EBUILD pam-1.5.3-r1.ebuild 4462 BLAKE2B f0129140303ad021889f2bcdfd9d49277ca8f1a89ac49ee66a6769bf9d4c3ac0c31fdaf1cf2e7c0157a9b7e29399bf0906149ef2d339d5f71e49416f7bb70747 SHA512 c065fd998e4df0fda9fd8bf34ff274033e30b2d4ed920ddea3e1f6c118750d64c650783b7ec3138c8b444ae8205ef8ed3181d282177e21c0d74bdb5065b18bcb
+EBUILD pam-1.6.1.ebuild 4473 BLAKE2B 649271aee3c5bc0a2dbe24ec78d6b50a260cbde3cdc2b0665c5688cf453f14643a927b7121b2082a8b37e75fed81f7253111bb3971c7b96761ebf9d2d4ddf4a5 SHA512 2712effc8e1d76e20106a658607e9cc1724b6ee0805894f852b9956c36710266757df356b7250388d57e72d6004095e4b893d3876afff506e35276dee5f8af73
 MISC metadata.xml 846 BLAKE2B e236bd8c7a53097d96164d9063d1dbb9372cef4ec92731dc43df6731cc7f4fc2935aeeb2e069b6da1d4bce3f1cc6a657e0361208581da615f3f41ec72c02261e SHA512 e2e28deadb2c941f8fa31447ec20c95ccb340d638f8b1e742a89ccc2dbb3c8d88e764f750d6e13c5a6320a612d6f2447689c02862a5e897919d1e9bca7857089
diff --git a/sys-libs/pam/pam-1.5.3-r1.ebuild b/sys-libs/pam/pam-1.5.3-r1.ebuild
index 5e9602e23a38..db88b6e80235 100644
--- a/sys-libs/pam/pam-1.5.3-r1.ebuild
+++ b/sys-libs/pam/pam-1.5.3-r1.ebuild
@@ -85,10 +85,10 @@ multilib_src_configure() {
 		--disable-regenerate-docu
 		--disable-static
 		--disable-Werror
-		# TODO: wire this up now it's more useful as of 1.5.3
+		# TODO: wire this up now it's more useful as of 1.5.3 (bug #931117)
 		--disable-econf
 
-		# TODO: add elogind support
+		# TODO: add elogind support (bug #931115)
 		# lastlog is enabled again for now by us until logind support
 		# is handled. Even then, disabling lastlog will probably need
 		# a news item.
diff --git a/sys-libs/pam/pam-1.5.3.ebuild b/sys-libs/pam/pam-1.6.1.ebuild
index 2ddcf24b4f38..06b8b9406e7e 100644
--- a/sys-libs/pam/pam-1.5.3.ebuild
+++ b/sys-libs/pam/pam-1.6.1.ebuild
@@ -9,7 +9,7 @@ MY_P="Linux-${PN^^}-${PV}"
 # Can reconsider w/ EAPI 8 and IDEPEND, bug #810979
 TMPFILES_OPTIONAL=1
 
-inherit db-use fcaps flag-o-matic toolchain-funcs usr-ldscript multilib-minimal
+inherit db-use fcaps flag-o-matic toolchain-funcs multilib-minimal
 
 DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
 HOMEPAGE="https://github.com/linux-pam/linux-pam"
@@ -21,8 +21,8 @@ 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"
-IUSE="audit berkdb debug nis selinux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit berkdb examples debug nis selinux"
 
 BDEPEND="
 	app-alternatives/yacc
@@ -45,10 +45,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 PDEPEND=">=sys-auth/pambase-20200616"
 
-PATCHES=(
-	"${FILESDIR}/${P}-termios.patch"
-)
-
 src_prepare() {
 	default
 	touch ChangeLog || die
@@ -85,10 +81,10 @@ multilib_src_configure() {
 		--disable-regenerate-docu
 		--disable-static
 		--disable-Werror
-		# TODO: wire this up now it's more useful as of 1.5.3
+		# TODO: wire this up now it's more useful as of 1.5.3 (bug #931117)
 		--disable-econf
 
-		# TODO: add elogind support
+		# TODO: add elogind support (bug #931115)
 		# lastlog is enabled again for now by us until logind support
 		# is handled. Even then, disabling lastlog will probably need
 		# a news item.
@@ -96,6 +92,7 @@ multilib_src_configure() {
 		--enable-lastlog
 
 		$(use_enable audit)
+		$(multilib_native_use_enable examples)
 		$(use_enable berkdb db)
 		$(use_enable debug)
 		$(use_enable nis)
@@ -112,8 +109,6 @@ multilib_src_compile() {
 multilib_src_install() {
 	emake DESTDIR="${D}" install \
 		sepermitlockdir="/run/sepermit"
-
-	gen_usr_ldscript -a pam pam_misc pamc
 }
 
 multilib_src_install_all() {