- up to 2.20 (CAP_SYSLOG support; updated vserver cap value)

Changed files:
    libcap-vserver.patch -> 1.2
    libcap.spec -> 1.79

diff --git a/libcap-vserver.patch b/libcap-vserver.patch
index 4109815de9d2062221d735412bad758c2a057317..69795090156e4b392b13c3b1cf6e27df69eb333c 100644 (file)
--- a/libcap-vserver.patch
+++ b/libcap-vserver.patch
@@ -1,13 +1,16 @@
---- libcap-2.16/libcap/include/linux/capability.h~     2008-07-10 08:18:40.000000000 +0200
-+++ libcap-2.16/libcap/include/linux/capability.h      2009-01-28 03:02:03.276944392 +0100
-@@ -346,7 +346,9 @@ typedef struct kernel_cap_struct {
+--- libcap-2.20/libcap/include/linux/capability.h~     2011-01-19 06:00:55.000000000 +0100
++++ libcap-2.20/libcap/include/linux/capability.h      2011-01-20 23:34:36.261352242 +0100
+@@ -362,7 +362,12 @@
  
- #define CAP_MAC_ADMIN        33
+ #define CAP_LAST_CAP         CAP_SYSLOG
  
--#define CAP_LAST_CAP         CAP_MAC_ADMIN
-+#define CAP_CONTEXT          34
+-#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
++/* Allow context manipulations */
++/* Allow changing context info on files */
 +
-+#define CAP_LAST_CAP         CAP_CONTEXT
- 
- #define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
++#define CAP_CONTEXT         63
++
++#define cap_valid(x) ((x) >= 0 && ((x) <= CAP_LAST_CAP || (x) == CAP_CONTEXT))
  
+ /*
+  * Bit location of each capability (used by user-space library and kernel)

diff --git a/libcap.spec b/libcap.spec
index 103725fabc64c8fac002803dfebd56aa685492cb..02f77275eae2e659740ea233515bc74fc6652f2c 100644 (file)
--- a/libcap.spec
+++ b/libcap.spec
@@ -2,13 +2,13 @@ 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.19
+Version:       2.20
 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: 9caa6dafc9e3db4cbaecdb8e48f23fa2
+# Source0-md5: 8ce6905851ffdde287d00d8269775ade
 Patch0:                %{name}-make.patch
 Patch1:                %{name}-vserver.patch
 URL:           http://sites.google.com/site/fullycapable/
@@ -92,14 +92,16 @@ Moduł PAM capability wymuszający dziedziczone zbiory uprawnień.
 %build
 %{__make} \
        CC="%{__cc}" \
-       OPT_CFLAGS="-Iinclude %{rpmcflags}" \
+       OPT_CFLAGS="-Iinclude %{rpmcflags} %{rpmcppflags}" \
        DEBUG= \
        OPT_LDFLAGS="%{rpmldflags}" \
        LDLIBS="-L../libcap -lcap"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
+       RAISE_SETFCAP=no \
        FAKEROOT=$RPM_BUILD_ROOT \
        lib=%{_lib}