From a5ca6450509768d92d74bc7a346ae71f8bbb0471 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 06:49:46 +0000 Subject: [PATCH 1/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- uid_wrapper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uid_wrapper.spec b/uid_wrapper.spec index 511c589..0b00003 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,6 +1,6 @@ Name: uid_wrapper Version: 1.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A wrapper for privilege separation License: GPLv3+ @@ -68,6 +68,9 @@ popd %{_mandir}/man1/uid_wrapper.1* %changelog +* 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 From fbc66b4fabeac77eff190203bb6fab61a80ab492 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 2 Oct 2014 15:01:49 +0200 Subject: [PATCH 2/6] Do not own /usr/lib64/cmake. resolves: #1146410 --- uid_wrapper.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/uid_wrapper.spec b/uid_wrapper.spec index 0b00003..ecaaba2 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,6 +1,6 @@ Name: uid_wrapper Version: 1.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A wrapper for privilege separation License: GPLv3+ @@ -59,7 +59,6 @@ popd %files %doc AUTHORS README ChangeLog COPYING %{_libdir}/libuid_wrapper.so* -%dir %{_libdir}/cmake %dir %{_libdir}/cmake/uid_wrapper %{_libdir}/cmake/uid_wrapper/uid_wrapper-config-version.cmake %{_libdir}/cmake/uid_wrapper/uid_wrapper-config.cmake @@ -68,6 +67,9 @@ popd %{_mandir}/man1/uid_wrapper.1* %changelog +* 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 From 75ef113623d8d889d0233b32722a7c30ff4a39aa Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 15 Dec 2014 22:13:27 +0100 Subject: [PATCH 3/6] Fix format errors in changelog. Signed-off-by: Michael Adam (cherry picked from commit f79ed1c744293b5917b004154e41e26060250ad0) --- uid_wrapper.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/uid_wrapper.spec b/uid_wrapper.spec index ecaaba2..ff085e8 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,6 +1,6 @@ Name: uid_wrapper Version: 1.0.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A wrapper for privilege separation License: GPLv3+ @@ -67,7 +67,10 @@ popd %{_mandir}/man1/uid_wrapper.1* %changelog -* Thu Oct 02 2014 - Andreas Schneider - 1.0.2-4 +* Mon Dec 15 2014 Michael Adam - 1.0.2-5 +- Fix format errors in changelog. + +* 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 @@ -76,26 +79,26 @@ popd * 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 +* 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 +* 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 +* 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 +* 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 +* Mon Feb 03 2014 Andreas Schneider - 1.0.0-1 - Initial version 1.0.0 From 7df7ce712ee6e2653877eb300c595fa40b75b540 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 15 Dec 2014 22:40:13 +0100 Subject: [PATCH 4/6] Require cmake, to not have directory _libdir/cmake without owner Reviewed-by: Michael Adam (cherry picked from commit 18d6c1a637e498c26856f5a913494ba5dc62b338) --- uid_wrapper.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/uid_wrapper.spec b/uid_wrapper.spec index ff085e8..2b78975 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -12,6 +12,8 @@ Patch0: aarch64-has-no-sys-access.patch BuildRequires: cmake BuildRequires: libcmocka-devel +Requires: cmake + %description Some projects like a file server need privilege separation to be able to switch to the connection user and do file operations. uid_wrapper convincingly lies @@ -69,6 +71,7 @@ popd %changelog * Mon Dec 15 2014 Michael Adam - 1.0.2-5 - Fix format errors in changelog. +- Require cmake. * Thu Oct 02 2014 Andreas Schneider - 1.0.2-4 - resolves: #1146410 - Do not own /usr/lib64/cmake. From 7aa3b9fce8a6a9477d6d4176280e7de159ef4dce Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 15 Dec 2014 22:17:00 +0100 Subject: [PATCH 5/6] Don't own _libdir/pkgconfig and require pkgconfig instead. Reviewed-by: Michael Adam (cherry picked from commit 58ff6dd9f2be140c7ab583539c3c8f69d6abb3e6) --- uid_wrapper.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/uid_wrapper.spec b/uid_wrapper.spec index 2b78975..3b179d5 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -13,6 +13,7 @@ BuildRequires: cmake BuildRequires: libcmocka-devel Requires: cmake +Requires: pkgconfig %description Some projects like a file server need privilege separation to be able to switch @@ -64,7 +65,6 @@ popd %dir %{_libdir}/cmake/uid_wrapper %{_libdir}/cmake/uid_wrapper/uid_wrapper-config-version.cmake %{_libdir}/cmake/uid_wrapper/uid_wrapper-config.cmake -%dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/uid_wrapper.pc %{_mandir}/man1/uid_wrapper.1* @@ -72,6 +72,7 @@ popd * 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. From 413c8e93e81e97f0edfb444e88b97ffa369b2616 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 21 Jan 2015 13:52:25 +0100 Subject: [PATCH 6/6] Update to version 1.1.0 --- .gitignore | 1 + aarch64-has-no-sys-access.patch | 15 --------------- sources | 2 +- uid_wrapper.spec | 9 +++++---- 4 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 aarch64-has-no-sys-access.patch diff --git a/.gitignore b/.gitignore index dffae94..1082de1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /uid_wrapper-1.0.1.tar.gz /uid_wrapper-1.0.2.tar.gz +/uid_wrapper-1.1.0.tar.gz diff --git a/aarch64-has-no-sys-access.patch b/aarch64-has-no-sys-access.patch deleted file mode 100644 index 9e0cae7..0000000 --- a/aarch64-has-no-sys-access.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: uid_wrapper-1.0.2/tests/testsuite.c -=================================================================== ---- uid_wrapper-1.0.2.orig/tests/testsuite.c -+++ uid_wrapper-1.0.2/tests/testsuite.c -@@ -198,8 +198,10 @@ static void test_uwrap_syscall(void **st - rc = access(".", R_OK); - assert_int_equal(rc, 0); - -+#ifdef SYS_access - rc = syscall(SYS_access, ".", R_OK); - assert_int_equal(rc, 0); -+#endif - - ZERO_STRUCT(tv1); - ZERO_STRUCT(tv2); diff --git a/sources b/sources index 0aadc5b..7289e50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8fb6b12fa2f0dd918f2d5ad90e60014f uid_wrapper-1.0.2.tar.gz +097385bb018d4f3e521a176e9e6d3f07 uid_wrapper-1.1.0.tar.gz diff --git a/uid_wrapper.spec b/uid_wrapper.spec index 3b179d5..1e1f172 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,13 +1,12 @@ Name: uid_wrapper -Version: 1.0.2 -Release: 5%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: A wrapper for privilege separation License: GPLv3+ Url: http://cwrap.org/ Source0: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz -Patch0: aarch64-has-no-sys-access.patch BuildRequires: cmake BuildRequires: libcmocka-devel @@ -31,7 +30,6 @@ development/testing. %prep %setup -q -%patch0 -p1 %build if test ! -e "obj"; then @@ -69,6 +67,9 @@ popd %{_mandir}/man1/uid_wrapper.1* %changelog +* 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.