Author: cieciwa Date: Thu Mar 10 09:53:24 2005 GMT
Module: SPECS Tag: LINUX_2_6_11
---- Log message:
- _rel 0.31,
- added grsecurity patch.
---- Files affected:
SPECS:
kernel.spec (1.441.2.961.2.5 -> 1.441.2.961.2.6)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.961.2.5 SPECS/kernel.spec:1.441.2.961.2.6
--- SPECS/kernel.spec:1.441.2.961.2.5 Wed Mar 9 16:32:53 2005
+++ SPECS/kernel.spec Thu Mar 10 10:53:17 2005
@@ -12,18 +12,18 @@
%bcond_without smp # don't build SMP kernel
%bcond_without up # don't build UP kernel
%bcond_without source # don't build kernel-source package
-#%bcond_without grsec # build without grsec
-#%bcond_with vserver # enable vserver (disables grsec)
-#%bcond_with pax # enable PaX
+%bcond_without grsec # build without grsec
+%bcond_with vserver # enable vserver (disables grsec)
+%bcond_with pax # enable PaX
%bcond_with verbose # verbose build (V=1)
%bcond_with preemptive # build preemptive kernel
%bcond_with regparm # use register arguments (this break
binary-only modules)
%{?debug:%define with_verbose 1}
-#%if %{with vserver}
-#%undefine with_grsec
-#%endif
+%if %{with vserver}
+%undefine with_grsec
+%endif
%if !%{with grsec}
%undefine with_pax
@@ -56,7 +56,7 @@
%define _post_ver .2
#define _post_ver %{nil}
-%define _rel 0.30
+%define _rel 0.31
%define _cset 20050302_0807
%define _apply_cset 0
@@ -183,7 +183,8 @@
#
http://kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.10-rc2/2.6.10-rc-mm2/broken-out
#Patch110: linux-reiser4.patch.bz2
-#Patch200: grsecurity-2.1.1-2.6.10-200501131222.patch
+## based on http://grsecurity.org/grsecurity-2.1.3-2.6.11-200503091157.patch
+Patch200: grsecurity-2.1.3-2.6.11-200503091157.patch
#Patch201: linux-2.6.10-secfix-200501071130.patch
# linux vserver
@@ -585,16 +586,16 @@
# <bconded_patches>
#grsec
-#%ifarch alpha %{ix86} ia64 ppc sparc sparc64 amd64
-#%if %{with grsec}
-#%patch200 -p1
+%ifarch alpha %{ix86} ia64 ppc sparc sparc64 amd64
+%if %{with grsec}
+%patch200 -p1
#%patch201 -p1
-#%endif
-#%endif
+%endif
+%endif
-#%if %{with vserver}
+%if %{with vserver}
#%patch250 -p1
-#%endif
+%endif
# </bconded_patches
@@ -1228,9 +1229,9 @@
%{_prefix}/src/linux-%{version}/crypto
%{_prefix}/src/linux-%{version}/drivers
%{_prefix}/src/linux-%{version}/fs
-#%if %{with grsec}
-#%{_prefix}/src/linux-%{version}/grsecurity
-#%endif
+%if %{with grsec}
+%{_prefix}/src/linux-%{version}/grsecurity
+%endif
%{_prefix}/src/linux-%{version}/init
%{_prefix}/src/linux-%{version}/ipc
%{_prefix}/src/linux-%{version}/kernel
@@ -1259,6 +1260,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.961.2.6 2005/03/10 09:53:17 cieciwa
+- _rel 0.31,
+- added grsecurity patch.
+
Revision 1.441.2.961.2.5 2005/03/09 15:32:53 cieciwa
- update - Dirty hack - NFY.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.961.2.5&r2=1.441.2.961.2.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
