diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-09-10 04:21:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-09-10 04:21:55 +0100 |
commit | 677b7ba5c317778df2ad7e70df94b9b7eec4adbc (patch) | |
tree | 6c418a1546fff5becab5d8b9ed6803323e7f316e /sys-libs/libcap/files | |
parent | fbda87924e6faa7a1919f1a2b4182490bde5ec5c (diff) |
gentoo resync : 10.09.2021
Diffstat (limited to 'sys-libs/libcap/files')
4 files changed, 239 insertions, 669 deletions
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 <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 -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 <polynomial-c@gentoo.org> ---- - 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 <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 -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 <polynomial-c@gentoo.org> ---- - 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 <sam@gentoo.org> -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 <vapier@gentoo.org> -and was forward-ported by Lars Wendler <polynomial-c@gentoo.org>. - -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 <sam@gentoo.org> ---- 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 <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 + |