diff options
Diffstat (limited to 'package/libcap')
| -rw-r--r-- | package/libcap/Makefile | 10 | ||||
| -rw-r--r-- | package/libcap/patches/patch-Make_Rules | 49 | ||||
| -rw-r--r-- | package/libcap/patches/patch-Makefile | 14 | ||||
| -rw-r--r-- | package/libcap/patches/patch-libcap_Makefile | 22 | ||||
| -rw-r--r-- | package/libcap/patches/patch-libcap__makenames_c | 11 | ||||
| -rw-r--r-- | package/libcap/patches/patch-libcap_libcap_pc_in | 6 | ||||
| -rw-r--r-- | package/libcap/patches/patch-progs_Makefile | 12 |
7 files changed, 25 insertions, 99 deletions
diff --git a/package/libcap/Makefile b/package/libcap/Makefile index ffceb83af..29c417237 100644 --- a/package/libcap/Makefile +++ b/package/libcap/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libcap -PKG_VERSION:= 2.25 -PKG_RELEASE:= 2 -PKG_HASH:= 693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162 +PKG_VERSION:= 2.59 +PKG_RELEASE:= 1 +PKG_HASH:= 49f64ae40b113e53cbc161e22af7094e3bb4a0611fa33ef5a4257b011779f034 PKG_DESCR:= capabilities library PKG_SECTION:= libs/misc PKG_URL:= http://www.friedhoff.org/posixfilecaps.html @@ -25,6 +25,10 @@ endif HOST_STYLE:= manual CONFIG_STYLE:= manual +MAKE_ENV+= BUILD_CC="${HOST_CC}" +ifeq ($(ADK_PACKAGE_PAM),) +MAKE_ENV+= PAM_CAP=no +endif host-build: (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ diff --git a/package/libcap/patches/patch-Make_Rules b/package/libcap/patches/patch-Make_Rules index fa587e654..b40545b48 100644 --- a/package/libcap/patches/patch-Make_Rules +++ b/package/libcap/patches/patch-Make_Rules @@ -1,50 +1,11 @@ ---- libcap-2.25.orig/Make.Rules 2016-01-31 02:14:53.000000000 +0100 -+++ libcap-2.25/Make.Rules 2016-11-21 12:54:45.000000000 +0100 -@@ -13,21 +13,14 @@ FAKEROOT=$(DESTDIR) +--- libcap-2.59.orig/Make.Rules 2021-09-27 03:18:19.000000000 +0200 ++++ libcap-2.59/Make.Rules 2021-10-12 14:15:43.966424789 +0200 +@@ -18,7 +18,7 @@ FAKEROOT=$(DESTDIR) # administrative operations that could be needed to recover a system. ifndef lib -lib=$(shell ldd /usr/bin/ld|egrep "ld-linux|ld.so"|cut -d/ -f2) -+lib=lib ++lib=/usr/lib endif --ifdef prefix --exec_prefix=$(prefix) --lib_prefix=$(exec_prefix) --inc_prefix=$(lib_prefix) --man_prefix=$(prefix)/share --else - prefix=/usr --exec_prefix= -+exec_prefix=$(prefix) - lib_prefix=$(exec_prefix) - inc_prefix=$(prefix) - man_prefix=$(prefix)/share --endif - - # Target directories - -@@ -48,10 +41,10 @@ MINOR=25 - 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) -+CC ?= gcc -+CFLAGS ?= -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -+BUILD_CC := $(CC_FOR_BUILD) -+BUILD_CFLAGS := $(CFLAGS_FOR_BUILD) $(IPATH) - AR := ar - RANLIB := ranlib - DEBUG = -g #-DDEBUG -@@ -68,7 +61,7 @@ INCS=$(topdir)/libcap/include/sys/capabi - LDFLAGS += -L$(topdir)/libcap - CFLAGS += -Dlinux $(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) -+#INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) - DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) - - # When installing setcap, set its inheritable bit to be able to place + ifndef sbin diff --git a/package/libcap/patches/patch-Makefile b/package/libcap/patches/patch-Makefile deleted file mode 100644 index 51603e650..000000000 --- a/package/libcap/patches/patch-Makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- libcap-2.25.orig/Makefile 2014-05-31 22:11:05.000000000 +0200 -+++ libcap-2.25/Makefile 2016-09-23 10:32:34.156211429 +0200 -@@ -10,11 +10,7 @@ include Make.Rules - - all install clean: %: %-here - $(MAKE) -C libcap $@ --ifneq ($(PAM_CAP),no) -- $(MAKE) -C pam_cap $@ --endif - $(MAKE) -C progs $@ -- $(MAKE) -C doc $@ - - all-here: - diff --git a/package/libcap/patches/patch-libcap_Makefile b/package/libcap/patches/patch-libcap_Makefile index bbe31f53b..6dcb3e073 100644 --- a/package/libcap/patches/patch-libcap_Makefile +++ b/package/libcap/patches/patch-libcap_Makefile @@ -1,13 +1,11 @@ ---- libcap-2.25.orig/libcap/Makefile 2016-01-31 01:01:41.000000000 +0100 -+++ libcap-2.25/libcap/Makefile 2016-09-23 15:09:26.623578683 +0200 -@@ -63,9 +63,8 @@ cap_text.o: cap_text.c $(USE_GPERF_OUTPU - $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ +--- libcap-2.59.orig/libcap/Makefile 2021-09-18 05:56:21.000000000 +0200 ++++ libcap-2.59/libcap/Makefile 2021-10-12 14:20:14.254434411 +0200 +@@ -76,7 +76,7 @@ $(PSXTITLE).pc: $(PSXTITLE).pc.in + $< >$@ - install: all -- mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys -+ mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys $(FAKEROOT)$(LIBDIR) - install -m 0644 include/sys/capability.h $(FAKEROOT)$(INCDIR)/sys -- mkdir -p -m 0755 $(FAKEROOT)$(LIBDIR) - install -m 0644 $(STALIBNAME) $(FAKEROOT)$(LIBDIR)/$(STALIBNAME) - install -m 0644 $(MINLIBNAME) $(FAKEROOT)$(LIBDIR)/$(MINLIBNAME) - ln -sf $(MINLIBNAME) $(FAKEROOT)$(LIBDIR)/$(MAJLIBNAME) + _makenames: _makenames.c cap_names.list.h +- $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $< -o $@ + + cap_names.h: _makenames + ./_makenames > cap_names.h diff --git a/package/libcap/patches/patch-libcap__makenames_c b/package/libcap/patches/patch-libcap__makenames_c deleted file mode 100644 index 641bd6592..000000000 --- a/package/libcap/patches/patch-libcap__makenames_c +++ /dev/null @@ -1,11 +0,0 @@ ---- libcap-2.22.orig/libcap/_makenames.c 2008-12-04 08:03:12.000000000 +0100 -+++ libcap-2.22/libcap/_makenames.c 2013-10-28 10:54:58.000000000 +0100 -@@ -7,7 +7,7 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <sys/capability.h> -+#include "include/sys/capability.h" - - /* - * #include 'sed' generated array diff --git a/package/libcap/patches/patch-libcap_libcap_pc_in b/package/libcap/patches/patch-libcap_libcap_pc_in index 742f136c0..0d61c60a8 100644 --- a/package/libcap/patches/patch-libcap_libcap_pc_in +++ b/package/libcap/patches/patch-libcap_libcap_pc_in @@ -1,5 +1,5 @@ ---- libcap-2.25.orig/libcap/libcap.pc.in 2013-12-24 18:08:53.000000000 +0100 -+++ libcap-2.25/libcap/libcap.pc.in 2018-01-01 20:11:08.911444653 +0100 +--- libcap-2.59.orig/libcap/libcap.pc.in 2020-07-01 04:43:01.000000000 +0200 ++++ libcap-2.59/libcap/libcap.pc.in 2021-10-12 14:15:43.958424789 +0200 @@ -1,7 +1,7 @@ prefix=@prefix@ -exec_prefix=@exec_prefix@ @@ -10,4 +10,4 @@ +includedir=${prefix}/include Name: libcap - Description: libcap + Description: libcap - linux capabilities library diff --git a/package/libcap/patches/patch-progs_Makefile b/package/libcap/patches/patch-progs_Makefile deleted file mode 100644 index c13d1ddd8..000000000 --- a/package/libcap/patches/patch-progs_Makefile +++ /dev/null @@ -1,12 +0,0 @@ ---- libcap-2.25.orig/progs/Makefile 2016-01-31 01:01:41.000000000 +0100 -+++ libcap-2.25/progs/Makefile 2016-09-23 10:37:55.480689559 +0200 -@@ -26,9 +26,6 @@ install: all - for p in $(PROGS) ; do \ - install -m 0755 $$p $(FAKEROOT)$(SBINDIR) ; \ - done --ifeq ($(RAISE_SETFCAP),yes) -- $(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap --endif - - clean: - $(LOCALCLEAN) |