packages: kernel/kernel.spec - dropped CVE-2010-3081 patch. It is subset of...

[pawelz]

Author: pawelz                       Date: Mon Sep 20 16:14:37 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dropped CVE-2010-3081 patch. It is subset of grsec_full.patch.

---- Files affected:
packages/kernel:
   kernel.spec (1.820 -> 1.821) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.820 packages/kernel/kernel.spec:1.821
--- packages/kernel/kernel.spec:1.820	Mon Sep 20 17:32:23 2010
+++ packages/kernel/kernel.spec	Mon Sep 20 18:14:31 2010
@@ -313,7 +313,6 @@
 Patch2000:	kernel-small_fixes.patch
 Patch2001:	kernel-pwc-uncompress.patch
 Patch2003:	kernel-regressions.patch
-Patch2004:	kernel-CVE-2010-3081.patch
 
 # kill some thousands of warnings
 # (only warnings, so just remove parts of this patch if conflics)
@@ -857,7 +856,6 @@
 %patch2000 -p1
 %patch2001 -p1
 #%patch2003 -p1
-%patch2004 -p1
 
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{postver}%{?alt_kernel:_%{alt_kernel}}#g' Makefile
@@ -1594,19 +1592,22 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.821  2010/09/20 16:14:31  pawelz
+- dropped CVE-2010-3081 patch. It is subset of grsec_full.patch.
+
 Revision 1.820  2010/09/20 15:32:23  pawelz
-- added CVE reference (2.6.35.4-2 fixes CVS-2010-3081)
+- added CVE reference (2.6.35.4-2 fixes CVE-2010-3081)
 
 Revision 1.819  2010/09/20 09:17:43  baggins
 - rel 2
 - fix local root on 64bit kernels
-- fixes CVS-2010-3081
 
 Revision 1.818  2010/09/19 18:36:12  arekm
 - rel 1
 
 Revision 1.817  2010/09/19 17:30:24  arekm
 - grsec from http://www.grsecurity.net/~spender/grsecurity-2.2.0-2.6.35.4-201009172030.patch
+- fixes CVE-2010-3081
 
 Revision 1.816  2010/09/06 17:16:59  arekm
 - don't do parallel install (broken with make 3.82)
================================================================

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