diff --git a/.gitignore b/.gitignore index 5dd1a57..74551c9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ /uid_wrapper-1.2.1.tar.gz /uid_wrapper-1.2.2.tar.gz /uid_wrapper-1.2.4.tar.gz +/uid_wrapper-1.2.7.tar.gz +/uid_wrapper-1.2.7.tar.gz.asc diff --git a/0001-pkg-config-Fix-installation-path.patch b/0001-pkg-config-Fix-installation-path.patch new file mode 100644 index 0000000..e9bcfb0 --- /dev/null +++ b/0001-pkg-config-Fix-installation-path.patch @@ -0,0 +1,23 @@ +From 7b3211858d07cb93f89c1fd5eaa178f14e1f1968 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Wed, 12 Feb 2020 09:52:40 +0100 +Subject: [PATCH] pkg-config: Fix installation path + +Signed-off-by: Andreas Schneider +--- + uid_wrapper.pc.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/uid_wrapper.pc.cmake b/uid_wrapper.pc.cmake +index c15d3be..7e0095c 100644 +--- a/uid_wrapper.pc.cmake ++++ b/uid_wrapper.pc.cmake +@@ -1,4 +1,4 @@ + Name: @PROJECT_NAME@ + Description: The uid_wrapper library + Version: @PROJECT_VERSION@ +-Libs: @CMAKE_INSTALL_LIBDIR@/@UID_WRAPPER_LIB@ ++Libs: @CMAKE_INSTALL_FULL_LIBDIR@/@UID_WRAPPER_LIB@ +-- +2.24.1 + diff --git a/sources b/sources index eb47d36..aaf8e11 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (uid_wrapper-1.2.4.tar.gz) = 212b35f7d0655611c5bb7927e4e29049ce79a4e677805fa7154142dff559ddc6dd7117a4c94314b69e27c954ff03ef49470ed69e2405cf46b5958643c6021d3b +SHA512 (uid_wrapper-1.2.7.tar.gz) = ed906638ded4fbd981212f38de66112e65514b618bda6b1bda85a915c00691d471859df7c8dc7915b546e5c8e107e2e07e6b3a841fcebeedc8cf4b18e5c16f1a +SHA512 (uid_wrapper-1.2.7.tar.gz.asc) = 20f2e4b7a5b3dff2f479140a8cd143bec74a29fd3f4888ac96d7dff6c4a77d886a8cb28b065090890c4100b3cdc0fd9e2973a87259b8c3957df49c264c479e0a diff --git a/uid_wrapper-1.2.7-cmake-config-fix-installation-path.patch b/uid_wrapper-1.2.7-cmake-config-fix-installation-path.patch new file mode 100644 index 0000000..d159122 --- /dev/null +++ b/uid_wrapper-1.2.7-cmake-config-fix-installation-path.patch @@ -0,0 +1,6 @@ +index 0a3e3fd..43ab1fa 100644 +--- a/uid_wrapper-config.cmake.in ++++ b/uid_wrapper-config.cmake.in +@@ -1 +1 @@ +-set(UID_WRAPPER_LIBRARY @CMAKE_INSTALL_LIBDIR@/@UID_WRAPPER_LIB@) ++set(UID_WRAPPER_LIBRARY @CMAKE_INSTALL_FULL_LIBDIR@/@UID_WRAPPER_LIB@) diff --git a/uid_wrapper.keyring b/uid_wrapper.keyring new file mode 100644 index 0000000..411bf36 Binary files /dev/null and b/uid_wrapper.keyring differ diff --git a/uid_wrapper.spec b/uid_wrapper.spec index 5e3f864..1ddca27 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,16 +1,25 @@ Name: uid_wrapper -Version: 1.2.4 -Release: 5%{?dist} +Version: 1.2.7 +Release: 3%{?dist} Summary: A wrapper for privilege separation License: GPLv3+ Url: http://cwrap.org/ 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: 0001-pkg-config-Fix-installation-path.patch +Patch1: uid_wrapper-1.2.7-cmake-config-fix-installation-path.patch BuildRequires: gcc BuildRequires: cmake -BuildRequires: libcmocka-devel +BuildRequires: gnupg2 +BuildRequires: libcmocka-devel >= 1.1.0 + +Recommends: cmake +Recommends: pkgconfig %description Some projects like a file server need privilege separation to be able to switch @@ -27,7 +36,8 @@ This package doesn't have a devel package cause this project is for development/testing. %prep -%setup -q +gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} +%autosetup -p1 %build if test ! -e "obj"; then @@ -54,7 +64,8 @@ make test || cat $(find Testing -name "*.log") popd %files -%doc AUTHORS README ChangeLog COPYING +%doc AUTHORS README.md ChangeLog +%license LICENSE %{_libdir}/libuid_wrapper.so* %dir %{_libdir}/cmake %dir %{_libdir}/cmake/uid_wrapper @@ -65,6 +76,20 @@ popd %{_mandir}/man1/uid_wrapper.1* %changelog +* Tue Mar 03 2020 Anderson Sasaki - 1.2.7-3 +- Fix invalid library path in cmake configuration file (bz#1809275) + +* Wed Feb 12 2020 Andreas Schneider - 1.2.7-2 +- resolves: #1801869 - Fix invalid lib pkg-config lib path + +* Tue Feb 11 2020 Andreas Schneider - 1.2.7-1 +- Update to version 1.2.7 + * Fix unsetting initial XIDs + * Fix manpage installation + * Fix cmake-config installation + * Fixed running with sanitizers +- resolves: #1690028 - Allow running without RTLD_DEEPBIND + * Sat Jul 27 2019 Fedora Release Engineering - 1.2.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild