From cc2f3ef0e48483f8909f6f29f58bcb984ea27682 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Fri, 23 Sep 2016 14:43:56 +0200
Subject: add support for permission fixups when using genimage

Add suid-bit to Xorg as an example. Create
simple *.perm files with relative path to
the files. You can use any command available on
the host. (f.e. chmod/chown)
---
 package/libcap/patches/patch-libcap_Makefile | 50 +++++-----------------------
 1 file changed, 9 insertions(+), 41 deletions(-)

(limited to 'package/libcap/patches/patch-libcap_Makefile')

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)
-- 
cgit v1.2.3