From cea66ef3c49d4a3740a88e713f5682b00e221764 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 7 Aug 2014 09:13:49 +0200 Subject: [PATCH 01/10] Fix building on rhel6 with bad %cmake macro. --- uid_wrapper.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uid_wrapper.spec b/uid_wrapper.spec index 511c589..21619b1 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -37,6 +37,7 @@ fi pushd obj %cmake \ -DUNIT_TESTING=ON \ + -DCMAKE_SKIP_RPATH:BOOL=OFF \ %{_builddir}/%{name}-%{version} make %{?_smp_mflags} VERBOSE=1 @@ -70,6 +71,7 @@ popd %changelog * Mon Aug 04 2014 Marcin Juszkiewicz - 1.0.2-2 - Handle lack of SYS_access on AArch64 +- Fix building on rhel6 with bad %cmake macro. * Thu Jul 31 2014 - Andreas Schneider - 1.0.2-1 - Update to version 1.0.2. From c2ab12b6a3b84c4c8787364495d6d4a92f7bf9da Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 7 Aug 2014 12:56:33 +0200 Subject: [PATCH 02/10] Use the cmake28 package in epel6. --- uid_wrapper.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/uid_wrapper.spec b/uid_wrapper.spec index 21619b1..b02f5ff 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -9,7 +9,7 @@ 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: cmake28 BuildRequires: libcmocka-devel %description @@ -35,7 +35,7 @@ if test ! -e "obj"; then mkdir obj fi pushd obj -%cmake \ +%cmake28 \ -DUNIT_TESTING=ON \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ %{_builddir}/%{name}-%{version} @@ -72,6 +72,7 @@ popd * Mon Aug 04 2014 Marcin Juszkiewicz - 1.0.2-2 - Handle lack of SYS_access on AArch64 - Fix building on rhel6 with bad %cmake macro. +- Use the cmake28 package in epel6. * Thu Jul 31 2014 - Andreas Schneider - 1.0.2-1 - Update to version 1.0.2. From 1c94c72f1456b27f83407c644c8258a44de1b0e5 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 2 Oct 2014 15:01:49 +0200 Subject: [PATCH 03/10] 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 b02f5ff..19c8224 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+ @@ -60,7 +60,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 @@ -69,6 +68,9 @@ popd %{_mandir}/man1/uid_wrapper.1* %changelog +* Thu Oct 02 2014 - Andreas Schneider - 1.0.2-3 +- resolves: #1146410 - Do not own /usr/lib64/cmake. + * Mon Aug 04 2014 Marcin Juszkiewicz - 1.0.2-2 - Handle lack of SYS_access on AArch64 - Fix building on rhel6 with bad %cmake macro. From 8698b36b416e0e4a986d839cdf1fda614a66554f Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 15 Dec 2014 22:13:27 +0100 Subject: [PATCH 04/10] Fix format errors in changelog. Signed-off-by: Michael Adam --- uid_wrapper.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/uid_wrapper.spec b/uid_wrapper.spec index 19c8224..5731ea2 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+ @@ -68,7 +68,10 @@ popd %{_mandir}/man1/uid_wrapper.1* %changelog -* Thu Oct 02 2014 - Andreas Schneider - 1.0.2-3 +* Mon Dec 15 2014 Michael Adam - 1.0.2-4 +- Fix format errors in changelog. + +* Thu Oct 02 2014 Andreas Schneider - 1.0.2-3 - resolves: #1146410 - Do not own /usr/lib64/cmake. * Mon Aug 04 2014 Marcin Juszkiewicz - 1.0.2-2 @@ -76,26 +79,26 @@ popd - Fix building on rhel6 with bad %cmake macro. - Use the cmake28 package in epel6. -* 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 e41e5f2fd8e0ae370c4274deac93c332ebdd6f11 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 15 Dec 2014 22:40:13 +0100 Subject: [PATCH 05/10] Require cmake, to not have directory _libdir/cmake without owner Reviewed-by: Michael Adam --- uid_wrapper.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/uid_wrapper.spec b/uid_wrapper.spec index 5731ea2..2f8a9b2 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -12,6 +12,8 @@ Patch0: aarch64-has-no-sys-access.patch BuildRequires: cmake28 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 @@ -70,6 +72,7 @@ popd %changelog * Mon Dec 15 2014 Michael Adam - 1.0.2-4 - Fix format errors in changelog. +- Require cmake. * Thu Oct 02 2014 Andreas Schneider - 1.0.2-3 - resolves: #1146410 - Do not own /usr/lib64/cmake. From 0aae6f91e996302dd64b6f4215cf7795061cf3d8 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 15 Dec 2014 22:17:00 +0100 Subject: [PATCH 06/10] Don't own _libdir/pkgconfig and require pkgconfig instead. Reviewed-by: Michael Adam --- uid_wrapper.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/uid_wrapper.spec b/uid_wrapper.spec index 2f8a9b2..af84ad2 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -13,6 +13,7 @@ BuildRequires: cmake28 BuildRequires: libcmocka-devel Requires: cmake +Requires: pkgconfig %description Some projects like a file server need privilege separation to be able to switch @@ -65,7 +66,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* @@ -73,6 +73,7 @@ popd * Mon Dec 15 2014 Michael Adam - 1.0.2-4 - 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-3 - resolves: #1146410 - Do not own /usr/lib64/cmake. From 4a240b3a95071c3386811752a0503511ab3f996c Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 21 Jan 2015 13:52:25 +0100 Subject: [PATCH 07/10] Update to version 1.1.0 --- .gitignore | 1 + sources | 2 +- uid_wrapper.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) 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/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 af84ad2..23e332a 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,6 +1,6 @@ Name: uid_wrapper -Version: 1.0.2 -Release: 4%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: A wrapper for privilege separation License: GPLv3+ @@ -70,6 +70,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-4 - Fix format errors in changelog. - Require cmake. From 5f7b45822e43ac4228761e677463fdbae1c81cd4 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 21 Jan 2015 16:30:38 +0100 Subject: [PATCH 08/10] Remove obsolete patch. --- aarch64-has-no-sys-access.patch | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 aarch64-has-no-sys-access.patch 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); From b0c0fff6ea2450aad4645fb0c2477bcff74c9913 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 21 Jan 2015 16:31:13 +0100 Subject: [PATCH 09/10] Remove patch from spec. --- uid_wrapper.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/uid_wrapper.spec b/uid_wrapper.spec index 23e332a..90a486d 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -7,7 +7,6 @@ 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: cmake28 BuildRequires: libcmocka-devel @@ -31,7 +30,6 @@ development/testing. %prep %setup -q -%patch0 -p1 %build if test ! -e "obj"; then From 0c7fac54c5f0b265901fedcc385ff1c322efb85c Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 2 Sep 2015 14:04:24 +0200 Subject: [PATCH 10/10] Update to version 1.1.1 --- .gitignore | 1 + sources | 2 +- uid_wrapper.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1082de1..6b9ea66 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /uid_wrapper-1.0.1.tar.gz /uid_wrapper-1.0.2.tar.gz /uid_wrapper-1.1.0.tar.gz +/uid_wrapper-1.1.1.tar.gz diff --git a/sources b/sources index 7289e50..9812371 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -097385bb018d4f3e521a176e9e6d3f07 uid_wrapper-1.1.0.tar.gz +ea0a3917db8bd48cebf10f518d8bbb96 uid_wrapper-1.1.1.tar.gz diff --git a/uid_wrapper.spec b/uid_wrapper.spec index 90a486d..6d55a69 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,5 +1,5 @@ Name: uid_wrapper -Version: 1.1.0 +Version: 1.1.1 Release: 1%{?dist} Summary: A wrapper for privilege separation @@ -68,6 +68,9 @@ popd %{_mandir}/man1/uid_wrapper.1* %changelog +* Wed Sep 02 2015 Andreas Schneider - 1.1.1-1 +- Update to version 1.1.1 + * Wed Jan 21 2015 Andreas Schneider - 1.1.0-1 - Update to version 1.1.0