SPECS (LINUX_2_6): kernel.spec - grsec_minimal re-enabled

[zbyniu]

Author: zbyniu                       Date: Thu Sep 28 15:56:52 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- grsec_minimal re-enabled

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1634 -> 1.441.2.1635) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1634 SPECS/kernel.spec:1.441.2.1635
--- SPECS/kernel.spec:1.441.2.1634	Wed Sep 27 21:14:56 2006
+++ SPECS/kernel.spec	Thu Sep 28 17:56:46 2006
@@ -5,7 +5,6 @@
 # - all netfilter patches needs update (API changed again)
 # - VESAFB-TNG
 # - IMQ
-# - grsecurity_minimal
 # - wanpipe
 # - reiser4
 # - Linux ABI
@@ -276,7 +275,7 @@
 
 Patch200:	linux-2.6-ppc-ICE-hacks.patch
 
-#Patch1000:	linux-2.6-grsec-minimal.patch
+Patch1000:	linux-2.6-grsec-minimal.patch
 
 Patch2000:	kernel-small_fixes.patch
 
@@ -895,9 +894,9 @@
 #%endif
 #%endif
 
-#%if %{with grsec_minimal}
-#%patch1000 -p1
-#%endif
+%if %{with grsec_minimal}
+%patch1000 -p1
+%endif
 %if %{with grsec_full}
 %patch9999 -p1
 %endif
@@ -1708,7 +1707,7 @@
 %{_prefix}/src/linux-%{version}/drivers
 %{_prefix}/src/linux-%{version}/fs
 %if %{with grsecurity}
-#%{_prefix}/src/linux-%{version}/grsecurity
+%{_prefix}/src/linux-%{version}/grsecurity
 %endif
 %{_prefix}/src/linux-%{version}/init
 %{_prefix}/src/linux-%{version}/ipc
@@ -1742,6 +1741,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1635  2006/09/28 15:56:46  zbyniu
+- grsec_minimal re-enabled
+
 Revision 1.441.2.1634  2006/09/27 19:14:56  zbyniu
 - grsec_full is ready
 
================================================================

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