gentoo resync : 25.08.2020

7 files changed, 341 insertions, 46 deletions

diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index edb437e0bb9d..57ae8eeca760 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -2,14 +2,17 @@ AUX libcap-2.21-include.patch 218 BLAKE2B 536be33e749bc818efb29e3a7a010029025520
 AUX libcap-2.25-build-system-fixes.patch 4705 BLAKE2B be3c05b5c798411cc03458c1ce71956ddf2996db71d349e6733a082ec90b264d6a24aa6abaff4b44a65502dc9cd49fe749f11d2fc41fa45879fa0cb6bde2b6ef SHA512 c99df67dfdceefeea3c3033a38e94a93cd7a9c4ed6e74f42c3b7198d66deee4b5d4aa91c540a48b12749ce3285c0ac3f11d0ecc33b913c3f0169578ae28745da
 AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 988 BLAKE2B 63417032b843ff7cb704c9880cfca4db5083d05d479c71dd12925d729f22a4900c2ae277a20399d58830eaca969842d587a2ae0a646809d6b659a75d13678312 SHA512 ba573ce68858c1370f3d25ad03678a534e6f3052076694d09e795d1febf2f3d76a6a170658b71d9e31105521fd5d22dd72095585a5402286dba424937064b389
 AUX libcap-2.26-no-perl.patch 2483 BLAKE2B 34d20ca017119a40e31e2da64786a93c1d5468558e8dfcfb15f3758b6648aaad38bf333c11b35a2c8c4cb66d823e4daefed93b7073a0a65225fe9ef3494ff9ef SHA512 750a64c7b45fd145a043f29b8262c9f972aa4dcfb76afed9e440365c0e55d67d0103491e67a34f0f24ee580656e2fffd589b46b0c5a04b4c9e05b5dac6bbe994
-AUX libcap-2.28-no_perl.patch 2599 BLAKE2B 55a6ef3573517e7cd7f367b811a5b6edc2b91974a23e99a31e1704dd5bcda90dfa3b7fde69c37f48c8ad1d97d0c8d68441830f7cc94adacb50cb54246519cb89 SHA512 40d739250a3508538f7083da700efe47628acd6b213e806b5c9d321ce55ce870dd58073459991b235d3cd3190b53e62e1fcc11f79779bda9239f3e042fb9428b
-AUX libcap-2.34-build-system-fixes.patch 6993 BLAKE2B 66f003f78f3176be90f9e71f6ff1fc3de6005201be398583c3a79854e7b08a6bda384bb49bf24b24994bf4f5d2dfe9c6e82a7351483acad504628d6610a19094 SHA512 2f59a6831ed9b0116fa48becec66fa48fd8668254d3085d45e2c3ab198bde3148617bd7c852b8c7e1ab48d8a563116505e46dddc59d6d1a4eb18d02f86523804
+AUX libcap-2.38-no_perl.patch 3049 BLAKE2B 77fdcda75b273fd69695161d48f37fda40375f5f36acdb31e9f9e5b7585e6933733586c6ad96673efb79a6657dbbffd4431612ed723905e9f4d595a9dd8c49c4 SHA512 f3938a8a78407639bfdda4d9c4b4096025f956430f9efbce438689aabbea74915c55c6afbd45a7af4ecc0c437ee72e9aa8335da52d3237c928702e62824e537a
+AUX libcap-2.39-build-system-fixes.patch 6890 BLAKE2B 175a11c83400e4e1ed1983020b174011c630745ada66b9b18f1dc4d91c4e5f09d3c8b2236c03588efaae894cc2e52c71c23a8368139e3e6b4877347ca1e7e14b SHA512 30bc0d1c18d449ee91ae118ecad34bec87bd282c9139997d6dcba2b6cb5392614df92ed05ae71cd8a092c19c9e6e202d46e7188408bde855f0ea6816f9a5e3cf
+AUX libcap-2.42-build-system-fixes.patch 6518 BLAKE2B 138347d98901a0a41c36a3f3e1ff7c539836ba00e0cb1c80005d1e261c35f822bee51a4ca86be324f84b29fc6362e9b891ef105b2142f22be4e8896731b3ee16 SHA512 fbe8fe06ab3650b3247811b04b4afa1d56fc641de0b90c448b99904816b7d4e02d30c5dc54cd038d57c16f828a671c73f3c176e1e5826e6b9c69e2d3085015ff
 DIST libcap-2.26.tar.xz 67172 BLAKE2B 9d1952bd03e1bba5ffa225a5088b8d841c2007219bbb9524f979ac65e472bf932db496acf93984fa77fe42e71d45b85cd603ca461a071fb4742526dfbc5f66eb SHA512 1c2d59f007226405a924950b2c2090393527e06f0692a84e6463e33915a070df61a9070b8f30a624d5630ddd39290eac117e5d440577d1edd48510195b9d12f0
 DIST libcap-2.27.tar.xz 67780 BLAKE2B 7b58d7afdd90281771a302cd9554f067b9e3636b0c052935973d8a0d890490c3933b3513874b788a8c10e37ab5ad9cfa766408c9629b7c8562cb17bfdef87747 SHA512 e32335fd3e0d1564574acc73df7030b5b0fd98875217bffabd76f2765f1a7a6f1369f03df2ee22a1782776838784e342378c10613ea1163d53ae5055ab6a62b6
-DIST libcap-2.34.tar.xz 111556 BLAKE2B 083599a899e5cc8942aedc3c932627d8608ea9cdc4eefe716e5fe2fb195276be26373697aa5bb3e84b801ccabb08f78c44f67ed82ea5c383a7c6a4d86f9e06b4 SHA512 6604aeab3de547e16e3c63e35cf41a5aaacf0cb52ffc818c822ada88595437986df731990d4b288eb72f9150de41fb8a93a6a727b936058e88b49b86352c4771
-DIST libcap-2.36.tar.xz 112612 BLAKE2B fec0997eba7af6e9df83ce91235bdd96e98d7284268f0e3d3f4ef41e7b5e0621649a90069f2a162bcecf387c156ff481be379012fc57bbbc59309b850fe879ae SHA512 0193bd1b1b6223260a629458a37db581a0ff61f1d23f439fd2bdd0e6f3acb30ce996fb0f4f86c59670183d9f42932ae1e817e44e6b64f4ff49d61ea3a4a10aa5
+DIST libcap-2.41.tar.xz 139812 BLAKE2B 96630d2ff45e3cc40f18d0a739796bbed4c5b246a48db64b81870c6f200c6cedfed74ed0267261c3de712e9d14799015ccd1a2391e9a2a9c6d5c250864bf841f SHA512 efb778f1fee3da9ccbcc5c05d0e33dfced55a7fdfe17e1f40f121b6ec08b891c0cd95e91e5b6dce84a9cdb62d40f20efe2b26454013e1e898c25c3f9550af0f9
+DIST libcap-2.42.tar.xz 141288 BLAKE2B 1ee5c3934ba88a8127a6d96780a539d8b291e99d2e621660338fb9a9d511470bedfc3406af0bc787fda0ee0c54ce491d65a11a3e92a8da9f5d494c0931de77db SHA512 2abe2d106583a48e3ee0dbc0f82e5ec92a3209cad2abcc1690a12f33364a1dab467b624670a1cdcac0c8d12761e86d5a05bca90aa4199fee75d46e181a695d50
+DIST libcap-2.43.tar.xz 125284 BLAKE2B bde36f8397f4adb74760eb403daa06bee1b8f45ddc253cc3c3ef1f6e95d0e4c76d0f2e6fa3335a8bc451f18ac7128c96230f6aba9ae0320fa4f9d669e7b4f715 SHA512 817add571fb2c54ad2a39974e6545b8fc8d855ecdcf2e00b2cc10e583802c49dfea2d8bca484c89ecd574fdacfc46565b51e3064a4407cf1985defb913240d45
 EBUILD libcap-2.26-r2.ebuild 2064 BLAKE2B aa5abfd36287b9c97d2d738b7ee22c79861a657cb59752bb6bf41b3d161db25d87f3440c5458bccd6a0c7912fc96b200a8f8bf37f8c2adcfd635e99a8adf5c44 SHA512 f68fa911a03fe962f0b23851c951d25900f1d61750263763e9b9c8a144aa93070c4018552d3b90cafa72254aa5e459489b6c33d3fb27cebc1fd214b817b253fb
 EBUILD libcap-2.27.ebuild 2073 BLAKE2B 97374abb2a068288ec1456020d3896bf59ef358715b749e8fd01c6dab55001944f658623aef58b1415cdb434d441728f0b3c264034d6e71850919c71f0f6a29f SHA512 e76a058c37dd0f4eeae4efebba9f92c4c0f3a8cf924a461870795d6405b832124e79031f3f3e4723eca749cdd8795ec9aa022ca257f10b1d7df3d31912983d46
-EBUILD libcap-2.34.ebuild 2181 BLAKE2B 7ba9a0776b869e13f99e923d6cc81e1b2f6b0f29101149297b91508ca7577bcb56f7c9edb8025ace9928cc805995a6b5373448d3baf3fcecee60edd20042f199 SHA512 991999593030f1af2f999de2d0cdec7973acc915b92b4a6227679194ba5f0ca11f74840c38e813379b07f34cca450b3824133482193f27db9d6b15b285933fef
-EBUILD libcap-2.36.ebuild 2181 BLAKE2B 7ba9a0776b869e13f99e923d6cc81e1b2f6b0f29101149297b91508ca7577bcb56f7c9edb8025ace9928cc805995a6b5373448d3baf3fcecee60edd20042f199 SHA512 991999593030f1af2f999de2d0cdec7973acc915b92b4a6227679194ba5f0ca11f74840c38e813379b07f34cca450b3824133482193f27db9d6b15b285933fef
+EBUILD libcap-2.41.ebuild 2181 BLAKE2B 74eddd214dab22c022b4ef8c9947651f7aa18b758956f8d00399c9e7ac8b4a84502f4e236a43d542bfa234a8b084608e4dba875b5bb9277dcb85f273015657bd SHA512 6da0c74cd79261791e0b46f5baf5c46ae068e72a0c0ea831acabf5f37af4e9b7d83387468603fea7f6549aa91ae3aae7e2efaf05a36e580505892695f640713d
+EBUILD libcap-2.42.ebuild 2181 BLAKE2B c9a26f0bea1a14794fa3692057aa7742cd3f4237279b44f941271c94ce57515505141f6f74718730a159e2a801c3cd13ca0a01db2dfff2eeab8c578628adcc43 SHA512 52e5a0b1bdd050b8e55e6380881bcb45697bec2a03bb8d1c39f3200c36c55ff82c736842117a0c3db03ea5164698a50cda610a72fc7e9cecec3d6e718ccc8ed7
+EBUILD libcap-2.43.ebuild 2181 BLAKE2B c9a26f0bea1a14794fa3692057aa7742cd3f4237279b44f941271c94ce57515505141f6f74718730a159e2a801c3cd13ca0a01db2dfff2eeab8c578628adcc43 SHA512 52e5a0b1bdd050b8e55e6380881bcb45697bec2a03bb8d1c39f3200c36c55ff82c736842117a0c3db03ea5164698a50cda610a72fc7e9cecec3d6e718ccc8ed7
 MISC metadata.xml 332 BLAKE2B 2177c836192a85a6d943221da405f7f11f355011767789d81009d5e4d822a203302a946fa1a0ffbc66be6a37a7069aa94a796125fa1dedbdf023762b47f8f614 SHA512 a9887500fd60b72156ac2589b1fefab8dd70b0c03477dd795f147fdc91bbe6fd027b8cf58c3e86cdb6e831368d34b4881cdf0e833af5aee9e7d1a01e90408ae1
diff --git a/sys-libs/libcap/files/libcap-2.28-no_perl.patch b/sys-libs/libcap/files/libcap-2.38-no_perl.patch
index d8a20c2e1310..f3e0c468c869 100644
--- a/sys-libs/libcap/files/libcap-2.28-no_perl.patch
+++ b/sys-libs/libcap/files/libcap-2.38-no_perl.patch
@@ -1,4 +1,4 @@
-From 71ed151782c55b69ad4ce87658c0ce2ccc9c4a86 Mon Sep 17 00:00:00 2001
+From 3f76418eaf73896489129c529fac021e4f3a03c0 Mon Sep 17 00:00:00 2001
 From: Mike Frysinger <vapier@gentoo.org>
 Date: Wed, 21 Nov 2018 11:00:54 +0100
 Subject: [PATCH] use awk/sed instead of perl for creating header files
@@ -11,14 +11,15 @@ Forward ported from libcap-2.22 to libcap-2.26
 and incorporated the gperf-3.1 fix provided by Mike Gilbert
 <floppym@gentoo.org>
 Forward ported from libcap-2.26 to libcap-2.28
+Forward ported from libcap-2.28 to libcap-2.38
 
 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
 ---
- libcap/Makefile | 24 ++++++++++++++++++------
- 1 file changed, 18 insertions(+), 6 deletions(-)
+ libcap/Makefile | 26 +++++++++++++++++++-------
+ 1 file changed, 19 insertions(+), 7 deletions(-)
 
 diff --git a/libcap/Makefile b/libcap/Makefile
-index 93f43bf..e2e371d 100644
+index 3d6463d..df2526c 100644
 --- a/libcap/Makefile
 +++ b/libcap/Makefile
 @@ -22,6 +22,8 @@ MAJLIBNAME=$(LIBNAME).$(VERSION)
@@ -28,18 +29,14 @@ index 93f43bf..e2e371d 100644
 +AWK = awk
 +SED = sed
  
- all: $(MINLIBNAME) $(STALIBNAME) libcap.pc $(STAPSXLIBNAME)
+ all: $(MINLIBNAME) $(STACAPLIBNAME) libcap.pc libpsx.pc $(STAPSXLIBNAME)
  
-@@ -46,12 +48,22 @@ cap_names.h: _makenames
+@@ -55,17 +57,27 @@ 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 *, size_t);\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) > $@
 -	sed -e 's/unsigned int len/size_t len/' -i $@
--
--cap_names.list.h: Makefile $(KERNEL_HEADERS)/linux/capability.h
--	@echo "=> making $@ from $(KERNEL_HEADERS)/linux/capability.h"
--	perl -e 'while ($$l=<>) { if ($$l =~ /^\#define[ \t](CAP[_A-Z]+)[ \t]+([0-9]+)\s+$$/) { $$tok=$$1; $$val=$$2; $$tok =~ tr/A-Z/a-z/; print "{\"$$tok\",$$val},\n"; } }' $(KERNEL_HEADERS)/linux/capability.h | fgrep -v 0x > $@
 +	(printf "%b" "struct __cap_token_s { const char *name; int index; };\n%%\n"; \
 +	$(SED) -e 's:["{}]::g' -e 's:,$$::' $<) | \
 +	gperf \
@@ -52,13 +49,23 @@ index 93f43bf..e2e371d 100644
 +		--hash-function-name=__cap_hash_name \
 +		--lookup-function-name="__cap_lookup_name" \
 +		-c -t -m20 $(INDENT) > $@
+ 
+-# Intention is that libcap keeps up with torvalds' tree, as reflected
+-# by this maintained version of the kernel header. libcap dynamically
+-# trims the meaning of "all" capabilities down to that of the running
+-# kernel as of 2.30.
+ UAPI_HEADER := $(topdir)/libcap/include/uapi/linux/capability.h
+ cap_names.list.h: Makefile $(UAPI_HEADER)
+ 	@echo "=> making $@ from $(UAPI_HEADER)"
+-	perl -e 'while ($$l=<>) { if ($$l =~ /^\#define[ \t](CAP[_A-Z]+)[ \t]+([0-9]+)\s+$$/) { $$tok=$$1; $$val=$$2; $$tok =~ tr/A-Z/a-z/; print "{\"$$tok\",$$val},\n"; } }' $(UAPI_HEADER) | fgrep -v 0x > $@
++	$(AWK) '($$0 ~ /^#define[[:space:]]+CAP[_A-Z]+[[:space:]]+[0-9]+[[:space:]]*$$/) { printf "{\"%s\",%s},\n", tolower($$2), $$3 }' $(UAPI_HEADER) > $@
 +
 +cap_names.list.h: $(KERNEL_HEADERS)/linux/capability.h Makefile
 +	@echo "=> making $@ from $<"
 +	$(AWK) '($$0 ~ /^#define[[:space:]]+CAP[_A-Z]+[[:space:]]+[0-9]+[[:space:]]*$$/) { printf "{\"%s\",%s},\n", tolower($$2), $$3 }' $< > $@
  
- $(STALIBNAME): $(CAPOBJS)
+ $(STACAPLIBNAME): $(CAPOBJS)
  	$(AR) rcs $@ $^
 -- 
-2.24.0
+2.27.0
 
diff --git a/sys-libs/libcap/files/libcap-2.34-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.39-build-system-fixes.patch
index 126e538633b5..7ae18107f9a5 100644
--- a/sys-libs/libcap/files/libcap-2.34-build-system-fixes.patch
+++ b/sys-libs/libcap/files/libcap-2.39-build-system-fixes.patch
@@ -1,4 +1,4 @@
-From ac790bb368d309d1d2add15bbb59559d53cb05bb Mon Sep 17 00:00:00 2001
+From cc1012914a4041eb2b5fb30057f28f62c1788662 Mon Sep 17 00:00:00 2001
 From: Mike Frysinger <vapier@gentoo.org>
 Date: Tue, 5 May 2020 09:52:40 +0200
 Subject: [PATCH] build system fixes
@@ -19,6 +19,8 @@ Forward ported from libcap-2.25 to libcap-2.28
 Forward ported from libcap-2.28 to libcap-2.29
 Forward ported from libcap-2.29 to libcap-2.33
 Forward ported from libcap-2.33 to libcap-2.34
+Forward ported from libcap-2.34 to libcap-2.37
+Forward ported from libcap-2.37 to libcap-2.39
 
 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
 ---
@@ -27,14 +29,14 @@ Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
  libcap/Makefile  |  7 ++++---
  pam_cap/Makefile |  8 +++++---
  progs/Makefile   |  2 +-
- tests/Makefile   |  8 +++++---
- 6 files changed, 28 insertions(+), 22 deletions(-)
+ tests/Makefile   |  6 ++++--
+ 6 files changed, 27 insertions(+), 21 deletions(-)
 
 diff --git a/Make.Rules b/Make.Rules
-index 0fbfba0..755581d 100644
+index 98fb9db..889798e 100644
 --- a/Make.Rules
 +++ b/Make.Rules
-@@ -47,36 +47,38 @@ MINOR=34
+@@ -52,37 +52,39 @@ GOMAJOR=0
  # Compilation specifics
  
  KERNEL_HEADERS := $(topdir)/libcap/include/uapi
@@ -79,25 +81,26 @@ index 0fbfba0..755581d 100644
  INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
  DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
  
--GOLANG := $(shell if [ -n "$(shell go version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
-+GOLANG ?= $(shell if [ -n "$(shell go version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
+ GO := go
+-GOLANG := $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
++GOLANG ?= $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
  ifeq ($(GOLANG),yes)
- GOROOT := $(shell go env GOROOT)
- GOCGO := $(shell if [ "$(shell go env CGO_ENABLED)" = 1 ]; then echo yes ; else echo no ; fi)
+ GOROOT := $(shell $(GO) env GOROOT)
+ GOCGO := $(shell if [ "$(shell $(GO) env CGO_ENABLED)" = 1 ]; then echo yes ; else echo no ; fi)
 diff --git a/Makefile b/Makefile
-index d8cf49c..c0b10a0 100644
+index e148633..b29f5f1 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -16,7 +16,6 @@ endif
- ifeq ($(GOLANG),yes)
+@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes)
  	$(MAKE) -C go $@
+ 	rm -f cap/go.sum
  endif
 -	$(MAKE) -C tests $@
  	$(MAKE) -C progs $@
  	$(MAKE) -C doc $@
  	$(MAKE) -C kdebug $@
 diff --git a/libcap/Makefile b/libcap/Makefile
-index c2cb0d1..406dfe5 100644
+index 4321c2f..3d6463d 100644
 --- a/libcap/Makefile
 +++ b/libcap/Makefile
 @@ -21,6 +21,7 @@ PSXOBJS=$(addsuffix .o, $(PSXFILES))
@@ -117,7 +120,7 @@ index c2cb0d1..406dfe5 100644
  
  cap_names.h: _makenames
  	./_makenames > cap_names.h
-@@ -75,10 +76,10 @@ $(MINLIBNAME): $(CAPOBJS)
+@@ -80,10 +81,10 @@ $(MINLIBNAME): $(CAPOBJS)
  	ln -sf $(MAJLIBNAME) $(LIBNAME)
  
  %.o: %.c $(INCLS)
@@ -177,10 +180,10 @@ index 076e44f..fd13351 100644
  install: all
  	mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR)
 diff --git a/tests/Makefile b/tests/Makefile
-index 3fedeca..3645ddd 100644
+index bfedbc2..2b9a801 100644
 --- a/tests/Makefile
 +++ b/tests/Makefile
-@@ -16,6 +16,8 @@ test: run_psx_test run_libcap_psx_test
+@@ -16,19 +16,21 @@ test: run_psx_test run_libcap_psx_test
  
  sudotest: test run_libcap_launch_test run_libcap_launch_test
  
@@ -188,15 +191,10 @@ index 3fedeca..3645ddd 100644
 +
  install: all
  
- run_psx_test: psx_test psx_test_wrap
-@@ -23,16 +25,16 @@ run_psx_test: psx_test psx_test_wrap
- 	./psx_test_wrap
+ run_psx_test: psx_test
+ 	./psx_test
  
  psx_test: psx_test.c $(DEPS)
--	$(CC) $(CFLAGS) $(IPATH) -DNOWRAP $< -o $@ $(LIBPSXLIB)
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -DNOWRAP $< -o $@ $(LIBPSXLIB)
- 
- psx_test_wrap: psx_test.c $(DEPS)
 -	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
 +	$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
  
@@ -210,5 +208,5 @@ index 3fedeca..3645ddd 100644
  run_libcap_launch_test: libcap_launch_test libcap_psx_launch_test noop
  	sudo ./libcap_launch_test
 -- 
-2.26.2
+2.27.0
 
diff --git a/sys-libs/libcap/files/libcap-2.42-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.42-build-system-fixes.patch
new file mode 100644
index 000000000000..10959cf93395
--- /dev/null
+++ b/sys-libs/libcap/files/libcap-2.42-build-system-fixes.patch
@@ -0,0 +1,200 @@
+From 8599fc87e91b7903cfb1877983615dadcbcc1b29 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 5 May 2020 09:52:40 +0200
+Subject: [PATCH] build system fixes
+
+This touches up the homebrewed build system to work much better "out of the
+box" for people.  Specifically:
+        - allow toolchain vars to be set via environment
+        - CC / BUILD_CC / AR / RANLIB
+        - CFLAGS / CPPFLAGS / LDFLAGS
+        - split CPPFLAGS out of CFLAGS
+        - break -fPIC out of global CFLAGS and only use where needed
+        - use LDLIBS for libraries, not LDFLAGS
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+Forward ported from libcap-2.24 to libcap-2.25
+Forward ported from libcap-2.25 to libcap-2.28
+Forward ported from libcap-2.28 to libcap-2.29
+Forward ported from libcap-2.29 to libcap-2.33
+Forward ported from libcap-2.33 to libcap-2.34
+Forward ported from libcap-2.34 to libcap-2.37
+Forward ported from libcap-2.37 to libcap-2.39
+Forward ported from libcap-2.39 to libcap-2.42
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ Make.Rules       | 12 +++++++-----
+ Makefile         |  1 -
+ libcap/Makefile  |  7 ++++---
+ pam_cap/Makefile |  8 +++++---
+ progs/Makefile   |  2 +-
+ tests/Makefile   |  6 ++++--
+ 6 files changed, 21 insertions(+), 15 deletions(-)
+
+diff --git a/Make.Rules b/Make.Rules
+index 8440e18..67fd4a6 100644
+--- a/Make.Rules
++++ b/Make.Rules
+@@ -52,13 +52,12 @@ GOMAJOR=0
+ # Compilation specifics
+ 
+ KERNEL_HEADERS := $(topdir)/libcap/include/uapi
+-IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
+ 
+ CC ?= $(CROSS_COMPILE)gcc
+ DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ CFLAGS ?= -O2 $(DEFINES)
+ BUILD_CC ?= $(CC)
+-BUILD_CFLAGS ?= -O2 $(DEFINES) $(IPATH)
++BUILD_CFLAGS ?= $(CFLAGS)
+ AR ?= $(CROSS_COMPILE)ar
+ RANLIB ?= $(CROSS_COMPILE)ranlib
+ DEBUG = -g #-DDEBUG
+@@ -73,16 +72,19 @@ LIBPSXLIB := -L$(topdir)/libcap -lpsx -lpthread
+ 
+ BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes)
+ 
+-SYSTEM_HEADERS = /usr/include
++LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include $(DEFINES)
++CPPFLAGS += $(LIBCAP_CPPFLAGS)
++BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS)
+ INCS=$(topdir)/libcap/include/sys/capability.h
+ LDFLAGS += -L$(topdir)/libcap
+-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
++CPPFLAGS += -Dlinux
++CFLAGS += $(WARNINGS) $(DEBUG)
+ PAM_CAP ?= $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
+ INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
+ DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
+ 
+ GO := go
+-GOLANG := $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
++GOLANG ?= $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
+ ifeq ($(GOLANG),yes)
+ GOROOT := $(shell $(GO) env GOROOT)
+ GOCGO := $(shell if [ "$(shell $(GO) env CGO_ENABLED)" = 1 ]; then echo yes ; else echo no ; fi)
+diff --git a/Makefile b/Makefile
+index 03d7748..4437468 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes)
+ 	$(MAKE) -C go $@
+ 	rm -f cap/go.sum
+ endif
+-	$(MAKE) -C tests $@
+ 	$(MAKE) -C progs $@
+ 	$(MAKE) -C doc $@
+ 	$(MAKE) -C kdebug $@
+diff --git a/libcap/Makefile b/libcap/Makefile
+index 81b089e..63fe555 100644
+--- a/libcap/Makefile
++++ b/libcap/Makefile
+@@ -21,6 +21,7 @@ PSXOBJS=$(addsuffix .o, $(PSXFILES))
+ MAJLIBNAME=$(LIBNAME).$(VERSION)
+ MINLIBNAME=$(MAJLIBNAME).$(MINOR)
+ GPERF_OUTPUT = _caps_output.gperf
++CFLAGS += -fPIC
+ 
+ all: $(MINLIBNAME) $(STACAPLIBNAME) pcs $(STAPSXLIBNAME)
+ 
+@@ -50,7 +51,7 @@ libpsx.pc: libpsx.pc.in
+ 		$< >$@
+ 
+ _makenames: _makenames.c cap_names.list.h
+-	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
++	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
+ 
+ cap_names.h: _makenames
+ 	./_makenames > cap_names.h
+@@ -82,10 +83,10 @@ $(MINLIBNAME): $(CAPOBJS)
+ 	ln -sf $(MAJLIBNAME) $(LIBNAME)
+ 
+ %.o: %.c $(INCLS)
+-	$(CC) $(CFLAGS) $(IPATH) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
+-	$(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
+ 
+ cap_test: cap_test.c libcap.h
+ 	$(CC) $(CFLAGS) $(IPATH) $< -o $@
+diff --git a/pam_cap/Makefile b/pam_cap/Makefile
+index 56604fd..2da4674 100644
+--- a/pam_cap/Makefile
++++ b/pam_cap/Makefile
+@@ -3,6 +3,8 @@
+ topdir=$(shell pwd)/..
+ include ../Make.Rules
+ 
++CFLAGS += -fPIC
++
+ all: pam_cap.so
+ 	$(MAKE) testlink
+ 
+@@ -16,16 +18,16 @@ install: all
+ # written (and you know why it fails), email me and explain why. Thanks!
+ 
+ pam_cap.so: pam_cap.o
+-	$(LD) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS)
++	$(LD) $(CFLAGS) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS)
+ 
+ pam_cap.o: pam_cap.c
+-	$(CC) $(CFLAGS) $(IPATH) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ test_pam_cap: test_pam_cap.c pam_cap.c
+ 	$(CC) $(CFLAGS) $(IPATH) -o $@ test_pam_cap.c $(LIBCAPLIB) $(LDFLAGS) --static
+ 
+ testlink: test.c pam_cap.o
+-	$(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS)
+ 
+ test: pam_cap.so
+ 	make testlink
+diff --git a/progs/Makefile b/progs/Makefile
+index 076e44f..fd13351 100644
+--- a/progs/Makefile
++++ b/progs/Makefile
+@@ -23,7 +23,7 @@ $(BUILD): %: %.o $(DEPS)
+ 	$(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS)
+ 
+ %.o: %.c $(INCS)
+-	$(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -c $< -o $@
++	$(CC) $(CAPSH_SHELL) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ install: all
+ 	mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR)
+diff --git a/tests/Makefile b/tests/Makefile
+index bfedbc2..2b9a801 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -16,19 +16,21 @@ test: run_psx_test run_libcap_psx_test
+ 
+ sudotest: test run_libcap_launch_test run_libcap_launch_test
+ 
++CFLAGS += -fPIC
++
+ install: all
+ 
+ run_psx_test: psx_test
+ 	./psx_test
+ 
+ psx_test: psx_test.c $(DEPS)
+-	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
++	$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
+ 
+ run_libcap_psx_test: libcap_psx_test
+ 	./libcap_psx_test
+ 
+ libcap_psx_test: libcap_psx_test.c $(DEPS)
+-	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
++	$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
+ 
+ run_libcap_launch_test: libcap_launch_test libcap_psx_launch_test noop
+ 	sudo ./libcap_launch_test
+-- 
+2.28.0
+
diff --git a/sys-libs/libcap/libcap-2.34.ebuild b/sys-libs/libcap/libcap-2.41.ebuild
index 3546067e15c6..0b09bd935e0d 100644
--- a/sys-libs/libcap/libcap-2.34.ebuild
+++ b/sys-libs/libcap/libcap-2.41.ebuild
@@ -27,8 +27,8 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.34-build-system-fixes.patch
-	"${FILESDIR}"/${PN}-2.28-no_perl.patch
+	"${FILESDIR}"/${PN}-2.39-build-system-fixes.patch
+	"${FILESDIR}"/${PN}-2.38-no_perl.patch
 	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
 	"${FILESDIR}"/${PN}-2.21-include.patch
 )
diff --git a/sys-libs/libcap/libcap-2.36.ebuild b/sys-libs/libcap/libcap-2.42.ebuild
index 3546067e15c6..acba4de6b6cd 100644
--- a/sys-libs/libcap/libcap-2.36.ebuild
+++ b/sys-libs/libcap/libcap-2.42.ebuild
@@ -27,8 +27,8 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.34-build-system-fixes.patch
-	"${FILESDIR}"/${PN}-2.28-no_perl.patch
+	"${FILESDIR}"/${PN}-2.42-build-system-fixes.patch
+	"${FILESDIR}"/${PN}-2.38-no_perl.patch
 	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
 	"${FILESDIR}"/${PN}-2.21-include.patch
 )
diff --git a/sys-libs/libcap/libcap-2.43.ebuild b/sys-libs/libcap/libcap-2.43.ebuild
new file mode 100644
index 000000000000..acba4de6b6cd
--- /dev/null
+++ b/sys-libs/libcap/libcap-2.43.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib multilib-minimal toolchain-funcs pam usr-ldscript
+
+DESCRIPTION="POSIX 1003.1e capabilities"
+HOMEPAGE="https://sites.google.com/site/fullycapable/"
+SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
+
+# it's available under either of the licenses
+LICENSE="|| ( GPL-2 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="pam static-libs"
+
+# While the build system optionally uses gperf, we don't DEPEND on it because
+# the build automatically falls back when it's unavailable.  #604802
+RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]"
+PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	${PDEPEND}
+	sys-kernel/linux-headers"
+
+# Requires test suite being run as root (via sudo)
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.42-build-system-fixes.patch
+	"${FILESDIR}"/${PN}-2.38-no_perl.patch
+	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
+	"${FILESDIR}"/${PN}-2.21-include.patch
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+run_emake() {
+	local args=(
+		exec_prefix="${EPREFIX}"
+		lib_prefix="${EPREFIX}/usr"
+		lib="$(get_libdir)"
+		prefix="${EPREFIX}/usr"
+		PAM_CAP="$(usex pam yes no)"
+		DYNAMIC=yes
+		GOLANG=no
+	)
+	emake "${args[@]}" "$@"
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+	tc-export_build_env BUILD_CC
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	run_emake
+}
+
+multilib_src_install() {
+	# no configure, needs explicit install line #444724#c3
+	run_emake DESTDIR="${D}" install
+
+	gen_usr_ldscript -a cap
+	if ! use static-libs ; then
+		# Don't remove libpsx.a!
+		# See https://bugs.gentoo.org/703912
+		rm "${ED}"/usr/$(get_libdir)/libcap.a || die
+	fi
+
+	if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then
+		rm -r "${ED}"/usr/$(get_libdir)/security || die
+	fi
+
+	if use pam; then
+		dopammod pam_cap/pam_cap.so
+		dopamsecurity '' pam_cap/capability.conf
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc CHANGELOG README doc/capability.notes
+}