6 files changed, 182 insertions, 4 deletions
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 9af9332484cf..a1bb568f8eaf 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index d8275ab0d5d2..a19e459b143f 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -11,7 +11,9 @@ AUX nss-pam-ldapd-0.9.12-netdb-defines.patch 861 BLAKE2B a7a8774f31bd9a2a156965e
 AUX nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch 403 BLAKE2B 2e17a92b3650ce4e6627be7ddb2f656cd9ab53e49d7e2b11d078dac0d7a00015d88d861bfdc1378eb25c1b9750ed3811023cc95b04ccf9d028ffc5899dc01cd5 SHA512 c8cccb044a641f673f12db9717bda4c0c4d91bd1933342595d8f3f540449459c5cf14263133487195b223670d450873f608e3ce5b6f1ca775ca7fe0180a9f962
 AUX pynslcd.init 515 BLAKE2B 711ba152ea9cc52198171e451889ab42a224581bae7e4378846f480063ed9a672fdb38b153d6941364d3d06e325d9feb95f6fd17885b4e6181d99393cb54de0a SHA512 56334d86cc027e538d8a0bf9a8b87308e3ae6e91be608a4a630f21c57cc41b6cb5dc6fb3220fed1ca555dd4da6a5c7c10b2776f9e49a7b71a96ece21fc65fed7
 DIST nss-pam-ldapd-0.9.12.tar.gz 791983 BLAKE2B af580d400230db709f7ac09720edd6127b3b26c6987d1e8f6d6535ad8e68fd8cb5cf2a3319e4456fb2af28aba6528f7a5cdc28463ccfee747dbbf6abc35eee87 SHA512 5eca4851a9bcb2779548d193a363a143d6106bfc6463b8d3f0c2d5d7d227ec1e680861383d4813f40b44d1be2ce5f7ed019d838f7f6796e15f96f7411d3bb8f6
+DIST nss-pam-ldapd-0.9.13.tar.gz 808355 BLAKE2B a4270d5256e8277898d7deffa427c6b943b082d1dbd5b171f148ff755f79f3a3427864859fdcdb66b33fa09c1ecc8da3674ab40c240708fef0d77f43942fe5ba SHA512 6c2f73cbc800704a23cb98f405d8391dc12d2322fc6ce59cc20e9be34a74752952d8ae6c1980836fcb178a5c7e84f5ed794a15271bda90f611f9e6aefb6eee0a
 EBUILD nss-pam-ldapd-0.9.12-r2.ebuild 4351 BLAKE2B 2e857169a2558b86001961357704e8ad60fc54c8cd7770999fed9e2d8732446bc7c487e3e749473102040987f95b0b9f8dd958726fbdf2521de01cb474bc5bcb SHA512 b229587a477d9d560b597dea78dccfaa45877ab17e5a61a127a220ebf492d1a0dccad85dc40abcd83e91acfea2c477ef41f62dce81d54309e2ee38fcdbd1b0ba
 EBUILD nss-pam-ldapd-0.9.12-r3.ebuild 4516 BLAKE2B c0326692530b9c8c8286af7351e5b7b410031ce137c56fd177fe8fd3ee9b9083bbe8758af424bb1ee12fe36f281345b96ede91bfbc6d03387408a0d749437e10 SHA512 069d36ea0f05789c068c3fe67f99910444c8a447621d39b775417f5ba6bc5b95a8f19e3128c40a9b81869e9de4ea68a09bc2c56c435ef83cb152ce1218f40c85
 EBUILD nss-pam-ldapd-0.9.12-r4.ebuild 4753 BLAKE2B 626d5cb6d713f7343ed5993135b61c128bc43cf2d2bb032297101bc903023c710af683d458ca237415b79183de06bf86acda2a9864ad1f3eb060ee232a6df847 SHA512 01969d97da9633434c25c77531b3d65921e1514992e7aaed4c896afbbf2ba5296befddca56b26b86dfd0888bdb9804f6b85e81f1e6c2e2ecbd26d084d5a7b1ff
+EBUILD nss-pam-ldapd-0.9.13.ebuild 4757 BLAKE2B 677fa38f10d5b38bb3a03f9f9b2f5e08adf229df76b706351157e632e6e8d45fe4625251973263dbc5fe0c11f8eb2bd0ff66ff74844df4eb66316b168ddd1f7d SHA512 f601d228f777c1f592f65b0726733706c8e09a904736229fd32c85e273521544876ba2387a6a4c75583a519596ff010059ff9379d135c0f4d12a46fbb310f08b
 MISC metadata.xml 1170 BLAKE2B 5c121a0afae864d757fda18c8546e494804c9b9d6a7d6fe2ad485b6a7bb2ed291776063407721222fa765251c9ca4d945740e8a0aa53da670747fb35cf1b8f9e SHA512 ba534679ae3b983a9b143530112f6495a4a4b5b82077095b3cc62965c1cf808c7a2d098410c00bee195112c5e7ff3afe4b368fa9a1662ce22cf48634229df7cf
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.13.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.13.ebuild
new file mode 100644
index 000000000000..f683a99bc8d7
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.13.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools python-r1 s6 systemd tmpfiles multilib-minimal
+
+DESCRIPTION="NSS module for name lookups using LDAP"
+HOMEPAGE="https://arthurdejong.org/nss-pam-ldapd/"
+SRC_URI="https://arthurdejong.org/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug kerberos +pam pynslcd sasl selinux test +utils"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	utils? ( ${PYTHON_REQUIRED_USE} )
+	kerberos? ( sasl )
+	test? ( ${PYTHON_REQUIRED_USE} pynslcd )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/nslcd
+	acct-user/nslcd
+	net-nds/openldap:=[${MULTILIB_USEDEP}]
+	sasl? ( dev-libs/cyrus-sasl[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	sys-libs/pam[${MULTILIB_USEDEP}]
+	utils? ( ${PYTHON_DEPS} )
+	pynslcd? (
+		dev-python/python-ldap[${PYTHON_USEDEP}]
+		dev-python/python-daemon[${PYTHON_USEDEP}]
+	)
+	elibc_musl? ( sys-libs/musl-nscd )
+	!sys-auth/nss_ldap
+	!sys-auth/pam_ldap
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? ( dev-python/pylint[${PYTHON_USEDEP}] )
+"
+RDEPEND+=" selinux? ( sec-policy/selinux-nslcd )"
+
+PATCHES=(
+	"${FILESDIR}"/nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch
+	"${FILESDIR}"/nss-pam-ldapd-0.9.11-use-mkstemp.patch
+	"${FILESDIR}"/nss-pam-ldapd-0.9.11-relative-imports.patch
+	"${FILESDIR}"/nss-pam-ldapd-0.9.11-tests.patch
+	"${FILESDIR}"/nss-pam-ldapd-0.9.11-tests-py39.patch
+	"${FILESDIR}"/nss-pam-ldapd-0.9.12-netdb-defines.patch
+	"${FILESDIR}"/nss-pam-ldapd-0.9.12-configure-CFLAGS-decontamination.patch
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && python_setup
+}
+
+src_prepare() {
+	default
+
+	touch pynslcd/__init__.py || die "Could not create __init__.py for pynslcd"
+	mv pynslcd/pynslcd.py pynslcd/main.py || die
+
+        find "${S}" -name Makefile.am -exec \
+        sed -e '/^AM_CFLAGS/ s/$/ \$(DEBUG_CFLAGS) \$(EXTRA_CFLAGS)/g' \
+        -i {} \; || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-utils
+		--enable-warnings
+		--with-ldap-lib=openldap
+		--with-ldap-conf-file="${EPREFIX}"/etc/nslcd.conf
+		--with-nslcd-pidfile=/run/nslcd/nslcd.pid
+		--with-nslcd-socket=/run/nslcd/socket
+		--with-nss-flavour=glibc
+		$(use_enable pynslcd)
+		$(use_enable debug)
+		$(use_enable kerberos)
+		$(use_enable pam)
+		$(use_enable sasl)
+
+		# nss libraries always go in /lib on Gentoo
+		--with-pam-seclib-dir="${EPREFIX}"/$(get_libdir)/security
+		--libdir="${EPREFIX}"/$(get_libdir)
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_test() {
+	python_test() {
+		cp -l "${S}"/pynslcd/*.py pynslcd/ || die "Could not copy python files for tests"
+		nonfatal emake check || die "tests failed with ${EPYTHON}"
+	}
+
+	pushd "${BUILD_DIR}" >/dev/null || die
+	ln -s ../pynslcd/constants.py utils/constants.py || die
+	python_foreach_impl python_test
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if use pynslcd; then
+		python_moduleinto pynslcd
+		python_foreach_impl python_domodule pynslcd/*.py
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	newinitd "${FILESDIR}"/nslcd.init nslcd
+	s6_install_service nslcd "${FILESDIR}"/nslcd.s6
+
+	insinto /usr/share/nss-pam-ldapd
+	doins "${WORKDIR}"/${P}/nslcd.conf
+
+	fperms o-r /etc/nslcd.conf
+
+	if use utils; then
+		python_moduleinto nslcd
+		python_foreach_impl python_domodule utils/*.py
+
+		local script
+		for script in chsh getent; do
+			python_foreach_impl python_newscript utils/${script}.py ${script}.ldap
+		done
+	fi
+	if use pynslcd; then
+		rm -rf "${ED}"/usr/share/pynslcd || die
+		python_moduleinto pynslcd
+		python_foreach_impl python_domodule pynslcd/*.py
+		python_scriptinto /usr/sbin
+		python_foreach_impl python_newscript pynslcd/main.py pynslcd
+		newinitd "${FILESDIR}"/pynslcd.init pynslcd
+	fi
+
+	newtmpfiles "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf
+	systemd_newunit "${FILESDIR}"/nslcd.service nslcd.service
+}
+
+pkg_postinst() {
+	tmpfiles_process nslcd.conf
+
+	elog "For this to work you must configure /etc/nslcd.conf"
+	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
+	elog
+	elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can"
+	elog "start it like this:"
+	elog "  # /etc/init.d/nslcd start"
+	elog
+	elog "You can add it to the default runlevel like so:"
+	elog " # rc-update add nslcd default"
+	elog
+	elog "If you have >=sys-apps/openrc-0.16.3, you can also use s6"
+	elog "to supervise this service."
+	elog "To do this, emerge sys-apps/s6 then add nslcd-s6"
+	elog "default runlevel instead of nslcd."
+	elog
+	elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
+	elog " is now named /etc/nslcd.conf"
+}
diff --git a/sys-auth/pam_mysql/Manifest b/sys-auth/pam_mysql/Manifest
index d946a0b31187..cf92246979ab 100644
--- a/sys-auth/pam_mysql/Manifest
+++ b/sys-auth/pam_mysql/Manifest
@@ -1,3 +1,3 @@
 DIST pam_mysql-0.8.2.tar.gz 55023 BLAKE2B 2b278dc8cff229dd9fe9da2316f51838e6b9d57714dc07c7dfe85142ac4bb2e6c3a3de7eed7ab34917c08a07197c187434211cb7841c85f4c8d2d088309bae3a SHA512 268dd721554bc15125b6ea95b3f7b7a5f4ebf772e0ad65b6cf53d7e23d6154f10d916da774ea338a6b75427b2a6ada2b4730a57a88a15abea62a0454e7c5ea1e
-EBUILD pam_mysql-0.8.2-r1.ebuild 904 BLAKE2B 4151821f0a8b2bcb42c7c378259ff0816112926e4d56225dcda49194bd64621ad66e7fb5f00e8af3b6eff87f5001add9479c8d4dd52004b9f244b80eca0974b1 SHA512 8467fff18eb04282a2ed93c41bc1162287f6dada4ad48ed9c98274a5f1c28592bce8d7bd9720c290bb8cf635b969db43705928c6b1960f7770d2ad52c7fc252e
-MISC metadata.xml 405 BLAKE2B 7d198451e3aa26eddbdfbeae2bf0d4bccd21c37f6ff240884e0abf7e85fe5aca97f48509d76690890a41dca2916ef0df108c928f1b972ace31eb8c8a77001151 SHA512 1ecae37325853eab5d77ec19cf74a794146d2f2fd833c3b090aef29c3b337b9e4ca3513aae383b711a58942c3eafbb7ed041e5e3d58e4075e43c7608880ae8df
+EBUILD pam_mysql-0.8.2-r2.ebuild 969 BLAKE2B eb627b848cfedfdf995769ee605f8c27602f76efd71a0e585aa7c3e08f26c8615de6744e319d3bce56b9276c7c7ce16173185a0aee86d21e1d38fc087288b581 SHA512 5d6e130b346e6e022d5bcbd00c39c922632cfe0d533122a43dc047760538ceca7c065ba1418a14c44b0c8603e2659d1e17f7f757e9dbe4b58e0bfc862e3822dc
+MISC metadata.xml 470 BLAKE2B 6e17b3bee65c17cb87e4e16b0ed4dab8be2886241716442dc48181cf6660455808134983495b6acc111c5d37971dbbb369de97730c689844791442b5ea49694d SHA512 49d0ec5732f41b32c8c16bbcf0a6f31bd6bbab1878911bb55badb638ebd0ae9ba53c1c03757e755e1140ad92f236d77a8f01b419c0dbbf8e8dec66ce17b12c77
diff --git a/sys-auth/pam_mysql/metadata.xml b/sys-auth/pam_mysql/metadata.xml
index 7d38d2712c8e..b97d1775dc2f 100644
--- a/sys-auth/pam_mysql/metadata.xml
+++ b/sys-auth/pam_mysql/metadata.xml
@@ -10,5 +10,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">pam-mysql</remote-id>
+		<remote-id type="github">NigelCunningham/pam-MySQL</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-auth/pam_mysql/pam_mysql-0.8.2-r1.ebuild b/sys-auth/pam_mysql/pam_mysql-0.8.2-r2.ebuild
index b697b813dc71..6bf8eec3517f 100644
--- a/sys-auth/pam_mysql/pam_mysql-0.8.2-r1.ebuild
+++ b/sys-auth/pam_mysql/pam_mysql-0.8.2-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 inherit autotools pam
 
@@ -25,6 +25,10 @@ RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
+QA_CONFIG_IMPL_DECL_SKIP=(
+	md5_calc # for Solaris, bug #908580
+)
+
 src_prepare() {
 	default