14 files changed, 255 insertions, 62 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 916ac78c7d2c..88acdc2e048a 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/nss_wrapper/Manifest b/sys-libs/nss_wrapper/Manifest
index b31a562c752a..3367875b203f 100644
--- a/sys-libs/nss_wrapper/Manifest
+++ b/sys-libs/nss_wrapper/Manifest
@@ -1,5 +1,4 @@
-DIST nss_wrapper-1.1.12.tar.gz 176038 BLAKE2B 16c8b81dc9a56b074d61ddb3c7ac6108ce4a2494081341b4a734d21017236c864652db06d9e7a9f3584c286b24a46be184156b1c1c9be04a37e7906f75dc4adf SHA512 ff2efc70b29b30a2761952637c3794e73da2c8ae9273222b146e62312acd2b3bdecfca54722ca86c9a2fd700162717782b2b8f8072e76c17657e44c602911a2b
+AUX nss_wrapper-1.1.15-cmocka-cmake.patch 839 BLAKE2B 1c09c413f1f7f77e91385cd5872e8265ea3acf0b9a79f4303a60cb89d1dd63709686cd257cf837ef41d33b2acba3848d1a48eca6dfcbf6f7c0ef6957bab39e7b SHA512 89552fc49217a75b5e4db55a87ea14f88f0de3a788ca8978c891897d88b19ea262d16bb85a372891794763aa28e9b01ac01b926832bfe21823f9887331e16aa1
 DIST nss_wrapper-1.1.15.tar.gz 185236 BLAKE2B 9c087ec3118eabccef386214abf76d384d9f85bb095aded43492a7f41b13e196a92e088ca7b8b798f9517cbbdc1cf5efbe3c7201cbb623322a9277681203954a SHA512 803dfb67e042800e60f4735177384ff3b9348f4c96c02e62ae0b449583542fdaf443eb1fa48b5d5e4ea6fe0d81ce84f340bd406c968c05f71b5c64dd499feacd
-EBUILD nss_wrapper-1.1.12.ebuild 583 BLAKE2B 897dd3573568c9b358cf8b2489d59ec9f30b3a545fba33c17d3a1b96428fa285fc3ece39ce5e4d3765fd487c409283981e56e67bcbe3cdb42b703ce481a5bdc5 SHA512 7270119ba6a55e136375d8368d43204a51e127467f97a62c8d2eb496532524f3e402a3ca8882a5a87a06aafbf933684809e46ee097053a3dd7768cea788661eb
-EBUILD nss_wrapper-1.1.15.ebuild 589 BLAKE2B ebb098a005340b3a449a6db70ed8bba2ed7e904832e06be544f4ba20b2a711d8bdc1176693436604e804e1532f82268f95970ac4e150ec440b5ab90b4e4d72e9 SHA512 b8366e74de3d1e47ea5fb16545820d929317079e420f071a201f23ab1dc9e92ca620873ef4050c0b963de725e835e6b470cf11ab18fdc146a98fb6f472d586c2
+EBUILD nss_wrapper-1.1.15.ebuild 742 BLAKE2B fa74c9537603f0ad62f79ac2f446d02cf9d286f2161c9c24f881b1fd408466800e19a38f4345540673b43fbb0b3aca102bfadb0510c400d0afa8fb098b33aa19 SHA512 43997a7bdd2c9dd5b1b40d2f1c731c64011c1e7aab58590d20c69f5272af3eb215ffe6d80dffcaffd08bf14c4d01eb29ebaf07c43ebd33cb75202eafdddec85f
 MISC metadata.xml 250 BLAKE2B e398673dd1a3522ccddb89a82a53fc2578d8e0777ec46f889d01d618609a22958d91699beef513c7912799e0e8ff985200f7c67bba941235da25c24cd4b48f09 SHA512 16834c3cbecd0dd5a9c8c311d2b8ebc63d8cd72c5891498f4f0048988993c104aadd4e24e632bf54071c11f810716432e89e4afab029555875f9f52794daa6e9
diff --git a/sys-libs/nss_wrapper/files/nss_wrapper-1.1.15-cmocka-cmake.patch b/sys-libs/nss_wrapper/files/nss_wrapper-1.1.15-cmocka-cmake.patch
new file mode 100644
index 000000000000..503066dd30b9
--- /dev/null
+++ b/sys-libs/nss_wrapper/files/nss_wrapper-1.1.15-cmocka-cmake.patch
@@ -0,0 +1,26 @@
+https://git.samba.org/?p=nss_wrapper.git;a=commit;h=2c879a0ffa70cee33329291d7576ec971d420da2
+
+From 2c879a0ffa70cee33329291d7576ec971d420da2 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Fri, 17 Feb 2023 17:51:27 +0100
+Subject: [PATCH] cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,5 +1,9 @@
+ project(tests C)
+ 
++if (TARGET cmocka::cmocka)
++    set(CMOCKA_LIBRARY cmocka::cmocka)
++endif()
++
+ set(TESTSUITE_LIBRARIES nss_utils ${NWRAP_REQUIRED_LIBRARIES} ${CMOCKA_LIBRARY})
+ string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+ 
+-- 
+2.34.1
diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.12.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.12.ebuild
deleted file mode 100644
index baba871e3046..000000000000
--- a/sys-libs/nss_wrapper/nss_wrapper-1.1.12.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Wrapper for the user, group and hosts NSS API"
-HOMEPAGE="https://cwrap.org/nss_wrapper.html"
-SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-util/cmocka )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake-multilib_src_configure
-}
diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.15.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.15.ebuild
index f2ca73072069..b99114af385b 100644
--- a/sys-libs/nss_wrapper/nss_wrapper-1.1.15.ebuild
+++ b/sys-libs/nss_wrapper/nss_wrapper-1.1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,17 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="test? ( dev-util/cmocka )"
+# sys-libs/uid_wrapper is used to "better test initgroups()" optionally
+BDEPEND="
+	test? (
+		dev-util/cmocka
+		sys-libs/uid_wrapper
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmocka-cmake.patch
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/sys-libs/pam_wrapper/Manifest b/sys-libs/pam_wrapper/Manifest
index 7da8336e3805..ec6b57307663 100644
--- a/sys-libs/pam_wrapper/Manifest
+++ b/sys-libs/pam_wrapper/Manifest
@@ -1,5 +1,10 @@
 AUX pam_wrapper-1.1.4-tests-import.patch 767 BLAKE2B 65ce88028190bbbd3aacdf0a3af7591ebe90e4c24fb3502ef631ee8b126377cc6fe2a8a124658d5624e569235c9d48751e1f8142dbb87f5179d6017647991f3c SHA512 420704520ef5e4d6e1a5f4fca64619ab29765e9a5ddd347d1fc5427664e212695b6c19d7c15fe787f7375570378a261fab99c2b345ff7e96f3a7aaaf35e51939
+AUX pam_wrapper-1.1.5-env-var-typo.patch 957 BLAKE2B 8dbbe94484339ff2b1062c43133fc9d5986cdcbf70d26e2eee65a990a273cfcb7dda8fd9c8d240481528fb49ab2c32e1538a0e79d7cfd3c443fa3acb45852b04 SHA512 a220ea15815185c58184947123d7ba3fd2cc150f276f38bce222f3979c478459db344a87ea401bc239748855d81ec993e48b15c60be98006f0c99d61585c76ed
+AUX pam_wrapper-1.1.5-mkdir-race.patch 1476 BLAKE2B fcd85c50086dfe54b2473b885aba4a2891a55f18e9c61c98f345d1f86d2b3dd320eab7e491b01916760a82092d51f990cb742141e36c899c2e4756bfae426b57 SHA512 60d0f0d62fa73f0fc2aeeb1218197435e8266ed1e055d038dac58636d6bc2c0a99fbe24de688a0a5929a0b13fdec64d3334910b6ae18fec0971dfea26bdaa119
+AUX pam_wrapper-1.1.5-tests-import.patch 724 BLAKE2B a19af5ba7534ee0e106e464df2a0cb58af59cbdf90d0f4632d70ecb4ccf2558068919caf1e50874a30e771390193c18fa1ecc457129e400fdf50cfcca5c11344 SHA512 e2e9eeb26582feee621b8bfeb363052d23d898bdd44f5e7a399220cf4c4fd96e0e476a162f86b643a1557ceddd20a1cae11be3344fde3a1485f4c07b98bcf962
 DIST pam_wrapper-1.1.4.tar.gz 170882 BLAKE2B fa0a789f6fd6f809c7ef80e354e886b5f1f0b4212060dc0e388a44701e4a1f49635b8f47344156ad65cd273660e3b0a806480c37875a830e2f5d8e56c4ec0818 SHA512 3b68dc6d7815707d74d1340facd9c2de4dff3934402ac2c2632371b39c41a75744434744ed7308e157be03a03a941405638cadb6f34995de56fb1f5f45d37de2
+DIST pam_wrapper-1.1.5.tar.gz 95037 BLAKE2B 78adeaac3994349460c2c9966e1145c3c6b78189cf1e6092cf0272bc82498c2182b114d718ce47b3403e32255d8ae5e65dee22e7bc261442323a661a4dbd1b38 SHA512 eee2c0683bd87c5416b52115105a9a2397cbec261e358ff20d9b272509f64ee5ea50a4adcb04f7791d451ca904ffd31c3bc07dc53555c3808f50f71634ab6323
 EBUILD pam_wrapper-1.1.4-r2.ebuild 2011 BLAKE2B 4a3b59007bccaf8af11dddb0717b600fe14a52d1a52c72dfa523ab12bc78aae0ab8c5dadb9474f7b646f4eae08d05c4a9c3f89282a031f0b4922acd5b9c9877c SHA512 2ae30db5fa69125b751a6cc032d63080f9e8f5f564f269e4fc5a41b927fab21a56f593ca18ee2b0ce0805301d97a1812d59e6d0d0ffce2f10ad7dbfa2dfe3b50
 EBUILD pam_wrapper-1.1.4-r3.ebuild 2012 BLAKE2B 8821b5cbef33bff9e9bcc1bfceaf43d44e45c8dffe7b70bdfec5bb044f6bf87a83b62aae2795d9196e1377bc59520c1fcac6894d7df66fb24f6afcb77f123ff0 SHA512 8a23e450d303103cf14aedc418a49e95c8ab0ad02e72d23202a1a4f0ca40cd85ca27e6cfd8cf3dc6b43edb73308de5e23d5f4b88104117d4db59b00f8b99e805
+EBUILD pam_wrapper-1.1.5.ebuild 2094 BLAKE2B c075e39ee7f317ce02a5bfc8e8eabbac87cc6493612eb797f122ff40241c1ef3dc086a7bd06274b14f78b8219d3be03a8973a95f03e72b5be686e07ef63e7660 SHA512 f0b53a46e44929c7bd389c2da9d895b0614bec4c0663f1804587eac857336e4a5aa277405f1c823105ceb5e7fde5a25e4bcd5ad1c3e1fb6616931ccc745a4b03
 MISC metadata.xml 250 BLAKE2B e398673dd1a3522ccddb89a82a53fc2578d8e0777ec46f889d01d618609a22958d91699beef513c7912799e0e8ff985200f7c67bba941235da25c24cd4b48f09 SHA512 16834c3cbecd0dd5a9c8c311d2b8ebc63d8cd72c5891498f4f0048988993c104aadd4e24e632bf54071c11f810716432e89e4afab029555875f9f52794daa6e9
diff --git a/sys-libs/pam_wrapper/files/pam_wrapper-1.1.5-env-var-typo.patch b/sys-libs/pam_wrapper/files/pam_wrapper-1.1.5-env-var-typo.patch
new file mode 100644
index 000000000000..0874e5daaf24
--- /dev/null
+++ b/sys-libs/pam_wrapper/files/pam_wrapper-1.1.5-env-var-typo.patch
@@ -0,0 +1,25 @@
+https://git.samba.org/?p=pam_wrapper.git;a=commit;h=9f0cccf7432dd9be1de953f9b13a7f9b06c40442
+
+From 9f0cccf7432dd9be1de953f9b13a7f9b06c40442 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Fri, 10 Nov 2023 15:38:37 +0100
+Subject: [PATCH] pwrap: Fix PAM_WRAPPER_DISABLE_DEEPBIND environment variable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
+Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>
+--- a/src/pam_wrapper.c
++++ b/src/pam_wrapper.c
+@@ -336,7 +336,7 @@ static void *pwrap_load_lib_handle(enum pwrap_lib lib)
+ 
+ #ifdef RTLD_DEEPBIND
+ 	const char *env_preload = getenv("LD_PRELOAD");
+-	const char *env_deepbind = getenv("UID_WRAPPER_DISABLE_DEEPBIND");
++	const char *env_deepbind = getenv("PAM_WRAPPER_DISABLE_DEEPBIND");
+ 	bool enable_deepbind = true;
+ 
+ 	/* Don't do a deepbind if we run with libasan */
+-- 
+2.34.1
diff --git a/sys-libs/pam_wrapper/files/pam_wrapper-1.1.5-mkdir-race.patch b/sys-libs/pam_wrapper/files/pam_wrapper-1.1.5-mkdir-race.patch
new file mode 100644
index 000000000000..f3c1458d6dce
--- /dev/null
+++ b/sys-libs/pam_wrapper/files/pam_wrapper-1.1.5-mkdir-race.patch
@@ -0,0 +1,40 @@
+https://git.samba.org/?p=pam_wrapper.git;a=commitdiff;h=7bd24b0e54995da5f333575f97c9f1fa796fe0f1
+
+From 7bd24b0e54995da5f333575f97c9f1fa796fe0f1 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Jan=20Kundr=C3=A1t?= <jan.kundrat@cesnet.cz>
+Date: Mon, 6 Nov 2023 18:34:58 +0100
+Subject: [PATCH] die quickly upon mkdir failure
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+We just had this failure in our CI system that's currently running just
+three PAM-wrapped tests in parallel. Since this is a classic TOCTOU race
+(albeit in a test code, and therefore with little to no security
+implications), the `mkdir` can fail, and when that happens it's much
+better to just die quickly rather than continuing as if nothing
+happened.
+
+Signed-off-by: Jan Kundrát <jan.kundrat@cesnet.cz>
+Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>
+Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
+--- a/src/pam_wrapper.c
++++ b/src/pam_wrapper.c
+@@ -893,6 +893,7 @@ static void pwrap_init(void)
+ 		PWRAP_LOG(PWRAP_LOG_ERROR,
+ 			  "Failed to create pam_wrapper config dir: %s - %s",
+ 			  tmp_config_dir, strerror(errno));
++		exit(1);
+ 	}
+ 
+ 	/* Create file with the PID of the the process */
+@@ -1121,6 +1122,7 @@ static void pwrap_init(void)
+ 		PWRAP_LOG(PWRAP_LOG_ERROR,
+ 			  "Failed to create pam_wrapper config dir: %s - %s",
+ 			  tmp_config_dir, strerror(errno));
++		exit(1);
+ 	}
+ 
+ 	/* Create file with the PID of the the process */
+-- 
+2.34.1
diff --git a/sys-libs/pam_wrapper/files/pam_wrapper-1.1.5-tests-import.patch b/sys-libs/pam_wrapper/files/pam_wrapper-1.1.5-tests-import.patch
new file mode 100644
index 000000000000..884583c098b4
--- /dev/null
+++ b/sys-libs/pam_wrapper/files/pam_wrapper-1.1.5-tests-import.patch
@@ -0,0 +1,22 @@
+--- a/tests/pypamtest_test.py
++++ b/tests/pypamtest_test.py
+@@ -15,19 +15,6 @@ class PyPamTestCase(unittest.TestCase):
+         self.assertSequenceEqual(test_result.errors, info_list)
+ 
+ class PyPamTestImport(unittest.TestCase):
+-    def setUp(self):
+-        " Make sure we load the in-tree module "
+-        if sys.hexversion >= 0x3000000:
+-            self.modpath = os.path.join(os.getcwd(), "../src/python/python3")
+-        else:
+-            self.assertTrue(False)
+-        self.system_path = sys.path[:]
+-        sys.path = [ self.modpath ]
+-
+-    def tearDown(self):
+-        " Restore the system path "
+-        sys.path = self.system_path
+-
+     def testImport(self):
+         " Import the module "
+         try:
diff --git a/sys-libs/pam_wrapper/pam_wrapper-1.1.5.ebuild b/sys-libs/pam_wrapper/pam_wrapper-1.1.5.ebuild
new file mode 100644
index 000000000000..8ce00c0e4a60
--- /dev/null
+++ b/sys-libs/pam_wrapper/pam_wrapper-1.1.5.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake-multilib python-r1
+
+DESCRIPTION="A tool to test PAM applications and PAM modules"
+HOMEPAGE="https://cwrap.org/pam_wrapper.html"
+SRC_URI="
+	https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz
+	https://ftp.samba.org/pub/cwrap/${P}.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Require newer PAM so we know where it's located, bug #825078
+RDEPEND="
+	${PYTHON_DEPS}
+	>=sys-libs/pam-1.5.3-r1:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.5-tests-import.patch
+	"${FILESDIR}"/${P}-mkdir-race.patch
+	"${FILESDIR}"/${P}-env-var-typo.patch
+)
+
+multilib_src_configure() {
+	configure_for_python() {
+		local mycmakeargs=( -DUNIT_TESTING=OFF )
+		cmake_src_configure
+	}
+
+	if multilib_is_native_abi ; then
+		# Build the Pythons for each version (but only for the native ABI)
+		# bug #737468
+		python_foreach_impl configure_for_python
+	fi
+
+	# Do the regular build now
+	local mycmakeargs=(
+		-DUNIT_TESTING=$(usex test)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Python{Libs,Interp,SiteLibs}=ON
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		python_foreach_impl cmake_src_compile
+	fi
+
+	# Compile the "proper" version without Python last
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	cmake_src_test
+
+	# Fails b/c of sandbox?
+	#python_test() {
+	#	local -x PYTHONPATH="${BUILD_DIR}/src/python/python3:${PYTHONPATH}"
+	#	elog "${PYTHONPATH}"
+	#	${EPYTHON} "${S}"/tests/pypamtest_test.py || die "Tests failed with ${EPYTHON}"
+	#}
+
+	#if multilib_is_native_abi ; then
+	#	python_foreach_impl python_test
+	#fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		python_foreach_impl cmake_src_install
+	fi
+
+	# Install the "proper" version without Python last
+	cmake_src_install
+}
diff --git a/sys-libs/uid_wrapper/Manifest b/sys-libs/uid_wrapper/Manifest
index 682b60d788ab..f82b6a1a4280 100644
--- a/sys-libs/uid_wrapper/Manifest
+++ b/sys-libs/uid_wrapper/Manifest
@@ -1,5 +1,4 @@
-DIST uid_wrapper-1.2.9.tar.gz 48150 BLAKE2B bfd52c5a5e6a6a4322cff9fbf9bb2ceee3f5eb004d1174cf1d548bf08eade02453c0b551e006ea30aaa0b147748c6592184a597f9c615da2ed5355fe96222a20 SHA512 561dd8d5b139020f47a908e6baca9197d46f6192c280c23f85fad80fcac3fffb2823200777b0f353f79949cfb45b7dcc21b9a585a4bc21b26632b0e0df11d825
+AUX uid_wrapper-1.3.0-cmocka-cmake.patch 850 BLAKE2B c67b7cb93a89e01d374d121b66f2b9c5b608a70cb75b6b7a4c8b7fb2c027d4e5cb66c2c90fabf1c0fd1e1676367129c55f65e2fffec57998bda1cbbce852a107 SHA512 054ed20913dae13de43cc3f3bca2ba257bd39626e73445d57c2ab0b766525371096ee2b89e7c35407932ee7495f3c83b4b2b93a5610eb86e1be2644b2c214bd1
 DIST uid_wrapper-1.3.0.tar.gz 51126 BLAKE2B 9460d50ce7cfa613316bda38678d4918aceb048a5f8bc3d48abd4024fd67b0e6194c543c7f7092041b91b4f72d8bab79858697ee541ccef0486c3aa4cfad2506 SHA512 a66515b701882cf8ac62c6aae719eb07a46b852ecfd5274c7a1f038b066db85fbc0cdf4fff2c79e7b1e45d08622cd90884498f668fe479989e47e79ecd932095
-EBUILD uid_wrapper-1.2.9.ebuild 625 BLAKE2B 496477ab07652fcff34dc87c502a468f6e78450966c860e42b34d549895b5ca46608f6d9d29324bdc95529cdd0ca6774aa1d29ae9ef4dd2dee0903bd82fbc648 SHA512 cc121baf19df64d19f545fca8056f02109dcfd590709b2021ae71830e1480644776305d122dfe4293fd0af41d631969c7247906542d53f27f69fc70c41e82daf
-EBUILD uid_wrapper-1.3.0.ebuild 625 BLAKE2B d1c968bf79231492c73683095eceb008304e948696c08f0a1960fbf4511a4f5ca1b682dacf123c76f1438f884485653268837e797f1d128cec32b58c691a1bda SHA512 27f5ac3ae72ae7fe3e1a4abc82e540853298e54ad605194ec15de097db3a961822127ccc5c17c8d330724cfe79e8b48bd7ec749b8b6f153b73d8ef5085f3637f
+EBUILD uid_wrapper-1.3.0.ebuild 677 BLAKE2B 4620e0f2b98f6dbf78db58677022216d048fb37c10ff6a02b7262afe6c823f2e17176107bbc92b5c060f832035bdc8cc07ce6c39b661dc8ad76a5e6f2cfe266f SHA512 9c20c64065ea1e1f4483c6529a8f7b609204a6b465378d7b229fea15994a66020b44bafa943cc7ad1fb78eae58b5d7ffb869b330543abdf875c8b244b4cb42ff
 MISC metadata.xml 250 BLAKE2B e398673dd1a3522ccddb89a82a53fc2578d8e0777ec46f889d01d618609a22958d91699beef513c7912799e0e8ff985200f7c67bba941235da25c24cd4b48f09 SHA512 16834c3cbecd0dd5a9c8c311d2b8ebc63d8cd72c5891498f4f0048988993c104aadd4e24e632bf54071c11f810716432e89e4afab029555875f9f52794daa6e9
diff --git a/sys-libs/uid_wrapper/files/uid_wrapper-1.3.0-cmocka-cmake.patch b/sys-libs/uid_wrapper/files/uid_wrapper-1.3.0-cmocka-cmake.patch
new file mode 100644
index 000000000000..ada998f5f543
--- /dev/null
+++ b/sys-libs/uid_wrapper/files/uid_wrapper-1.3.0-cmocka-cmake.patch
@@ -0,0 +1,26 @@
+https://git.samba.org/?p=uid_wrapper.git;a=commit;h=850f24c6366abda30bfd77734b90330b8809d306
+
+From 850f24c6366abda30bfd77734b90330b8809d306 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Fri, 17 Feb 2023 17:51:27 +0100
+Subject: [PATCH] cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,5 +1,9 @@
+ project(tests C)
+ 
++if (TARGET cmocka::cmocka)
++    set(CMOCKA_LIBRARY cmocka::cmocka)
++endif()
++
+ add_library(uwrap_fake_socket_wrapper SHARED uwrap_fake_socket_wrapper.c)
+ target_compile_options(uwrap_fake_socket_wrapper
+                        PRIVATE
+-- 
+2.34.1
diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.2.9.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.2.9.ebuild
deleted file mode 100644
index 65f21f57ae88..000000000000
--- a/sys-libs/uid_wrapper/uid_wrapper-1.2.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Wrapper to fake privilege separation"
-HOMEPAGE="https://cwrap.org/uid_wrapper.html"
-SRC_URI="https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz
-	https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-util/cmocka )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake-multilib_src_configure
-}
diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.3.0.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.3.0.ebuild
index be756c6ce50b..bd23cc44cfcf 100644
--- a/sys-libs/uid_wrapper/uid_wrapper-1.3.0.ebuild
+++ b/sys-libs/uid_wrapper/uid_wrapper-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,6 +18,10 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-util/cmocka )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-cmocka-cmake.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DUNIT_TESTING=$(usex test)