libcap: update to 2.26

4 files changed, 11 insertions, 45 deletions

diff --git a/libcap/.footprint b/libcap/.footprint
index 2986cba1..4c55aed7 100644
--- a/libcap/.footprint
+++ b/libcap/.footprint
@@ -1,6 +1,6 @@
 drwxr-xr-x	root/root	lib/
-lrwxrwxrwx	root/root	lib/libcap.so.2 -> libcap.so.2.25
--rw-r--r--	root/root	lib/libcap.so.2.25
+lrwxrwxrwx	root/root	lib/libcap.so.2 -> libcap.so.2.26
+-rw-r--r--	root/root	lib/libcap.so.2.26
 drwxr-xr-x	root/root	sbin/
 -rwxr-xr-x	root/root	sbin/capsh
 -rwxr-xr-x	root/root	sbin/getcap
@@ -12,7 +12,7 @@ drwxr-xr-x	root/root	usr/include/sys/
 -rw-r--r--	root/root	usr/include/sys/capability.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libcap.a
-lrwxrwxrwx	root/root	usr/lib/libcap.so -> ../../lib/libcap.so.2.25
+lrwxrwxrwx	root/root	usr/lib/libcap.so -> ../../lib/libcap.so.2.26
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libcap.pc
 drwxr-xr-x	root/root	usr/share/
diff --git a/libcap/.signature b/libcap/.signature
index f5fd9043..b89bc405 100644
--- a/libcap/.signature
+++ b/libcap/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqjHOuGScypAwBYxoohhYPKOy7VuiClGAlHa7IVvDScr38f24/CdKUOtjzk5tVCeLcO6TiVB8OfTj55I3bqJaswc=
-SHA256 (Pkgfile) = 009646b7b626a9e547d9e4d7d599ecab5a614aa3d9af28d49656d1ec47468582
-SHA256 (.footprint) = 05ee56643778445bd4dc126d33f0ebfd578ec85a45000ae7786420a9bda40d60
-SHA256 (libcap-2.25.tar.xz) = 693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162
-SHA256 (libcap-2.25-gperf.patch) = b435d629f4dcd53ba0b230ae6bc42708a155826b5ea350387e70594ee6a04b04
+RWRJc1FUaeVeqmwjGyGyehLiB/KtuH7GTXHBpu0ukJYfuUdVvfGfqcJbqj0BcDwyW/rsV1JNcsZ7i76BHQ1qruCUQodIoadimgE=
+SHA256 (Pkgfile) = a70bb902e3e4699f0263118db3df0bca55a815617f04cb04d3fbe6a516814a64
+SHA256 (.footprint) = bad2a61404305700aad924563b5898d93d904524b19b5e01e16c63fc90148ddf
+SHA256 (libcap-2.26.tar.xz) = b630b7c484271b3ba867680d6a14b10a86cfa67247a14631b14c06731d5a458b
diff --git a/libcap/Pkgfile b/libcap/Pkgfile
index f9d80f7d..f61cc0b8 100644
--- a/libcap/Pkgfile
+++ b/libcap/Pkgfile
@@ -4,19 +4,17 @@
 # Depends on:  attr
 
 name=libcap
-version=2.25
-release=2
-source=(https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$name-$version.tar.xz
-        $name-$version-gperf.patch)
+version=2.26
+release=1
+source=(https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$name-$version.tar.xz)
 
 build () {
     cd $name-$version
 
-    patch -p1 -i $SRC/$name-$version-gperf.patch
     sed -i "/^CFLAGS/s/-O2/$CFLAGS/" Make.Rules 
 
     make
-    make RAISE_SETFCAP=no DESTDIR=$PKG man_prefix=/usr/share install
+    make RAISE_SETFCAP=no DESTDIR=$PKG install
 
     install -d $PKG/usr/lib
     mv $PKG/lib/libcap.a $PKG/usr/lib
diff --git a/libcap/libcap-2.25-gperf.patch b/libcap/libcap-2.25-gperf.patch
deleted file mode 100644
index 45007a96..00000000
--- a/libcap/libcap-2.25-gperf.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 13992f56d80c0ee20e08f99b8e8ff37d63e65f9d Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 16 Jan 2017 12:09:35 -0500
-Subject: [PATCH] Fix build with gperf-3.1
-
-gperf-3.1 lookup functions take a size_t instead of unsigned int.
-
-To resolve this:
-
-1. Pass --includes to gperf so that size_t is defined.
-2. Remove __cap_lookup_name declaration.
----
- libcap/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libcap/Makefile b/libcap/Makefile
-index d189777..634a042 100644
---- a/libcap/Makefile
-+++ b/libcap/Makefile
-@@ -41,7 +41,7 @@ cap_names.h: _makenames
- 	./_makenames > cap_names.h
- 
- $(GPERF_OUTPUT): cap_names.list.h
--	perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, unsigned int);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@
-+	perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --includes --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@
- 
- cap_names.list.h: Makefile $(KERNEL_HEADERS)/linux/capability.h
- 	@echo "=> making $@ from $(KERNEL_HEADERS)/linux/capability.h"
--- 
-2.11.0
-