From b306c68380d67eeef9d72083649ef23a6f4b7b04 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 17 Jul 2025 15:48:25 +0200 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild