SPECS (LINUX_2_6): kernel.spec up to 2.6.25.9; backport security= option

[arekm]

Author: arekm                        Date: Wed Jun 25 11:02:16 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
up to 2.6.25.9; backport security= option

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1926 -> 1.441.2.1927) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1926 SPECS/kernel.spec:1.441.2.1927
--- SPECS/kernel.spec:1.441.2.1926	Mon Jun 23 22:11:16 2008
+++ SPECS/kernel.spec	Wed Jun 25 13:02:10 2008
@@ -106,11 +106,11 @@
 %endif
 
 %define		_basever		2.6.25
-%define		_postver		.8
+%define		_postver		.9
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			2
+%define		_rel			1
 
 %define		_enable_debug_packages			0
 
@@ -158,7 +158,7 @@
 %endif
 %if "%{_postver}" != "%{nil}"
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5:	007e6aca33604bc09687790361026d3c
+# Source1-md5:	493a0b7dd145d4f378ce3970e3690320
 %endif
 
 Source3:	kernel-autoconf.h
@@ -348,6 +348,8 @@
 # based on http://www.udpcast.linux.lu/download/bzip2-lzma-kernel-2.6.23.12.patch.gz
 Patch7001:	kernel-bzip2-lzma.patch
 
+Patch9996:	linux-2.6-security-opt.patch
+
 # not ready yet
 Patch9997:	pax_selinux_hooks-2.6.20.patch
 
@@ -911,6 +913,8 @@
 %endif
 %endif
 
+%patch9996 -p1
+
 %if %{with pax}
 # now we have an separate testing pax-only patch - in the future we
 # could have single grsecurity patch and will have to prepare separate
@@ -1707,6 +1711,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1927  2008/06/25 11:02:10  arekm
+up to 2.6.25.9; backport security= option
+
 Revision 1.441.2.1926  2008/06/23 20:11:16  arekm
 - rel 2; fix pcmcia split (no duplication of files; move b1pcmcia to pcmcia subpkg)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1926&r2=1.441.2.1927&f=u