SPECS (LINUX_2_6): kernel.spec - grsecurity-2.1.9-2.6.16.14.patch ...

[zbyniu]

Author: zbyniu                       Date: Sun May  7 10:39:04 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- grsecurity-2.1.9-2.6.16.14.patch not conflicting with vserver; rel 0.3

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1533 -> 1.441.2.1534) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1533 SPECS/kernel.spec:1.441.2.1534
--- SPECS/kernel.spec:1.441.2.1533	Sun May  7 01:33:30 2006
+++ SPECS/kernel.spec	Sun May  7 12:38:59 2006
@@ -34,10 +34,6 @@
 %define		with_grsecurity		1
 %endif
 
-%if %{with grsec_full}
-TODO: full grsecurity conflicts with vserver
-%endif
-
 %ifarch sparc
 # sparc32 is missing important updates from 2.5 cycle - won't build.
 %undefine	with_smp
@@ -88,7 +84,7 @@
 %define		_udev_ver		071
 %define		_mkvmlinuz_ver		1.3
 
-%define		_rel			0.2
+%define		_rel			0.3
 
 %define		_netfilter_snap		20060504
 %define		_nf_hipac_ver		0.9.1
@@ -249,10 +245,10 @@
 
 Patch1000:	linux-2.6-grsec-minimal.patch
 
-# grsecurity snap for 2.6.16.9
-# based on http://www.grsecurity.net/~spender/grsecurity-2.1.9-2.6.16.2-200604101732.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.9.patch
+Patch9999:	grsecurity-2.1.9-2.6.16.14.patch
 
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 3:2.14.90.0.7
@@ -759,10 +755,9 @@
 %endif
 
 %if %{with grsec_minimal}
-%patch1000 -p1
+#%%patch1000 -p1
 %endif
 %if %{with grsec_full}
-%error TODO
 %patch9999 -p1
 %endif
 
@@ -1593,6 +1588,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1534  2006/05/07 10:38:59  zbyniu
+- grsecurity-2.1.9-2.6.16.14.patch not conflicting with vserver; rel 0.3
+
 Revision 1.441.2.1533  2006/05/06 23:33:30  baggins
 - rel 0.2
 
================================================================

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