From 284272133bd9dc398e4561fe64876d28c7400fc0 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 27 Feb 2023 10:35:24 +0100 Subject: [PATCH 01/12] Fix building with cmocka >= 1.1.6 --- uid_wrapper-fix-cmocka-1.1.6+-support.patch | 31 +++++++++++++++++++++ uid_wrapper.spec | 7 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 uid_wrapper-fix-cmocka-1.1.6+-support.patch 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 34c4847..3cc1bad 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,6 +1,6 @@ Name: uid_wrapper Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?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 @@ -62,6 +64,9 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %{_mandir}/man1/uid_wrapper.1* %changelog +* 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 From e5d7f1583716d5e8f08bf21379860325e61c4500 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 6 Mar 2023 19:46:01 +0100 Subject: [PATCH 02/12] Update License to SPDX expression --- uid_wrapper.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/uid_wrapper.spec b/uid_wrapper.spec index 3cc1bad..28d93e8 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,9 +1,9 @@ Name: uid_wrapper Version: 1.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A wrapper for privilege separation -License: GPLv3+ +License: GPL-3.0-or-later Url: http://cwrap.org/ Source0: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz @@ -35,7 +35,7 @@ This package doesn't have a devel package cause this project is for development/testing. %prep -gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 %build @@ -64,6 +64,9 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %{_mandir}/man1/uid_wrapper.1* %changelog +* 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 From ea6ebb3c74916d40ec120b67e53da003d30e7388 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:03:03 +0000 Subject: [PATCH 03/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uid_wrapper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uid_wrapper.spec b/uid_wrapper.spec index 28d93e8..b99bd3b 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,6 +1,6 @@ Name: uid_wrapper Version: 1.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A wrapper for privilege separation License: GPL-3.0-or-later @@ -64,6 +64,9 @@ development/testing. %{_mandir}/man1/uid_wrapper.1* %changelog +* 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 From 55339606afb8966dcca68ff408fc87546900afe5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:02:58 +0000 Subject: [PATCH 04/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- uid_wrapper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uid_wrapper.spec b/uid_wrapper.spec index b99bd3b..921e3f2 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,6 +1,6 @@ Name: uid_wrapper Version: 1.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A wrapper for privilege separation License: GPL-3.0-or-later @@ -64,6 +64,9 @@ development/testing. %{_mandir}/man1/uid_wrapper.1* %changelog +* 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 From 603bc5a8c28710f598f70e1c487ac3b747dd535f Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 13 Jun 2024 08:16:28 +0200 Subject: [PATCH 05/12] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 154 ++++++++++++++++++++++++++++++++++++++++++++++ uid_wrapper.spec | 157 +---------------------------------------------- 2 files changed, 156 insertions(+), 155 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..0f6fdab --- /dev/null +++ b/changelog @@ -0,0 +1,154 @@ +* 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/uid_wrapper.spec b/uid_wrapper.spec index 921e3f2..9ba5ca8 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,6 +1,6 @@ Name: uid_wrapper Version: 1.3.0 -Release: 6%{?dist} +Release: %autorelease Summary: A wrapper for privilege separation License: GPL-3.0-or-later @@ -64,157 +64,4 @@ development/testing. %{_mandir}/man1/uid_wrapper.1* %changelog -* 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 +%autochangelog From b0c058b68129865b9d5c7bc3f8a9b0e33393bae9 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 13 Jun 2024 08:17:45 +0200 Subject: [PATCH 06/12] Update to version 1.3.1 --- .gitignore | 2 ++ sources | 4 +-- uid_wrapper-fix-cmocka-1.1.6+-support.patch | 31 --------------------- uid_wrapper.spec | 4 +-- 4 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 uid_wrapper-fix-cmocka-1.1.6+-support.patch diff --git a/.gitignore b/.gitignore index 0598ce8..b5f4d75 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ /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 diff --git a/sources b/sources index 21bf0cc..9f010a3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uid_wrapper-1.3.0.tar.gz) = a66515b701882cf8ac62c6aae719eb07a46b852ecfd5274c7a1f038b066db85fbc0cdf4fff2c79e7b1e45d08622cd90884498f668fe479989e47e79ecd932095 -SHA512 (uid_wrapper-1.3.0.tar.gz.asc) = d6b4178749249ee2bcacb85d9aa767e4b1d07e3cfcae1376745ea7559818af3716a9ccb8731cd24c3acd1a3ff419a6814d6a0e9c65d3a31b4cefbc314a81554e +SHA512 (uid_wrapper-1.3.1.tar.gz) = a221f1ee5e654d328dd614882917781c036bca140b9fb8d08157862b775f17b4a7813b7efbc4e5ae3ef9bf1540c0ca158d7bdb503b7f62ac563dd29aa75396b6 +SHA512 (uid_wrapper-1.3.1.tar.gz.asc) = 1ce6ebc0c0827a9d7e94ee6d8a8037b89ba1e4eb1bc7bef33afe6a5af2090ca4a21209ad13c25c31fba57298cefa0208f577737f8755d9fb726d821eaa6789ec diff --git a/uid_wrapper-fix-cmocka-1.1.6+-support.patch b/uid_wrapper-fix-cmocka-1.1.6+-support.patch deleted file mode 100644 index 58184b4..0000000 --- a/uid_wrapper-fix-cmocka-1.1.6+-support.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 9ba5ca8..f18b0c9 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,5 +1,5 @@ Name: uid_wrapper -Version: 1.3.0 +Version: 1.3.1 Release: %autorelease Summary: A wrapper for privilege separation @@ -10,8 +10,6 @@ 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 From b6187571328738d9e05ea4a03c40fcead59138f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:11:47 +0000 Subject: [PATCH 07/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f653a6b04c448ae64b2bb09d10fc38f01e3923b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:41:02 +0000 Subject: [PATCH 08/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b306c68380d67eeef9d72083649ef23a6f4b7b04 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 17 Jul 2025 15:48:25 +0200 Subject: [PATCH 09/12] Fix tests --- uid_wrapper.spec | 2 ++ uwrap-fix-tests.patch | 65 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 uwrap-fix-tests.patch diff --git a/uid_wrapper.spec b/uid_wrapper.spec index f18b0c9..bad4551 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -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: uwrap-fix-tests.patch + BuildRequires: gcc BuildRequires: cmake BuildRequires: gnupg2 diff --git a/uwrap-fix-tests.patch b/uwrap-fix-tests.patch new file mode 100644 index 0000000..4699855 --- /dev/null +++ b/uwrap-fix-tests.patch @@ -0,0 +1,65 @@ +From fb17ea0d4a346e21332f5eb32dcb02b2e57c2320 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Thu, 17 Jul 2025 15:19:39 +0200 +Subject: [PATCH 1/2] cpack: Fix ignore files + +Signed-off-by: Andreas Schneider +--- + CPackConfig.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CPackConfig.cmake b/CPackConfig.cmake +index 955c8ee..c1a3373 100644 +--- a/CPackConfig.cmake ++++ b/CPackConfig.cmake +@@ -16,7 +16,7 @@ set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}") + + ### source generator + set(CPACK_SOURCE_GENERATOR "TGZ") +-set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build*;/obj*;tags;cscope.*") ++set(CPACK_SOURCE_IGNORE_FILES "~$;\.swp$;\.git;\.gitignore;/\.cache/;/\.clangd/;/build*;/obj*;tags;cscope.*") + set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") + + if (WIN32) +-- +GitLab + + +From a85877afadfbca22b2d8927dca62d6cc0e25dd65 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Thu, 17 Jul 2025 15:20:43 +0200 +Subject: [PATCH 2/2] tests: Add missing include for stdint.h + +Signed-off-by: Andreas Schneider +--- + tests/test_thread_sync_setreuid.c | 1 + + tests/test_uwrap_disabled.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/tests/test_thread_sync_setreuid.c b/tests/test_thread_sync_setreuid.c +index 720a707..627791c 100644 +--- a/tests/test_thread_sync_setreuid.c ++++ b/tests/test_thread_sync_setreuid.c +@@ -2,6 +2,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/tests/test_uwrap_disabled.c b/tests/test_uwrap_disabled.c +index 52a2bf0..61a8c87 100644 +--- a/tests/test_uwrap_disabled.c ++++ b/tests/test_uwrap_disabled.c +@@ -2,6 +2,7 @@ + + #include + #include ++#include + #include + #include + +-- +GitLab + From 03fe9bf3f77119c7707c9585380c20be8211cb9b Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 24 Jul 2025 11:44:49 +0200 Subject: [PATCH 10/12] Update to version 1.3.2 --- .gitignore | 2 ++ sources | 4 +-- uid_wrapper.spec | 4 +-- uwrap-fix-tests.patch | 65 ------------------------------------------- 4 files changed, 5 insertions(+), 70 deletions(-) delete mode 100644 uwrap-fix-tests.patch diff --git a/.gitignore b/.gitignore index b5f4d75..14419bf 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ /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/sources b/sources index 9f010a3..6362a44 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uid_wrapper-1.3.1.tar.gz) = a221f1ee5e654d328dd614882917781c036bca140b9fb8d08157862b775f17b4a7813b7efbc4e5ae3ef9bf1540c0ca158d7bdb503b7f62ac563dd29aa75396b6 -SHA512 (uid_wrapper-1.3.1.tar.gz.asc) = 1ce6ebc0c0827a9d7e94ee6d8a8037b89ba1e4eb1bc7bef33afe6a5af2090ca4a21209ad13c25c31fba57298cefa0208f577737f8755d9fb726d821eaa6789ec +SHA512 (uid_wrapper-1.3.2.tar.gz) = a248494c445b8186e3fc9e3eb8b21149a08dc504871ffaf339d5f61e13f7291973d07d467d81e253d165792dd15f5df69db8a7e1e3424093a5b051f9a562d6fb +SHA512 (uid_wrapper-1.3.2.tar.gz.asc) = d24956d7f396a91e1b063d074ace3da7c098b06bf43433d80d89d162c394b93b078330106fc4318a42ccca7c0eea6f317a28a2f0976ab821f61478c03ff378da diff --git a/uid_wrapper.spec b/uid_wrapper.spec index bad4551..eb88e68 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,5 +1,5 @@ Name: uid_wrapper -Version: 1.3.1 +Version: 1.3.2 Release: %autorelease Summary: A wrapper for privilege separation @@ -10,8 +10,6 @@ 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: uwrap-fix-tests.patch - BuildRequires: gcc BuildRequires: cmake BuildRequires: gnupg2 diff --git a/uwrap-fix-tests.patch b/uwrap-fix-tests.patch deleted file mode 100644 index 4699855..0000000 --- a/uwrap-fix-tests.patch +++ /dev/null @@ -1,65 +0,0 @@ -From fb17ea0d4a346e21332f5eb32dcb02b2e57c2320 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Thu, 17 Jul 2025 15:19:39 +0200 -Subject: [PATCH 1/2] cpack: Fix ignore files - -Signed-off-by: Andreas Schneider ---- - CPackConfig.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CPackConfig.cmake b/CPackConfig.cmake -index 955c8ee..c1a3373 100644 ---- a/CPackConfig.cmake -+++ b/CPackConfig.cmake -@@ -16,7 +16,7 @@ set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}") - - ### source generator - set(CPACK_SOURCE_GENERATOR "TGZ") --set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build*;/obj*;tags;cscope.*") -+set(CPACK_SOURCE_IGNORE_FILES "~$;\.swp$;\.git;\.gitignore;/\.cache/;/\.clangd/;/build*;/obj*;tags;cscope.*") - set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") - - if (WIN32) --- -GitLab - - -From a85877afadfbca22b2d8927dca62d6cc0e25dd65 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Thu, 17 Jul 2025 15:20:43 +0200 -Subject: [PATCH 2/2] tests: Add missing include for stdint.h - -Signed-off-by: Andreas Schneider ---- - tests/test_thread_sync_setreuid.c | 1 + - tests/test_uwrap_disabled.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/tests/test_thread_sync_setreuid.c b/tests/test_thread_sync_setreuid.c -index 720a707..627791c 100644 ---- a/tests/test_thread_sync_setreuid.c -+++ b/tests/test_thread_sync_setreuid.c -@@ -2,6 +2,7 @@ - - #include - #include -+#include - #include - #include - -diff --git a/tests/test_uwrap_disabled.c b/tests/test_uwrap_disabled.c -index 52a2bf0..61a8c87 100644 ---- a/tests/test_uwrap_disabled.c -+++ b/tests/test_uwrap_disabled.c -@@ -2,6 +2,7 @@ - - #include - #include -+#include - #include - #include - --- -GitLab - From d272a7e93f831eb70d08d8ddaa61512c31654aeb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:34:03 +0000 Subject: [PATCH 11/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 78ea4f67d91624b4c5c44abef0f85286180ae85c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:08:35 +0000 Subject: [PATCH 12/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild