SOURCES (LINUX_2_6): kernel-ipt_ACCOUNT.patch - better place in Kc...

[zbyniu]

Author: zbyniu                       Date: Wed Aug 15 11:01:53 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- better place in Kconfig

---- Files affected:
SOURCES:
   kernel-ipt_ACCOUNT.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/kernel-ipt_ACCOUNT.patch
diff -u SOURCES/kernel-ipt_ACCOUNT.patch:1.1.2.1 SOURCES/kernel-ipt_ACCOUNT.patch:1.1.2.2
--- SOURCES/kernel-ipt_ACCOUNT.patch:1.1.2.1	Wed Aug 15 12:59:17 2007
+++ SOURCES/kernel-ipt_ACCOUNT.patch	Wed Aug 15 13:01:48 2007
@@ -1,6 +1,6 @@
 diff -uNrp linux/include/linux/netfilter_ipv4/ipt_ACCOUNT.h linux-2.6/include/linux/netfilter_ipv4/ipt_ACCOUNT.h
 --- linux/include/linux/netfilter_ipv4/ipt_ACCOUNT.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6/include/linux/netfilter_ipv4/ipt_ACCOUNT.h	2006-10-26 12:24:51.000000000 +0200
++++ linux/include/linux/netfilter_ipv4/ipt_ACCOUNT.h	2006-10-26 12:24:51.000000000 +0200
 @@ -0,0 +1,100 @@
 +/***************************************************************************
 + *   Copyright (C) 2004-2005 by Intra2net AG                               *
@@ -104,7 +104,7 @@
 +#endif /*_IPT_ACCOUNT_H*/
 diff -uNrp linux/net/ipv4/netfilter/ipt_ACCOUNT.c linux-2.6/net/ipv4/netfilter/ipt_ACCOUNT.c
 --- linux/net/ipv4/netfilter/ipt_ACCOUNT.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6/net/ipv4/netfilter/ipt_ACCOUNT.c	2007-07-25 15:07:46.000000000 +0200
++++ linux/net/ipv4/netfilter/ipt_ACCOUNT.c	2007-07-25 15:07:46.000000000 +0200
 @@ -0,0 +1,1159 @@
 +/***************************************************************************
 + *   This is a module which is used for counting packets.                  *
@@ -1266,9 +1266,12 @@
 +module_exit(fini);
 +MODULE_LICENSE("GPL");
 diff -uNrp linux/net/ipv4/netfilter/Kconfig.ladd linux-2.6/net/ipv4/netfilter/Kconfig.ladd
---- linux/net/ipv4/netfilter/Kconfig.ladd	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6/net/ipv4/netfilter/Kconfig.ladd	2006-10-26 12:24:51.000000000 +0200
-@@ -0,0 +1,21 @@
+--- linux/net/ipv4/netfilter/Kconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux/net/ipv4/netfilter/Kconfig	2007-08-15 12:17:22.000000000 +0200
+@@ -647,5 +647,26 @@
+ 	  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_TARGET_ACCOUNT
 +	tristate "ACCOUNT target support"
 +	depends on IP_NF_IPTABLES
@@ -1290,14 +1293,16 @@
 +	  http://www.intra2net.com/de/produkte/opensource/ipt_account/
 +		  
 +	  To compile it as a module, choose M here.  If unsure, say N.
+ endmenu
+ 
 diff -uNrp linux/net/ipv4/netfilter/Makefile.ladd linux-2.6/net/ipv4/netfilter/Makefile.ladd
---- linux/net/ipv4/netfilter/Makefile.ladd	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6/net/ipv4/netfilter/Makefile.ladd	2006-10-26 12:24:51.000000000 +0200
+--- linux/net/ipv4/netfilter/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ linux/net/ipv4/netfilter/Makefile	2006-10-26 12:24:51.000000000 +0200
 @@ -0,0 +1,1 @@
 +obj-$(CONFIG_IP_NF_TARGET_ACCOUNT) += ipt_ACCOUNT.o
 diff -ur linux-2.6.19.1/include/linux/netfilter_ipv4/ip_tables.h linux-2.6.19.1.ipt_ACCOUNT/include/linux/netfilter_ipv4/ip_tables.h
 --- linux-2.6.19.1/include/linux/netfilter_ipv4/ip_tables.h	Mon Dec 11 20:32:53 2006
-+++ linux-2.6.19.1.ipt_ACCOUNT/include/linux/netfilter_ipv4/ip_tables.h	Wed Dec 20 15:56:35 2006
++++ linux.19.1.ipt_ACCOUNT/include/linux/netfilter_ipv4/ip_tables.h	Wed Dec 20 15:56:35 2006
 @@ -111,11 +111,22 @@
  #define IPT_SO_SET_ADD_COUNTERS	(IPT_BASE_CTL + 1)
  #define IPT_SO_SET_MAX		IPT_SO_SET_ADD_COUNTERS
================================================================

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