Mercurial > vanilla

changeset 1267:c22994927443

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core/libcap: upgrade to 2.60
author David Demelier <markand@malikania.fr>
date Wed, 10 Nov 2021 14:45:36 +0100
parents 340f62d6f172
children 75472fcfed5f
files core/libcap/libcap.sh core/libcap/libcap.sha1 core/libcap/patch-makefile.patch
diffstat 3 files changed, 21 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/core/libcap/libcap.sh	Wed Nov 10 14:41:13 2021 +0100
+++ b/core/libcap/libcap.sh	Wed Nov 10 14:45:36 2021 +0100
@@ -16,13 +16,13 @@
 #
 
 PKGNAME=libcap
-PKGVERSION=2.26
+PKGVERSION=2.60
 PKGREVISION=1
 PKGLICENSE="GPL-2.0-only"
 PKGSUMMARY="POSIX 1003.1e capabilities"
-PKGWWW="https://kernel.org/pub/linux/libs/security/linux-privs/libcap2"
+PKGWWW="https://sites.google.com/site/fullycapable"
 PKGDOWNLOAD="https://kernel.org/pub/linux/libs/security/linux-privs/libcap2/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="attr linux-headers perl"
+PKGDEPENDS="bash:build attr linux-headers perl"
 PKGPRESERVE="lib/libcap.so.2.26"
 
 : ${CC:=clang}
@@ -32,17 +32,19 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	tar -xvf $PKGNAME-$PKGVERSION.tar.xz
 	cd $PKGNAME-$PKGVERSION
 
+	patch -p1 < ../patch-makefile.patch
 	make \
 		BUILD_CC="$CC" \
 		CC="$CC" \
-		CFLAGS="$CFLAGS" \
+		DESTDIR=$DESTDIR \
+		EXTRA_CFLAGS="$CFLAGS" \
+		GOLANG=no \
+		LIBDIR=/lib \
 		RAISE_SETFCAP=no \
 		SBINDIR=/bin \
-		DESTDIR=$DESTDIR \
-		LIBDIR=/lib \
 		lib=/lib \
 		prefix= \
 		all install
--- a/core/libcap/libcap.sha1	Wed Nov 10 14:41:13 2021 +0100
+++ b/core/libcap/libcap.sha1	Wed Nov 10 14:45:36 2021 +0100
@@ -1,1 +1,1 @@
-f3cd8447b31651fa6b542e6a15a352ae72ead92e  libcap-2.26.tar.xz
+d17862b8cdb7c784572deb60df279c8a06775e0f  libcap-2.60.tar.xz
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/libcap/patch-makefile.patch	Wed Nov 10 14:45:36 2021 +0100
@@ -0,0 +1,11 @@
+--- a/Make.Rules
++++ b/Make.Rules
+@@ -82,7 +82,7 @@
+ 	-Winline -Wshadow -Wunreachable-code
+ COPTS ?= -O2
+ CFLAGS ?= $(COPTS) $(DEBUG)
+-CFLAGS += $(WARNINGS)
++CFLAGS += $(WARNINGS) $(EXTRA_CFLAGS)
+ CPPFLAGS += -Dlinux $(DEFINES) $(LIBCAP_INCLUDES)
+ LDFLAGS ?= # -g
+