Author: arekm Date: Wed Jan 19 17:10:06 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 2; introduce CAP_SYSLOG from 2.6.38+; move CAP_CONTEXT to 63 (follow
vserver upstream)
---- Files affected:
packages/linux-libc-headers:
linux-libc-headers.spec (1.164 -> 1.165) , vserver.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/linux-libc-headers/linux-libc-headers.spec
diff -u packages/linux-libc-headers/linux-libc-headers.spec:1.164
packages/linux-libc-headers/linux-libc-headers.spec:1.165
--- packages/linux-libc-headers/linux-libc-headers.spec:1.164 Thu Jan 6
10:29:59 2011
+++ packages/linux-libc-headers/linux-libc-headers.spec Wed Jan 19 18:10:01 2011
@@ -5,7 +5,7 @@
Summary(pl.UTF-8): Nagłówki jądra Linuksa do użytku z bibliotekami C
Name: linux-libc-headers
Version: %{basever}%{postver}
-Release: 1
+Release: 2
Epoch: 7
License: GPL v2
Group: Development
@@ -25,7 +25,8 @@
Patch5: %{name}-pom-set.patch
Patch6: linux-kernel-headers.SuSE.TIOCGDEV.patch
Patch7: %{name}-atm-vbr.patch
-Patch8: vserver.patch
+Patch8: %{name}-cap-syslog.patch
+Patch9: vserver.patch
AutoReqProv: no
BuildRequires: perl-base
BuildRequires: rpmbuild(macros) >= 1.568
@@ -71,6 +72,7 @@
%patch6 -p2
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%install
rm -rf $RPM_BUILD_ROOT
@@ -117,6 +119,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.165 2011/01/19 17:10:01 arekm
+- rel 2; introduce CAP_SYSLOG from 2.6.38+; move CAP_CONTEXT to 63 (follow
vserver upstream)
+
Revision 1.164 2011/01/06 09:29:59 qboosh
- updated to 2.6.37
- updated TIOCGDEV patch
================================================================
Index: packages/linux-libc-headers/vserver.patch
diff -u packages/linux-libc-headers/vserver.patch:1.1
packages/linux-libc-headers/vserver.patch:1.2
--- packages/linux-libc-headers/vserver.patch:1.1 Sun Apr 11 20:55:26 2010
+++ packages/linux-libc-headers/vserver.patch Wed Jan 19 18:10:01 2011
@@ -1,13 +1,16 @@
---- linux/include/linux/capability.h~ 2010-03-16 07:59:51.000000000 +0100
-+++ linux/include/linux/capability.h 2010-04-11 20:38:13.284838415 +0200
-@@ -332,7 +332,9 @@
+--- linux-2.6.37/include/linux/capability.h~ 2011-01-19 19:06:36.467207804
+0100
++++ linux-2.6.37/include/linux/capability.h 2011-01-19 19:07:14.046959978
+0100
+@@ -356,7 +356,12 @@
- #define CAP_MAC_ADMIN 33
+ #define CAP_LAST_CAP CAP_MAC_ADMIN
--#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)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/linux-libc-headers/linux-libc-headers.spec?r1=1.164&r2=1.165&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/linux-libc-headers/vserver.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
