[packages/libcap] - updated to 2.25 - updated make patch - removed obsolete no-linux-xattr patch

[qboosh]

commit 7976b695ec1d1f2e0301d40ad28475e34c3cdc24
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Mar 30 20:48:00 2016 +0200

    - updated to 2.25
    - updated make patch
    - removed obsolete no-linux-xattr patch

 libcap-make.patch    | 12 ++++++------
 libcap.spec          |  8 +++-----
 no-linux-xattr.patch | 20 --------------------
 3 files changed, 9 insertions(+), 31 deletions(-)
---
diff --git a/libcap.spec b/libcap.spec
index e8f7f54..1822738 100644
--- a/libcap.spec
+++ b/libcap.spec
@@ -2,15 +2,14 @@ Summary:	POSIX.1e capability suite
 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:	3
+Version:	2.25
+Release:	1
 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
+# Source0-md5:	6666b839e5d46c2ad33fc8aa2ceb5f77
 Patch0:		%{name}-make.patch
-Patch1:		no-linux-xattr.patch
 URL:		https://sites.google.com/site/fullycapable/
 BuildRequires:	attr-devel
 BuildRequires:	pam-devel
@@ -89,7 +88,6 @@ Moduł PAM capability wymuszający dziedziczone zbiory uprawnień.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__make} \
diff --git a/libcap-make.patch b/libcap-make.patch
index dc5bda7..86f31ae 100644
--- a/libcap-make.patch
+++ b/libcap-make.patch
@@ -1,7 +1,7 @@
---- libcap-2.22/Make.Rules.orig	2011-07-25 04:18:23.000000000 +0200
-+++ libcap-2.22/Make.Rules	2011-07-28 19:09:49.898308263 +0200
-@@ -48,7 +48,7 @@
- IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
+--- libcap-2.25/Make.Rules.orig	2016-01-31 02:14:53.000000000 +0100
++++ libcap-2.25/Make.Rules	2016-03-30 20:34:57.110616155 +0200
+@@ -49,7 +49,7 @@
+ IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
  
  CC := gcc
 -CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
@@ -9,12 +9,12 @@
  BUILD_CC := $(CC)
  BUILD_CFLAGS := $(CFLAGS) $(IPATH)
  AR := ar
-@@ -59,7 +59,7 @@
+@@ -60,7 +60,7 @@
          -Wstrict-prototypes -Wmissing-prototypes \
          -Wnested-externs -Winline -Wshadow
  LD=$(CC) -Wl,-x -shared
 -LDFLAGS := #-g
 +LDFLAGS := $(OPT_LDFLAGS) #-g
+ BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes)
  
  SYSTEM_HEADERS = /usr/include
- INCS=$(topdir)/libcap/include/sys/capability.h
diff --git a/no-linux-xattr.patch b/no-linux-xattr.patch
deleted file mode 100644
index bdb3a5f..0000000
--- a/no-linux-xattr.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/7976b695ec1d1f2e0301d40ad28475e34c3cdc24