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

[cieciwa]

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

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

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-nf-time.patch
diff -u SOURCES/linux-2.6-nf-time.patch:1.1.2.1 SOURCES/linux-2.6-nf-time.patch:1.1.2.2
--- SOURCES/linux-2.6-nf-time.patch:1.1.2.1	Thu Sep 15 10:37:07 2005
+++ SOURCES/linux-2.6-nf-time.patch	Fri Oct 28 14:57:11 2005
@@ -1,12 +1,12 @@
  include/linux/netfilter_ipv4/ipt_time.h |   18 +++
  net/ipv4/netfilter/Kconfig              |   14 ++
- net/ipv4/netfilter/Makefile             |    3 
+ net/ipv4/netfilter/Makefile             |    1 
  net/ipv4/netfilter/ipt_time.c           |  179 ++++++++++++++++++++++++++++++++
- 4 files changed, 214 insertions(+)
+ 4 files changed, 212 insertions(+)
 
-diff -uNr linux-2.6.13.1/include.orig/linux/netfilter_ipv4/ipt_time.h linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_time.h
---- linux-2.6.13.1/include.orig/linux/netfilter_ipv4/ipt_time.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_time.h	2005-09-15 10:36:18.749272250 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_time.h linux-2.6.14/include/linux/netfilter_ipv4/ipt_time.h
+--- linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_time.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/include/linux/netfilter_ipv4/ipt_time.h	2005-10-28 14:41:16.000000000 +0200
 @@ -0,0 +1,18 @@
 +#ifndef __ipt_time_h_included__
 +#define __ipt_time_h_included__
@@ -26,9 +26,37 @@
 +
 +
 +#endif /* __ipt_time_h_included__ */
-diff -uNr linux-2.6.13.1/net.orig/ipv4/netfilter/ipt_time.c linux-2.6.13.1/net/ipv4/netfilter/ipt_time.c
---- linux-2.6.13.1/net.orig/ipv4/netfilter/ipt_time.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/net/ipv4/netfilter/ipt_time.c	2005-09-15 10:36:18.749272250 +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:41:16.000000000 +0200
+@@ -821,5 +821,19 @@
+ 	  Allows altering the ARP packet payload: source and destination
+ 	  hardware and network addresses.
+ 
++config IP_NF_MATCH_TIME
++	tristate  'TIME match support'
++	depends on IP_NF_IPTABLES
++	help
++	  This option adds a `time' match, which allows you
++	  to match based on the packet arrival time/date
++	  (arrival time/date at the machine which netfilter is running on) or
++	  departure time/date (for locally generated packets).
++	
++	  If you say Y here, try iptables -m time --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:41:16.000000000 +0200
+@@ -0,0 +0,1 @@
++obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_time.o
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/ipt_time.c linux-2.6.14/net/ipv4/netfilter/ipt_time.c
+--- linux-2.6.14.org/net/ipv4/netfilter/ipt_time.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/net/ipv4/netfilter/ipt_time.c	2005-10-28 14:41:16.000000000 +0200
 @@ -0,0 +1,179 @@
 +/*
 +  This is a module which is used for time matching
@@ -209,31 +237,3 @@
 +	r->tm_mon=i;
 +	r->tm_mday=work-__spm[i]+1;
 +}
-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-15 10:32:21.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/Kconfig	2005-09-15 10:36:18.757272750 +0200
-@@ -870,5 +870,19 @@
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
- 
-+config IP_NF_MATCH_TIME
-+	tristate  'TIME match support'
-+	depends on IP_NF_IPTABLES
-+	help
-+	  This option adds a `time' match, which allows you
-+	  to match based on the packet arrival time/date
-+	  (arrival time/date at the machine which netfilter is running on) or
-+	  departure time/date (for locally generated packets).
-+	
-+	  If you say Y here, try iptables -m time --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-15 10:32:21.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/Makefile	2005-09-15 10:36:18.761273000 +0200
-@@ -0,0 +0,1 @@
-+obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_time.o
================================================================

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