packages: kernel/kernel-patches.config, kernel/kernel.spec - ipv4options ma...

[baggins]

Author: baggins                      Date: Tue Jul 12 09:35:24 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ipv4options match is in xtables-addons

---- Files affected:
packages/kernel:
   kernel-patches.config (1.11 -> 1.12) , kernel.spec (1.935 -> 1.936) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-patches.config
diff -u packages/kernel/kernel-patches.config:1.11 packages/kernel/kernel-patches.config:1.12
--- packages/kernel/kernel-patches.config:1.11	Mon Jul 11 13:09:06 2011
+++ packages/kernel/kernel-patches.config	Tue Jul 12 11:35:19 2011
@@ -46,7 +46,6 @@
 #- *** FILE: net/ipv4/netfilter/Kconfig ***
 #-
 IP_NF_TARGET_IPV4OPTSSTRIP all=m
-IP_NF_MATCH_IPV4OPTIONS all=m
 NF_NAT_MMS all=m
 NF_CONNTRACK_RSH all=m
 IP_NF_MATCH_RPC all=m

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.935 packages/kernel/kernel.spec:1.936
--- packages/kernel/kernel.spec:1.935	Tue Jul 12 08:52:10 2011
+++ packages/kernel/kernel.spec	Tue Jul 12 11:35:19 2011
@@ -184,7 +184,6 @@
 # were ported to nf_conntrack.
 
 Patch10:	kernel-pom-ng-IPV4OPTSSTRIP.patch
-Patch11:	kernel-pom-ng-ipv4options.patch
 
 Patch16:	kernel-pom-ng-mms-conntrack-nat.patch
 Patch22:	kernel-pom-ng-rsh.patch
@@ -691,9 +690,6 @@
 # kernel-pom-ng-IPV4OPTSSTRIP.patch
 %patch10 -p1
 
-# kernel-pom-ng-ipv4options.patch
-%patch11 -p1
-
 # kernel-pom-ng-mms-conntrack-nat.patch
 %patch16 -p1
 
@@ -1531,6 +1527,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.936  2011/07/12 09:35:19  baggins
+- ipv4options match is in xtables-addons
+
 Revision 1.935  2011/07/12 06:52:10  baggins
 - rc7
 - disable tuxonice by default, patch broken, project did not release anything
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-patches.config?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.935&r2=1.936&f=u