[packages/libcap] - updated to 2.43 - updated make patch
qboosh
qboosh at pld-linux.org
Sat Aug 22 09:35:41 CEST 2020
commit 3720f29bcad61acfda827a5ce09503c53a9d1315
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Aug 22 09:38:06 2020 +0200
- updated to 2.43
- updated make patch
libcap-make.patch | 33 ++++++++++++++-------------------
libcap.spec | 14 +++++++-------
2 files changed, 21 insertions(+), 26 deletions(-)
---
diff --git a/libcap.spec b/libcap.spec
index a52e100..469c6cd 100644
--- 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
diff --git a/libcap-make.patch b/libcap-make.patch
index b65312e..c123aa8 100644
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libcap.git/commitdiff/3720f29bcad61acfda827a5ce09503c53a9d1315
More information about the pld-cvs-commit
mailing list