summaryrefslogtreecommitdiff
path: root/sys-libs/libcap
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-12-14 13:26:14 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-12-14 13:26:14 +0000
commit6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree25413d1cb3a0cbfe36029db32398c0f333609215 /sys-libs/libcap
parent9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
gentoo resync : 14.12.2020
Diffstat (limited to 'sys-libs/libcap')
-rw-r--r--sys-libs/libcap/Manifest5
-rw-r--r--sys-libs/libcap/files/libcap-2.44-build-system-fixes.patch173
-rw-r--r--sys-libs/libcap/libcap-2.46.ebuild (renamed from sys-libs/libcap/libcap-2.44.ebuild)7
3 files changed, 5 insertions, 180 deletions
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 6c2c34d701b6..b0fbbf53d639 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.42-build-system-fixes.patch 6518 BLAKE2B 138347d98901a0a41c36a3f3e1ff7c539836ba00e0cb1c80005d1e261c35f822bee51a4ca86be324f84b29fc6362e9b891ef105b2142f22be4e8896731b3ee16 SHA512 fbe8fe06ab3650b3247811b04b4afa1d56fc641de0b90c448b99904816b7d4e02d30c5dc54cd038d57c16f828a671c73f3c176e1e5826e6b9c69e2d3085015ff
-AUX libcap-2.44-build-system-fixes.patch 5589 BLAKE2B fc101cd0780cfe71105b38ecc533057224012ea24b6a2825993af425c34f130317c1e9de3116e1369ba540c061e8200542b3b987d7bd7c144ac92ec0b1945bb9 SHA512 6a8f77da9be8f44039b58751dd84bcb401a2ad03c4d7a204f0f15c99eee5f3a6e1f439e9c70353503c3675362560421e52e82db1256549a6ef1a1d3c75329e04
AUX libcap-2.45-build-system-fixes.patch 6618 BLAKE2B 0f18fbf2ba66b0b6131b4f1b9df1005ddeccda31ace7085104531cf57c09d7d2f7ed1aea489f9ef6f2d9701c80acae94265a08aa25951fc6fa95820d0441f789 SHA512 738090eaba52eed82bb8cbf1f3a9a440a1b2e409e875965f8499e78047faad21476e9be42e3707f968e3b5d633b0581b27e09f101b0e4de26abeaf58c7b45e33
DIST libcap-2.43.tar.xz 125284 BLAKE2B bde36f8397f4adb74760eb403daa06bee1b8f45ddc253cc3c3ef1f6e95d0e4c76d0f2e6fa3335a8bc451f18ac7128c96230f6aba9ae0320fa4f9d669e7b4f715 SHA512 817add571fb2c54ad2a39974e6545b8fc8d855ecdcf2e00b2cc10e583802c49dfea2d8bca484c89ecd574fdacfc46565b51e3064a4407cf1985defb913240d45
-DIST libcap-2.44.tar.xz 125568 BLAKE2B 758b756648d27e7fa81024e33712a77f2b676fe1aa0519c232412d1468afb6b982d5ab54162e2f46ebba5dbcb962d5779e5b15550c938aca52e499d406990a6f SHA512 1bb323ca362923bd6bd0e2e4639cf8726975165a620a243b31e797056439eb7efb2bfbc8e5521636783a86c7415b2037b1638c98747b79183ca7d3d42a04ff20
DIST libcap-2.45.tar.xz 127608 BLAKE2B 61b422ad3a53b9f1e2e2fb253794ac5eef652e6592ffe5b0c4d7eb98c6683ebf08342bb2cbd1e4792cec206639c56bc3bafb983a990523ee3a1814686b57edf1 SHA512 32ddc303eeb1bf6a4b6cc81b0cb0c49544c58697735925b661a0cdfa18e4096fdbaed1a340c09b8060b09302dea332b216e9bdaf246e4c45f91211afc4752138
+DIST libcap-2.46.tar.xz 129296 BLAKE2B 22df1dcf37a920e831c47edad62df2b3e35b5360605ed24bdb9199ac8ba1fd30cd20492f8a9eae25232cc042cbef9a89a3649e0d06412b84c58f12e7795844bc SHA512 6dcb249aac78efde959a986e7f06a364b2e6e57dd40b14e791d5a56012df485b2395dee0228f4cc3e1cddb2a4e3dcb9c1d83d5331ed084f23a46848494933845
EBUILD libcap-2.43.ebuild 2172 BLAKE2B 94abe1f5d3ebb812f67f7d1170c4f1fa9766b75526ac1a088bd8019b76c76695784b8d57f5740f0c684f8a3fe4440bf8b61f5eec3fbfdd1bd1eb7543fe8710f5 SHA512 7593c942c3650af81cbd905d97f5265efb53a16ac9bd9156eada840ea10c85e64de2464fbc4088306a73e3761a1606f8000e9a95e9ee36b15db741e33aa08612
-EBUILD libcap-2.44.ebuild 2246 BLAKE2B 9c2d5b8613b7d40f4b5092c39bc28915669d5a62b2cd9a2f95a47039cdcabea05990d5d47c40a679af1947291c48449d6dd9d18d29cc02a4e5c3c6da0b82b294 SHA512 ccaa49098bd02ecc82fbe4a6734d68097bf38c5f1108332ee39089f0c81fe39978264c14b817532180bb92c46f3572840643a0d8fc0c57e68b283789e56d8a2b
EBUILD libcap-2.45.ebuild 2211 BLAKE2B d2336c7bbf69c5f99806dabdc568cfae6d7266b55fcb5b4501a5378e61fe186a915a72a282b8400997d78e8caff13d08b11b8bd9b5eace6798f8a608b01f4989 SHA512 c10100e06e0e8dda04dc6825277993fe36f123bed7effc1f23e72fa6e7b8c852a434c4ec9c4bafd064b014b0011507d23aa22ba68dba31c44f03035beef988a4
+EBUILD libcap-2.46.ebuild 2211 BLAKE2B d2336c7bbf69c5f99806dabdc568cfae6d7266b55fcb5b4501a5378e61fe186a915a72a282b8400997d78e8caff13d08b11b8bd9b5eace6798f8a608b01f4989 SHA512 c10100e06e0e8dda04dc6825277993fe36f123bed7effc1f23e72fa6e7b8c852a434c4ec9c4bafd064b014b0011507d23aa22ba68dba31c44f03035beef988a4
MISC metadata.xml 332 BLAKE2B 2177c836192a85a6d943221da405f7f11f355011767789d81009d5e4d822a203302a946fa1a0ffbc66be6a37a7069aa94a796125fa1dedbdf023762b47f8f614 SHA512 a9887500fd60b72156ac2589b1fefab8dd70b0c03477dd795f147fdc91bbe6fd027b8cf58c3e86cdb6e831368d34b4881cdf0e833af5aee9e7d1a01e90408ae1
diff --git a/sys-libs/libcap/files/libcap-2.44-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.44-build-system-fixes.patch
deleted file mode 100644
index eeee8ba2ccf1..000000000000
--- a/sys-libs/libcap/files/libcap-2.44-build-system-fixes.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-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
-Forward ported from libcap-2.42 to libcap-2.44
-
-
---- a/Make.Rules
-+++ b/Make.Rules
-@@ -52,7 +52,6 @@ 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
-@@ -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
-@@ -75,16 +74,19 @@ LIBPSXLIB := -L$(topdir)/libcap -lpsx -lpthread -Wl,-wrap,pthread_create
-
- 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)
---- 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
-@@ -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 $@
---- 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
---- a/progs/Makefile
-+++ b/progs/Makefile
-@@ -27,7 +27,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)
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -24,19 +24,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
- $(LDPATH) ./psx_test
-
- psx_test: psx_test.c $(DEPS)
-- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB)
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBPSXLIB)
-
- run_libcap_psx_test: libcap_psx_test
- $(LDPATH) ./libcap_psx_test
-
- libcap_psx_test: libcap_psx_test.c $(DEPS)
-- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS)
-
- run_libcap_launch_test: libcap_launch_test libcap_psx_launch_test noop
- sudo $(LDPATH) ./libcap_launch_test
diff --git a/sys-libs/libcap/libcap-2.44.ebuild b/sys-libs/libcap/libcap-2.46.ebuild
index 50d850b8a01f..f96270520eda 100644
--- a/sys-libs/libcap/libcap-2.44.ebuild
+++ b/sys-libs/libcap/libcap-2.46.ebuild
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
RESTRICT="test"
PATCHES=(
- "${FILESDIR}"/${PN}-2.44-build-system-fixes.patch
+ "${FILESDIR}"/${PN}-2.45-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
@@ -69,10 +69,9 @@ multilib_src_install() {
run_emake DESTDIR="${D}" install
gen_usr_ldscript -a cap
+ gen_usr_ldscript -a psx
if ! use static-libs ; then
- # Don't remove libpsx.a!
- # See https://bugs.gentoo.org/703912
- rm "${ED}"/usr/$(get_libdir)/libcap.a || die
+ rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die
fi
if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then