diff --git a/.gitignore b/.gitignore index dffae94..6b9ea66 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +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/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..9812371 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8fb6b12fa2f0dd918f2d5ad90e60014f uid_wrapper-1.0.2.tar.gz +ea0a3917db8bd48cebf10f518d8bbb96 uid_wrapper-1.1.1.tar.gz diff --git a/uid_wrapper.spec b/uid_wrapper.spec index 511c589..6d55a69 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,17 +1,19 @@ Name: uid_wrapper -Version: 1.0.2 -Release: 2%{?dist} +Version: 1.1.1 +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: cmake28 BuildRequires: libcmocka-devel +Requires: cmake +Requires: pkgconfig + %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 @@ -28,15 +30,15 @@ development/testing. %prep %setup -q -%patch0 -p1 %build if test ! -e "obj"; then mkdir obj fi pushd obj -%cmake \ +%cmake28 \ -DUNIT_TESTING=ON \ + -DCMAKE_SKIP_RPATH:BOOL=OFF \ %{_builddir}/%{name}-%{version} make %{?_smp_mflags} VERBOSE=1 @@ -59,38 +61,52 @@ 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 -%dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/uid_wrapper.pc %{_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 + +* 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. + * 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 +* 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