- updated to 2.28

diff --git a/libcap-make.patch b/libcap-make.patch
index 86f31aebab85628da104779461c4a1df4a2b319c..7568d976327bcd0a5c687683ba842ca082e40f6c 100644 (file)
--- a/libcap-make.patch
+++ b/libcap-make.patch
@@ -1,5 +1,5 @@
---- libcap-2.25/Make.Rules.orig        2016-01-31 02:14:53.000000000 +0100
-+++ libcap-2.25/Make.Rules     2016-03-30 20:34:57.110616155 +0200
+--- libcap-2.28/Make.Rules.orig        2019-12-07 21:10:11.000000000 +0100
++++ libcap-2.28/Make.Rules     2019-12-12 19:31:59.704359343 +0100
 @@ -49,7 +49,7 @@
  IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
  
@@ -15,6 +15,6 @@
  LD=$(CC) -Wl,-x -shared
 -LDFLAGS := #-g
 +LDFLAGS := $(OPT_LDFLAGS) #-g
- BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes)
+ LIBCAPLIB := -L$(topdir)/libcap -lcap
+ LIBPSXLIB := -L$(topdir)/libcap -lpsx -lpthread
  
- SYSTEM_HEADERS = /usr/include

diff --git a/libcap.spec b/libcap.spec
index cace0405103c06fe8cab22a46d3254279f609888..a633cb68244be341202b15d1cb73d3ee628c78e2 100644 (file)
--- a/libcap.spec
+++ b/libcap.spec
@@ -1,17 +1,25 @@
+#
+# Conditional build:
+%bcond_with    golang  # Go components (nothing useful yet?)
+
+%ifnarch %{ix86} %{x8664} %{arm} aarch64 mips64 mips64le ppc64le
+%undefine      with_golang
+%endif
 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.27
+Version:       2.28
 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: 2e8f9fab32eb5ccb37969fe317fd17aa
+# Source0-md5: 4066ddca53fb7e146f98372c8e43afc4
 Patch0:                %{name}-make.patch
 URL:           https://sites.google.com/site/fullycapable/
 BuildRequires: attr-devel
+%{?with_golang:BuildRequires:  golang}
 BuildRequires: pam-devel
 BuildRequires: perl-base
 BuildRequires: tar >= 1:1.22
@@ -90,21 +98,24 @@ Moduł PAM capability wymuszający dziedziczone zbiory uprawnień.
 %patch0 -p1
 
 %build
-%{__make} \
+%{__make} -j1 \
        CC="%{__cc}" \
-       OPT_CFLAGS="-Iinclude %{rpmcflags} %{rpmcppflags}" \
        DEBUG= \
-       OPT_LDFLAGS="%{rpmldflags}" \
-       LDLIBS="-L../libcap -lcap"
+       %{!?with_golang:GOLANG=0} \
+       OPT_CFLAGS="-Iinclude %{rpmcflags} %{rpmcppflags}" \
+       OPT_LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       RAISE_SETFCAP=no \
+%{__make} -j1 install \
        FAKEROOT=$RPM_BUILD_ROOT \
+       %{!?with_golang:GOLANG=0} \
+       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
@@ -144,6 +155,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcap.so
+%{_libdir}/libpsx.a
 %{_includedir}/sys/capability.h
 %{_pkgconfigdir}/libcap.pc
 %{_mandir}/man3/libcap*.3*