libcap: version bumo to 2.22

...and remove CFLAGS, LDFLAGS override patch. With the ptxdist wrapper it isn't
needed anymore.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

4 files changed, 5 insertions, 74 deletions

diff --git a/patches/libcap-2.21/0001-Make.Rules-don-t-overwrite-CFLAGS-and-LDFLAGS.patch b/patches/libcap-2.21/0001-Make.Rules-don-t-overwrite-CFLAGS-and-LDFLAGS.patch
deleted file mode 100644
index d3e9da0c2..000000000
--- a/patches/libcap-2.21/0001-Make.Rules-don-t-overwrite-CFLAGS-and-LDFLAGS.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Mon, 11 Jan 2010 19:12:43 +0100
-Subject: [PATCH] Make.Rules: don't overwrite CFLAGS and LDFLAGS
-
-This breaks where libs are in non standard locations, which are supplied
-by LDFLAGS=-L from outside.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- Make.Rules       |    7 ++++---
- libcap/Makefile  |    2 +-
- pam_cap/Makefile |    2 +-
- 3 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/Make.Rules b/Make.Rules
-index e0f3c6a..a76ba31 100644
---- a/Make.Rules
-+++ b/Make.Rules
-@@ -48,7 +48,7 @@ KERNEL_HEADERS := $(topdir)/libcap/include
- IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
- 
- CC := gcc
--CFLAGS := -O2
-+CFLAGS += -O2
- BUILD_CC := $(CC)
- BUILD_CFLAGS := $(CFLAGS) $(IPATH)
- AR := ar
-@@ -58,8 +58,9 @@ 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)
-+LDFLAGS_SHLIB = -Wl,-x -shared
-+LDFLAGS += #-g
- 
- SYSTEM_HEADERS = /usr/include
- INCS=$(topdir)/libcap/include/sys/capability.h
-diff --git a/libcap/Makefile b/libcap/Makefile
-index 4762c60..0593b9d 100644
---- a/libcap/Makefile
-+++ b/libcap/Makefile
-@@ -50,7 +50,7 @@ $(STALIBNAME): $(OBJS)
- 	$(RANLIB) $@
- 
- $(MINLIBNAME): $(OBJS)
--	$(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^
-+	$(LD) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB) -Wl,-soname,$(MAJLIBNAME) -o $@ $^
- 	ln -sf $(MINLIBNAME) $(MAJLIBNAME)
- 	ln -sf $(MAJLIBNAME) $(LIBNAME)
- 
-diff --git a/pam_cap/Makefile b/pam_cap/Makefile
-index 9ca5bef..6e46afb 100644
---- a/pam_cap/Makefile
-+++ b/pam_cap/Makefile
-@@ -17,7 +17,7 @@ install: all
- 	install -m 0755 pam_cap.so $(LIBDIR)/security
- 
- pam_cap.so: pam_cap.o
--	$(LD) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS)
-+	$(LD) $(LDFLAGS) $(LDFLAGS_SHLIB) -o pam_cap.so $< $(LDLIBS)
- 
- pam_cap.o: pam_cap.c
- 	$(CC) $(CFLAGS) $(IPATH) -c $< -o $@
--- 
-1.7.4.1
-
diff --git a/patches/libcap-2.21/series b/patches/libcap-2.21/series
deleted file mode 100644
index d16ef2830..000000000
--- a/patches/libcap-2.21/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Make.Rules-don-t-overwrite-CFLAGS-and-LDFLAGS.patch
-0002-Fix-build-on-non-Linux-host.patch
-# 187508e7e810aa0efb7a7ad4d7af2d9e  - git-ptx-patches magic
diff --git a/patches/libcap-2.21/0002-Fix-build-on-non-Linux-host.patch b/patches/libcap-2.22/0001-Fix-build-on-non-Linux-host.patch
index b22690669..867eace3d 100644
--- a/patches/libcap-2.21/0002-Fix-build-on-non-Linux-host.patch
+++ b/patches/libcap-2.22/0001-Fix-build-on-non-Linux-host.patch
@@ -1,9 +1,9 @@
-From dd53fb42020b5a0612870924dd95e3a488ddf13d Mon Sep 17 00:00:00 2001
 From: Bernhard Walle <bernhard@bwalle.de>
 Date: Sun, 8 Apr 2012 17:55:56 +0200
 Subject: [PATCH] Fix build on non-Linux host
 
 Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
  libcap/include/linux/capability.h |    6 ++++++
  libcap/include/sys/capability.h   |    1 -
diff --git a/patches/libcap-2.22/series b/patches/libcap-2.22/series
new file mode 100644
index 000000000..4f7f7421b
--- /dev/null
+++ b/patches/libcap-2.22/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Fix-build-on-non-Linux-host.patch
+# 69b7a8db215659ad00eab9b8ed2ab43e  - git-ptx-patches magic