9 files changed, 174 insertions, 94 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 57a1ee2e9cef..8ddd7dcde02b 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libmemcached/Manifest b/dev-libs/libmemcached/Manifest
index b70b5a216c47..9c0466f9b911 100644
--- a/dev-libs/libmemcached/Manifest
+++ b/dev-libs/libmemcached/Manifest
@@ -5,5 +5,5 @@ AUX libmemcached-1.0.18-disable-sphinx.patch 264 BLAKE2B 6b26230f2c79d4f9f0cffcd
 AUX libmemcached-1.0.18-gcc7.patch 846 BLAKE2B 6c82a0cec03e6992e975b30a6c2b00bf6630104b107ee1241fc9fc6be11054f3def0b2a3c9606762d193f7c729e3ef31865cdaab6b4294071a14bbb0a0aed212 SHA512 87667843bee44e1388f6088085a5d0c3a3a824f4830861024f5a19ab1747e96a74b8fae5870f848358a66258aeb18c9a6fa3a1d17bd03260b41f389e01e19c49
 AUX libmemcached-1.0.18-musl.patch 1495 BLAKE2B be213de08d246829d5a017ca4f77c7c4581ead106c7ec817511698f2d66bca3271c2d2ab5f2017a15545538787f0c3a6bee8d0b148b180718fd43809a6bc6b6c SHA512 ddb0594d826d756115743caec69762995fd25e09fd3765c685cfd558e2918ffad0679fc2872d37c8e1954cbcdc14852dd861fcbf9eac645f47a86265ab2bd651
 DIST libmemcached-1.0.18.tar.gz 1039649 BLAKE2B e55acdc4c0cb2417f01b2980f7f71d9dfd685877361622422ee812f9e066ed2711549d457cf1b4a48a14c778e820b54abfe0c6274812c71fc7961e68167975e9 SHA512 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585
-EBUILD libmemcached-1.0.18-r4.ebuild 1405 BLAKE2B 31c13537a1643368d6b61c8345ca831f87f6be44c8b9a91bf3e170598834a8accbda232a4370cfe2ef2c21f81f1bd7184820e4ef0d50be66fea3f08d3671abf5 SHA512 5506713ed94046270f469af8595e31746f6ee7b03ccd9a5cf9725d87cbf5fb2e22b12aa65589c29da7287194dd31e9eabf64b82ceadc2c07866135f3a7347f3b
+EBUILD libmemcached-1.0.18-r4.ebuild 1412 BLAKE2B 64908570c6deec09bd6b1777e6a2e00054ba81a413c41a2e8c01b2f94c3cea3304f89f10226cdd408cc77859285dec1f31f6fb2277283ab9c9020835c232b171 SHA512 f3f1998d49651d7fbbece7c61f81d47d0845309c880334df0bb0f97aa8f0746f360643bba06730e3ba48f549e4fe4d9f35d1f58bd76bc38b219c48094fa3bcc5
 MISC metadata.xml 827 BLAKE2B b3e3a04c088a9119eba98099919684fc7b59205259b6cac2301eefbfe3623d4dac1fc9692abce68505af65fb8a5a277337488f18d32bdf6e3823199a3c86391f SHA512 579b472acfc9763e94e7ccbf8173327aa40cc89c7dddb4234e20e9106aab809ccc928cf197c81f5bea096c2c2fb6703aba518e003122d7e552f75e7d59cb2f25
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
index 494ea66b4cd5..d92170ea5003 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug hsieh +libevent sasl"
 # https://bugs.gentoo.org/498250
 # https://bugs.launchpad.net/gentoo/+bug/1278023
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index 3b82cbaaf945..f2bcd5a93877 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,3 +1,6 @@
+AUX libpwquality-1.4.4-musl-fgetpwent_r.patch 1260 BLAKE2B e9c9df60e0e1ba022185393f044190e0539950e5bf1f58a9c1ade2174fd8d04158b8834c8581bcd3818a7c95206a2dc288176dab21a31a809792ebbedfa4bb94 SHA512 e9f6fc0e21128eb306c9ad777d6b034f01e5d5a751c055fe6cc3f2f9ef03a3e4b718ebcf1f549922ffe4356e9c0bc8225e194c94bcc37c29b200f982c3179700
+AUX libpwquality-1.4.4-pam_pwquality-include.patch 1208 BLAKE2B d7899e6caeb8a1f4515026165d9a321e0a7840b45e4f2472a8562f7a88e35c80f7295349491f3a0037da1ff12e7c74e99236c4ef1d3334fbc477bf393bf3954b SHA512 e570c7f036a1182e43c63b852040468b0dd45ca115ff98f62bc4d3bba02b0c368cd9b1e857e39ea5fcd0b74b265cc7baea529359593512d896f65c6b658afd27
 DIST libpwquality-1.4.4.tar.bz2 426923 BLAKE2B 732e349a89b418d0b29d433551cd67e7b5f0daacb50ea73cfa7e45623801f6b559322645b4f4b0d741512964556d7e004d6a1c63b20e395c3c1b96923506e8bb SHA512 2d49b79105361663f009f7183fde9123e6f1e63bd678dfe5418143f611e763af8dd44374b826b3c22a00e721047c539741dc44d99a2289b9ab229791768d6e76
 EBUILD libpwquality-1.4.4-r1.ebuild 2088 BLAKE2B 45114a8a0e6fad03eb18ed2e8f0a7229115ed715a2c5a986e734f2cf26bdacacc4c4b357c72bf1bafdc8c733390d5fdc194bd0892fbbd6b588cff35be546dadf SHA512 eb83fcec8077595910448d3be5580438e7842e395d0066d34f4a708fffb9c766c2fe5baccc00180d0ea885f9d41ad60ae749c526bb41d14a31b6a16d5782d676
+EBUILD libpwquality-1.4.4-r2.ebuild 2278 BLAKE2B fc91df1168c79e5c3305560578afe3ad6d2c230f92daa4097b8db7d68c2982e15b551afad4464d7d65ed4f2439b7fb539017b8aff8924ad72a6d9a0e89c68c92 SHA512 bad219ff9eb5c5497526aeda7a83d0e74dc7b377a09909efb401e895a8563f67ef12ae6f4c76b4a8468ed039698744656cee6f7c479fb60a71428ea515168c64
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libpwquality/files/libpwquality-1.4.4-musl-fgetpwent_r.patch b/dev-libs/libpwquality/files/libpwquality-1.4.4-musl-fgetpwent_r.patch
new file mode 100644
index 000000000000..6cfb538103ae
--- /dev/null
+++ b/dev-libs/libpwquality/files/libpwquality-1.4.4-musl-fgetpwent_r.patch
@@ -0,0 +1,42 @@
+https://github.com/libpwquality/libpwquality/commit/9084c1b032161cdb53d5f66132a91bdc207faecf
+
+From: Noel Kuntze <noel.kuntze@thermi.consulting>
+Date: Mon, 24 May 2021 14:15:34 +0200
+Subject: [PATCH] pam_pwquality.c: Use pam_modutil_check_user_in_passwd instead
+ of fgetpwent_r (not available on musl)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -97,6 +97,11 @@ if test "$enable_pam" != "no"; then
+       test $fail = 1 &&
+         AC_MSG_ERROR([You must install the PAM development package in order to compile libpwquality])
+   fi
++  AC_CHECK_FUNC(
++    [pam_modutil_check_user_in_passwd],
++    [AC_DEFINE([HAVE_PAM_CHECK_USER_IN_PASSWD], [], [have pam_modutil_check_user_in_passwd])],
++    []
++  )  
+ fi
+ 
+ if test "$enable_pam" = "yes"; then
+--- a/src/pam_pwquality.c
++++ b/src/pam_pwquality.c
+@@ -98,6 +98,9 @@ static int
+ check_local_user (pam_handle_t *pamh,
+                   const char *user)
+ {
++#ifdef HAVE_PAM_CHECK_USER_IN_PASSWD
++        return pam_modutil_check_user_in_passwd(pamh, user, NULL) == PAM_SUCCESS;
++#else
+         struct passwd pw, *pwp;
+         char buf[4096];
+         int found = 0;
+@@ -136,6 +139,7 @@ check_local_user (pam_handle_t *pamh,
+         } else {
+                 return found;
+         }
++#endif
+ }
+ 
+ PAM_EXTERN int
+
diff --git a/dev-libs/libpwquality/files/libpwquality-1.4.4-pam_pwquality-include.patch b/dev-libs/libpwquality/files/libpwquality-1.4.4-pam_pwquality-include.patch
new file mode 100644
index 000000000000..2ed638c1e34a
--- /dev/null
+++ b/dev-libs/libpwquality/files/libpwquality-1.4.4-pam_pwquality-include.patch
@@ -0,0 +1,35 @@
+https://github.com/libpwquality/libpwquality/pull/62
+
+From 27057c6cbf528108c35df934280c7dd83e8d5ce9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 7 Sep 2022 05:42:17 +0100
+Subject: [PATCH] pam_pwquality: add include for
+ pam_modutil_check_user_in_passwd
+
+After 9084c1b032161cdb53d5f66132a91bdc207faecf, one gets:
+```
+pam_pwquality.c: In function 'check_local_user':
+pam_pwquality.c:102:16: error: implicit declaration of function 'pam_modutil_check_user_in_passwd' [-Werror=implicit-function-declaration]
+  102 |         return pam_modutil_check_user_in_passwd(pamh, user, NULL) == PAM_SUCCESS;
+      |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+cc1: some warnings being treated as errors
+make[2]: *** [Makefile:634: pam_pwquality.lo] Error 1
+make[2]: *** Waiting for unfinished jobs....
+```
+
+We need to include security/pam_modutil.h when appropriate.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/pam_pwquality.c
++++ b/src/pam_pwquality.c
+@@ -34,6 +34,10 @@
+ #include <security/_pam_macros.h>
+ #include <security/pam_ext.h>
+ 
++#ifdef HAVE_PAM_CHECK_USER_IN_PASSWD
++#include <security/pam_modutil.h>
++#endif
++
+ /* argument parsing */
+ #define PAM_DEBUG_ARG       0x0001
+ 
diff --git a/dev-libs/libpwquality/libpwquality-1.4.4-r2.ebuild b/dev-libs/libpwquality/libpwquality-1.4.4-r2.ebuild
new file mode 100644
index 000000000000..460d78a4c2b0
--- /dev/null
+++ b/dev-libs/libpwquality/libpwquality-1.4.4-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools pam python-r1 usr-ldscript
+
+DESCRIPTION="Library for password quality checking and generating random passwords"
+HOMEPAGE="https://github.com/libpwquality/libpwquality"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="pam python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	>=sys-devel/gettext-0.18.2
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=sys-libs/cracklib-2.8:=[static-libs(+)?]
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-musl-fgetpwent_r.patch
+	"${FILESDIR}"/${PN}-1.4.4-pam_pwquality-include.patch
+)
+
+src_prepare() {
+	default
+	# ensure pkgconfig files go in /usr
+	sed -e "s:\(pkgconfigdir *=\).*:\1 ${EPREFIX}/usr/$(get_libdir)/pkgconfig:" \
+		-i src/Makefile.{am,in} || die "sed failed"
+
+	# Needed for musl patch, drop on next release
+	eautoreconf
+
+	if use python ; then
+		# bug #830397
+		export SETUPTOOLS_USE_DISTUTILS=stdlib
+		python_copy_sources
+	fi
+}
+
+src_configure() {
+	# Install library in /lib for pam
+	configuring() {
+		local sitedir
+		econf \
+			--libdir="${EPREFIX}/$(get_libdir)" \
+			$(use_enable pam) \
+			--with-securedir="${EPREFIX}/$(getpam_mod_dir)" \
+			$(use_enable python python-bindings) \
+			$(usex python "--with-pythonsitedir=$(use python && python_get_sitedir)" "") \
+			$(use_enable static-libs static)
+	}
+	if_use_python_python_foreach_impl configuring
+}
+
+src_compile() {
+	if_use_python_python_foreach_impl default
+}
+
+src_test() {
+	if_use_python_python_foreach_impl default
+}
+
+src_install() {
+	if_use_python_python_foreach_impl default
+	if use static-libs; then
+		# Do not install static libs in /lib
+		mkdir -p "${ED}/usr/$(get_libdir)"
+		mv "${ED}/$(get_libdir)/libpwquality.a" "${ED}/usr/$(get_libdir)/" || die
+		gen_usr_ldscript libpwquality.so
+	fi
+	find "${ED}" -name '*.la' -delete || die
+}
+
+if_use_python_python_foreach_impl() {
+	if use python; then
+		python_foreach_impl run_in_build_dir "$@"
+	else
+		"$@"
+	fi
+}
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index f04f950bed58..6f96fe4c1c03 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,6 +1,5 @@
 AUX redland-1.0.17-ldflags-pc-leak.patch 716 BLAKE2B 1f8b458270dba77a0ef87355dcaea697ed1c34ce2a23ec7306c5e9d5fe88163570c607bb22710e3ead38999acf629c4f0958db74077e1c3c3f4717477d73b798 SHA512 7aad38f953e4d8744f4804038f972a9520f61c28e57f8b92e5c44f554f8017eae22a2d5b07b65caf0908407ccfeab5835190376a3c9ef125517fd6f9e75805f6
 AUX redland-1.0.17-mysql-8-my_bool.patch 462 BLAKE2B f1a34d640698149b45a6a23c961690c79c02760b16c1087a79c27e8443cb956e953b02f9d435176c890500e4942cd37fe2c0105295490a3f4a629a651146fe33 SHA512 c796f5b6a3231a150310a889890137a7dd510cc75c8b80fead9db3c8fa4de27a132c58ad261188a6c6359f1debcd9b5ba273b7af4af3242035d4f6bc12364643
 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850
-EBUILD redland-1.0.17-r2.ebuild 2538 BLAKE2B b319b82ab865d47ca3217177ec3ec82d86d8d4f98f36b495ca607015f3ba4aadcefc8502a50b490f472cf420c096683fc9ad353ad846845c811ab632c0d135f7 SHA512 9391a54cbee61d1ee54f2a04f2dc1604e0b837d247c9b629b71ac35f4225156cec9bed62236c1cdf407fb0ac1951a7fc534ab167c231f780b676cbfb439e16aa
 EBUILD redland-1.0.17-r3.ebuild 2073 BLAKE2B d48888e71ead61c51120aea7131fb65e048323d4a9032aebd3398d25871c0e7cd702b12433089e7347d4b11ddfbc3018b0f0dd4ab080884bd798c2dcbcfc45c8 SHA512 11fbac898cc1a9ae0cdb5c57868f5a5cb2851d9e35732bfef0ede1996bbe3b82feb2033b2ad3d9cde64b35ae4045745fb6c5071895ff096bfc55ce299ebc4f95
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/dev-libs/redland/redland-1.0.17-r2.ebuild b/dev-libs/redland/redland-1.0.17-r2.ebuild
deleted file mode 100644
index 2e53e182c36d..000000000000
--- a/dev-libs/redland/redland-1.0.17-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit db-use libtool
-
-DESCRIPTION="High-level interface for the Resource Description Framework"
-HOMEPAGE="http://librdf.org/"
-SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"
-
-RDEPEND="dev-libs/libltdl:0
-	mysql? ( dev-db/mysql-connector-c:0= )
-	sqlite? ( =dev-db/sqlite-3* )
-	berkdb? ( sys-libs/db )
-	>=media-libs/raptor-2.0.14
-	>=dev-libs/rasqal-0.9.32
-	postgres? ( dev-db/postgresql )
-	iodbc? ( dev-db/libiodbc )
-	odbc? ( dev-db/unixODBC )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.17-mysql-8-my_bool.patch )
-
-MAKEOPTS="${MAKEOPTS} -j1" #500574, required for both src_compile() and src_install()
-
-src_prepare() {
-	default
-	elibtoolize # NOTE: this is for fbsd .so version
-}
-
-src_configure() {
-	local myconf=( --without-virtuoso )
-	if use iodbc; then
-		myconf=( --with-virtuoso --with-iodbc --without-unixodbc )
-	elif use odbc; then
-		myconf=( --with-virtuoso --with-unixodbc --without-iodbc )
-	fi
-
-	if use berkdb; then
-		myconf+=(
-			--with-bdb-include="$(db_includedir)"
-			--with-bdb-lib="${EPREFIX}"/usr/$(get_libdir)
-			--with-bdb-dbname="$(db_libname)"
-		)
-	fi
-
-	# FIXME: upstream doesn't test with --with-threads and testsuite fails
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with berkdb bdb) \
-		$(use_with mysql) \
-		$(use_with sqlite) \
-		$(use_with postgres postgresql) \
-		--without-threads \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		"${myconf[@]}"
-}
-
-src_test() {
-	if ! use berkdb; then
-		export REDLAND_TEST_CLONING_STORAGE_TYPE=hashes
-		export REDLAND_TEST_CLONING_STORAGE_NAME=test
-		export REDLAND_TEST_CLONING_STORAGE_OPTIONS="hash-type='memory',dir='.',write='yes',new='yes',contexts='yes'"
-	fi
-	default
-}
-
-src_install() {
-	default
-	docinto html
-	dodoc {FAQS,NEWS,README,RELEASE,TODO}.html
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	# !!! REMOVE THIS ON VERSION BUMP, see bug 468298 for proper fix !!!
-	if [[ -n ${LDFLAGS} ]]; then
-		sed -i \
-			-e "s:${LDFLAGS} ::g" \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/${PN}.pc || die
-	fi
-
-	# https://bugs.gentoo.org/467768
-	local _rdocdir=/usr/share/doc/${PF}/html/${PN}
-	[[ -d ${ED}/${_rdocdir} ]] && dosym ${_rdocdir} /usr/share/gtk-doc/html/${PN}
-}