SOURCES (LINUX_2_6): linux-2.6-nf-policy.patch - snap 20051028 for...

cieciwa cieciwa at pld-linux.org
Mon Oct 31 19:45:01 CET 2005 

Author: cieciwa                      Date: Mon Oct 31 18:45:01 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- snap 20051028 for 2.6.14.

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

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-nf-policy.patch
diff -u SOURCES/linux-2.6-nf-policy.patch:1.1.2.1 SOURCES/linux-2.6-nf-policy.patch:1.1.2.2
--- SOURCES/linux-2.6-nf-policy.patch:1.1.2.1	Thu Sep 15 10:33:13 2005
+++ SOURCES/linux-2.6-nf-policy.patch	Mon Oct 31 19:44:56 2005
@@ -8,9 +8,9 @@
  net/ipv6/netfilter/ip6t_policy.c           |  200 +++++++++++++++++++++++++++++
  8 files changed, 502 insertions(+)
 
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/include/linux/netfilter_ipv4/ipt_policy.h linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_policy.h
---- linux-2.6.13.1.org/include/linux/netfilter_ipv4/ipt_policy.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_policy.h	2005-09-15 10:23:16.000000000 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_policy.h linux-2.6.14/include/linux/netfilter_ipv4/ipt_policy.h
+--- linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_policy.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/include/linux/netfilter_ipv4/ipt_policy.h	2005-10-31 19:28:55.000000000 +0100
 @@ -0,0 +1,52 @@
 +#ifndef _IPT_POLICY_H
 +#define _IPT_POLICY_H
@@ -64,9 +64,9 @@
 +};
 +
 +#endif /* _IPT_POLICY_H */
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/include/linux/netfilter_ipv6/ip6t_policy.h linux-2.6.13.1/include/linux/netfilter_ipv6/ip6t_policy.h
---- linux-2.6.13.1.org/include/linux/netfilter_ipv6/ip6t_policy.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/include/linux/netfilter_ipv6/ip6t_policy.h	2005-09-15 10:23:16.000000000 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/include/linux/netfilter_ipv6/ip6t_policy.h linux-2.6.14/include/linux/netfilter_ipv6/ip6t_policy.h
+--- linux-2.6.14.org/include/linux/netfilter_ipv6/ip6t_policy.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/include/linux/netfilter_ipv6/ip6t_policy.h	2005-10-31 19:28:55.000000000 +0100
 @@ -0,0 +1,52 @@
 +#ifndef _IP6T_POLICY_H
 +#define _IP6T_POLICY_H
@@ -120,10 +120,10 @@
 +};
 +
 +#endif /* _IP6T_POLICY_H */
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv4/netfilter/Kconfig linux-2.6.13.1/net/ipv4/netfilter/Kconfig
---- linux-2.6.13.1.org/net/ipv4/netfilter/Kconfig	2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/Kconfig	2005-09-15 10:23:16.000000000 +0200
-@@ -692,5 +692,15 @@
+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-31 19:28:55.000000000 +0100
+@@ -821,5 +821,15 @@
  	  Allows altering the ARP packet payload: source and destination
  	  hardware and network addresses.
  
@@ -139,14 +139,14 @@
 +
  endmenu
  
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv4/netfilter/Makefile linux-2.6.13.1/net/ipv4/netfilter/Makefile
---- linux-2.6.13.1.org/net/ipv4/netfilter/Makefile	2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/Makefile	2005-09-15 10:23:16.000000000 +0200
+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-31 19:28:55.000000000 +0100
 @@ -0,0 +0,1 @@
 +obj-$(CONFIG_IP_NF_MATCH_POLICY) += ipt_policy.o
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv4/netfilter/ipt_policy.c linux-2.6.13.1/net/ipv4/netfilter/ipt_policy.c
---- linux-2.6.13.1.org/net/ipv4/netfilter/ipt_policy.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/net/ipv4/netfilter/ipt_policy.c	2005-09-15 10:23:16.000000000 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/ipt_policy.c linux-2.6.14/net/ipv4/netfilter/ipt_policy.c
+--- linux-2.6.14.org/net/ipv4/netfilter/ipt_policy.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/net/ipv4/netfilter/ipt_policy.c	2005-10-31 19:28:55.000000000 +0100
 @@ -0,0 +1,176 @@
 +/* IP tables module for matching IPsec policy
 + *
@@ -324,10 +324,10 @@
 +
 +module_init(init);
 +module_exit(fini);
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv6/netfilter/Kconfig linux-2.6.13.1/net/ipv6/netfilter/Kconfig
---- linux-2.6.13.1.org/net/ipv6/netfilter/Kconfig	2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/net/ipv6/netfilter/Kconfig	2005-09-15 10:23:16.000000000 +0200
-@@ -238,5 +238,15 @@
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv6/netfilter/Kconfig linux-2.6.14/net/ipv6/netfilter/Kconfig
+--- linux-2.6.14.org/net/ipv6/netfilter/Kconfig	2005-10-28 02:02:08.000000000 +0200
++++ linux-2.6.14/net/ipv6/netfilter/Kconfig	2005-10-31 19:28:55.000000000 +0100
+@@ -278,5 +278,15 @@
  	  If you want to compile it as a module, say M here and read
  	  <file:Documentation/modules.txt>.  If unsure, say `N'.
  
@@ -343,20 +343,14 @@
 +
  endmenu
  
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv6/netfilter/Makefile linux-2.6.13.1/net/ipv6/netfilter/Makefile
---- linux-2.6.13.1.org/net/ipv6/netfilter/Makefile	2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/net/ipv6/netfilter/Makefile	2005-09-15 10:23:16.000000000 +0200
-@@ -13,6 +13,7 @@
- obj-$(CONFIG_IP6_NF_MATCH_IPV6HEADER) += ip6t_ipv6header.o
- obj-$(CONFIG_IP6_NF_MATCH_FRAG) += ip6t_frag.o
- obj-$(CONFIG_IP6_NF_MATCH_AHESP) += ip6t_esp.o ip6t_ah.o
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv6/netfilter/Makefile linux-2.6.14/net/ipv6/netfilter/Makefile
+--- linux-2.6.14.org/net/ipv6/netfilter/Makefile	2005-10-28 02:02:08.000000000 +0200
++++ linux-2.6.14/net/ipv6/netfilter/Makefile	2005-10-31 19:28:55.000000000 +0100
+@@ -0,0 +0,1 @@
 +obj-$(CONFIG_IP6_NF_MATCH_POLICY) += ip6t_policy.o
- obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t_eui64.o
- obj-$(CONFIG_IP6_NF_MATCH_MULTIPORT) += ip6t_multiport.o
- obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv6/netfilter/ip6t_policy.c linux-2.6.13.1/net/ipv6/netfilter/ip6t_policy.c
---- linux-2.6.13.1.org/net/ipv6/netfilter/ip6t_policy.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/net/ipv6/netfilter/ip6t_policy.c	2005-09-15 10:23:16.000000000 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv6/netfilter/ip6t_policy.c linux-2.6.14/net/ipv6/netfilter/ip6t_policy.c
+--- linux-2.6.14.org/net/ipv6/netfilter/ip6t_policy.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/net/ipv6/netfilter/ip6t_policy.c	2005-10-31 19:28:55.000000000 +0100
 @@ -0,0 +1,200 @@
 +/* IP tables module for matching IPsec policy
 + *
================================================================

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

More information about the pld-cvs-commit mailing list