- up to 2.17

Changed files:
    headers.patch -> 1.2
    libcap.spec -> 1.74

diff --git a/headers.patch b/headers.patch
deleted file mode 100644 (file)
index 3aeb891..0000000
--- a/headers.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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
-  */
- 
---- libcap-2.16/progs/capsh.c~ 2009-05-16 00:52:08.000000000 +0200
-+++ libcap-2.16/progs/capsh.c  2009-05-16 00:52:22.876562306 +0200
-@@ -13,10 +13,10 @@
- #include <string.h>
- #include <stdlib.h>
- #include <sys/prctl.h>
--#include <sys/capability.h>
- #include <unistd.h>
- #include <errno.h>
- #include <sys/wait.h>
-+#include <sys/capability.h>
- 
- /* prctl based API for altering character of current process */
- #define PR_GET_KEEPCAPS    7
-
---- libcap-2.16/libcap/include/linux/capability.h~     2009-05-16 00:52:08.000000000 +0200
-+++ libcap-2.16/libcap/include/linux/capability.h      2009-05-16 00:52:22.876562306 +0200
-@@ -40,13 +40,13 @@ struct task_struct;
- typedef struct __user_cap_header_struct {
-       __u32 version;
-       int pid;
--} __user *cap_user_header_t;
-+} *cap_user_header_t;
- 
- typedef struct __user_cap_data_struct {
-         __u32 effective;
-         __u32 permitted;
-         __u32 inheritable;
--} __user *cap_user_data_t;
-+} *cap_user_data_t;
- 
- 
- #define XATTR_CAPS_SUFFIX "capability"

diff --git a/libcap.spec b/libcap.spec
index 99612160b728d7a5b6b57cc263a656e87cd0dbab..7f7d368b7ab83f34a145f38c099f63215b55d154 100644 (file)
--- a/libcap.spec
+++ b/libcap.spec
@@ -2,16 +2,15 @@ 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.16
-Release:       6
+Version:       2.17
+Release:       1
 Epoch:         1
 License:       GPL or BSD
 Group:         Applications/System
 Source0:       ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.gz
-# Source0-md5: 9e075fda242c4070ba76407064c13302
+# Source0-md5: fa8c3841ce491b379de316a195e65da2
 Patch0:                %{name}-make.patch
 Patch1:                %{name}-vserver.patch
-Patch2:                headers.patch
 URL:           http://sites.google.com/site/fullycapable/
 BuildRequires: attr-devel
 BuildRequires: pam-devel
@@ -88,7 +87,6 @@ Moduł PAM capability wymuszający dziedziczone zbiory uprawnień.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__make} \