diff --git a/.gitignore b/.gitignore index 14419bf..74551c9 100644 --- a/.gitignore +++ b/.gitignore @@ -8,13 +8,3 @@ /uid_wrapper-1.2.4.tar.gz /uid_wrapper-1.2.7.tar.gz /uid_wrapper-1.2.7.tar.gz.asc -/uid_wrapper-1.2.8.tar.gz.asc -/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 -/uid_wrapper-1.3.1.tar.gz -/uid_wrapper-1.3.1.tar.gz.asc -/uid_wrapper-1.3.2.tar.gz -/uid_wrapper-1.3.2.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/changelog b/changelog deleted file mode 100644 index 0f6fdab..0000000 --- a/changelog +++ /dev/null @@ -1,154 +0,0 @@ -* Sat Jan 27 2024 Fedora Release Engineering - 1.3.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.3.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Mar 06 2023 Andreas Schneider - 1.3.0-4 -- Update License to SPDX expression - -* Mon Feb 27 2023 Andreas Schneider - 1.3.0-3 -- Fix building with cmocka >= 1.1.6 - -* Sat Jan 21 2023 Fedora Release Engineering - 1.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* 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 - -* Sat Jan 22 2022 Fedora Release Engineering - 1.2.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Dec 02 2021 Andreas Schneider - 1.2.9-1 -- Rebase to version 1.2.9 -- resolves: rhbz#2021214 - Add support for getgroups_chk() - -* Fri Jul 23 2021 Fedora Release Engineering - 1.2.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Apr 19 2021 Andreas Schneider - 1.2.8-1 -- Update to version 1.2.8 - o https://gitlab.com/cwrap/uid_wrapper/-/blob/uid_wrapper-1.2.8/ChangeLog - -* Wed Jan 27 2021 Fedora Release Engineering - 1.2.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.2.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* 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 - -* Fri Jan 31 2020 Fedora Release Engineering - 1.2.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.2.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.2.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.2.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.2.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Jul 31 2017 Andreas Schneider - 1.2.4-1 -- Update to version 1.2.4 - * Added deadlock workaround for glibc < 2.24 - * Fixed a possible deadlock bug if uid_wrapper is turned off - * Logging is always turned on now - * Fixed a memory leak - * Limited number of groups during fork+exec - -* Thu Jul 27 2017 Fedora Release Engineering - 1.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Jul 13 2017 Andreas Schneider - 1.2.2-1 -- Update to version 1.2.2: - * Added support for fork'ed and then exec'ed processes - * Added support for Alpha - -* Tue Jun 27 2017 Nils Philippsen - 1.2.1-3 -- drop requirements on cmake, pkgconfig and rather own the directories for the - files augmenting these packages - -* Sat Feb 11 2017 Fedora Release Engineering - 1.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Mar 23 2016 Andreas Schneider - 1.2.1-1 -- Update to version 1.2.1 - * Documented missing options. - * Fixed a comipilation issue with -O3. - -* Fri Feb 05 2016 Fedora Release Engineering - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Oct 29 2015 Andreas Schneider - 1.2.0-1 -- Update to version 1.2.0 - * Added privilege checks for all set*uid and set*gid functions. - * Added a lot more and accurate tests which work as root. - * Fixed some minor issues - -* Wed Sep 02 2015 Andreas Schneider - 1.1.1-1 -- Update to version 1.1.1 - -* Fri Jun 19 2015 Fedora Release Engineering - 1.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Jan 21 2015 Andreas Schneider - 1.1.0-1 -- Update to version 1.1.0 - -* Mon Dec 15 2014 Michael Adam - 1.0.2-5 -- Fix format errors in changelog. -- Require cmake. -- Don't own _libdir/pkgconfig, and require pkgconfig instead. - -* Thu Oct 02 2014 Andreas Schneider - 1.0.2-4 -- resolves: #1146410 - Do not own /usr/lib64/cmake. - -* Mon Aug 18 2014 Fedora Release Engineering - 1.0.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Mon Aug 04 2014 Marcin Juszkiewicz - 1.0.2-2 -- Handle lack of SYS_access on AArch64 - -* Thu Jul 31 2014 Andreas Schneider - 1.0.2-1 -- Update to version 1.0.2. - -* Sun Jun 08 2014 Fedora Release Engineering - 1.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 11 2014 Andreas Schneider - 1.0.1-3 -- Fix some typos. -- resolves: #1060910 - Fedora import - -* Tue Feb 11 2014 Andreas Schneider - 1.0.1-2 -- Remove Group -- Remove glibc-devel build requirement -- Do not create a subpackage. - -* Tue Feb 04 2014 Andreas Schneider - 1.0.1-1 -- Update to version 1.0.1 - * Added --libs to pkg-config. - * Added socket_wrapper-config.cmake - * Fixed a bug packaging the obj directory. - -* Mon Feb 03 2014 Andreas Schneider - 1.0.0-1 -- Initial version 1.0.0 diff --git a/sources b/sources index 6362a44..aaf8e11 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uid_wrapper-1.3.2.tar.gz) = a248494c445b8186e3fc9e3eb8b21149a08dc504871ffaf339d5f61e13f7291973d07d467d81e253d165792dd15f5df69db8a7e1e3424093a5b051f9a562d6fb -SHA512 (uid_wrapper-1.3.2.tar.gz.asc) = d24956d7f396a91e1b063d074ace3da7c098b06bf43433d80d89d162c394b93b078330106fc4318a42ccca7c0eea6f317a28a2f0976ab821f61478c03ff378da +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.spec b/uid_wrapper.spec index eb88e68..1ddca27 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,15 +1,18 @@ Name: uid_wrapper -Version: 1.3.2 -Release: %autorelease +Version: 1.2.7 +Release: 3%{?dist} Summary: A wrapper for privilege separation -License: GPL-3.0-or-later +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: gnupg2 @@ -33,24 +36,35 @@ This package doesn't have a devel package cause this project is for development/testing. %prep -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %autosetup -p1 %build +if test ! -e "obj"; then + mkdir obj +fi +pushd obj %cmake \ - -DUNIT_TESTING=ON -%cmake_build + -DUNIT_TESTING=ON \ + %{_builddir}/%{name}-%{version} + +make %{?_smp_mflags} VERBOSE=1 +popd %install -%cmake_install +pushd obj +make DESTDIR=%{buildroot} install +popd %ldconfig_scriptlets %check -%ctest +pushd obj +make test || cat $(find Testing -name "*.log") +popd %files -%doc AUTHORS README.md CHANGELOG +%doc AUTHORS README.md ChangeLog %license LICENSE %{_libdir}/libuid_wrapper.so* %dir %{_libdir}/cmake @@ -62,4 +76,112 @@ development/testing. %{_mandir}/man1/uid_wrapper.1* %changelog -%autochangelog +* 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 + +* Sun Feb 03 2019 Fedora Release Engineering - 1.2.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.2.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Jul 31 2017 Andreas Schneider - 1.2.4-1 +- Update to version 1.2.4 + * Added deadlock workaround for glibc < 2.24 + * Fixed a possible deadlock bug if uid_wrapper is turned off + * Logging is always turned on now + * Fixed a memory leak + * Limited number of groups during fork+exec + +* Thu Jul 27 2017 Fedora Release Engineering - 1.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Jul 13 2017 Andreas Schneider - 1.2.2-1 +- Update to version 1.2.2: + * Added support for fork'ed and then exec'ed processes + * Added support for Alpha + +* Tue Jun 27 2017 Nils Philippsen - 1.2.1-3 +- drop requirements on cmake, pkgconfig and rather own the directories for the + files augmenting these packages + +* Sat Feb 11 2017 Fedora Release Engineering - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Mar 23 2016 Andreas Schneider - 1.2.1-1 +- Update to version 1.2.1 + * Documented missing options. + * Fixed a comipilation issue with -O3. + +* Fri Feb 05 2016 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Oct 29 2015 Andreas Schneider - 1.2.0-1 +- Update to version 1.2.0 + * Added privilege checks for all set*uid and set*gid functions. + * Added a lot more and accurate tests which work as root. + * Fixed some minor issues + +* Wed Sep 02 2015 Andreas Schneider - 1.1.1-1 +- Update to version 1.1.1 + +* Fri Jun 19 2015 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Jan 21 2015 Andreas Schneider - 1.1.0-1 +- Update to version 1.1.0 + +* Mon Dec 15 2014 Michael Adam - 1.0.2-5 +- Fix format errors in changelog. +- Require cmake. +- Don't own _libdir/pkgconfig, and require pkgconfig instead. + +* Thu Oct 02 2014 Andreas Schneider - 1.0.2-4 +- resolves: #1146410 - Do not own /usr/lib64/cmake. + +* Mon Aug 18 2014 Fedora Release Engineering - 1.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Aug 04 2014 Marcin Juszkiewicz - 1.0.2-2 +- Handle lack of SYS_access on AArch64 + +* Thu Jul 31 2014 Andreas Schneider - 1.0.2-1 +- Update to version 1.0.2. + +* Sun Jun 08 2014 Fedora Release Engineering - 1.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 11 2014 Andreas Schneider - 1.0.1-3 +- Fix some typos. +- resolves: #1060910 - Fedora import + +* Tue Feb 11 2014 Andreas Schneider - 1.0.1-2 +- Remove Group +- Remove glibc-devel build requirement +- Do not create a subpackage. + +* Tue Feb 04 2014 Andreas Schneider - 1.0.1-1 +- Update to version 1.0.1 + * Added --libs to pkg-config. + * Added socket_wrapper-config.cmake + * Fixed a bug packaging the obj directory. + +* Mon Feb 03 2014 Andreas Schneider - 1.0.0-1 +- Initial version 1.0.0