From 813a686a451a9a8473473ab1db455abb510cee85 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Wed, 23 Feb 2011 21:07:25 +0000
Subject: [PATCH] libcap2: 2.16 -> 2.20

Fix compilation with newer kernel headers:

| .../tmp/sysroots/.../usr/include/asm/sigcontext.h:28:2: error:
|    expected specifier-qualifier-list before '__u64'
| .../tmp/sysroots/.../usr/include/asm/sigcontext.h:191:2: error:
|    expected specifier-qualifier-list before '__u64'
| make[1]: *** [capsh.o] Error 1

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 .../libcap/{libcap2-2.16 => libcap2}/make.patch | 17 +++++++----------
 .../libcap/{libcap2_2.16.bb => libcap2_2.20.bb} |  8 ++++----
 2 files changed, 11 insertions(+), 14 deletions(-)
 rename recipes/libcap/{libcap2-2.16 => libcap2}/make.patch (66%)
 rename recipes/libcap/{libcap2_2.16.bb => libcap2_2.20.bb} (83%)

diff --git a/recipes/libcap/libcap2-2.16/make.patch b/recipes/libcap/libcap2/make.patch
similarity index 66%
rename from recipes/libcap/libcap2-2.16/make.patch
rename to recipes/libcap/libcap2/make.patch
index b8508e4a63..57a2cae513 100644
--- a/recipes/libcap/libcap2-2.16/make.patch
+++ b/recipes/libcap/libcap2/make.patch
@@ -1,10 +1,8 @@
-Index: libcap-2.16/Make.Rules
-===================================================================
---- libcap-2.16.orig/Make.Rules	2008-12-04 08:03:30.000000000 +0100
-+++ libcap-2.16/Make.Rules	2011-01-13 22:51:04.568844000 +0100
-@@ -45,25 +45,18 @@
+--- a/Make.Rules
++++ b/Make.Rules
+@@ -47,25 +47,18 @@
  KERNEL_HEADERS := $(topdir)/libcap/include
- IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
+ IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
  
 -CC := gcc
 -CFLAGS := -O2
@@ -12,20 +10,19 @@ Index: libcap-2.16/Make.Rules
 -BUILD_CFLAGS := $(CFLAGS) $(IPATH)
 -AR := ar
 -RANLIB := ranlib
-+LD=$(CC) -Wl,-x -shared
  DEBUG = -g #-DDEBUG
- WARNINGS=-fPIC -Wall -Wwrite-strings \
+ WARNINGS=-Wall -Wwrite-strings \
          -Wpointer-arith -Wcast-qual -Wcast-align \
          -Wstrict-prototypes -Wmissing-prototypes \
          -Wnested-externs -Winline -Wshadow
--LD=$(CC) -Wl,-x -shared
+ LD=$(CC) -Wl,-x -shared
 -LDFLAGS := #-g
  
 -SYSTEM_HEADERS = /usr/include
 +SYSTEM_HEADERS ?= /usr/include
  INCS=$(topdir)/libcap/include/sys/capability.h
  LDFLAGS += -L$(topdir)/libcap
- CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) $(IPATH)
+ CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
 -PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
 +PAM_CAP := $(shell if [ -f $(SYSTEM_HEADERS)/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)
diff --git a/recipes/libcap/libcap2_2.16.bb b/recipes/libcap/libcap2_2.20.bb
similarity index 83%
rename from recipes/libcap/libcap2_2.16.bb
rename to recipes/libcap/libcap2_2.20.bb
index beb45f2234..8f7dc3bf8d 100644
--- a/recipes/libcap/libcap2_2.16.bb
+++ b/recipes/libcap/libcap2_2.20.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 SECTION = "libs"
 LICENSE = "GPL"
 DEPENDS = "bison-native flex-native attr ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-PR = "r3"
+PR = "r0"
 
 BUILD_CFLAGS += "-I${S}/libcap/include"
 CFLAGS += "-I${S}/libcap/include"
@@ -13,6 +13,9 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/libcap2/libca
 	   file://make.patch \
 	"
 
+SRC_URI[md5sum] = "10e47ed32ca2214eb0e58780282d27b4"
+SRC_URI[sha256sum] = "20e7c1ea4d3d5c410efb3a6ff138dc417912fae316d883460dcd58d9803a9220"
+
 S = "${WORKDIR}/libcap-${PV}"
 
 EXTRA_OEMAKE = "SYSTEM_HEADERS=${STAGING_INCDIR}"
@@ -23,6 +26,3 @@ do_install() {
 	install -d ${D}${libdir}
 	oe_libinstall -s -C libcap libcap ${D}${libdir}
 }
-
-SRC_URI[md5sum] = "6e2c9d0f3c3118e41cd07288ba9577ce"
-SRC_URI[sha256sum] = "9c5a41a5577d6f702fe4d29e92f91f1d586a2ef272f6b7fa137bae3f0e76cc2f"
-- 
2.39.5