- updated to 2.43

- updated make patch

diff --git a/libcap-make.patch b/libcap-make.patch
index b65312ef1cbaa2da4ed6deee118d029f33033d8e..c123aa8a9270872cf00aadba8f8d990379ee61f5 100644 (file)
--- a/libcap-make.patch
+++ b/libcap-make.patch
@@ -1,21 +1,16 @@
---- 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 @@
+--- libcap-2.43/Make.Rules.orig        2020-08-22 09:14:05.046054584 +0200
++++ libcap-2.43/Make.Rules     2020-08-22 09:16:07.162059691 +0200
+@@ -56,9 +56,11 @@
  
- CC := $(CROSS_COMPILE)gcc
+ 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 := -O2 $(DEFINES) $(IPATH)
- AR := $(CROSS_COMPILE)ar
-@@ -62,7 +63,7 @@
-         -Wstrict-prototypes -Wmissing-prototypes \
-         -Wnested-externs -Winline -Wshadow
- LD=$(CC) -Wl,-x -shared
--LDFLAGS := #-g
-+LDFLAGS := $(OPT_LDFLAGS) #-g
- LIBCAPLIB := -L$(topdir)/libcap -lcap
- LIBPSXLIB := -L$(topdir)/libcap -lpsx -lpthread
- 
+-CFLAGS ?= -O2 $(DEFINES)
++CFLAGS ?= -O2
++CFLAGS += $(DEFINES)
+ BUILD_CC ?= $(CC)
+-BUILD_CFLAGS ?= -O2 $(DEFINES) $(IPATH)
++BUILD_CFLAGS ?= -O2
++BUILD_CFLAGS += $(DEFINES) $(IPATH)
+ AR ?= $(CROSS_COMPILE)ar
+ RANLIB ?= $(CROSS_COMPILE)ranlib
+ DEBUG = -g #-DDEBUG

diff --git a/libcap.spec b/libcap.spec
index a52e100189d6a255fed12de119cd625c623b21fa..469c6cd7dfa66b49dd005ea7793cd62cf1973d8f 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.36
+Version:       2.43
 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: 3d8cd4a87650cdee130691cb110c2ce2
+# Source0-md5: 28f65c74c7ea797f70d3627d0bf1b342
 Patch0:                %{name}-make.patch
 URL:           https://sites.google.com/site/fullycapable/
 BuildRequires: attr-devel
@@ -98,12 +98,12 @@ Moduł PAM capability wymuszający dziedziczone zbiory uprawnień.
 %patch0 -p1
 
 %build
+CFLAGS="%{rpmcflags} %{rpmcppflags}" \
+LDFLAGS="%{rpmldflags}" \
 %{__make} -j1 \
        CC="%{__cc}" \
        DEBUG= \
-       %{!?with_golang:GOLANG=0} \
-       OPT_CFLAGS="-Iinclude %{rpmcflags} %{rpmcppflags}" \
-       OPT_LDFLAGS="%{rpmldflags}"
+       %{!?with_golang:GOLANG=0}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -179,6 +179,6 @@ rm -rf $RPM_BUILD_ROOT
 
 # TODO: golang - where?
 # installs under
-#%{_datadir/gocode/src/libcap
+#%{_datadir}/gocode/src/kernel.org/pub/linux/libs/security/libcap
 # or should we use
-#%{_libdir/golang/src/libcap
+#%{_libdir}/golang/src/libcap