packages: libcap/libcap-vserver.patch, libcap/libcap.spec - up to 2.20 (CAP...

[arekm]

Author: arekm                        Date: Thu Jan 20 21:38:43 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.20 (CAP_SYSLOG support; updated vserver cap value)

---- Files affected:
packages/libcap:
   libcap-vserver.patch (1.1 -> 1.2) , libcap.spec (1.78 -> 1.79) 

---- Diffs:

================================================================
Index: packages/libcap/libcap-vserver.patch
diff -u packages/libcap/libcap-vserver.patch:1.1 packages/libcap/libcap-vserver.patch:1.2
--- packages/libcap/libcap-vserver.patch:1.1	Wed Jan 28 03:16:45 2009
+++ packages/libcap/libcap-vserver.patch	Thu Jan 20 22:38:38 2011
@@ -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)

================================================================
Index: packages/libcap/libcap.spec
diff -u packages/libcap/libcap.spec:1.78 packages/libcap/libcap.spec:1.79
--- packages/libcap/libcap.spec:1.78	Fri Jan 15 16:38:28 2010
+++ packages/libcap/libcap.spec	Thu Jan 20 22:38:38 2011
@@ -3,13 +3,13 @@
 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/
@@ -93,14 +93,16 @@
 %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}
 
@@ -169,6 +171,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2011/01/20 21:38:38  arekm
+- up to 2.20 (CAP_SYSLOG support; updated vserver cap value)
+
 Revision 1.78  2010/01/15 15:38:28  qboosh
 - updated to 2.19
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libcap/libcap-vserver.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libcap/libcap.spec?r1=1.78&r2=1.79&f=u