summaryrefslogtreecommitdiff
path: root/sys-libs/uid_wrapper
diff options
context:
space:
mode:
Diffstat (limited to 'sys-libs/uid_wrapper')
-rw-r--r--sys-libs/uid_wrapper/Manifest5
-rw-r--r--sys-libs/uid_wrapper/files/uid_wrapper-1.3.0-cmocka-cmake.patch26
-rw-r--r--sys-libs/uid_wrapper/uid_wrapper-1.2.9.ebuild27
-rw-r--r--sys-libs/uid_wrapper/uid_wrapper-1.3.0.ebuild6
4 files changed, 33 insertions, 31 deletions
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)