[packages/libcap] - remove linux/xattr.h from sys/capability.h - rel 2

[baggins]

commit 14300c6331e17fe9aaf6c6af04303a690eaba495
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jan 23 08:38:13 2014 +0100

    - remove linux/xattr.h from sys/capability.h
    - rel 2
    
    linux/xattr.h when included via sys/capability.h causes conflicts
    with sys/xattr.h (redefinition of XATTR_CREATE.) and is completely
    unneeded, as nothing from linux/xattr.h is used in sys/capability.h.

 libcap.spec          |  4 +++-
 no-linux-xattr.patch | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
---
diff --git a/libcap.spec b/libcap.spec
index 9cf06a3..d1404af 100644
--- a/libcap.spec
+++ b/libcap.spec
@@ -3,13 +3,14 @@ Summary(pl.UTF-8):	Wsparcie dla standardu "capability" POSIX.1e
 Summary(pt_BR.UTF-8):	Biblioteca para leitura e configuração de capabilities.
 Name:		libcap
 Version:	2.24
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v2 or BSD
 Group:		Applications/System
 Source0:	https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.xz
 # Source0-md5:	d43ab9f680435a7fff35b4ace8d45b80
 Patch0:		%{name}-make.patch
+Patch1:		no-linux-xattr.patch
 URL:		https://sites.google.com/site/fullycapable/
 BuildRequires:	attr-devel
 BuildRequires:	pam-devel
@@ -88,6 +89,7 @@ Moduł PAM capability wymuszający dziedziczone zbiory uprawnień.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} \
diff --git a/no-linux-xattr.patch b/no-linux-xattr.patch
new file mode 100644
index 0000000..bdb3a5f
--- /dev/null
+++ b/no-linux-xattr.patch
@@ -0,0 +1,20 @@
+--- libcap-2.24/libcap/include/sys/capability.h~	2014-01-02 02:50:56.000000000 +0100
++++ libcap-2.24/libcap/include/sys/capability.h	2014-01-23 08:31:19.862345644 +0100
+@@ -27,7 +27,6 @@
+ #define __user
+ #endif
+ #include <linux/capability.h>
+-#include <linux/xattr.h>
+ 
+ /*
+  * POSIX capability types
+--- libcap-2.24/libcap/cap_file.c~	2013-12-24 18:35:13.000000000 +0100
++++ libcap-2.24/libcap/cap_file.c	2014-01-23 08:33:01.455678242 +0100
+@@ -13,6 +13,7 @@
+ #define XATTR_SECURITY_PREFIX "security."
+ 
+ #include "libcap.h"
++#include <linux/xattr.h>
+ 
+ #ifdef VFS_CAP_U32
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libcap.git/commitdiff/14300c6331e17fe9aaf6c6af04303a690eaba495