SPECS (LINUX_2_6_16): kernel.spec - we have more capabilities in k...

[zbyniu]

Author: zbyniu                       Date: Fri Dec 22 12:33:12 2006 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- we have more capabilities in kernel, support in grsecurity and apparmor added
- rel 2

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1558.2.58 -> 1.441.2.1558.2.59) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.58 SPECS/kernel.spec:1.441.2.1558.2.59
--- SPECS/kernel.spec:1.441.2.1558.2.58	Fri Dec 15 20:02:58 2006
+++ SPECS/kernel.spec	Fri Dec 22 13:33:03 2006
@@ -132,7 +132,7 @@
 
 %define		_basever	2.6.16
 %define		_postver	.36
-%define		_rel		1
+%define		_rel		2
 %define		_subname	%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -292,10 +292,12 @@
 Patch1000:	linux-2.6-grsec-minimal.patch
 
 Patch1200:	linux-2.6-apparmor.patch
+Patch1201:	linux-2.6-apparmor-caps.patch
 
 # grsecurity snap for 2.6.16.14
 # based on http://www.grsecurity.net/~spender/grsecurity-2.1.9-2.6.16.14-200605060936.patch
 Patch9999:	grsecurity-2.1.9-2.6.16.14.patch
+Patch10000:	linux-2.6-grsec-caps.patch
 
 URL:		http://www.kernel.org/
 %if %{with xen0} || %{with xenU}
@@ -865,16 +867,19 @@
 %patch250 -p1
 
 %patch1200 -p1
+%patch1201 -p1
 
 %if %{with grsec_minimal}
 %patch1000 -p1
 %endif
 %if %{with grsec_full}
 %patch9999 -p1
+%patch10000 -p1
 %endif
 
 %if %{with pax}
 %patch9999 -p1
+%patch10000 -p1
 %endif
 
 # Fix EXTRAVERSION in main Makefile
@@ -1717,6 +1722,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1558.2.59  2006/12/22 12:33:03  zbyniu
+- we have more capabilities in kernel, support in grsecurity and apparmor added
+- rel 2
+
 Revision 1.441.2.1558.2.58  2006/12/15 19:02:58  glen
 - use macros for same location to be able to merge different kernel specs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1558.2.58&r2=1.441.2.1558.2.59&f=u