4 files changed, 38 insertions, 108 deletions
diff --git a/package/libcap/patches/patch-Make_Rules b/package/libcap/patches/patch-Make_Rules
index a6a637d3b..57b0e9425 100644
--- a/package/libcap/patches/patch-Make_Rules
+++ b/package/libcap/patches/patch-Make_Rules
@@ -1,20 +1,19 @@
---- libcap-2.24.orig/Make.Rules	2014-01-06 02:16:21.000000000 +0100
-+++ libcap-2.24/Make.Rules	2015-02-26 14:01:28.000000000 +0100
-@@ -12,22 +12,12 @@ FAKEROOT=$(DESTDIR)
- # These choices are motivated by the fact that getcap and setcap are
+--- libcap-2.25.orig/Make.Rules	2016-01-31 02:14:53.000000000 +0100
++++ libcap-2.25/Make.Rules	2016-09-23 10:37:16.179167139 +0200
+@@ -13,21 +13,14 @@ FAKEROOT=$(DESTDIR)
  # administrative operations that could be needed to recover a system.
  
--ifndef lib
+ ifndef lib
 -lib=$(shell ldd /usr/bin/ld|egrep "ld-linux|ld.so"|cut -d/ -f2)
--endif
--
++lib=lib
+ endif
+ 
 -ifdef prefix
 -exec_prefix=$(prefix)
 -lib_prefix=$(exec_prefix)
 -inc_prefix=$(lib_prefix)
 -man_prefix=$(prefix)/share
 -else
-+lib=lib
  prefix=/usr
 -exec_prefix=
 +exec_prefix=$(prefix)
@@ -25,41 +24,3 @@
  
  # Target directories
  
-@@ -48,28 +38,28 @@ MINOR=24
- 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
-+CC ?= gcc
-+CFLAGS ?= -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- BUILD_CC := $(CC)
- BUILD_CFLAGS := $(CFLAGS) $(IPATH)
--AR := ar
--RANLIB := ranlib
--DEBUG = -g #-DDEBUG
-+AR ?= ar
-+RANLIB ?= ranlib
-+DEBUG = 
- 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
-+LD=$(CC) -shared
-+LDFLAGS ?= #-g
- 
- SYSTEM_HEADERS = /usr/include
- INCS=$(topdir)/libcap/include/sys/capability.h
- 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)
-+PAM_CAP := no
- INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
- DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
--LIBATTR := yes
-+LIBATTR := no
- 
- # When installing setcap, set its inheritable bit to be able to place
- # capabilities on files. It can be used in conjunction with pam_cap
diff --git a/package/libcap/patches/patch-Makefile b/package/libcap/patches/patch-Makefile
index 8e2f8415b..51603e650 100644
--- a/package/libcap/patches/patch-Makefile
+++ b/package/libcap/patches/patch-Makefile
@@ -1,25 +1,14 @@
---- libcap-2.24.orig/Makefile	2013-12-27 19:17:17.000000000 +0100
-+++ libcap-2.24/Makefile	2015-02-26 20:36:58.000000000 +0100
-@@ -16,6 +16,22 @@ endif
+--- 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 $@
+-	$(MAKE) -C doc $@
  
-+progs:
-+	$(MAKE) -C progs all
-+
-+shared:
-+	$(MAKE) -C libcap shared
-+
-+static:
-+	$(MAKE) -C libcap static
-+
-+install-shared:
-+	$(MAKE) -C libcap install-shared
-+
-+install-static:
-+	$(MAKE) -C libcap install-static
-+
-+
  all-here:
  
- install-here:
diff --git a/package/libcap/patches/patch-libcap_Makefile b/package/libcap/patches/patch-libcap_Makefile
index cf7703a43..5b1823e64 100644
--- a/package/libcap/patches/patch-libcap_Makefile
+++ b/package/libcap/patches/patch-libcap_Makefile
@@ -1,42 +1,10 @@
---- libcap-2.24.orig/libcap/Makefile	2014-01-06 01:55:03.000000000 +0100
-+++ libcap-2.24/libcap/Makefile	2015-02-26 20:34:47.000000000 +0100
-@@ -28,6 +28,9 @@ GPERF_OUTPUT = _caps_output.gperf
- 
- all: $(MINLIBNAME) $(STALIBNAME) libcap.pc
- 
-+static: $(STALIBNAME)
-+shared: $(MINLIBNAME)
-+
- ifeq ($(shell gperf --version > /dev/null 2>&1 && echo yes),yes)
- USE_GPERF_OUTPUT = $(GPERF_OUTPUT)
- INCLUDE_GPERF_OUTPUT = -include $(GPERF_OUTPUT)
-@@ -43,7 +46,7 @@ libcap.pc: libcap.pc.in
- 		$< >$@
- 
- _makenames: _makenames.c cap_names.list.h
--	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
-+	$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
- 
- cap_names.h: _makenames
- 	./_makenames > cap_names.h
-@@ -70,6 +73,20 @@ $(MINLIBNAME): $(OBJS)
- cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
- 	$(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
- 
-+install-shared: install-headers
-+	mkdir -p -m 0755 $(LIBDIR)
-+	install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
-+	ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
-+	ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
-+
-+install-static: install-headers
-+	mkdir -p -m 0755 $(LIBDIR)
-+	install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)
-+
-+install-headers:
-+	mkdir -p -m 0755 $(INCDIR)/sys
-+	install -m 0644 include/sys/capability.h $(INCDIR)/sys
-+
+--- libcap-2.25.orig/libcap/Makefile	2016-01-31 01:01:41.000000000 +0100
++++ libcap-2.25/libcap/Makefile	2016-09-23 10:34:12.564023450 +0200
+@@ -65,7 +65,6 @@ cap_text.o: cap_text.c $(USE_GPERF_OUTPU
  install: all
- 	mkdir -p -m 0755 $(INCDIR)/sys
- 	install -m 0644 include/sys/capability.h $(INCDIR)/sys
+ 	mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys
+ 	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)
diff --git a/package/libcap/patches/patch-progs_Makefile b/package/libcap/patches/patch-progs_Makefile
new file mode 100644
index 000000000..c13d1ddd8
--- /dev/null
+++ b/package/libcap/patches/patch-progs_Makefile
@@ -0,0 +1,12 @@
+--- 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)