diff --git a/libcap-2.22.tar.bz2 b/libcap-2.22.tar.bz2 deleted file mode 100644 index 08065f7..0000000 --- a/libcap-2.22.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f -size 60051 diff --git a/libcap-2.25.tar.xz b/libcap-2.25.tar.xz new file mode 100644 index 0000000..48b06f2 --- /dev/null +++ b/libcap-2.25.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162 +size 63672 diff --git a/libcap-nolibattr.patch b/libcap-nolibattr.patch deleted file mode 100644 index e5e2441..0000000 --- a/libcap-nolibattr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libcap-2.22.orig/libcap/Makefile -+++ libcap-2.22/libcap/Makefile -@@ -16,7 +16,7 @@ FILES=cap_alloc cap_proc cap_extint cap_ - # no support). - ifeq ($(LIBATTR),yes) - FILES += cap_file --LDFLAGS += -lattr -+LDFLAGS += - endif - - INCLS=libcap.h cap_names.h $(INCS) diff --git a/libcap.changes b/libcap.changes index e2ef1de..50145a0 100644 --- a/libcap.changes +++ b/libcap.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Mon Aug 29 21:10:05 UTC 2016 - dimstar@opensuse.org + +- Update to versison 2.25: + + Recover gperf detection in make rules. + + Man page typo fix. + + Tweak make rules to make packaging more straightforward. + + Fix error explanation in setcap. + + Drop need to link with libattr. It turns out libcap wasn't + actually using any code from that library, so linking to it was + superfluous. +- Drop libcap-nolibattr.patch: fixed upstream. +- No longer add %{buildroot} to all variables for make install the + Makefile learned about the meaning of DESTDIR. + +------------------------------------------------------------------- +Sat Jan 31 11:22:58 UTC 2015 - p.drouand@gmail.com + +- Update to version 2.24 + * Fix compilation problems (note to self, make distclean && make, + before release) + * Some make rule changes to make uploading a release to kernel.org + easier for me. + * Tidied up some documented links. +- Update libcap-nolibattr.patch +- Add pkg-config build requirement; libcap now provides a pkgconfig + file +- Clean up specfile +- Move libraries and binaries to /usr because of #UsrMove + ------------------------------------------------------------------- Thu Jun 19 17:32:36 UTC 2014 - crrodriguez@opensuse.org diff --git a/libcap.spec b/libcap.spec index baf7e33..7e3452c 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,7 +1,7 @@ # # spec file for package libcap # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,17 +20,13 @@ Name: libcap Summary: Library for Capabilities (linux-privs) Support License: BSD-3-Clause and GPL-2.0 Group: System/Libraries -Version: 2.22 +Version: 2.25 Release: 0 -Source: ftp://ftp.de.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-%{version}.tar.bz2 +Source: https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-%{version}.tar.xz Source2: baselibs.conf Url: https://sites.google.com/site/fullycapable/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch0: libcap-nolibattr.patch -%if 0%{?suse_version} > 1030 BuildRequires: fdupes -%endif -%define debug_package_requires libcap2 = %{version}-%{release} +BuildRequires: pkg-config %description Capabilities are a measure to limit the omnipotence of the superuser. @@ -40,8 +36,6 @@ control. Without kernel patches, you can use this library to drop capabilities within setuid binaries. If you use patches, this can be done automatically by the kernel. - - %package -n libcap2 Summary: Library for Capabilities (linux-privs) Support Group: System/Libraries @@ -72,8 +66,6 @@ draft 15 capabilities. Install libcap-devel if you want to develop or compile applications using libcap. - - %package progs Summary: Libcap utility programs Group: System/Filesystems @@ -82,26 +74,24 @@ Group: System/Filesystems This package contains utility programs handling capabilities via libcap. - - %prep %setup -q -%patch0 -p1 %build -# lib=%{_lib} make %{?_smp_mflags} COPTFLAG="$RPM_OPT_FLAGS" -lib=%{_lib} make %{?_smp_mflags} DEBUG="-g $RPM_OPT_FLAGS" +make prefix=%{_prefix} lib=%{_lib} LIBDIR=%{_libdir} SBINDIR=%{_sbindir} \ + INCDIR=%{_includedir} MANDIR=%{_mandir} DEBUG="-g %{optflags}" %install -make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=$RPM_BUILD_ROOT/%{_lib} MANDIR=$RPM_BUILD_ROOT%{_mandir} RAISE_SETFCAP=no -# remove unneeded files -rm -f $RPM_BUILD_ROOT/%{_lib}/*.*a -# move *.so file to libdir and relink -rm -f $RPM_BUILD_ROOT/%{_lib}/*.so -mkdir -p $RPM_BUILD_ROOT%{_libdir} -ln -s /%{_lib}/libcap.so.2 $RPM_BUILD_ROOT%{_libdir}/libcap.so -%if 0%{?suse_version} > 1030 +make install RAISE_SETFCAP=no \ + DESTDIR=%{buildroot} \ + LIBDIR=/%{_libdir} \ + SBINDIR=/%{_sbindir} \ + INCDIR=/%{_includedir} \ + MANDIR=/%{_mandir}/ \ + PKGCONFIGDIR=%{_libdir}/pkgconfig/ +find %{buildroot} -type f -name '*.la' -print -delete +# do not provide static libs +rm %{buildroot}%{_libdir}/libcap.a %fdupes -s $RPM_BUILD_ROOT -%endif %post -n libcap2 -p /sbin/ldconfig @@ -109,19 +99,21 @@ ln -s /%{_lib}/libcap.so.2 $RPM_BUILD_ROOT%{_libdir}/libcap.so %files -n libcap2 %defattr(-,root,root) -%attr(755,root,root) /%{_lib}/libcap.so.* +%doc License +%{_libdir}/libcap.so.* %files progs %defattr(-,root,root) %{_mandir}/man1/* %{_mandir}/man8/* -/sbin/* +%{_sbindir}/* %files devel %defattr(-,root,root) %doc License README CHANGELOG %{_includedir}/sys/capability.h %{_libdir}/*.so +%{_libdir}/pkgconfig/%{name}.pc %{_mandir}/man3/* %changelog