SOURCES (LINUX_2_6): linux-2.6-nf-ipv4options.patch - snap 2005102...

[cieciwa]

Author: cieciwa                      Date: Fri Oct 28 12:23:51 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- snap 20051028 for 2.6.14.

---- Files affected:
SOURCES:
   linux-2.6-nf-ipv4options.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-nf-ipv4options.patch
diff -u SOURCES/linux-2.6-nf-ipv4options.patch:1.1.2.1 SOURCES/linux-2.6-nf-ipv4options.patch:1.1.2.2
--- SOURCES/linux-2.6-nf-ipv4options.patch:1.1.2.1	Thu Sep 15 10:09:08 2005
+++ SOURCES/linux-2.6-nf-ipv4options.patch	Fri Oct 28 14:23:46 2005
@@ -1,12 +1,12 @@
  include/linux/netfilter_ipv4/ipt_ipv4options.h |   21 +++
  net/ipv4/netfilter/Kconfig                     |   13 +
- net/ipv4/netfilter/Makefile                    |    3 
+ net/ipv4/netfilter/Makefile                    |    1 
  net/ipv4/netfilter/ipt_ipv4options.c           |  172 +++++++++++++++++++++++++
- 4 files changed, 209 insertions(+)
+ 4 files changed, 207 insertions(+)
 
-diff -uNr linux-2.6.13.1/include.orig/linux/netfilter_ipv4/ipt_ipv4options.h linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_ipv4options.h
---- linux-2.6.13.1/include.orig/linux/netfilter_ipv4/ipt_ipv4options.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_ipv4options.h	2005-09-15 10:06:56.847160250 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_ipv4options.h linux-2.6.14/include/linux/netfilter_ipv4/ipt_ipv4options.h
+--- linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_ipv4options.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/include/linux/netfilter_ipv4/ipt_ipv4options.h	2005-10-28 14:07:40.000000000 +0200
 @@ -0,0 +1,21 @@
 +#ifndef __ipt_ipv4options_h_included__
 +#define __ipt_ipv4options_h_included__
@@ -29,9 +29,36 @@
 +
 +
 +#endif /* __ipt_ipv4options_h_included__ */
-diff -uNr linux-2.6.13.1/net.orig/ipv4/netfilter/ipt_ipv4options.c linux-2.6.13.1/net/ipv4/netfilter/ipt_ipv4options.c
---- linux-2.6.13.1/net.orig/ipv4/netfilter/ipt_ipv4options.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/net/ipv4/netfilter/ipt_ipv4options.c	2005-09-15 10:06:56.847160250 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/Kconfig linux-2.6.14/net/ipv4/netfilter/Kconfig
+--- linux-2.6.14.org/net/ipv4/netfilter/Kconfig	2005-10-28 02:02:08.000000000 +0200
++++ linux-2.6.14/net/ipv4/netfilter/Kconfig	2005-10-28 14:07:40.000000000 +0200
+@@ -821,5 +821,18 @@
+ 	  Allows altering the ARP packet payload: source and destination
+ 	  hardware and network addresses.
+ 
++config IP_NF_MATCH_IPV4OPTIONS
++	tristate  'IPV4OPTIONS match support'
++	depends on IP_NF_IPTABLES
++	help
++	  This option adds a IPV4OPTIONS match.
++	  It allows you to filter options like source routing,
++	  record route, timestamp and router-altert.
++	
++	  If you say Y here, try iptables -m ipv4options --help for more information.
++	 
++	  If you want to compile it as a module, say M here and read
++	  Documentation/modules.txt.  If unsure, say `N'.
++
+ endmenu
+ 
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/Makefile linux-2.6.14/net/ipv4/netfilter/Makefile
+--- linux-2.6.14.org/net/ipv4/netfilter/Makefile	2005-10-28 02:02:08.000000000 +0200
++++ linux-2.6.14/net/ipv4/netfilter/Makefile	2005-10-28 14:07:40.000000000 +0200
+@@ -0,0 +0,1 @@
++obj-$(CONFIG_IP_NF_MATCH_IPV4OPTIONS) += ipt_ipv4options.o
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/ipt_ipv4options.c linux-2.6.14/net/ipv4/netfilter/ipt_ipv4options.c
+--- linux-2.6.14.org/net/ipv4/netfilter/ipt_ipv4options.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/net/ipv4/netfilter/ipt_ipv4options.c	2005-10-28 14:07:40.000000000 +0200
 @@ -0,0 +1,172 @@
 +/*
 +  This is a module which is used to match ipv4 options.
@@ -205,30 +232,3 @@
 +
 +module_init(init);
 +module_exit(fini);
-diff -uNr linux-2.6.13.1/net.orig/ipv4/netfilter/Kconfig linux-2.6.13.1/net/ipv4/netfilter/Kconfig
---- linux-2.6.13.1/net.orig/ipv4/netfilter/Kconfig	2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/Kconfig	2005-09-15 10:06:56.851160500 +0200
-@@ -692,5 +692,18 @@
- 	  Allows altering the ARP packet payload: source and destination
- 	  hardware and network addresses.
- 
-+config IP_NF_MATCH_IPV4OPTIONS
-+	tristate  'IPV4OPTIONS match support'
-+	depends on IP_NF_IPTABLES
-+	help
-+	  This option adds a IPV4OPTIONS match.
-+	  It allows you to filter options like source routing,
-+	  record route, timestamp and router-altert.
-+	
-+	  If you say Y here, try iptables -m ipv4options --help for more information.
-+	 
-+	  If you want to compile it as a module, say M here and read
-+	  Documentation/modules.txt.  If unsure, say `N'.
-+
- endmenu
- 
-diff -uNr linux-2.6.13.1/net.orig/ipv4/netfilter/Makefile linux-2.6.13.1/net/ipv4/netfilter/Makefile
---- linux-2.6.13.1/net.orig/ipv4/netfilter/Makefile	2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/Makefile	2005-09-15 10:06:56.855160750 +0200
-@@ -0,0 +0,1 @@
-+obj-$(CONFIG_IP_NF_MATCH_IPV4OPTIONS) += ipt_ipv4options.o
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-nf-ipv4options.patch?r1=1.1.2.1&r2=1.1.2.2&f=u