libcap: updated to 2.30

4 files changed, 10 insertions, 101 deletions

diff --git a/libcap/.footprint b/libcap/.footprint
index fbff6ea0..233d8605 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.29
--rw-r--r--	root/root	lib/libcap.so.2.29
+lrwxrwxrwx	root/root	lib/libcap.so.2 -> libcap.so.2.30
+-rw-r--r--	root/root	lib/libcap.so.2.30
 -rw-r--r--	root/root	lib/libpsx.a
 drwxr-xr-x	root/root	lib/security/
 -rwxr-xr-x	root/root	lib/security/pam_cap.so
@@ -16,7 +16,7 @@ drwxr-xr-x	root/root	usr/include/sys/
 -rw-r--r--	root/root	usr/include/sys/psx_syscall.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.29
+lrwxrwxrwx	root/root	usr/lib/libcap.so -> ../../lib/libcap.so.2.30
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libcap.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libpsx.pc
diff --git a/libcap/.signature b/libcap/.signature
index f20d1112..ed762776 100644
--- a/libcap/.signature
+++ b/libcap/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqjBUHgTEKedjZshhnwNSOaxAYgQQEvnWKBDZbLuMJBBXu6bTZpaKf/E3C36wjz/TIyDCwqmBi1QIVANFb9Qqeg4=
-SHA256 (Pkgfile) = 93d8d0817562261582dacd34fc4e7b2863525e678e0ef614411e0385e5cc3c8e
-SHA256 (.footprint) = b3adda1066793020d872c92cd2bf69122903dc0e0eba916893effb98a1d622e0
-SHA256 (libcap-2.29.tar.xz) = 6c83352c316c40d1d4c8ad704e13dc36840ff05eccc36050aa18e42e7f2aa7f8
-SHA256 (libcap-2.29-libpsx_pkgconfig.patch) = b4b20c4b8b24a2d99347685d77f8b492d9efbac793b6c6ff589cc4b50d261725
+RWRJc1FUaeVeqqq2Jl+Hg2znUD7733Si/TbxmLDY1lZ13o+UHs4EGtSvNzApCX7AFh4apjmDHTmb1Fn2eGgv+FtI0uN2HjGUkAc=
+SHA256 (Pkgfile) = 99bc0f28161b31360752650482d4e5ac25345bdfa50f0d0173d1ad96235cb595
+SHA256 (.footprint) = 864d11f62e04081fa7ce834391b99ffb591339038c10f7283bdc739d73826289
+SHA256 (libcap-2.30.tar.xz) = a287bae0b0d95e5230a1c4177b835c70774511b631f87c7bd29e91a03e027f11
diff --git a/libcap/Pkgfile b/libcap/Pkgfile
index 8c541017..a00ea3c1 100644
--- a/libcap/Pkgfile
+++ b/libcap/Pkgfile
@@ -4,15 +4,13 @@
 # Depends on:  attr linux-pam
 
 name=libcap
-version=2.29
-release=2
-source=(https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$name-$version.tar.xz
-        libcap-2.29-libpsx_pkgconfig.patch)
+version=2.30
+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/libcap-2.29-libpsx_pkgconfig.patch
     sed -i "/^CFLAGS/s/-O2/$CFLAGS/" Make.Rules 
 
     make GOLANG=no RAISE_SETFCAP=no DESTDIR=$PKG install
diff --git a/libcap/libcap-2.29-libpsx_pkgconfig.patch b/libcap/libcap-2.29-libpsx_pkgconfig.patch
deleted file mode 100644
index 413b2790..00000000
--- a/libcap/libcap-2.29-libpsx_pkgconfig.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From e13e5b24fb98dc3ec2f76bc51ed0d714460e75d8 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sat, 28 Dec 2019 18:48:35 +0100
-Subject: [PATCH] USe separate libpsx.pc file instead of libcap.pc
-
-pkgconfig fails to parse current libcap.pc file but pkgconf succeeds
-
-Gentoo-bug: https://bugs.gentoo.org/703932
----
- libcap/Makefile     | 12 +++++++++++-
- libcap/libcap.pc.in |  7 -------
- libcap/libpsx.pc.in | 12 ++++++++++++
- 3 files changed, 23 insertions(+), 8 deletions(-)
- create mode 100644 libcap/libpsx.pc.in
-
-diff --git a/libcap/Makefile b/libcap/Makefile
-index 949cfad..5795458 100644
---- a/libcap/Makefile
-+++ b/libcap/Makefile
-@@ -22,7 +22,7 @@ MAJLIBNAME=$(LIBNAME).$(VERSION)
- MINLIBNAME=$(MAJLIBNAME).$(MINOR)
- GPERF_OUTPUT = _caps_output.gperf
- 
--all: $(MINLIBNAME) $(STACAPLIBNAME) libcap.pc $(STAPSXLIBNAME)
-+all: $(MINLIBNAME) $(STACAPLIBNAME) libcap.pc libpsx.pc $(STAPSXLIBNAME)
- 
- ifeq ($(BUILD_GPERF),yes)
- USE_GPERF_OUTPUT = $(GPERF_OUTPUT)
-@@ -38,6 +38,15 @@ libcap.pc: libcap.pc.in
- 		-e 's,@deps@,$(DEPS),' \
- 		$< >$@
- 
-+libpsx.pc: libpsx.pc.in
-+	sed -e 's,@prefix@,$(prefix),' \
-+		-e 's,@exec_prefix@,$(exec_prefix),' \
-+		-e 's,@libdir@,$(LIBDIR),' \
-+		-e 's,@includedir@,$(inc_prefix)/include,' \
-+		-e 's,@VERSION@,$(VERSION).$(MINOR),' \
-+		-e 's,@deps@,$(DEPS),' \
-+		$< >$@
-+
- _makenames: _makenames.c cap_names.list.h
- 	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
- 
-@@ -86,6 +95,7 @@ ifeq ($(FAKEROOT),)
- endif
- 	mkdir -p -m 0755 $(FAKEROOT)$(PKGCONFIGDIR)
- 	install -m 0644 libcap.pc $(FAKEROOT)$(PKGCONFIGDIR)/libcap.pc
-+	install -m 0644 libpsx.pc $(FAKEROOT)$(PKGCONFIGDIR)/libpsx.pc
- ifeq ($(GOLANG),yes)
- 	mkdir -p -m 0755 $(FAKEROOT)$(GOPKGDIR)/libcap/cap
- 	install -m 0644 src/libcap/cap/* $(FAKEROOT)$(GOPKGDIR)/libcap/cap/
-diff --git a/libcap/libcap.pc.in b/libcap/libcap.pc.in
-index 3d6b273..69cd231 100644
---- a/libcap/libcap.pc.in
-+++ b/libcap/libcap.pc.in
-@@ -9,10 +9,3 @@ Version: @VERSION@
- Libs: -L${libdir} -lcap
- Libs.private: @deps@
- Cflags: -I${includedir}
--
--Name: libpsx
--Description: libpsx - linux posix syscall API for pthreads
--Version: @VERSION@
--Libs: -L${libdir} -lpsx -lpthread -Wl,-wrap,pthread_create
--Libs.private: @deps@
--Cflags: -I${includedir}
-diff --git a/libcap/libpsx.pc.in b/libcap/libpsx.pc.in
-new file mode 100644
-index 0000000..8677a86
---- /dev/null
-+++ b/libcap/libpsx.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: libpsx
-+Description: libpsx - linux posix syscall API for pthreads
-+Version: @VERSION@
-+Libs: -L${libdir} -lpsx -lpthread -Wl,-wrap,pthread_create
-+Libs.private: @deps@
-+Cflags: -I${includedir}
-+Requires: libcap
--- 
-2.24.1
-