SOURCES (LINUX_2_6): linux-2.6-nf-account.patch - snap 20051028 fo...

[cieciwa]

Author: cieciwa                      Date: Sat Oct 29 23:36:02 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- snap 20051028 for 2.6.14.

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

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-nf-account.patch
diff -u SOURCES/linux-2.6-nf-account.patch:1.1.2.1 SOURCES/linux-2.6-nf-account.patch:1.1.2.2
--- SOURCES/linux-2.6-nf-account.patch:1.1.2.1	Fri Sep 16 15:17:24 2005
+++ SOURCES/linux-2.6-nf-account.patch	Sun Oct 30 01:35:57 2005
@@ -1,12 +1,6 @@
- include/linux/netfilter_ipv4/ipt_account.h |   26 
- net/ipv4/netfilter/Kconfig                 |   46 +
- net/ipv4/netfilter/Makefile                |    1 
- net/ipv4/netfilter/ipt_account.c           |  937 +++++++++++++++++++++++++++++
- 4 files changed, 1010 insertions(+)
-
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/include/linux/netfilter_ipv4/ipt_account.h linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_account.h
---- linux-2.6.13.1.org/include/linux/netfilter_ipv4/ipt_account.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_account.h	2005-09-16 15:08:29.000000000 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_account.h linux-2.6.14/include/linux/netfilter_ipv4/ipt_account.h
+--- linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_account.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/include/linux/netfilter_ipv4/ipt_account.h	2005-10-30 01:21:06.000000000 +0200
 @@ -0,0 +1,26 @@
 +/* 
 + * accounting match (ipt_account.c)
@@ -34,10 +28,10 @@
 +
 +#endif
 +
-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-16 15:08:29.000000000 +0200
-@@ -692,5 +692,51 @@
+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-30 01:21:06.000000000 +0200
+@@ -821,5 +821,51 @@
  	  Allows altering the ARP packet payload: source and destination
  	  hardware and network addresses.
  
@@ -89,14 +83,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-16 15:08:29.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-30 01:21:06.000000000 +0200
 @@ -0,0 +0,1 @@
 +obj-$(CONFIG_IP_NF_MATCH_ACCOUNT) += ipt_account.o
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv4/netfilter/ipt_account.c linux-2.6.13.1/net/ipv4/netfilter/ipt_account.c
---- linux-2.6.13.1.org/net/ipv4/netfilter/ipt_account.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/net/ipv4/netfilter/ipt_account.c	2005-09-16 15:08:29.000000000 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/ipt_account.c linux-2.6.14/net/ipv4/netfilter/ipt_account.c
+--- linux-2.6.14.org/net/ipv4/netfilter/ipt_account.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/net/ipv4/netfilter/ipt_account.c	2005-10-30 01:21:06.000000000 +0200
 @@ -0,0 +1,937 @@
 +/* 
 + * accounting match (ipt_account.c)
================================================================

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