SOURCES (LINUX_2_6): linux-2.6-nf-expire.patch - updated for 2.6.1...

cieciwa cieciwa at pld-linux.org
Fri Oct 28 13:57:08 CEST 2005


Author: cieciwa                      Date: Fri Oct 28 11:57:08 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- updated for 2.6.14. [snap 20052810]

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

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-nf-expire.patch
diff -u SOURCES/linux-2.6-nf-expire.patch:1.1.2.1 SOURCES/linux-2.6-nf-expire.patch:1.1.2.2
--- SOURCES/linux-2.6-nf-expire.patch:1.1.2.1	Thu Sep 15 09:58:37 2005
+++ SOURCES/linux-2.6-nf-expire.patch	Fri Oct 28 13:57:02 2005
@@ -8,9 +8,9 @@
  net/ipv6/netfilter/ip6t_expire.c           |  566 +++++++++++++++++++++++++++++
  8 files changed, 1217 insertions(+)
 
-diff -uNr linux-2.6.13.1/include.orig/linux/netfilter_ipv4/ipt_expire.h linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_expire.h
---- linux-2.6.13.1/include.orig/linux/netfilter_ipv4/ipt_expire.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_expire.h	2005-09-15 09:51:28.559761000 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_expire.h linux-2.6.14/include/linux/netfilter_ipv4/ipt_expire.h
+--- linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_expire.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/include/linux/netfilter_ipv4/ipt_expire.h	2005-10-28 13:38:37.000000000 +0200
 @@ -0,0 +1,32 @@
 +/* This module matches until it expires, at which point the entire
 + * rule is deleted
@@ -44,9 +44,9 @@
 +};
 +
 +#endif
-diff -uNr linux-2.6.13.1/include.orig/linux/netfilter_ipv6/ip6t_expire.h linux-2.6.13.1/include/linux/netfilter_ipv6/ip6t_expire.h
---- linux-2.6.13.1/include.orig/linux/netfilter_ipv6/ip6t_expire.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/include/linux/netfilter_ipv6/ip6t_expire.h	2005-09-15 09:51:28.559761000 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/include/linux/netfilter_ipv6/ip6t_expire.h linux-2.6.14/include/linux/netfilter_ipv6/ip6t_expire.h
+--- linux-2.6.14.org/include/linux/netfilter_ipv6/ip6t_expire.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/include/linux/netfilter_ipv6/ip6t_expire.h	2005-10-28 13:38:37.000000000 +0200
 @@ -0,0 +1,32 @@
 +/* This module matches until it expires, at which point the entire
 + * rule is deleted
@@ -80,9 +80,34 @@
 +};
 +
 +#endif
-diff -uNr linux-2.6.13.1/net.orig/ipv4/netfilter/ipt_expire.c linux-2.6.13.1/net/ipv4/netfilter/ipt_expire.c
---- linux-2.6.13.1/net.orig/ipv4/netfilter/ipt_expire.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/net/ipv4/netfilter/ipt_expire.c	2005-09-15 09:51:28.559761000 +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 13:38:37.000000000 +0200
+@@ -821,5 +821,16 @@
+ 	  Allows altering the ARP packet payload: source and destination
+ 	  hardware and network addresses.
+ 
++config IP_NF_MATCH_EXPIRE
++	tristate  'expiring match support'
++	depends on IP_NF_IPTABLES
++	help
++	  This option adds an expiring match, which allows you to add
++	  rules to your iptables ruleset which will later be removed
++	  automatically.
++
++	  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 13:38:37.000000000 +0200
+@@ -0,0 +0,1 @@
++obj-$(CONFIG_IP_NF_MATCH_EXPIRE) += ipt_expire.o
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/ipt_expire.c linux-2.6.14/net/ipv4/netfilter/ipt_expire.c
+--- linux-2.6.14.org/net/ipv4/netfilter/ipt_expire.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/net/ipv4/netfilter/ipt_expire.c	2005-10-28 13:38:37.000000000 +0200
 @@ -0,0 +1,563 @@
 +/* This module matches until it expires, at which point the entire
 + * rule is deleted
@@ -647,16 +672,16 @@
 +		dprintk("error restoring counters (%d)", ret);
 +	return ret;
 +}
-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 09:51:28.567761500 +0200
-@@ -692,5 +692,16 @@
- 	  Allows altering the ARP packet payload: source and destination
- 	  hardware and network addresses.
+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-28 13:38:37.000000000 +0200
+@@ -278,5 +278,16 @@
+ 	  If you want to compile it as a module, say M here and read
+ 	  <file:Documentation/modules.txt>.  If unsure, say `N'.
  
-+config IP_NF_MATCH_EXPIRE
++config IP6_NF_MATCH_EXPIRE
 +	tristate  'expiring match support'
-+	depends on IP_NF_IPTABLES
++	depends on IP6_NF_IPTABLES
 +	help
 +	  This option adds an expiring match, which allows you to add
 +	  rules to your iptables ruleset which will later be removed
@@ -667,14 +692,14 @@
 +
  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 09:51:28.571761750 +0200
+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-28 13:38:37.000000000 +0200
 @@ -0,0 +0,1 @@
-+obj-$(CONFIG_IP_NF_MATCH_EXPIRE) += ipt_expire.o
-diff -uNr linux-2.6.13.1/net.orig/ipv6/netfilter/ip6t_expire.c linux-2.6.13.1/net/ipv6/netfilter/ip6t_expire.c
---- linux-2.6.13.1/net.orig/ipv6/netfilter/ip6t_expire.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/net/ipv6/netfilter/ip6t_expire.c	2005-09-15 09:51:28.563761250 +0200
++obj-$(CONFIG_IP6_NF_MATCH_EXPIRE) += ip6t_expire.o
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv6/netfilter/ip6t_expire.c linux-2.6.14/net/ipv6/netfilter/ip6t_expire.c
+--- linux-2.6.14.org/net/ipv6/netfilter/ip6t_expire.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/net/ipv6/netfilter/ip6t_expire.c	2005-10-28 13:38:37.000000000 +0200
 @@ -0,0 +1,566 @@
 +/* This module matches until it expires, at which point the entire
 + * rule is deleted
@@ -1242,28 +1267,3 @@
 +		dprintk("error restoring counters (%d)", ret);
 +	return ret;
 +}
-diff -uNr linux-2.6.13.1/net.orig/ipv6/netfilter/Kconfig linux-2.6.13.1/net/ipv6/netfilter/Kconfig
---- linux-2.6.13.1/net.orig/ipv6/netfilter/Kconfig	2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/net/ipv6/netfilter/Kconfig	2005-09-15 09:51:28.575762000 +0200
-@@ -238,5 +238,16 @@
- 	  If you want to compile it as a module, say M here and read
- 	  <file:Documentation/modules.txt>.  If unsure, say `N'.
- 
-+config IP6_NF_MATCH_EXPIRE
-+	tristate  'expiring match support'
-+	depends on IP6_NF_IPTABLES
-+	help
-+	  This option adds an expiring match, which allows you to add
-+	  rules to your iptables ruleset which will later be removed
-+	  automatically.
-+
-+	  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/ipv6/netfilter/Makefile linux-2.6.13.1/net/ipv6/netfilter/Makefile
---- linux-2.6.13.1/net.orig/ipv6/netfilter/Makefile	2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/net/ipv6/netfilter/Makefile	2005-09-15 09:51:28.575762000 +0200
-@@ -0,0 +0,1 @@
-+obj-$(CONFIG_IP6_NF_MATCH_EXPIRE) += ip6t_expire.o
================================================================

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




More information about the pld-cvs-commit mailing list