gentoo auto-resync : 05:09:2022 - 04:23:36

5 files changed, 140 insertions, 2 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index b96e77c69f21..75825ea0372d 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index a007bb95f2ad..53ef58094cdb 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,3 +1,5 @@
 DIST cracklib-2.9.7.tar.bz2 603630 BLAKE2B 81a45b2fb9f34da84d4fb864e1a9f67a4b22c246f1e4db1c599a555f79d560a04d95afb01a89cd3a2e0936f0e8fc51ff5ada26098c24d7af0777a94f51b82bbd SHA512 f6bf65ac092ba46ff78ddbc115692260fb76dc71219cd679d2ea935ebfb9e709fbb30259a7406743ed00dbdc415335b3ac9d9fcba1d204ea36d5eb96bf1333a2
+DIST cracklib-2.9.8.tar.bz2 613017 BLAKE2B d9a5d922d6ac777b08cec9c427c0cde48666cdf67bf4136eb5866a0111b101c795dceb8e206e90bff31d1c8d26505bc1a950e8ea079562d8afd601641a7caf0c SHA512 bba1b82067156f44095b282c70c06a05e58572cde7ad2430dd24c4b42ae98be86708ea86ba8b7104aa5887e16ac90d7cf3ae613b84ab9c0f7602307d78b75371
 EBUILD cracklib-2.9.7.ebuild 2613 BLAKE2B 314ce7d109f3987f8386408bd82220793bd65b5a6a459dca63c054faf6d4432b699f226626e096fe7cf1f57d987b4f68019806dcdc70289ddd6e0ad9e53949b3 SHA512 e5e60fe3f604eccac9b0cb1d0e1c15a0c22adee15a99352517770b322d8052f295baa6b5444dbaeb0fdff3557065d7fef2697f104b8daf8cb1f63d601ac1af8c
+EBUILD cracklib-2.9.8.ebuild 2680 BLAKE2B 1cd3a943947bdcaa1ba99995f3c76b49d2bfd0cfed010566d31dfe6c64388f075ffb499abd3b099317f94f337c4f2e338ec6e44c78cabe09159fcaddd37a81a0 SHA512 74f7b0218f11a667575ddb5564aa0b952c19e8abc1edfaf2c3e00c2cc0fc15500f01ac445f06f7c3a39f27f89c70a8932cd233628efb7d64fe7adc9b3af4f632
 MISC metadata.xml 385 BLAKE2B f81e1ac44f5a4c3f647473385363eed564accca3b62ecde3cb35fab14112af1ceb2a25dc2816fc096aee9c3ed15006252f32491583861689ed70d49218684360 SHA512 6d9908f12c310ef22feeae2216236f9b632dc5204916fbb5693cc53bb58e592dc44f49c45d2c8bc22addd69cc5e4e63df463a23299d09a637f4f0f7379e7b796
diff --git a/sys-libs/cracklib/cracklib-2.9.8.ebuild b/sys-libs/cracklib/cracklib-2.9.8.ebuild
new file mode 100644
index 000000000000..4ce5daed7e30
--- /dev/null
+++ b/sys-libs/cracklib/cracklib-2.9.8.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: ideally bump with sys-apps/cracklib-words
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 libtool multilib-minimal usr-ldscript
+
+MY_P=${P/_}
+DESCRIPTION="Password Checking Library"
+HOMEPAGE="https://github.com/cracklib/cracklib/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="nls python static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( virtual/libintl )
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+do_python() {
+	multilib_is_native_abi || return 0
+	use python || return 0
+
+	pushd python > /dev/null || die
+	distutils-r1_src_${EBUILD_PHASE}
+	popd > /dev/null || die
+}
+
+pkg_setup() {
+	# Workaround bug #195017
+	if has unmerge-orphans ${FEATURES} && has_version "<${CATEGORY}/${PN}-2.8.10" ; then
+		eerror "Upgrade path is broken with FEATURES=unmerge-orphans"
+		eerror "Please run: FEATURES=-unmerge-orphans emerge cracklib"
+		die "Please run: FEATURES=-unmerge-orphans emerge cracklib"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# bug ##269003
+	elibtoolize
+
+	do_python
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		# use /usr/lib so that the dictionary is shared between ABIs
+		--with-default-dict="/usr/lib/cracklib_dict"
+		--without-python
+		$(use_enable nls)
+		$(use_enable static-libs static)
+	)
+
+	export ac_cv_header_zlib_h=$(usex zlib)
+	export ac_cv_search_gzopen=$(usex zlib -lz no)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	do_python
+}
+
+multilib_src_test() {
+	default
+
+	# Make sure we load the freshly built library
+	LD_LIBRARY_PATH="${BUILD_DIR}/lib/.libs:${LD_LIBRARY_PATH}" do_python
+}
+
+python_test() {
+	${EPYTHON} -m unittest test_cracklib || die "Tests fail with ${EPYTHON}"
+}
+
+multilib_src_install() {
+	default
+
+	# Move shared libs to /
+	gen_usr_ldscript -a crack
+
+	do_python
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -type f -name "*.la" -delete || die
+	rm -r "${ED}"/usr/share/cracklib || die
+
+	insinto /usr/share/dict
+	doins dicts/cracklib-small
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]] ; then
+		ebegin "Regenerating cracklib dictionary"
+		create-cracklib-dict "${EPREFIX}"/usr/share/dict/* > /dev/null
+		eend $?
+	fi
+}
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 317756756437..dc82eb701363 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -4,5 +4,5 @@ DIST Linux-PAM-1.5.2.tar.xz 988784 BLAKE2B a835034cd239bc9377419c13dda45276e8e64
 DIST pam-1.5.1_p20210622.tar.gz 783068 BLAKE2B c8f13c2ccef73ad367d4fac9a7d1d0d3f3d0e4f1c8eea877d2ab467411cf17cc32c6c9c89e98d94090481d7d7746723175031ba8713a8fb0c3e1976e2854e58b SHA512 5b7a84b9de2d0b0c39cb33e9b8d24aeedca670b998536d74dc497eb7af31cb1f3157f196a01712c4ae273634b51ddad2062f207534b35b1d1a1e790816c8dc1b
 DIST pam-doc-1.5.1_p20210610.tar.xz 62308 BLAKE2B b3311e704ddc840b7fd28ea7764e8a0d3fdf508e2e37405acbfa26462a188c480859b3b21bd4a4b4acea70928e68650c216e8fb2d2b6f11ba33f54c6692cf3a2 SHA512 89b88f8ebf0c46f6b25dc0c5f39383ecbef0b12d6ffab388d92026066ee986f9068819cdbf38baaa1e341cd6cc84b1e8d3ad02db121aaf0ddad27e4e6efe26e7
 EBUILD pam-1.5.1_p20210622-r1.ebuild 3659 BLAKE2B 00ad76cec99ccc356d6e594125921b58dea4112bc8dd06b86a57d19c4b688511517c8a3c4205dc7cd3a1b20fa92b39e5ade0114594a8c765146fe11ccae56bb4 SHA512 12335aac62d987c2cfb8d1f630b0c0c3030c945382b5b6cf42aedd4eb75570a3f6cc98f12b9a43e4b81607c31a159f14ca3721534d089c151d4a6841d1b5b479
-EBUILD pam-1.5.2-r2.ebuild 3654 BLAKE2B c82ac38a6936c69ff06fd0768dd697e40561a01f143b8e27eecadd84459fe398b42c94e8c41885266172e0226094b1918d147c563b75bfa6e8e204466233cb5a SHA512 aa73c97f7609204c1650b6eaf3cb2b338c0bde66e3d17038de80fa3dc458d4d2e2acbde02768642b39e784d0942a554a451e302d3a65a10f35b7136bcc98f537
+EBUILD pam-1.5.2-r2.ebuild 4199 BLAKE2B b0f2f6a01cbb35f0b59a1cb99c66082f7e7c70988805e82da426fb07e809d57c2bd4c199501b4a0683fd817a57e46cc88af66668b80fbf79eb9374f4cdcc1557 SHA512 d1e82ecc18003e4c76d1d7be8ee2931be809fa35a6851cc84319b452ae26f8bf2106aa4e2929e29f9cc25d9888738f38c6464508588877b8999dfa1ae072b982
 MISC metadata.xml 754 BLAKE2B 366be10dfcad98d08ea3e307312b9a84804efa6f097f1505907e03fcb5fd0f4a6067d1d85d8dc5fec82c54c2e1fdf76d716d09a45571b0994d96130a2506e1f5 SHA512 b453a62fc3cdc6c0e7cd9c15d1bf72f8641a8eefc3971304ae5f0db3c93b69ca5f9c059e70b94ce799b15b640831c8832707fc1740f1361aca3a28c30ae8f366
diff --git a/sys-libs/pam/pam-1.5.2-r2.ebuild b/sys-libs/pam/pam-1.5.2-r2.ebuild
index 428087494c40..5a8c46443f0d 100644
--- a/sys-libs/pam/pam-1.5.2-r2.ebuild
+++ b/sys-libs/pam/pam-1.5.2-r2.ebuild
@@ -9,7 +9,7 @@ MY_P="Linux-${PN^^}-${PV}"
 # Can reconsider w/ EAPI 8 and IDEPEND, bug #810979
 TMPFILES_OPTIONAL=1
 
-inherit autotools db-use fcaps toolchain-funcs usr-ldscript multilib-minimal
+inherit autotools 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"
@@ -59,6 +59,19 @@ multilib_src_configure() {
 	# Do not let user's BROWSER setting mess us up. #549684
 	unset BROWSER
 
+	# This whole weird has_version libxcrypt block can go once
+	# musl systems have libxcrypt[system] if we ever make
+	# that mandatory. See bug #867991.
+	if use elibc_musl && ! has_version sys-libs/libxcrypt[system] ; then
+		# Avoid picking up symbol-versioned compat symbol on musl systems
+		export ac_cv_search_crypt_gensalt_rn=no
+
+		# Need to avoid picking up the libxcrypt headers which define
+		# CRYPT_GENSALT_IMPLEMENTS_AUTO_ENTROPY.
+		cp "${ESYSROOT}"/usr/include/crypt.h "${T}"/crypt.h || die
+		append-cppflags -I"${T}"
+	fi
+
 	local myconf=(
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 		--with-db-uniquename=-$(db_findver sys-libs/db)