From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EC282138335 for ; Wed, 31 Oct 2018 08:06:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8751E0B83; Wed, 31 Oct 2018 08:06:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5B13E0B83 for ; Wed, 31 Oct 2018 08:06:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E02B335CB7 for ; Wed, 31 Oct 2018 08:06:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA741454 for ; Wed, 31 Oct 2018 08:06:18 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1540973171.6bbcce8beb3962af0fa4d7c96f8e218d50bf7e75.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libcap/files/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch sys-libs/libcap/files/libcap-2.24-build-system-fixes.patch sys-libs/libcap/files/libcap-2.24-setcap-errno.patch X-VCS-Directories: sys-libs/libcap/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 6bbcce8beb3962af0fa4d7c96f8e218d50bf7e75 X-VCS-Branch: master Date: Wed, 31 Oct 2018 08:06:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ee6be200-530e-4d7e-8c96-4548fa1225b4 X-Archives-Hash: 44ece1ff5981bdf856c1aa83c153c37d commit: 6bbcce8beb3962af0fa4d7c96f8e218d50bf7e75 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sun Sep 30 12:58:00 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Oct 31 08:06:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bbcce8b sys-libs/libcap: remove unused patches Signed-off-by: Michael Mair-Keimberger gmail.com> Signed-off-by: Lars Wendler gentoo.org> ....20-ignore-RAISE_SETFCAP-install-failures.patch | 29 ---- .../files/libcap-2.24-build-system-fixes.patch | 163 --------------------- .../libcap/files/libcap-2.24-setcap-errno.patch | 45 ------ 3 files changed, 237 deletions(-) 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 1bc4d63ebb1..00000000000 --- 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 -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 ---- - 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 64393275bb8..00000000000 --- 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 -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 ---- - 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 08513f643e6..00000000000 --- 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 -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 ---- - 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 -