diff --git a/libcap-2.10.tar.bz2 b/libcap-2.10.tar.bz2 deleted file mode 100644 index c99dd70..0000000 --- a/libcap-2.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ba33424dc5f55bbaf50c639c0769cae3c06336068c91f7f38288a26251eaf31 -size 46374 diff --git a/libcap-2.11-build-fix.diff b/libcap-2.11-build-fix.diff new file mode 100644 index 0000000..c606f6e --- /dev/null +++ b/libcap-2.11-build-fix.diff @@ -0,0 +1,11 @@ +--- libcap/Makefile-dist 2008-08-06 14:56:15.000000000 +0200 ++++ libcap/Makefile 2008-08-06 14:56:46.000000000 +0200 +@@ -27,7 +27,7 @@ + endif + + _makenames: _makenames.c cap_names.sed +- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ ++ $(BUILD_CC) $(BUILD_CFLAGS) -Iinclude $< -o $@ + + cap_names.h: _makenames + ./_makenames > cap_names.h diff --git a/libcap-2.11.tar.bz2 b/libcap-2.11.tar.bz2 new file mode 100644 index 0000000..34d1002 --- /dev/null +++ b/libcap-2.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a39882189f1921008eb18acc3f5517697ab13ad5eed1762ce67e31ff53805889 +size 47321 diff --git a/libcap-dynamic-link.diff b/libcap-dynamic-link.diff index 3c65b92..cecbb6e 100644 --- a/libcap-dynamic-link.diff +++ b/libcap-dynamic-link.diff @@ -1,11 +1,11 @@ ---- progs/Makefile-dist 2008-04-23 15:28:10.000000000 +0200 -+++ progs/Makefile 2008-04-23 15:28:24.000000000 +0200 -@@ -9,7 +9,7 @@ +--- progs/Makefile-dist 2008-08-06 14:45:01.000000000 +0200 ++++ progs/Makefile 2008-08-06 14:45:06.000000000 +0200 +@@ -6,7 +6,7 @@ + # + PROGS=getpcaps getcap setcap capsh + +-LDFLAGS += --static ++# LDFLAGS += --static + LDLIBS += -lcap + all: $(PROGS) - - $(PROGS): %: %.o -- $(CC) --static $(COPTFLAG) $(LDFLAGS) -o $@ $< $(LIBS) -+ $(CC) $(COPTFLAG) $(LDFLAGS) -o $@ $< $(LIBS) - - %.o: %.c $(INCS) - $(CC) $(CFLAGS) -c $< -o $@ diff --git a/libcap.changes b/libcap.changes index 7590f0d..d4d44d6 100644 --- a/libcap.changes +++ b/libcap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Aug 6 14:45:32 CEST 2008 - tiwai@suse.de + +- updated to libcap-2.11: + * makefile fixes, minor clean-ups + * fix cap_copy_int(), new cap_get_pid() and cap_compare() + * fix cap_copy_ext() +- fix build with libcap-2.11. + ------------------------------------------------------------------- Mon Aug 4 00:57:06 CEST 2008 - ro@suse.de diff --git a/libcap.spec b/libcap.spec index 2ebfe70..6adb2ac 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,10 +1,17 @@ # -# spec file for package libcap (Version 2.10) +# spec file for package libcap (Version 2.11) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,10 +24,11 @@ License: BSD 3-Clause Group: System/Libraries AutoReqProv: on Summary: Library for Capabilities (linux-privs) Support -Version: 2.10 -Release: 2 +Version: 2.11 +Release: 1 Source: ftp://ftp.de.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-%{version}.tar.bz2 Patch: libcap-dynamic-link.diff +Patch1: libcap-2.11-build-fix.diff #URL: http://www.kernel.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libcap2 = %{version} @@ -82,12 +90,16 @@ libcap. %prep %setup -q %patch +%patch1 %build -lib=%{_lib} make %{?jobs:-j %jobs} LDFLAGS= COPTFLAG="$RPM_OPT_FLAGS" +# lib=%{_lib} make %{?jobs:-j %jobs} COPTFLAG="$RPM_OPT_FLAGS" +lib=%{_lib} make %{?jobs:-j %jobs} DEBUG="-g $RPM_OPT_FLAGS" %install make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=$RPM_BUILD_ROOT/%{_lib} MANDIR=$RPM_BUILD_ROOT%{_mandir} +# remove unneeded fi +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} @@ -104,7 +116,7 @@ ln -s /%{_lib}/libcap.so.2 $RPM_BUILD_ROOT%{_libdir}/libcap.so %files progs %defattr(-,root,root) -%doc %{_mandir}/man8/* +%{_mandir}/man8/* /sbin/* %files devel @@ -112,9 +124,15 @@ ln -s /%{_lib}/libcap.so.2 $RPM_BUILD_ROOT%{_libdir}/libcap.so %doc License README CHANGELOG %{_includedir}/sys/capability.h %{_libdir}/*.so -%doc %{_mandir}/man?/* +%{_mandir}/man3/* %changelog +* Wed Aug 06 2008 tiwai@suse.de +- updated to libcap-2.11: + * makefile fixes, minor clean-ups + * fix cap_copy_int(), new cap_get_pid() and cap_compare() + * fix cap_copy_ext() +- fix build with libcap-2.11. * Mon Aug 04 2008 ro@suse.de - fix requires for debuginfo package * Wed Jun 11 2008 tiwai@suse.de