summaryrefslogtreecommitdiff
path: root/sys-libs/nss_wrapper
diff options
context:
space:
mode:
Diffstat (limited to 'sys-libs/nss_wrapper')
-rw-r--r--sys-libs/nss_wrapper/Manifest5
-rw-r--r--sys-libs/nss_wrapper/files/nss_wrapper-1.1.15-cmocka-cmake.patch26
-rw-r--r--sys-libs/nss_wrapper/nss_wrapper-1.1.12.ebuild26
-rw-r--r--sys-libs/nss_wrapper/nss_wrapper-1.1.15.ebuild14
4 files changed, 40 insertions, 31 deletions
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=(