From 23c04b8d7ab5c9ef3ec881ca18094f51000adfe4 Mon Sep 17 00:00:00 2001
From: Antti Nykanen <aon@iki.fi>
Date: Wed, 13 May 2009 16:06:10 +0300
Subject: [PATCH] libcap: possibly fixed compilation with current headers

---
 libcap/.md5sum                   |  1 +
 libcap/Pkgfile                   |  6 ++++--
 libcap/libcap-2.16-headers.patch | 31 +++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 libcap/libcap-2.16-headers.patch

diff --git a/libcap/.md5sum b/libcap/.md5sum
index 47638492a..4347769f1 100644
--- a/libcap/.md5sum
+++ b/libcap/.md5sum
@@ -1,2 +1,3 @@
+172bd19f16c7f8f4ebf84a990376843e  libcap-2.16-headers.patch
 0d1cee9631768d29b43f450832668687  libcap-2.16-makefile.patch
 9e075fda242c4070ba76407064c13302  libcap-2.16.tar.gz
diff --git a/libcap/Pkgfile b/libcap/Pkgfile
index 3fb37b725..71724c3eb 100644
--- a/libcap/Pkgfile
+++ b/libcap/Pkgfile
@@ -5,14 +5,16 @@
 
 name=libcap
 version=2.16
-release=1
+release=2
 source=(ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/libcap-$version.tar.gz
-	$name-$version-makefile.patch)
+	$name-$version-makefile.patch
+	$name-$version-headers.patch)
 
 build () {
 	cd libcap-$version
 	
 	patch -p0 -i $SRC/$name-$version-makefile.patch
+	patch -p1 -i $SRC/$name-$version-headers.patch
 
 	make
 	make \
diff --git a/libcap/libcap-2.16-headers.patch b/libcap/libcap-2.16-headers.patch
new file mode 100644
index 000000000..23056bee5
--- /dev/null
+++ b/libcap/libcap-2.16-headers.patch
@@ -0,0 +1,31 @@
+diff --git a/libcap/include/sys/capability.h b/libcap/include/sys/capability.h
+index 4b1f7a3..d27017d 100644
+--- a/libcap/include/sys/capability.h
++++ b/libcap/include/sys/capability.h
+@@ -19,24 +19,12 @@ extern "C" {
+  * information for the user library.
+  */
+ 
++/* Linux headers are now sanitized properly for userspace */
++#include <linux/capability.h>
+ #include <sys/types.h>
+ #include <stdint.h>
+ 
+ /*
+- * Make sure we can be included from userland by preventing
+- * capability.h from including other kernel headers
+- */
+-#define _LINUX_TYPES_H
+-#define _LINUX_FS_H
+-#define __LINUX_COMPILER_H
+-#define __user
+-
+-typedef unsigned int __u32;
+-typedef __u32 __le32;
+-
+-#include <linux/capability.h>
+-
+-/*
+  * POSIX capability types
+  */
+