- updated to 2.36

- updated make patch

diff --git a/libcap-make.patch b/libcap-make.patch
index fbb5d7e22c8df0e0635441528ce71278989d9608..b65312ef1cbaa2da4ed6deee118d029f33033d8e 100644 (file)
--- a/libcap-make.patch
+++ b/libcap-make.patch
@@ -1,15 +1,16 @@
---- libcap-2.33/Make.Rules.orig        2020-03-02 00:12:15.000000000 +0100
-+++ libcap-2.33/Make.Rules     2020-03-22 18:57:35.993134683 +0100
-@@ -50,7 +50,7 @@
- IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
+--- libcap-2.36/Make.Rules.orig        2020-06-03 06:08:48.000000000 +0200
++++ libcap-2.36/Make.Rules     2020-06-03 21:32:52.392817492 +0200
+@@ -51,7 +51,8 @@
  
- CC := gcc # -std=c99
--CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+CFLAGS := $(OPT_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ CC := $(CROSS_COMPILE)gcc
+ DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-CFLAGS := -O2 $(DEFINES)
++OPT_CFLAGS := -O2
++CFLAGS := $(OPT_CFLAGS) $(DEFINES)
  BUILD_CC := $(CC)
- BUILD_CFLAGS := $(CFLAGS) $(IPATH)
- AR := ar
-@@ -61,7 +61,7 @@
+ BUILD_CFLAGS := -O2 $(DEFINES) $(IPATH)
+ AR := $(CROSS_COMPILE)ar
+@@ -62,7 +63,7 @@
          -Wstrict-prototypes -Wmissing-prototypes \
          -Wnested-externs -Winline -Wshadow
  LD=$(CC) -Wl,-x -shared

diff --git a/libcap.spec b/libcap.spec
index 9f58527295fea3f0d44d0c6df8df85c5da64d5e8..a52e100189d6a255fed12de119cd625c623b21fa 100644 (file)
--- a/libcap.spec
+++ b/libcap.spec
@@ -9,13 +9,13 @@ Summary:      POSIX.1e capability suite
 Summary(pl.UTF-8):     Wsparcie dla standardu "capability" POSIX.1e
 Summary(pt_BR.UTF-8):  Biblioteca para leitura e configuração de capabilities.
 Name:          libcap
-Version:       2.33
+Version:       2.36
 Release:       1
 Epoch:         1
 License:       GPL v2 or BSD
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.xz
-# Source0-md5: dcc6220b4a9bf260050b20c07edcddf4
+# Source0-md5: 3d8cd4a87650cdee130691cb110c2ce2
 Patch0:                %{name}-make.patch
 URL:           https://sites.google.com/site/fullycapable/
 BuildRequires: attr-devel
@@ -111,11 +111,10 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -j1 install \
        FAKEROOT=$RPM_BUILD_ROOT \
        %{!?with_golang:GOLANG=0} \
+       PKGCONFIGDIR=%{_pkgconfigdir} \
        RAISE_SETFCAP=no \
        lib=%{_lib}
 
-cp -p libcap/libpsx.a $RPM_BUILD_ROOT%{_libdir}
-
 install -d $RPM_BUILD_ROOT/%{_lib}/security
 install -p pam_cap/pam_cap.so $RPM_BUILD_ROOT/%{_lib}/security
 install -d $RPM_BUILD_ROOT/etc/security
@@ -177,3 +176,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc pam_cap/License
 %attr(755,root,root) /%{_lib}/security/pam_cap.so
 %config(noreplace) %verify(not md5 mtime size) /etc/security/capability.conf
+
+# TODO: golang - where?
+# installs under
+#%{_datadir/gocode/src/libcap
+# or should we use
+#%{_libdir/golang/src/libcap