diff --git a/.gitignore b/.gitignore index adeee05..0598ce8 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ /uid_wrapper-1.2.8.tar.gz /uid_wrapper-1.2.9.tar.gz /uid_wrapper-1.2.9.tar.gz.asc +/uid_wrapper-1.3.0.tar.gz +/uid_wrapper-1.3.0.tar.gz.asc diff --git a/sources b/sources index f94256b..21bf0cc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uid_wrapper-1.2.9.tar.gz) = 561dd8d5b139020f47a908e6baca9197d46f6192c280c23f85fad80fcac3fffb2823200777b0f353f79949cfb45b7dcc21b9a585a4bc21b26632b0e0df11d825 -SHA512 (uid_wrapper-1.2.9.tar.gz.asc) = cbb964c51c510e071a3a6224bb86e07816a40bf215c8acc5a244f853842df702e879f59a154ed140d90e2f1c9957212edfc8369a7121329cc35aa8874b600794 +SHA512 (uid_wrapper-1.3.0.tar.gz) = a66515b701882cf8ac62c6aae719eb07a46b852ecfd5274c7a1f038b066db85fbc0cdf4fff2c79e7b1e45d08622cd90884498f668fe479989e47e79ecd932095 +SHA512 (uid_wrapper-1.3.0.tar.gz.asc) = d6b4178749249ee2bcacb85d9aa767e4b1d07e3cfcae1376745ea7559818af3716a9ccb8731cd24c3acd1a3ff419a6814d6a0e9c65d3a31b4cefbc314a81554e diff --git a/uid_wrapper-fix-cmocka-1.1.6+-support.patch b/uid_wrapper-fix-cmocka-1.1.6+-support.patch new file mode 100644 index 0000000..58184b4 --- /dev/null +++ b/uid_wrapper-fix-cmocka-1.1.6+-support.patch @@ -0,0 +1,31 @@ +From 850f24c6366abda30bfd77734b90330b8809d306 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +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=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Schneider +Reviewed-by: Pavel Filipenský +--- + tests/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 635e86e..68e050e 100644 +--- 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.39.2 + diff --git a/uid_wrapper.spec b/uid_wrapper.spec index 8adb3c8..d3d5ea2 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,6 +1,6 @@ Name: uid_wrapper -Version: 1.2.9 -Release: 3%{?dist} +Version: 1.3.0 +Release: 2%{?dist} Summary: A wrapper for privilege separation License: GPLv3+ @@ -10,6 +10,8 @@ Source0: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz Source1: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz.asc Source2: uid_wrapper.keyring +Patch0: uid_wrapper-fix-cmocka-1.1.6+-support.patch + BuildRequires: gcc BuildRequires: cmake BuildRequires: gnupg2 @@ -50,7 +52,7 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %ctest %files -%doc AUTHORS README.md ChangeLog +%doc AUTHORS README.md CHANGELOG %license LICENSE %{_libdir}/libuid_wrapper.so* %dir %{_libdir}/cmake @@ -62,6 +64,13 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %{_mandir}/man1/uid_wrapper.1* %changelog +* Mon Feb 27 2023 Andreas Schneider - 1.3.0-2 +- Fix building with cmocka >= 1.1.6 + +* Tue Jan 17 2023 Andreas Schneider - 1.3.0-1 +- Update to version 1.3.0 + o https://gitlab.com/cwrap/uid_wrapper/-/blob/uid_wrapper-1.3.0/CHANGELOG + * Sat Jul 23 2022 Fedora Release Engineering - 1.2.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild