diff options
Diffstat (limited to 'sys-libs/libcap')
4 files changed, 0 insertions, 240 deletions
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest index e1d983d0d56e..8017bd00d633 100644 --- a/sys-libs/libcap/Manifest +++ b/sys-libs/libcap/Manifest @@ -1,8 +1,5 @@ -AUX libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch 840 BLAKE2B 9d6059a08b40f8ebbb3d21205a7c2427e2d64693e8539e5c372be96cd11ae889af4f6e1302273950427191749c986dd0b8f072cf112134b55708970ca312f1bc SHA512 59936147919f3a8959d87831583df96ab3e1883e58b746f6542cc6430434d2a93c07e79ff7e9fdf9698626aa42e60c6c57981025e46923be76ff2d65720d606c AUX libcap-2.21-include.patch 218 BLAKE2B 536be33e749bc818efb29e3a7a010029025520c4694178aa1d85bf0c48abfca4c77f940b4fbb9bd08464edc31af657960fc41cab71d112ebf3573d1aa1f23148 SHA512 637f5dc2d7ead44a19a57db436ddf7e8afa1b368c72e5520a1ac77633c20b0f9a2af9defdafed1edb7209474798d1bcd236c712a160b5c6920d8864411baefed AUX libcap-2.22-no-perl.patch 2360 BLAKE2B f9ef0549a8f2f1f08f3b93e9a4234d8d0188780dc134c4b56cc83b5ca94453f96e10a384de3d9dd24dbab3758376145e96b28ac3c0e04a9e1b46cc0c4f20b0cc SHA512 8c49d829cbae15f28ded70b96bc0715819b13183136d90b64b7b6bfbd85c262f0161d89450579e9b58961c724b34816919d111f839e3f5a7a68427ffe441881d -AUX libcap-2.24-build-system-fixes.patch 4943 BLAKE2B 5f66815f52b69171794225784e69025037f08796a0bd25ac46bd93477d3e2f471d9e52a53910f45f82f31853abb4dc62cfa03503bbcf7e32e3946745f3f01b7f SHA512 84283f0652f87a8c1f598413d03e8f3aeeb140b322519051df1873933d6d3ac738757e1c7c91ea6efc51548d224149b84d6a1fab0301a655eb609b183bc9e7ba -AUX libcap-2.24-setcap-errno.patch 1491 BLAKE2B 19a3422b560eb21957f10f512902aeff6cf5b832354a41a4ff24c497bc2189b06197063a26fa089864d573fc6cd6f0f42c0207b627053985fce9417543adfccb SHA512 367037d6c42d07c359e9ee397cbc7431ea05c3d34deea93db1473394decb9f61a2c9de186652fc3a12fb615406ec1a2f4d76eb63c4410c6a2b5f435ece5b05ef AUX libcap-2.25-build-system-fixes.patch 4705 BLAKE2B be3c05b5c798411cc03458c1ce71956ddf2996db71d349e6733a082ec90b264d6a24aa6abaff4b44a65502dc9cd49fe749f11d2fc41fa45879fa0cb6bde2b6ef SHA512 c99df67dfdceefeea3c3033a38e94a93cd7a9c4ed6e74f42c3b7198d66deee4b5d4aa91c540a48b12749ce3285c0ac3f11d0ecc33b913c3f0169578ae28745da AUX libcap-2.25-gperf.patch 620 BLAKE2B c870cd0d093df2e8f7498adc4d9b23f101089d80906eeba948982b599469c209e4dc4076efee04b37978b4226c3281ace2ee6ce751c27ee6719456657ebcdeda SHA512 1fd325160ebcf96f8a8f58e7f453241d15d2c968752cc050b52871536840f8ebbbfe1fa2bd03c19f86859e9739eb0059d30f157d2fa3a076da4a895fc32182e6 AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 988 BLAKE2B 63417032b843ff7cb704c9880cfca4db5083d05d479c71dd12925d729f22a4900c2ae277a20399d58830eaca969842d587a2ae0a646809d6b659a75d13678312 SHA512 ba573ce68858c1370f3d25ad03678a534e6f3052076694d09e795d1febf2f3d76a6a170658b71d9e31105521fd5d22dd72095585a5402286dba424937064b389 diff --git a/sys-libs/libcap/files/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch b/sys-libs/libcap/files/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch deleted file mode 100644 index 1bc4d63ebb1a..000000000000 --- a/sys-libs/libcap/files/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f2020ee4ee4b2f245637c77e81d62ab6d1db3c6c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Tue, 25 Jan 2011 15:52:31 -0500 -Subject: [PATCH] ignore RAISE_SETFCAP install failures - -While the new RAISE_SETFCAP feature is nifty, its failure to run (often -due to the fs not supporting it) shouldn't impair the default install. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - progs/Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/progs/Makefile b/progs/Makefile -index c261f57..9e1a84d 100644 ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -30,7 +30,7 @@ install: all - install -m 0755 $$p $(SBINDIR) ; \ - done - ifeq ($(RAISE_SETFCAP),yes) -- $(SBINDIR)/setcap cap_setfcap=i $(SBINDIR)/setcap -+ -$(SBINDIR)/setcap cap_setfcap=i $(SBINDIR)/setcap - endif - - clean: --- -1.7.4.rc2 - diff --git a/sys-libs/libcap/files/libcap-2.24-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.24-build-system-fixes.patch deleted file mode 100644 index 64393275bb80..000000000000 --- a/sys-libs/libcap/files/libcap-2.24-build-system-fixes.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 0485ff3e7f62a331aa4f1e8ec4c2fdcee400e324 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sun, 16 Nov 2008 09:10:31 -0500 -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> ---- - Make.Rules | 26 ++++++++++++++------------ - libcap/Makefile | 11 ++++++----- - pam_cap/Makefile | 8 +++++--- - progs/Makefile | 2 +- - 4 files changed, 26 insertions(+), 21 deletions(-) - -diff --git a/Make.Rules b/Make.Rules -index 18b7cf7..5364c46 100644 ---- a/Make.Rules -+++ b/Make.Rules -@@ -45,27 +45,29 @@ MINOR=24 - - # Compilation specifics - --KERNEL_HEADERS := $(topdir)/libcap/include/uapi --IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include -- --CC := gcc --CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --BUILD_CC := $(CC) --BUILD_CFLAGS := $(CFLAGS) $(IPATH) --AR := ar --RANLIB := ranlib -+CC ?= gcc -+CFLAGS ?= -O2 -+BUILD_CC ?= $(CC) -+BUILD_CFLAGS ?= $(CFLAGS) -+AR ?= ar -+RANLIB ?= ranlib - DEBUG = -g #-DDEBUG - WARNINGS=-Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align \ - -Wstrict-prototypes -Wmissing-prototypes \ - -Wnested-externs -Winline -Wshadow - LD=$(CC) -Wl,-x -shared --LDFLAGS := #-g -+LDFLAGS ?= #-g - --SYSTEM_HEADERS = /usr/include -+KERNEL_HEADERS = $(topdir)/libcap/include/uapi -+LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include -+LIBCAP_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -+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) -diff --git a/libcap/Makefile b/libcap/Makefile -index 0ccd2e7..6b446ea 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -16,7 +16,7 @@ FILES=cap_alloc cap_proc cap_extint cap_flag cap_text - # no support). - ifeq ($(LIBATTR),yes) - FILES += cap_file --LDFLAGS += -lattr -+LDLIBS += -lattr - DEPS = -lattr - endif - -@@ -25,6 +25,7 @@ OBJS=$(addsuffix .o, $(FILES)) - MAJLIBNAME=$(LIBNAME).$(VERSION) - MINLIBNAME=$(MAJLIBNAME).$(MINOR) - GPERF_OUTPUT = _caps_output.gperf -+CFLAGS += -fPIC - - all: $(MINLIBNAME) $(STALIBNAME) libcap.pc - -@@ -43,7 +44,7 @@ libcap.pc: libcap.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 -@@ -60,15 +61,15 @@ $(STALIBNAME): $(OBJS) - $(RANLIB) $@ - - $(MINLIBNAME): $(OBJS) -- $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^ -+ $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^ $(LDLIBS) - ln -sf $(MINLIBNAME) $(MAJLIBNAME) - 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 $@ - - install: all - mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys -diff --git a/pam_cap/Makefile b/pam_cap/Makefile -index cc32fb6..6f07b6b 100644 ---- a/pam_cap/Makefile -+++ b/pam_cap/Makefile -@@ -9,6 +9,8 @@ include ../Make.Rules - # written (and you know why it fails), email me and explain why. Thanks! - LDLIBS += -L../libcap -lcap - -+CFLAGS += -fPIC -+ - all: pam_cap.so - $(MAKE) testcompile - -@@ -17,13 +19,13 @@ install: all - install -m 0755 pam_cap.so $(FAKEROOT)$(LIBDIR)/security - - pam_cap.so: pam_cap.o -- $(LD) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS) -+ $(LD) $(CFLAGS) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS) - - pam_cap.o: pam_cap.c -- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - testcompile: test.c pam_cap.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS) - - clean: - rm -f *.o *.so testcompile *~ -diff --git a/progs/Makefile b/progs/Makefile -index 778149e..8f4e2e6 100644 ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -22,7 +22,7 @@ $(BUILD): %: %.o - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS) - - %.o: %.c $(INCS) -- $(CC) $(IPATH) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - install: all - mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) --- -2.4.1 - diff --git a/sys-libs/libcap/files/libcap-2.24-setcap-errno.patch b/sys-libs/libcap/files/libcap-2.24-setcap-errno.patch deleted file mode 100644 index 08513f643e65..000000000000 --- a/sys-libs/libcap/files/libcap-2.24-setcap-errno.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 62b190c09d5652c58679dffd7f09e4aceb4c7daa Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 13 Jul 2015 01:59:14 -0400 -Subject: [PATCH] setcap: fix errno display - -The commit 056ffb0bd25d91ffbcb83c521fc4d3d9904ec4d4 broke the display of -the final error message because it would do more operations that would -clobber errno. Example: -(libcap-2.22) sudo setcap cap_ipc_lock=ep /proc/filesystems | head -1 -Failed to set capabilities on file `/proc/filesystems' (Operation not supported) -(libcap-2.23) sudo setcap cap_ipc_lock=ep /proc/filesystems | head -1 -Failed to set capabilities on file `/proc/filesystems' (Invalid argument) - -Save the original errno value and use that for the final display instead. - -URL: https://bugs.gentoo.org/551672 -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - progs/setcap.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/progs/setcap.c b/progs/setcap.c -index 83090ae..7304343 100644 ---- a/progs/setcap.c -+++ b/progs/setcap.c -@@ -171,6 +171,7 @@ int main(int argc, char **argv) - retval = cap_set_file(*++argv, cap_d); - if (retval != 0) { - int explained = 0; -+ int oerrno = errno; - #ifdef linux - cap_value_t cap; - cap_flag_value_t per_state; -@@ -193,7 +194,7 @@ int main(int argc, char **argv) - - fprintf(stderr, - "Failed to set capabilities on file `%s' (%s)\n", -- argv[0], strerror(errno)); -+ argv[0], strerror(oerrno)); - if (!explained) { - usage(); - } --- -2.4.4 - |