gentoo resync : 25.09.2021

3 files changed, 2 insertions, 244 deletions

diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 57b7a448aa38..060d6d90afba 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -2,12 +2,11 @@ AUX libcap-2.21-include.patch 218 BLAKE2B 536be33e749bc818efb29e3a7a010029025520
 AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 988 BLAKE2B 63417032b843ff7cb704c9880cfca4db5083d05d479c71dd12925d729f22a4900c2ae277a20399d58830eaca969842d587a2ae0a646809d6b659a75d13678312 SHA512 ba573ce68858c1370f3d25ad03678a534e6f3052076694d09e795d1febf2f3d76a6a170658b71d9e31105521fd5d22dd72095585a5402286dba424937064b389
 AUX libcap-2.38-no_perl.patch 3049 BLAKE2B 77fdcda75b273fd69695161d48f37fda40375f5f36acdb31e9f9e5b7585e6933733586c6ad96673efb79a6657dbbffd4431612ed723905e9f4d595a9dd8c49c4 SHA512 f3938a8a78407639bfdda4d9c4b4096025f956430f9efbce438689aabbea74915c55c6afbd45a7af4ecc0c437ee72e9aa8335da52d3237c928702e62824e537a
 AUX libcap-2.48-build-system-fixes.patch 6274 BLAKE2B 4c81eb50b0a682ca9df03145a53e884589e0961e1b754b522f40d48fca60fe983ae93349d256e62977bf28c99c8c25763d05aa8483aebfc436664756a220d70a SHA512 5b88a5c5ea14d2270ed4018249ceb32b0c91db03ed18a6989cc44250da91887385dc3f37087f716771ddbaa90c7e3d733a64063507465eb354252d9f64b85f80
-AUX libcap-2.56-build-system-fixes.patch 6367 BLAKE2B 3625df48d4444071d710406a78599bab9b25d2fc1b0fe0b722053690b7ac99e62a1d66ef3597678752dab506680425b0c47fed386c1b83b86e13e357f0408157 SHA512 560f54b2018602ba9c39938ea7623ee363eca9c0f11467a38292f074a0e53b9cd0f38724cdcc952d759c0da0952199627aabc1d253da0aecb1c2301f595bf714
 AUX libcap-2.57-parallel-make.patch 1103 BLAKE2B f5c1517577d7c34ed8a4b9fcc8527e93a5b6301b3c2bbcfda21f3caa4bd3c22e6d524ea19f93c645f4f93153a71f93c132c97bac90594d4abbb3bb629d175daf SHA512 06e2d5d3bc757760b3bddedaec88373a7aef7d9052003bac46fe491d2e356247f0f1b199dc1ea11cfd368a5c047e8621e8f0cf8a1d82407deeee2ebde60f67a5
 DIST libcap-2.49.tar.xz 139568 BLAKE2B 5746dcdf2a737e747450bd50a701ee8543277b17b7fbf1304b79f707a088ea74dc6dc79c61ff89b55b718a460a7b0814f960f44d07944a97b832b78f4e14e07f SHA512 2934a2ded1370edeb9603dbf43d8ca23a2eb5d67efc5cec5d4ba96c707a8db2702da8aa9be0cb86c5ff100d37ec96115c7777a7566ad0ab2e0b4a288bbe357d0
-DIST libcap-2.56.tar.xz 167056 BLAKE2B 97d1cf6196bcbcb48e335f810385ca2b36e7c3e234a1f99172fe00419ecc4af7337f208e107f012e5ffd46c1b6207a9d4515f3a677a924dd26ed8a699a080a5a SHA512 8a5c6c99458b0996c9599e00648e99e53b222ddf429535c475099c1af02796331b864fbfae767c16cfb7f2899cf0beaf74095e26a52988361ea1400f012f30c8
 DIST libcap-2.57.tar.xz 167740 BLAKE2B e0c004f3d11caf824d907315e6102707bb34c0ef3e9d430f23c191d711f073267ef6dc44463e2ce8041b8d13658b0c20560f7f3c6387f770ff9e66b81ff9f5d3 SHA512 5c70b3c6a1248ca0de92538614f0d0d516d72f6f25b135c92738c377b67533662e6fd6b0b61cb051ec99f406387d3334fcc7ddb54789626e4c387bcf46ebffbf
+DIST libcap-2.58.tar.xz 168520 BLAKE2B 9f160c08e7e8bcb9eb49ab6a7a0805145461613a946ccfebeadc269b26331eadc9f467437b2f5b022e9a545b034ea4fd8fed4d5893e84d9a48dd85318810b974 SHA512 092e45f82113293e1c2db7e51dca7298496c2a3af08eb41107e8c2b4798c25d3c9059e152181dc048b232fe0e59c4c3beaa158da2e5798cd6e1013d85226a9cf
 EBUILD libcap-2.49-r1.ebuild 2127 BLAKE2B d77712422b1cb13b04b1a18e573c20151b03098a9effaee4a62b51f4035eac2f3dcc2760f6050d05220dca63edbd978df79299e6be4c885a73ec7a079d1cd558 SHA512 fb01c7f3c68d3fa55221bc0602c21ddb399121f97a0a3c9ef5788bbecb3912cc9f9924bd0339e27acc3103d3a1e110b4029f99c27a7232fd83229075383d898b
-EBUILD libcap-2.56.ebuild 2215 BLAKE2B 2538bc88c4f445d7eada3e0b3fdde720d95d03cf4bb56b8cf29d94061fbdf742f5ab951e08eed276f541de38ef0640276a83802bc7a86eed7537b84f00b0d23d SHA512 4eb915980141d110bd8c706e080a9190854f0d1e203185254a34433245197867fda31c70fa90d495cc866bc0b4ab23af0742879871b53240eca98da8a0b66621
 EBUILD libcap-2.57.ebuild 2218 BLAKE2B 31b59f3288097cbad2db73d8a08f6c92dd20e8f3db24ca3a70e38d6d8d07294833eb6773db1822b508c11fc7af47f30b422f0c578dd7f4d029e5af278e77cfd9 SHA512 ebf697457e90c80c89f67b0d1087856edb50a5ec7dc2cc45d13ad3e83c060bd71b519f88c02e70d2207d24e85941942663f370fe5ce488364cffa1c7e8b5f7b3
+EBUILD libcap-2.58.ebuild 2136 BLAKE2B 01dfe09c3089be3dc63da9d5c2ab8a1804979bb2a901d229cdd1f4722050307dc020f6745609bebc2e3d331065fa0ab06bcff2ce0b53588276eb3087f8afacb2 SHA512 75de17b063652f6c0788c26d19589c1790d5e713c47558f1e6ff28e4e7adfc6a66683be2fbc8cf6250ebc3e8670e4bcbee8f8f1d692846550b3aeb35334dbac9
 MISC metadata.xml 438 BLAKE2B b5260cc84a3fe6b992bb6218846c738af296522d7a467337c05a6240fd07fc9d6cece779bd9fcf24a11486a70874e17acae8182647d307a31cf43e1c19c3a2d3 SHA512 fa3713dcf6b7bb2ea6d4c2fdefc05e92ae345c76a6187ebcb40dab8c4ce0148650a8301f236efcb8cf53fff25730977a385578dbaa160b800159c6d6abbf37a9
diff --git a/sys-libs/libcap/files/libcap-2.56-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.56-build-system-fixes.patch
deleted file mode 100644
index 572bde97e2c2..000000000000
--- a/sys-libs/libcap/files/libcap-2.56-build-system-fixes.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-From 3249c2696468bc82ec45f4fcabddc390473a45da Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sat, 4 Sep 2021 10:39:34 +0200
-Subject: [PATCH 1/3] Build system fixes
-
-Summary:
-- Always keep $(WARNINGS) when overriding CFLAGS
-
-Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
----
- Make.Rules | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Make.Rules b/Make.Rules
-index 3eeb098..00f2a03 100644
---- a/Make.Rules
-+++ b/Make.Rules
-@@ -78,10 +78,11 @@ OBJCOPY := $(CROSS_COMPILE)objcopy
- 
- DEBUG = # -g -DDEBUG
- WARNINGS=-Wall -Wwrite-strings -Wpointer-arith -Wcast-qual -Wcast-align \
--        -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs       \
-+	-Wstrict-prototypes -Wmissing-prototypes -Wnested-externs       \
- 	-Winline -Wshadow
- COPTS ?= -O2
--CFLAGS ?= $(COPTS) $(WARNINGS) $(DEBUG)
-+CFLAGS ?= $(COPTS) $(DEBUG)
-+CFLAGS += $(WARNINGS)
- CPPFLAGS += -Dlinux $(DEFINES) $(LIBCAP_INCLUDES)
- LDFLAGS ?= # -g
- 
--- 
-2.33.0
-
-
-From 99799844ad9272d43892881d1090369e6032aec2 Mon Sep 17 00:00:00 2001
-From: "Andrew G. Morgan" <morgan@kernel.org>
-Date: Sat, 4 Sep 2021 11:42:24 -0700
-Subject: [PATCH 2/3] Don't build the tests/binaries until we want to run them
-
-Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
----
- tests/Makefile | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/tests/Makefile b/tests/Makefile
-index dd78432..ecb7d1b 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -8,12 +8,10 @@ include ../Make.Rules
- #
- 
- all:
--	$(MAKE) libcap_launch_test uns_test
--ifeq ($(PTHREADS),yes)
--	$(MAKE) psx_test libcap_psx_test libcap_psx_launch_test
--endif
-+	@echo leave test building to test target
- 
--install: all
-+install:
-+	@echo nothing to install from tests
- 
- ifeq ($(DYNAMIC),yes)
- LINKEXTRA=-Wl,-rpath,../libcap
--- 
-2.33.0
-
-
-From 5ef14d07420c299ecd8de96928a5d1ce1e232df3 Mon Sep 17 00:00:00 2001
-From: "Andrew G. Morgan" <morgan@kernel.org>
-Date: Sat, 4 Sep 2021 14:05:11 -0700
-Subject: [PATCH 3/3] Refactor top level Makefile to reduce redundant building
-
-Make build a bit quicker for folk that don't want to run tests.
-
-Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
----
- Makefile         | 28 +++++-----------------------
- doc/Makefile     |  6 ++++++
- go/Makefile      |  5 +++--
- libcap/Makefile  |  3 +++
- pam_cap/Makefile |  2 +-
- progs/Makefile   |  5 +++--
- 6 files changed, 21 insertions(+), 28 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 1c195dd..9ee11c8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -8,7 +8,7 @@ include Make.Rules
- # flags
- #
- 
--all install clean: %: %-here
-+all test sudotest install clean: %: %-here
- 	$(MAKE) -C libcap $@
- ifneq ($(PAM_CAP),no)
- 	$(MAKE) -C pam_cap $@
-@@ -20,10 +20,13 @@ endif
- 	$(MAKE) -C tests $@
- 	$(MAKE) -C progs $@
- 	$(MAKE) -C doc $@
--	$(MAKE) -C kdebug $@
- 
- all-here:
- 
-+test-here:
-+
-+sudotest-here:
-+
- install-here:
- 
- clean-here:
-@@ -41,30 +44,9 @@ distclean: clean
- release: distclean
- 	cd .. && ln -s libcap libcap-$(VERSION).$(MINOR) && tar cvf libcap-$(VERSION).$(MINOR).tar --exclude patches libcap-$(VERSION).$(MINOR)/* && rm libcap-$(VERSION).$(MINOR)
- 
--test: all
--	$(MAKE) -C libcap $@
--	$(MAKE) -C tests $@
--ifneq ($(PAM_CAP),no)
--	$(MAKE) -C pam_cap $@
--endif
--ifeq ($(GOLANG),yes)
--	$(MAKE) -C go $@
--endif
--	$(MAKE) -C progs $@
--
- ktest: all
- 	$(MAKE) -C kdebug test
- 
--sudotest: all
--	$(MAKE) -C tests $@
--ifneq ($(PAM_CAP),no)
--	$(MAKE) -C pam_cap $@
--endif
--ifeq ($(GOLANG),yes)
--	$(MAKE) -C go $@
--endif
--	$(MAKE) -C progs $@
--
- distcheck:
- 	./distcheck.sh
- 	$(MAKE) DYNAMIC=no COPTS="-D_FORTIFY_SOURCE=2 -O1 -g" clean test
-diff --git a/doc/Makefile b/doc/Makefile
-index e2802dc..9614180 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -32,6 +32,12 @@ MANS = $(MAN1S) $(MAN3S) $(MAN8S)
- 
- all: $(MANS)
- 
-+test:
-+	@echo no doc tests available
-+
-+sudotest:
-+	@echo no doc sudotests available
-+
- .PHONY: html
- html:
- 	mkdir -p html
-diff --git a/go/Makefile b/go/Makefile
-index 5af5321..2b2061b 100644
---- a/go/Makefile
-+++ b/go/Makefile
-@@ -14,8 +14,9 @@ IMPORTDIR=kernel.org/pub/linux/libs/security/libcap
- PKGDIR=pkg/$(GOOSARCH)/$(IMPORTDIR)
- 
- DEPS=../libcap/libcap.a ../libcap/libpsx.a
-+TESTS=compare-cap try-launching psx-signals
- 
--all: PSXGOPACKAGE CAPGOPACKAGE web setid gowns captree compare-cap try-launching psx-signals
-+all: PSXGOPACKAGE CAPGOPACKAGE web setid gowns captree
- 
- $(DEPS):
- 	$(MAKE) -C ../libcap all
-@@ -93,7 +94,7 @@ endif
- b210613: b210613.go CAPGOPACKAGE
- 	CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) build -mod=vendor $<
- 
--test: all
-+test: all $(TESTS)
- 	CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) $(GO) test -mod=vendor $(IMPORTDIR)/psx
- 	CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) $(GO) test -mod=vendor $(IMPORTDIR)/cap
- 	LD_LIBRARY_PATH=../libcap ./compare-cap
-diff --git a/libcap/Makefile b/libcap/Makefile
-index 4b96a0c..84340f2 100644
---- a/libcap/Makefile
-+++ b/libcap/Makefile
-@@ -148,6 +148,9 @@ ifeq ($(PTHREADS),yes)
- endif
- endif
- 
-+sudotest:
-+	@echo no sudotests for libcap
-+
- install: install-static
- ifeq ($(SHARED),yes)
- 	$(MAKE) install-shared
-diff --git a/pam_cap/Makefile b/pam_cap/Makefile
-index b245307..a000978 100644
---- a/pam_cap/Makefile
-+++ b/pam_cap/Makefile
-@@ -72,7 +72,7 @@ test: testlink test_pam_cap pam_cap.so
- 	LD_LIBRARY_PATH=../libcap ./pam_cap.so --help
- 	@echo "module can be run as an executable!"
- 
--sudotest: test test_pam_cap
-+sudotest: test_pam_cap
- 	$(SUDO) ./test_pam_cap root 0x0 0x0 0x0 config=./capability.conf
- 	$(SUDO) ./test_pam_cap root 0x0 0x0 0x0 config=./sudotest.conf
- 	$(SUDO) ./test_pam_cap alpha 0x0 0x0 0x0 config=./capability.conf
-diff --git a/progs/Makefile b/progs/Makefile
-index 2f887c8..e2bd7fe 100644
---- a/progs/Makefile
-+++ b/progs/Makefile
-@@ -42,7 +42,8 @@ ifeq ($(RAISE_SETFCAP),yes)
- 	$(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap
- endif
- 
--test: $(PROGS) capsh
-+test:
-+	@echo "no program tests without privilege, try 'make sudotest'"
- 
- capshdoc.h.cf: capshdoc.h ./mkcapshdoc.sh
- 	./mkcapshdoc.sh > $@
-@@ -60,7 +61,7 @@ uns_test: ../tests/uns_test.c
- 	$(MAKE) -C ../tests uns_test
- 	cp ../tests/uns_test .
- 
--sudotest: test tcapsh-static uns_test
-+sudotest: tcapsh-static uns_test
- 	$(SUDO) $(LDPATH) ./quicktest.sh
- 
- clean:
--- 
-2.33.0
-
diff --git a/sys-libs/libcap/libcap-2.56.ebuild b/sys-libs/libcap/libcap-2.58.ebuild
index 0298367e4475..ea1e6af49768 100644
--- a/sys-libs/libcap/libcap-2.56.ebuild
+++ b/sys-libs/libcap/libcap-2.58.ebuild
@@ -23,8 +23,6 @@ DEPEND="${PDEPEND}
 BDEPEND="tools? ( dev-lang/go )"
 
 PATCHES=(
-	# backport, remove on bump
-	"${FILESDIR}"/${PN}-2.56-build-system-fixes.patch
 	"${FILESDIR}"/${PN}-2.38-no_perl.patch
 	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
 )