* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/files/
@ 2018-10-31 8:06 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2018-10-31 8:06 UTC (permalink / raw
To: gentoo-commits
commit: 6bbcce8beb3962af0fa4d7c96f8e218d50bf7e75
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Sep 30 12:58:00 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> 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 <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Lars Wendler <polynomial-c <AT> 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 <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 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 <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 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 <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
-
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/files/
@ 2019-12-13 9:27 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2019-12-13 9:27 UTC (permalink / raw
To: gentoo-commits
commit: d6502cd58680cab758144bfe51ec6c5556179695
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 09:26:26 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 09:27:12 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6502cd5
sys-libs/libcap: Improved 2.28-build-system-fixes.patch
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/libcap-2.28-build-system-fixes.patch | 47 ++++++++++++++++++----
1 file changed, 39 insertions(+), 8 deletions(-)
diff --git a/sys-libs/libcap/files/libcap-2.28-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.28-build-system-fixes.patch
index ae0f2a36f6d..3c2ef3d2214 100644
--- a/sys-libs/libcap/files/libcap-2.28-build-system-fixes.patch
+++ b/sys-libs/libcap/files/libcap-2.28-build-system-fixes.patch
@@ -1,4 +1,4 @@
-From 9ce6d2ab1060c362178aba57b68bedca2d39cfe9 Mon Sep 17 00:00:00 2001
+From 95e48927b0c3a5e817a41c03d977fbf2e7083940 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 10 Feb 2016 09:47:27 +0100
Subject: [PATCH] build system fixes
@@ -19,17 +19,18 @@ Forward ported from libcap-2.25 to libcap-2.28
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
- Make.Rules | 30 ++++++++++++++++++------------
+ Make.Rules | 27 +++++++++++++++------------
libcap/Makefile | 7 ++++---
pam_cap/Makefile | 8 +++++---
progs/Makefile | 2 +-
- 4 files changed, 28 insertions(+), 19 deletions(-)
+ tests/Makefile | 8 +++++---
+ 5 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/Make.Rules b/Make.Rules
-index ab4f17c..1b659ea 100644
+index ab4f17c..bd8f73c 100644
--- a/Make.Rules
+++ b/Make.Rules
-@@ -46,35 +46,41 @@ MINOR=28
+@@ -46,35 +46,38 @@ MINOR=28
# Compilation specifics
KERNEL_HEADERS := $(topdir)/libcap/include/uapi
@@ -41,13 +42,11 @@ index ab4f17c..1b659ea 100644
-BUILD_CFLAGS := $(CFLAGS) $(IPATH)
-AR := ar
-RANLIB := ranlib
-+IPATH += -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
+
+CC ?= gcc
+CFLAGS ?= -O2
+BUILD_CC ?= $(CC)
+BUILD_CFLAGS ?= $(CFLAGS)
-+BUILD_CFLAGS += $(IPATH)
+AR ?= ar
+RANLIB ?= ranlib
DEBUG = -g #-DDEBUG
@@ -64,7 +63,6 @@ index ab4f17c..1b659ea 100644
BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes)
-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)
@@ -160,6 +158,39 @@ index 0786ad3..3abbbd9 100644
install: all
mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR)
+diff --git a/tests/Makefile b/tests/Makefile
+index b16bdcd..dfed90e 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -5,6 +5,8 @@ topdir=$(shell pwd)/..
+ include ../Make.Rules
+ #
+
++CFLAGS += -fPIC
++
+ all: run_psx_test run_libcap_psx_test
+
+ install: all
+@@ -14,16 +16,16 @@ run_psx_test: psx_test psx_test_wrap
+ ./psx_test_wrap
+
+ psx_test: psx_test.c
+- $(CC) $(CFLAGS) $(IPATH) -DNOWRAP $< -o $@ $(LIBPSXLIB)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -DNOWRAP $< -o $@ $(LIBPSXLIB)
+
+ psx_test_wrap: psx_test.c
+- $(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
+- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
++ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
+
+ clean:
+ rm -f psx_test psx_test_wrap libcap_psx_test
--
2.24.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/files/
@ 2021-03-20 16:11 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2021-03-20 16:11 UTC (permalink / raw
To: gentoo-commits
commit: 006d88e5a72eaa3636e1a9f8d0ea288505da72f0
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Mar 19 16:50:12 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Mar 20 16:11:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=006d88e5
sys-libs/libcap: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/20007
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/libcap-2.45-build-system-fixes.patch | 207 ---------------------
1 file changed, 207 deletions(-)
diff --git a/sys-libs/libcap/files/libcap-2.45-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.45-build-system-fixes.patch
deleted file mode 100644
index 4b22ed096e1..00000000000
--- a/sys-libs/libcap/files/libcap-2.45-build-system-fixes.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From 4e74abfe7309302b4aa6c90f9e54647cb5e0146d Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-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 <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
-Forward ported from libcap-2.44 to libcap-2.45
-
-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 cc6f95b..31d9db5 100644
---- 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
-@@ -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,
-@@ -104,7 +106,7 @@ PTHREADS ?= yes
-
- ifeq ($(PTHREADS),yes)
- 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 8e8d5f3..580c48f 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 230be39..7d0bcfb 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)
- 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 1d7fc7a..64dbe86 100644
---- a/progs/Makefile
-+++ b/progs/Makefile
-@@ -28,7 +28,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 fc39fee..3668825 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)
-@@ -62,13 +64,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
- run_libcap_launch_test: libcap_launch_test noop
---
-2.29.2
-
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/files/
@ 2021-09-23 19:02 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2021-09-23 19:02 UTC (permalink / raw
To: gentoo-commits
commit: 42e868756e356ea8fb5238a25a16ebbbce113136
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Sep 23 17:46:12 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Sep 23 19:00:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42e86875
sys-libs/libcap: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/22376
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/libcap-2.56-build-system-fixes.patch | 239 ---------------------
1 file changed, 239 deletions(-)
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
deleted file mode 100644
index 572bde97e2c..00000000000
--- a/sys-libs/libcap/files/libcap-2.56-build-system-fixes.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-From 3249c2696468bc82ec45f4fcabddc390473a45da Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-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 <morgan@kernel.org>
----
- 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" <morgan@kernel.org>
-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 <morgan@kernel.org>
----
- 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" <morgan@kernel.org>
-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 <morgan@kernel.org>
----
- 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
-
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/files/
@ 2021-11-20 8:31 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2021-11-20 8:31 UTC (permalink / raw
To: gentoo-commits
commit: c344ef7f386fc3c3090eb1bc36ec713b80f17ff0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 20 08:31:04 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 20 08:31:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c344ef7f
sys-libs/libcap: cleanup patches
Signed-off-by: Sam James <sam <AT> gentoo.org>
....25-ignore-RAISE_SETFCAP-install-failures.patch | 9 --------
sys-libs/libcap/files/libcap-2.38-no_perl.patch | 9 --------
.../files/libcap-2.48-build-system-fixes.patch | 24 ----------------------
3 files changed, 42 deletions(-)
diff --git a/sys-libs/libcap/files/libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch b/sys-libs/libcap/files/libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch
index 0f737361a4d1..e5455cd1ebb6 100644
--- a/sys-libs/libcap/files/libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch
+++ b/sys-libs/libcap/files/libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch
@@ -11,12 +11,6 @@ Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Forward ported from libcap-2.20 to libcap-2.25
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- progs/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/progs/Makefile b/progs/Makefile
-index c094a24..4a6db38 100644
--- a/progs/Makefile
+++ b/progs/Makefile
@@ -27,7 +27,7 @@ install: all
@@ -28,6 +22,3 @@ index c094a24..4a6db38 100644
endif
clean:
---
-2.7.1
-
diff --git a/sys-libs/libcap/files/libcap-2.38-no_perl.patch b/sys-libs/libcap/files/libcap-2.38-no_perl.patch
index f3e0c468c869..9104484d5770 100644
--- a/sys-libs/libcap/files/libcap-2.38-no_perl.patch
+++ b/sys-libs/libcap/files/libcap-2.38-no_perl.patch
@@ -14,12 +14,6 @@ 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 | 26 +++++++++++++++++++-------
- 1 file changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/libcap/Makefile b/libcap/Makefile
-index 3d6463d..df2526c 100644
--- a/libcap/Makefile
+++ b/libcap/Makefile
@@ -22,6 +22,8 @@ MAJLIBNAME=$(LIBNAME).$(VERSION)
@@ -66,6 +60,3 @@ index 3d6463d..df2526c 100644
$(STACAPLIBNAME): $(CAPOBJS)
$(AR) rcs $@ $^
---
-2.27.0
-
diff --git a/sys-libs/libcap/files/libcap-2.48-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.48-build-system-fixes.patch
index a672ecedaca6..b3986e19546c 100644
--- a/sys-libs/libcap/files/libcap-2.48-build-system-fixes.patch
+++ b/sys-libs/libcap/files/libcap-2.48-build-system-fixes.patch
@@ -27,17 +27,6 @@ Forward ported from libcap-2.44 to libcap-2.45
Forward ported from libcap-2.45 to libcap-2.48
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- Make.Rules | 10 ++++++----
- Makefile | 1 -
- libcap/Makefile | 7 ++++---
- pam_cap/Makefile | 8 +++++---
- progs/Makefile | 2 +-
- tests/Makefile | 6 ++++--
- 6 files changed, 20 insertions(+), 14 deletions(-)
-
-diff --git a/Make.Rules b/Make.Rules
-index ded9014..07b716f 100644
--- a/Make.Rules
+++ b/Make.Rules
@@ -52,7 +52,6 @@ GOMAJOR=0
@@ -73,8 +62,6 @@ index ded9014..07b716f 100644
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 7150b9b..9dff1e9 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes)
@@ -85,8 +72,6 @@ index 7150b9b..9dff1e9 100644
$(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)
@@ -119,8 +104,6 @@ index 9563d88..4b42f01 100644
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 @@
@@ -152,8 +135,6 @@ index 56604fd..2da4674 100644
test: pam_cap.so
make testlink
-diff --git a/progs/Makefile b/progs/Makefile
-index 1d7fc7a..64dbe86 100644
--- a/progs/Makefile
+++ b/progs/Makefile
@@ -28,7 +28,7 @@ $(BUILD): %: %.o $(DEPS)
@@ -165,8 +146,6 @@ index 1d7fc7a..64dbe86 100644
install: all
mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR)
-diff --git a/tests/Makefile b/tests/Makefile
-index 1e7039d..5874624 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -13,6 +13,8 @@ ifeq ($(PTHREADS),yes)
@@ -194,6 +173,3 @@ index 1e7039d..5874624 100644
# privileged
run_libcap_launch_test: libcap_launch_test noop ../progs/tcapsh-static
---
-2.30.0
-
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/files/
@ 2021-11-20 8:32 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2021-11-20 8:32 UTC (permalink / raw
To: gentoo-commits
commit: 18241e22fb667703a5e7bbb17487fd8c1d0f1f8f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 20 08:32:41 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 20 08:32:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18241e22
sys-libs/libcap: drop obsolete patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../libcap/files/libcap-2.57-parallel-make.patch | 29 ----------------------
1 file changed, 29 deletions(-)
diff --git a/sys-libs/libcap/files/libcap-2.57-parallel-make.patch b/sys-libs/libcap/files/libcap-2.57-parallel-make.patch
deleted file mode 100644
index 612044bcfb0d..000000000000
--- a/sys-libs/libcap/files/libcap-2.57-parallel-make.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://git.kernel.org/pub/scm/libs/libcap/libcap.git/patch/?id=893c134ca5cd6fc33ac19d8dbb9d985067d2e66b
-
-From: "Andrew G. Morgan" <morgan@kernel.org>
-Date: Fri, 10 Sep 2021 16:11:57 -0700
-Subject: Another missing dependency for make -j13
-
-One more missing dependency for pam_cap.so building.
-
-Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
---- a/pam_cap/Makefile
-+++ b/pam_cap/Makefile
-@@ -19,7 +19,11 @@ install: all
- 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 $@
-
--pam_cap.so: pam_cap.o execable.o pam_cap_linkopts
-+LIBCAP:
-+ $(MAKE) -C ../libcap all
-+ touch $@
-+
-+pam_cap.so: pam_cap.o execable.o pam_cap_linkopts LIBCAP
- 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
-@@ -83,3 +87,4 @@ sudotest: test_pam_cap
-
- clean:
- rm -f *.o *.so testlink lazylink.so test_pam_cap pam_cap_linkopts *~
-+ rm -f LIBCAP
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/files/
@ 2023-05-16 15:53 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2023-05-16 15:53 UTC (permalink / raw
To: gentoo-commits
commit: de4ccd31f9cef43574b7184b36369d010a6bb518
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue May 16 15:53:28 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue May 16 15:53:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de4ccd31
sys-libs/libcap: scrub patch
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/libcap-2.62-ignore-RAISE_SETFCAP-install-failures.patch | 5 -----
1 file changed, 5 deletions(-)
diff --git a/sys-libs/libcap/files/libcap-2.62-ignore-RAISE_SETFCAP-install-failures.patch b/sys-libs/libcap/files/libcap-2.62-ignore-RAISE_SETFCAP-install-failures.patch
index 04c59357c45f..bd1c22fcad5a 100644
--- a/sys-libs/libcap/files/libcap-2.62-ignore-RAISE_SETFCAP-install-failures.patch
+++ b/sys-libs/libcap/files/libcap-2.62-ignore-RAISE_SETFCAP-install-failures.patch
@@ -8,11 +8,6 @@ due to the fs not supporting it) shouldn't impair the default install.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-Forward ported from libcap-2.20 to libcap-2.25
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-diff --git a/progs/Makefile b/progs/Makefile
-index 2cb7520..6d417de 100644
--- a/progs/Makefile
+++ b/progs/Makefile
@@ -39,7 +39,7 @@ install: all
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-05-16 15:53 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-20 8:32 [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-05-16 15:53 David Seifert
2021-11-20 8:31 Sam James
2021-09-23 19:02 Conrad Kostecki
2021-03-20 16:11 Conrad Kostecki
2019-12-13 9:27 Lars Wendler
2018-10-31 8:06 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox