SPECS (LINUX_2_6_22): kernel.spec - patch for support conntrack in...

[zbyniu]

Author: zbyniu                       Date: Wed Dec 12 12:17:36 2007 GMT
Module: SPECS                         Tag: LINUX_2_6_22
---- Log message:
- patch for support conntrack in ipvs
- grsec fixes

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1796.2.29 -> 1.441.2.1796.2.30) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1796.2.29 SPECS/kernel.spec:1.441.2.1796.2.30
--- SPECS/kernel.spec:1.441.2.1796.2.29	Wed Dec 12 13:01:31 2007
+++ SPECS/kernel.spec	Wed Dec 12 13:17:30 2007
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
 #
-# STATUS: 2.6.22.12 ready
+# STATUS: 2.6.22.14 ready
 #
 # TODO:
 # - benchmark NO_HZ & HZ=1000 vs HZ=300 on i686
@@ -260,6 +260,9 @@
 # netfilter-layer7-v2.13.tar.gz from http://l7-filter.sf.net/
 Patch40:	kernel-layer7.patch
 
+# http://www.ssi.bg/~ja/nfct/ipvs-nfct-2.6.22-1.diff
+Patch41:	kernel-ipvs-nfct.patch
+
 ### End netfilter
 
 # http://www.linuximq.net/patchs/ (note 2.6.21 patch is broken here)
@@ -383,6 +386,7 @@
 Patch9999:	linux-2.6-grsec_full.patch
 Patch10000:	linux-2.6-grsec-caps.patch
 Patch10001:	linux-2.6-grsec-common.patch
+Patch10002:	kernel-grsec_fixes.patch
 
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 3:2.14.90.0.7
@@ -860,6 +864,9 @@
 # kernel-layer7.patch
 %patch40 -p1
 
+# ipvs-nfct
+%patch41 -p1
+
 ##
 # end of netfilter
 
@@ -960,12 +967,14 @@
 %patch9999 -p1
 %{?with_vserver:%patch10000 -p1}
 %{?with_vserver:%patch10001 -p1}
+%{?with_vserver:%patch10002 -p1}
 %else
 
 %if %{with grsec_full}
 %patch9999 -p1
 %{?with_vserver:%patch10000 -p1}
 %{?with_vserver:%patch10001 -p1}
+%{?with_vserver:%patch10002 -p1}
 %else
 %if %{with grsec_minimal}
 %patch1000 -p1
@@ -1706,6 +1715,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1796.2.30  2007-12-12 12:17:30  zbyniu
+- patch for support conntrack in ipvs
+- grsec fixes
+
 Revision 1.441.2.1796.2.29  2007-12-12 12:01:31  glen
 - add kernel-modpost_warn.patch; rel 4
 
================================================================

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