From 677b7ba5c317778df2ad7e70df94b9b7eec4adbc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 10 Sep 2021 04:21:55 +0100 Subject: gentoo resync : 10.09.2021 --- sys-libs/libcap/Manifest | 14 +- .../files/libcap-2.50-build-system-fixes.patch | 209 ------------------ .../files/libcap-2.52-build-system-fixes.patch | 219 ------------------- .../files/libcap-2.55-build-system-fixes.patch | 241 --------------------- .../files/libcap-2.56-build-system-fixes.patch | 239 ++++++++++++++++++++ sys-libs/libcap/libcap-2.51-r1.ebuild | 87 -------- sys-libs/libcap/libcap-2.52-r1.ebuild | 84 ------- sys-libs/libcap/libcap-2.55-r1.ebuild | 84 ------- sys-libs/libcap/libcap-2.56.ebuild | 90 ++++++++ sys-libs/libcap/metadata.xml | 17 +- 10 files changed, 343 insertions(+), 941 deletions(-) delete mode 100644 sys-libs/libcap/files/libcap-2.50-build-system-fixes.patch delete mode 100644 sys-libs/libcap/files/libcap-2.52-build-system-fixes.patch delete mode 100644 sys-libs/libcap/files/libcap-2.55-build-system-fixes.patch create mode 100644 sys-libs/libcap/files/libcap-2.56-build-system-fixes.patch delete mode 100644 sys-libs/libcap/libcap-2.51-r1.ebuild delete mode 100644 sys-libs/libcap/libcap-2.52-r1.ebuild delete mode 100644 sys-libs/libcap/libcap-2.55-r1.ebuild create mode 100644 sys-libs/libcap/libcap-2.56.ebuild (limited to 'sys-libs/libcap') diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest index 3ae15582791f..e79b886311cc 100644 --- a/sys-libs/libcap/Manifest +++ b/sys-libs/libcap/Manifest @@ -2,15 +2,9 @@ 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.50-build-system-fixes.patch 6687 BLAKE2B d46b6f0734a5acd930248b29c17850447d87f4e554b4d3e79cb35d978b17552e84e27e036c3b0c4ae6573f94e9e7033a9264b646d61dc8c441c04bc6d9b12af8 SHA512 0fd3b5463dcbbaca41d7c1099be7dd370945408f3763dad68d128a650cbf62c23c653a971b07ed4cdc1b56d425caeec3775b91912635c6a2539534bd20e00756 -AUX libcap-2.52-build-system-fixes.patch 7320 BLAKE2B 7b7de195e7cec61b395e9cbf1d8b41195079fb2b0742db2e6a53380de3e43ee038aac092b3fd69bea0906fc668abd67673a11699323c2003b4a9583ba472b59d SHA512 db569516789792020f975591a553bd4b7ca205a9bbbae6adb245fe719377f78335dcabe7ec987d5729da1052083a972ce725ecb263d990cec169a2960584e55a -AUX libcap-2.55-build-system-fixes.patch 9929 BLAKE2B c58e07556b97692079ba5bce3dec300e34313f67925a952cd542ca94bcee925acf28e85a89959bcabf8fe4ae75ea9f4fb0393a60631e1e196d6e88c14762da5b SHA512 4493da01af31eb51907b413b4110d293737bf55b1df716bbc6b51decbcb8811bbc71290cb2c46eef2ebacfd237fe8c4c830880af6e6582327e3b056384f0dd74 +AUX libcap-2.56-build-system-fixes.patch 6367 BLAKE2B 3625df48d4444071d710406a78599bab9b25d2fc1b0fe0b722053690b7ac99e62a1d66ef3597678752dab506680425b0c47fed386c1b83b86e13e357f0408157 SHA512 560f54b2018602ba9c39938ea7623ee363eca9c0f11467a38292f074a0e53b9cd0f38724cdcc952d759c0da0952199627aabc1d253da0aecb1c2301f595bf714 DIST libcap-2.49.tar.xz 139568 BLAKE2B 5746dcdf2a737e747450bd50a701ee8543277b17b7fbf1304b79f707a088ea74dc6dc79c61ff89b55b718a460a7b0814f960f44d07944a97b832b78f4e14e07f SHA512 2934a2ded1370edeb9603dbf43d8ca23a2eb5d67efc5cec5d4ba96c707a8db2702da8aa9be0cb86c5ff100d37ec96115c7777a7566ad0ab2e0b4a288bbe357d0 -DIST libcap-2.51.tar.xz 145440 BLAKE2B 9f004e28891fbbb3552016e2e9250eab38935b6b40ad9e808a64ab07eecb52c5fa9032caed0baab719df8afe9aeec98403d10b05336bebe15a50b64020e5afc2 SHA512 3b4a97ef864a2ce2f87056ebc282223b0c71ca71c539744dc629ffe7905ca5fdde937ca70c34ec84406fe54863d39abf32775818a5e5a6fdf3069706b1723a88 -DIST libcap-2.52.tar.xz 158720 BLAKE2B 0696ae00a485df019f5441efe1d71676ddf294f1116e7fc3f352ad0595f9d4830f2e4fac1f98353016de36a4866f9d018f53419970ccd114c6df0faa556bcea3 SHA512 95d9e0f81fd955c42a0f299163a4402f00e9e7a2b392dfbabe613abea4babba2730576e76c9b612665a0bb8bd88aa98bf28ea3eb5582b5c06cd1137594a59893 -DIST libcap-2.55.tar.xz 166164 BLAKE2B 75136d228c6b42086698aea79e774bed37d43aa0692154026708ddd27275fc611a702dafd0ad76b16b32d8006f863f7ca3aff1f645c74f1649ad5ae9b77db47c SHA512 b7c682b45800d96a86d12489855f643e8166849606e50ffae45da143790304858d677fe0d19067a9e09f5fa711548aee4bd7a6fda662a87ea2cc35c9455e8a2c +DIST libcap-2.56.tar.xz 167056 BLAKE2B 97d1cf6196bcbcb48e335f810385ca2b36e7c3e234a1f99172fe00419ecc4af7337f208e107f012e5ffd46c1b6207a9d4515f3a677a924dd26ed8a699a080a5a SHA512 8a5c6c99458b0996c9599e00648e99e53b222ddf429535c475099c1af02796331b864fbfae767c16cfb7f2899cf0beaf74095e26a52988361ea1400f012f30c8 EBUILD libcap-2.49-r1.ebuild 2127 BLAKE2B d77712422b1cb13b04b1a18e573c20151b03098a9effaee4a62b51f4035eac2f3dcc2760f6050d05220dca63edbd978df79299e6be4c885a73ec7a079d1cd558 SHA512 fb01c7f3c68d3fa55221bc0602c21ddb399121f97a0a3c9ef5788bbecb3912cc9f9924bd0339e27acc3103d3a1e110b4029f99c27a7232fd83229075383d898b -EBUILD libcap-2.51-r1.ebuild 2135 BLAKE2B 57512b05627f25da7f0f5f0d4c666033d10314f3616ce0c948e1e1efdb830e258db3fc84c09e07f738a98557045901033504392a7108143ce935dab9b2019f56 SHA512 c995e678606e6c344bcf81c628590566044d7b8f36088d1672cfda880a80ee16d6c2b611cc816d93bd8b2af7d263eaa4030668b46fe6ec585e31faab8cb77852 -EBUILD libcap-2.52-r1.ebuild 2078 BLAKE2B 40292480d5d4b12d8656b2a8957ba1f8e1196d48292673f0f7e1d72283867afd7e45cba1c128a342fef2b21346eef2f073df75104a37effccf488ba2e38b7cc8 SHA512 d34a442320a909d2f1051cbb0582ff8b60adcd6e909c4acac7e1cb3da1996f1253a4853aedd07dd0a8d62bc38d668670be063a6180bc656fa716730c9ad2634d -EBUILD libcap-2.55-r1.ebuild 2078 BLAKE2B dec9f825d21ee748bc0be0d7eb08eb8bcdc99c6abb97f9b2a21d16ae197d05b2f4e0e9c9ab3ac214c26ffc62393a513b4c81f0a05cded9e0d05240e455f778b4 SHA512 690790a04ffc0958d11d17c594f261d992b932bd544e3f38b7354bf59318b37e37bf5418429dbd2a0d230a83fb5786330d4aab6d7df01f5785a497ca2a2693aa -MISC metadata.xml 332 BLAKE2B 2177c836192a85a6d943221da405f7f11f355011767789d81009d5e4d822a203302a946fa1a0ffbc66be6a37a7069aa94a796125fa1dedbdf023762b47f8f614 SHA512 a9887500fd60b72156ac2589b1fefab8dd70b0c03477dd795f147fdc91bbe6fd027b8cf58c3e86cdb6e831368d34b4881cdf0e833af5aee9e7d1a01e90408ae1 +EBUILD libcap-2.56.ebuild 2215 BLAKE2B 2538bc88c4f445d7eada3e0b3fdde720d95d03cf4bb56b8cf29d94061fbdf742f5ab951e08eed276f541de38ef0640276a83802bc7a86eed7537b84f00b0d23d SHA512 4eb915980141d110bd8c706e080a9190854f0d1e203185254a34433245197867fda31c70fa90d495cc866bc0b4ab23af0742879871b53240eca98da8a0b66621 +MISC metadata.xml 437 BLAKE2B a79e7188d2d5a0edbbc306c9b2ef8d2f9cb93f6528298b6b25c70e7a335f73ff756424a02e993085d0c1172dcff497dcb295c5538fb92566520d72671fb41cdb SHA512 714b7b51395fc82d6a45a1476066654cb2aa7463b4ff9ad9e5636068305e29db790192034600382015e2dc06064d3e81d69bb0bb92ebbfee2bb525f9a52b8e12 diff --git a/sys-libs/libcap/files/libcap-2.50-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.50-build-system-fixes.patch deleted file mode 100644 index 45b24421c8a9..000000000000 --- a/sys-libs/libcap/files/libcap-2.50-build-system-fixes.patch +++ /dev/null @@ -1,209 +0,0 @@ -From 1f2465ec2b9dccd9823a54938722dc4e5edb8105 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Wed, 4 Nov 2020 22:46:20 +0100 -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 - -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 -Forward ported from libcap-2.42 to libcap-2.44 -Forward ported from libcap-2.44 to libcap-2.45 -Forward ported from libcap-2.45 to libcap-2.48 -Forward ported from libcap-2.48 to libcap-2.50 - -Signed-off-by: Lars Wendler ---- - Make.Rules | 10 ++++++---- - Makefile | 1 - - libcap/Makefile | 7 ++++--- - pam_cap/Makefile | 8 +++++--- - progs/Makefile | 4 ++-- - tests/Makefile | 6 ++++-- - 6 files changed, 21 insertions(+), 15 deletions(-) - -diff --git a/Make.Rules b/Make.Rules -index 98284e2..a797347 100644 ---- a/Make.Rules -+++ b/Make.Rules -@@ -52,7 +52,6 @@ GOMAJOR=1 - # 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 -@@ -60,7 +59,7 @@ COPTS ?= -O2 - CFLAGS ?= $(COPTS) $(DEFINES) - BUILD_CC ?= $(CC) - BUILD_COPTS ?= -O2 --BUILD_CFLAGS ?= $(BUILD_COPTS) $(DEFINES) $(IPATH) -+BUILD_CFLAGS ?= $(CFLAGS) - AR := $(CROSS_COMPILE)ar - RANLIB := $(CROSS_COMPILE)ranlib - DEBUG = -g #-DDEBUG -@@ -76,10 +75,13 @@ LIBPSXLIB := -L$(topdir)/libcap -lpsx $(PSXLINKFLAGS) - - 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) - INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) - - # SHARED tracks whether or not the SHARED libraries (libcap.so, -diff --git a/Makefile b/Makefile -index bfc2089..2b06c9a 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 9563d88..4b42f01 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -25,6 +25,7 @@ MINCAPLIBNAME=$(MAJCAPLIBNAME).$(MINOR) - PSXOBJS=$(addsuffix .o, $(PSXFILES)) - MAJPSXLIBNAME=$(PSXLIBNAME).$(VERSION) - MINPSXLIBNAME=$(MAJPSXLIBNAME).$(MINOR) -+CFLAGS += -fPIC - - all: pcs $(STACAPLIBNAME) - ifeq ($(SHARED),yes) -@@ -66,7 +67,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 -@@ -105,10 +106,10 @@ $(PSXLIBNAME) $(MAJPSXLIBNAME) $(MINPSXLIBNAME): $(PSXOBJS) include/sys/psx_sysc - endif - - %.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 289186e..313dc4d 100644 ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -28,7 +28,7 @@ $(BUILD): %: %.o $(DEPS) - $(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) - - %.o: %.c $(INCS) -- $(CC) $(IPATH) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - install: all - mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) -@@ -46,7 +46,7 @@ capshdoc.h.cf: capshdoc.h ./mkcapshdoc.sh - diff -u capshdoc.h $@ || (rm $@ ; exit 1) - - capsh: capsh.c capshdoc.h.cf $(DEPS) -- $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CAPSH_SHELL) $(CFLAGS) $(CPPFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) - - tcapsh-static: capsh.c capshdoc.h.cf $(DEPS) - $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) --static -diff --git a/tests/Makefile b/tests/Makefile -index 3a917c4..07eb2d5 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -13,6 +13,8 @@ ifeq ($(PTHREADS),yes) - $(MAKE) psx_test libcap_psx_test libcap_psx_launch_test - endif - -+CFLAGS += -fPIC -+ - install: all - - ifeq ($(DYNAMIC),yes) -@@ -63,13 +65,13 @@ run_psx_test: psx_test - ./psx_test - - psx_test: psx_test.c $(DEPS) -- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) - - run_libcap_psx_test: libcap_psx_test - ./libcap_psx_test - - libcap_psx_test: libcap_psx_test.c $(DEPS) -- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) - - # privileged - uns_test: uns_test.c $(DEPS) --- -2.32.0.rc1 - diff --git a/sys-libs/libcap/files/libcap-2.52-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.52-build-system-fixes.patch deleted file mode 100644 index 2d6b441c485d..000000000000 --- a/sys-libs/libcap/files/libcap-2.52-build-system-fixes.patch +++ /dev/null @@ -1,219 +0,0 @@ -From 0e977b8595d4e8690bd3f3a816c9ec407dca5ba6 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Wed, 4 Nov 2020 22:46:20 +0100 -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 - -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 -Forward ported from libcap-2.42 to libcap-2.44 -Forward ported from libcap-2.44 to libcap-2.45 -Forward ported from libcap-2.45 to libcap-2.48 -Forward ported from libcap-2.48 to libcap-2.50 -Forward ported from libcap-2.50 to libcap-2.52 - -Signed-off-by: Lars Wendler ---- - Make.Rules | 10 ++++++---- - Makefile | 1 - - libcap/Makefile | 7 ++++--- - pam_cap/Makefile | 10 ++++++---- - progs/Makefile | 4 ++-- - tests/Makefile | 6 ++++-- - 6 files changed, 22 insertions(+), 16 deletions(-) - -diff --git a/Make.Rules b/Make.Rules -index 8f7906c..fea4c78 100644 ---- a/Make.Rules -+++ b/Make.Rules -@@ -52,18 +52,13 @@ GOMAJOR=1 - # 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 - COPTS ?= -O2 - CFLAGS ?= $(COPTS) $(DEFINES) - BUILD_CC ?= $(CC) - BUILD_COPTS ?= -O2 --BUILD_CFLAGS ?= $(BUILD_COPTS) $(DEFINES) $(IPATH) --AR := $(CROSS_COMPILE)ar --RANLIB := $(CROSS_COMPILE)ranlib --OBJCOPY := $(CROSS_COMPILE)objcopy -+BUILD_CFLAGS ?= $(CFLAGS) - DEBUG = -g #-DDEBUG - WARNINGS=-Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align \ -@@ -77,10 +72,13 @@ - - 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) - INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) - - # SHARED tracks whether or not the SHARED libraries (libcap.so, -diff --git a/Makefile b/Makefile -index 984d502..a917238 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 47cf8f4..5125ffb 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -32,6 +32,7 @@ MINCAPLIBNAME=$(MAJCAPLIBNAME).$(MINOR) - PSXOBJS=$(addsuffix .o, $(PSXFILES)) - MAJPSXLIBNAME=$(PSXLIBNAME).$(VERSION) - MINPSXLIBNAME=$(MAJPSXLIBNAME).$(MINOR) -+CFLAGS += -fPIC - - all: pcs $(STACAPLIBNAME) - ifeq ($(SHARED),yes) -@@ -73,7 +74,7 @@ $(PSXTITLE).pc: $(PSXTITLE).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 -@@ -125,10 +126,10 @@ $(PSXLIBNAME) $(MAJPSXLIBNAME) $(MINPSXLIBNAME): $(PSXOBJS) include/sys/psx_sysc - endif - - %.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 $(CAPOBJS) - $(CC) $(CFLAGS) $(IPATH) $< $(CAPOBJS) -o $@ -diff --git a/pam_cap/Makefile b/pam_cap/Makefile -index a4c4891..a15feae 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 - -@@ -19,13 +21,13 @@ install: all - $(MAKE) -C ../libcap loader.txt - - execable.o: execable.c ../libcap/execable.h ../libcap/loader.txt -- $(CC) $(CFLAGS) $(IPATH) -DLIBCAP_VERSION=\"libcap-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" -c execable.c -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -DLIBCAP_VERSION=\"libcap-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" -c execable.c -o $@ - - pam_cap.so: pam_cap.o execable.o -- $(LD) -o pam_cap.so $+ $(LIBCAPLIB) $(LDFLAGS) --entry=__so_start -+ $(LD) $(CFLAGS) -o pam_cap.so $+ $(LIBCAPLIB) $(LDFLAGS) --entry=__so_start - - pam_cap.o: pam_cap.c -- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - ../libcap/libcap.a: - $(MAKE) -C ../libcap libcap.a -@@ -34,7 +36,7 @@ test_pam_cap: test_pam_cap.c pam_cap.c ../libcap/libcap.a - $(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: testlink test_pam_cap pam_cap.so - $(MAKE) testlink -diff --git a/progs/Makefile b/progs/Makefile -index 3e82862..dba7e8f 100644 ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -28,7 +28,7 @@ $(BUILD): %: %.o $(DEPS) - $(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) - - %.o: %.c $(INCS) -- $(CC) $(IPATH) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - install: all - mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) -@@ -46,7 +46,7 @@ capshdoc.h.cf: capshdoc.h ./mkcapshdoc.sh - diff -u capshdoc.h $@ || (rm $@ ; exit 1) - - capsh: capsh.c capshdoc.h.cf $(DEPS) -- $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CAPSH_SHELL) $(CFLAGS) $(CPPFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) - - tcapsh-static: capsh.c capshdoc.h.cf $(DEPS) - $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) --static -diff --git a/tests/Makefile b/tests/Makefile -index 3a917c4..07eb2d5 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -13,6 +13,8 @@ ifeq ($(PTHREADS),yes) - $(MAKE) psx_test libcap_psx_test libcap_psx_launch_test - endif - -+CFLAGS += -fPIC -+ - install: all - - ifeq ($(DYNAMIC),yes) -@@ -63,13 +65,13 @@ run_psx_test: psx_test - ./psx_test - - psx_test: psx_test.c $(DEPS) -- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) - - run_libcap_psx_test: libcap_psx_test - ./libcap_psx_test - - libcap_psx_test: libcap_psx_test.c $(DEPS) -- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) - - # privileged - uns_test: uns_test.c $(DEPS) --- -2.32.0 - diff --git a/sys-libs/libcap/files/libcap-2.55-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.55-build-system-fixes.patch deleted file mode 100644 index 501649c272d0..000000000000 --- a/sys-libs/libcap/files/libcap-2.55-build-system-fixes.patch +++ /dev/null @@ -1,241 +0,0 @@ -From abedd3c42100a636ae14a5c860ee2ed236af66ab Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Mon, 30 Aug 2021 07:04:15 +0100 -Subject: [PATCH] Build system fixes - -Summary: -- Respect tool choices: CC/AR/OBJCOPY/RANLIB -- Respect *FLAGS: CFLAGS/CPPFLAGS -- Use existing make process to spawn new jobs -- Only build tests conditionally (when we're going to run them) - -Much smaller version of patches from before thanks -to upstream incorporating some of our changes. - -See < 2.55 patches for some more context/history; the -original patch was from Mike Frysinger -and was forward-ported by Lars Wendler . - -Bug: https://bugs.gentoo.org/808807 (given this is where discussion occurred) -Bug: https://bugzilla.kernel.org/show_bug.cgi?id=214085 -Signed-off-by: Sam James ---- a/Make.Rules -+++ b/Make.Rules -@@ -64,24 +64,20 @@ KERNEL_HEADERS := $(topdir)/libcap/include/uapi - LIBCAP_INCLUDES = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include - DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - --CC := $(CROSS_COMPILE)gcc - LD=$(CC) -Wl,-x -shared - SUDO := sudo - COPTS ?= -O2 --CFLAGS ?= $(COPTS) $(DEFINES) -+CFLAGS ?= $(COPTS) - LDFLAGS ?= #-g --CPPFLAGS += $(LIBCAP_INCLUDES) -+CPPFLAGS += $(LIBCAP_INCLUDES) $(DEFINES) - - BUILD_CC ?= $(CC) - BUILD_LD ?= $(BUILD_CC) -Wl,-x -shared - BUILD_COPTS ?= $(COPTS) --BUILD_CFLAGS ?= $(BUILD_COPTS) $(DEFINES) -+BUILD_CFLAGS ?= $(CFLAGS) - BUILD_LDFLAGS ?= $(LDFLAGS) - BUILD_CPPFLAGS += $(LIBCAP_INCLUDES) - --AR := $(CROSS_COMPILE)ar --RANLIB := $(CROSS_COMPILE)ranlib --OBJCOPY := $(CROSS_COMPILE)objcopy - DEBUG = -g #-DDEBUG - WARNINGS=-Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align \ -@@ -95,7 +91,8 @@ BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes) - - SYSTEM_HEADERS = /usr/include - INCS=$(topdir)/libcap/include/sys/capability.h --CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) -+CPPFLAGS += -Dlinux -+CFLAGS += $(WARNINGS) $(DEBUG) - INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) - - # SHARED tracks whether or not the SHARED libraries (libcap.so, ---- 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 $@ ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -111,7 +111,7 @@ loader.txt: empty - $(OBJCOPY) --dump-section .interp=$@ $< /dev/null - - cap_magic.o: execable.h execable.c loader.txt -- $(CC) $(CFLAGS) $(CPPFLAGS) -DLIBRARY_VERSION=\"$(LIBTITLE)-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat loader.txt)\" -c execable.c -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -DLIBRARY_VERSION=\"$(LIBTITLE)-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat loader.txt)\" $(LDFLAGS) -c execable.c -o $@ - - $(CAPLIBNAME) $(MAJCAPLIBNAME) $(MINCAPLIBNAME): $(CAPOBJS) $(CAPMAGICOBJ) - $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJCAPLIBNAME) -o $(MINCAPLIBNAME) $^ $(MAGIC) -@@ -119,22 +119,22 @@ $(CAPLIBNAME) $(MAJCAPLIBNAME) $(MINCAPLIBNAME): $(CAPOBJS) $(CAPMAGICOBJ) - ln -sf $(MAJCAPLIBNAME) $(CAPLIBNAME) - - psx_magic.o: execable.h execable.c loader.txt -- $(CC) $(CFLAGS) $(CPPFLAGS) -DLIBRARY_VERSION=\"$(PSXTITLE)-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat loader.txt)\" -c execable.c -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -DLIBRARY_VERSION=\"$(PSXTITLE)-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat loader.txt)\" $(LDFLAGS) -c execable.c -o $@ - - $(PSXLIBNAME) $(MAJPSXLIBNAME) $(MINPSXLIBNAME): $(PSXOBJS) include/sys/psx_syscall.h $(PSXMAGICOBJ) -- $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJPSXLIBNAME) -o $(MINPSXLIBNAME) $(PSXOBJS) $(PSXMAGICOBJ) $(MAGIC) $(PSXLINKFLAGS) -+ $(LD) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJPSXLIBNAME) -o $(MINPSXLIBNAME) $(PSXOBJS) $(PSXMAGICOBJ) $(MAGIC) $(PSXLINKFLAGS) - ln -sf $(MINPSXLIBNAME) $(MAJPSXLIBNAME) - ln -sf $(MAJPSXLIBNAME) $(PSXLIBNAME) - endif - - %.o: %.c $(INCLS) -- $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c $< -o $@ - - cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ - - cap_test: cap_test.c libcap.h $(CAPOBJS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $< $(CAPOBJS) -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< $(CAPOBJS) -o $@ - - libcapsotest: $(CAPLIBNAME) - ./$(CAPLIBNAME) ---- a/pam_cap/Makefile -+++ b/pam_cap/Makefile -@@ -17,10 +17,10 @@ install: all - $(MAKE) -C ../libcap loader.txt - - execable.o: execable.c ../libcap/execable.h ../libcap/loader.txt -- $(CC) $(CFLAGS) $(CPPFLAGS) -DLIBCAP_VERSION=\"libcap-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" -c execable.c -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -DLIBCAP_VERSION=\"libcap-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" $(LDFLAGS) -c execable.c -o $@ - - pam_cap.so: pam_cap.o execable.o pam_cap_linkopts -- cat pam_cap_linkopts | xargs -e $(LD) -o $@ pam_cap.o execable.o $(LIBCAPLIB) $(LDFLAGS) -+ cat pam_cap_linkopts | xargs -e $(LD) $(LDFLAGS) -o $@ pam_cap.o execable.o $(LIBCAPLIB) - - # Some distributions force link everything at compile time, and don't - # take advantage of libpam's dlopen runtime options to resolve ill -@@ -51,21 +51,21 @@ pam_cap_linkopts: lazylink.so - ./lazylink.so || echo "-lpam" >> $@ - - lazylink.so: lazylink.c ../libcap/execable.h ../libcap/loader.txt -- $(LD) -o $@ $(CFLAGS) $(CPPFLAGS) lazylink.c -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" $(LDFLAGS) -Wl,-e,__so_start -+ $(LD) -o $@ $(CFLAGS) $(CPPFLAGS) -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" $(LDFLAGS) lazylink.c -Wl,-e,__so_start - endif - endif - - pam_cap.o: pam_cap.c -- $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c $< -o $@ - - ../libcap/libcap.a: - $(MAKE) -C ../libcap libcap.a - - test_pam_cap: test_pam_cap.c pam_cap.c ../libcap/libcap.a -- $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ test_pam_cap.c $(LIBCAPLIB) $(LDFLAGS) --static -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ test_pam_cap.c $(LIBCAPLIB) --static - - testlink: test.c pam_cap.o -- $(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) - - test: testlink test_pam_cap pam_cap.so - $(MAKE) testlink ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -22,16 +22,16 @@ DEPS = ../libcap/libcap.a - endif - - ../libcap/libcap.a: -- make -C ../libcap libcap.a -+ $(MAKE) -C ../libcap libcap.a - - ../libcap/libcap.so: -- make -C ../libcap libcap.so -+ $(MAKE) -C ../libcap libcap.so - - $(BUILD): %: %.o $(DEPS) -- $(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $< $(LIBCAPLIB) - - %.o: %.c $(INCS) -- $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c $< -o $@ - - install: all - mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) -@@ -49,10 +49,10 @@ capshdoc.h.cf: capshdoc.h ./mkcapshdoc.sh - diff -u capshdoc.h $@ || (rm $@ ; exit 1) - - capsh: capsh.c capshdoc.h.cf $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $(CAPSH_SHELL) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(CAPSH_SHELL) -o $@ $< $(LIBCAPLIB) - - tcapsh-static: capsh.c capshdoc.h.cf $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $(CAPSH_SHELL) -o $@ $< $(LIBCAPLIB) --static -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(CAPSH_SHELL) -o $@ $< $(LIBCAPLIB) --static - - uns_test: ../tests/uns_test.c - $(MAKE) -C ../tests uns_test ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -66,17 +66,17 @@ run_psx_test: psx_test - ./psx_test - - psx_test: psx_test.c $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) - - run_libcap_psx_test: libcap_psx_test - ./libcap_psx_test - - libcap_psx_test: libcap_psx_test.c $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) - - # privileged - uns_test: uns_test.c $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) - - run_uns_test: uns_test - echo exit | $(SUDO) ./uns_test -@@ -88,13 +88,13 @@ run_libcap_psx_launch_test: libcap_psx_launch_test ../progs/tcapsh-static - $(SUDO) ./libcap_psx_launch_test - - libcap_launch_test: libcap_launch_test.c $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) - - # This varies only slightly from the above insofar as it currently - # only links in the pthreads fork support. TODO() we need to change - # the source to do something interesting with pthreads. - libcap_psx_launch_test: libcap_launch_test.c $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) -DWITH_PTHREADS $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) -DWITH_PTHREADS $(LDFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) - - - # This test demonstrates that libpsx is needed to secure multithreaded -@@ -109,12 +109,12 @@ exploit.o: exploit.c - $(CC) $(CFLAGS) $(CPPFLAGS) -c $< - - exploit: exploit.o $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) -lpthread $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) -lpthread - - # Note, for some reason, the order of libraries is important to avoid - # the exploit working for dynamic linking. - noexploit: exploit.o $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LIBCAPLIB) - - # This one runs in a chroot with no shared library files. - noop: noop.c 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 new file mode 100644 index 000000000000..572bde97e2c2 --- /dev/null +++ b/sys-libs/libcap/files/libcap-2.56-build-system-fixes.patch @@ -0,0 +1,239 @@ +From 3249c2696468bc82ec45f4fcabddc390473a45da Mon Sep 17 00:00:00 2001 +From: David Seifert +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 +--- + 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" +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 +--- + 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" +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 +--- + 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.51-r1.ebuild b/sys-libs/libcap/libcap-2.51-r1.ebuild deleted file mode 100644 index c4a5075d066b..000000000000 --- a/sys-libs/libcap/libcap-2.51-r1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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 -PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )" -DEPEND="${PDEPEND} - sys-kernel/linux-headers" - -# Requires test suite being run as root (via sudo) -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-2.50-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 - CC="$(tc-getCC)" - AR="$(tc-getAR)" - RANLIB="$(tc-getRANLIB)" - ) - 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 - gen_usr_ldscript -a psx - if ! use static-libs ; then - rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.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 -} diff --git a/sys-libs/libcap/libcap-2.52-r1.ebuild b/sys-libs/libcap/libcap-2.52-r1.ebuild deleted file mode 100644 index 7a79484719d5..000000000000 --- a/sys-libs/libcap/libcap-2.52-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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 -PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )" -DEPEND="${PDEPEND} - sys-kernel/linux-headers" - -# Requires test suite being run as root (via sudo) -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-2.52-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 OBJCOPY 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 - gen_usr_ldscript -a psx - if ! use static-libs ; then - rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.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 -} diff --git a/sys-libs/libcap/libcap-2.55-r1.ebuild b/sys-libs/libcap/libcap-2.55-r1.ebuild deleted file mode 100644 index 0f5cb32668e0..000000000000 --- a/sys-libs/libcap/libcap-2.55-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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 -PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )" -DEPEND="${PDEPEND} - sys-kernel/linux-headers" - -# Requires test suite being run as root (via sudo) -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-2.55-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 OBJCOPY 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 - gen_usr_ldscript -a psx - if ! use static-libs ; then - rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.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 -} diff --git a/sys-libs/libcap/libcap-2.56.ebuild b/sys-libs/libcap/libcap-2.56.ebuild new file mode 100644 index 000000000000..0298367e4475 --- /dev/null +++ b/sys-libs/libcap/libcap-2.56.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit 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 tools" + +# While the build system optionally uses gperf, we don't DEPEND on it because +# the build automatically falls back when it's unavailable. #604802 +PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )" +DEPEND="${PDEPEND} + sys-kernel/linux-headers" +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 +) + +QA_FLAGS_IGNORED="sbin/captree" # go binaries don't use LDFLAGS + +src_prepare() { + default + multilib_copy_sources +} + +run_emake() { + local args=( + AR="$(tc-getAR)" + CC="$(tc-getCC)" + OBJCOPY="$(tc-getOBJCOPY)" + RANLIB="$(tc-getRANLIB)" + exec_prefix="${EPREFIX}" + lib_prefix="${EPREFIX}/usr" + lib="$(get_libdir)" + prefix="${EPREFIX}/usr" + PAM_CAP="$(usex pam yes no)" + DYNAMIC=yes + GOLANG="$(multilib_native_usex tools yes no)" + ) + emake "${args[@]}" "$@" +} + +src_configure() { + tc-export_build_env BUILD_CC + multilib-minimal_src_configure +} + +multilib_src_compile() { + run_emake +} + +multilib_src_test() { + run_emake test +} + +multilib_src_install() { + # no configure, needs explicit install line #444724#c3 + run_emake DESTDIR="${D}" install + + gen_usr_ldscript -a cap + gen_usr_ldscript -a psx + if ! use static-libs ; then + rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die + fi + + # install pam plugins ourselves + rm -rf "${ED}"/usr/$(get_libdir)/security || die + + 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 +} diff --git a/sys-libs/libcap/metadata.xml b/sys-libs/libcap/metadata.xml index d10107478bd7..c00b296dee90 100644 --- a/sys-libs/libcap/metadata.xml +++ b/sys-libs/libcap/metadata.xml @@ -1,11 +1,14 @@ - - base-system@gentoo.org - Gentoo Base System - - - cpe:/a:libcap:libcap - + + base-system@gentoo.org + Gentoo Base System + + + Install captree, which requires dev-lang/go + + + cpe:/a:libcap:libcap + -- cgit v1.2.3