packages: kernel/kernel.spec - fix grsec bcond usage

baggins baggins at pld-linux.org
Wed May 4 13:19:32 CEST 2011


Author: baggins                      Date: Wed May  4 11:19:32 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix grsec bcond usage

---- Files affected:
packages/kernel:
   kernel.spec (1.914 -> 1.915) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.914 packages/kernel/kernel.spec:1.915
--- packages/kernel/kernel.spec:1.914	Wed May  4 13:17:54 2011
+++ packages/kernel/kernel.spec	Wed May  4 13:19:26 2011
@@ -111,7 +111,7 @@
 %if %{with rescuecd}
 %define		alt_kernel	rescuecd
 %else # not rescuecd:
-%define		__alt_kernel	%{?with_pax:pax}%{!?with_grsec_full:nogrsecurity}%{?with_pae:pae}
+%define		__alt_kernel	%{?with_pax:pax}%{!?with_grsecurity:nogrsecurity}%{?with_pae:pae}
 %if "%{__alt_kernel}" != ""
 %define		alt_kernel	%{__alt_kernel}
 %endif
@@ -790,12 +790,12 @@
 #
 
 %if %{with grsecurity}
-### %patch9999 -p1
+%patch9999 -p1
 # aufs2 needs to modify those pointers
-### %patch147 -p1
-### %{?with_vserver:%patch10000 -p1}
-### %{?with_vserver:%patch10001 -p1}
-### %{?with_vserver:%patch10002 -p1}
+%patch147 -p1
+%{?with_vserver:%patch10000 -p1}
+%{?with_vserver:%patch10001 -p1}
+%{?with_vserver:%patch10002 -p1}
 %endif
 #
 # end of grsecurity & pax stuff
@@ -1546,6 +1546,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.915  2011/05/04 11:19:26  baggins
+- fix grsec bcond usage
+
 Revision 1.914  2011/05/04 11:17:54  baggins
 - there is no apparmor bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.914&r2=1.915&f=u



More information about the pld-cvs-commit mailing list