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

[cieciwa]

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

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

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-nf-quota.patch
diff -u SOURCES/linux-2.6-nf-quota.patch:1.1.2.1 SOURCES/linux-2.6-nf-quota.patch:1.1.2.2
--- SOURCES/linux-2.6-nf-quota.patch:1.1.2.1	Thu Sep 15 10:27:08 2005
+++ SOURCES/linux-2.6-nf-quota.patch	Fri Oct 28 14:44:52 2005
@@ -4,9 +4,9 @@
  net/ipv4/netfilter/ipt_quota.c           |   96 +++++++++++++++++++++++++++++++
  4 files changed, 119 insertions(+)
 
-diff -uNr linux-2.6.13.1/include.orig/linux/netfilter_ipv4/ipt_quota.h linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_quota.h
---- linux-2.6.13.1/include.orig/linux/netfilter_ipv4/ipt_quota.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_quota.h	2005-09-15 10:25:42.481508000 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_quota.h linux-2.6.14/include/linux/netfilter_ipv4/ipt_quota.h
+--- linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_quota.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/include/linux/netfilter_ipv4/ipt_quota.h	2005-10-28 14:28:52.000000000 +0200
 @@ -0,0 +1,12 @@
 +#ifndef _IPT_QUOTA_H
 +#define _IPT_QUOTA_H
@@ -20,9 +20,39 @@
 +};
 +
 +#endif /*_IPT_QUOTA_H*/
-diff -uNr linux-2.6.13.1/net.orig/ipv4/netfilter/ipt_quota.c linux-2.6.13.1/net/ipv4/netfilter/ipt_quota.c
---- linux-2.6.13.1/net.orig/ipv4/netfilter/ipt_quota.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/net/ipv4/netfilter/ipt_quota.c	2005-09-15 10:25:42.485508250 +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:28:52.000000000 +0200
+@@ -821,5 +821,15 @@
+ 	  Allows altering the ARP packet payload: source and destination
+ 	  hardware and network addresses.
+ 
++config IP_NF_MATCH_QUOTA
++	tristate  'quota match support'
++	depends on IP_NF_IPTABLES
++	help
++	  This match implements network quotas.
++	
++	  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:28:52.000000000 +0200
+@@ -47,6 +47,7 @@
+ # matches
+ obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o
+ obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o
++obj-$(CONFIG_IP_NF_MATCH_QUOTA) += ipt_quota.o
+ obj-$(CONFIG_IP_NF_MATCH_HASHLIMIT) += ipt_hashlimit.o
+ obj-$(CONFIG_IP_NF_MATCH_SCTP) += ipt_sctp.o
+ obj-$(CONFIG_IP_NF_MATCH_DCCP) += ipt_dccp.o
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/ipt_quota.c linux-2.6.14/net/ipv4/netfilter/ipt_quota.c
+--- linux-2.6.14.org/net/ipv4/netfilter/ipt_quota.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/net/ipv4/netfilter/ipt_quota.c	2005-10-28 14:28:52.000000000 +0200
 @@ -0,0 +1,96 @@
 +/* 
 + * netfilter module to enforce network quotas
@@ -120,27 +150,3 @@
 +module_init(init);
 +module_exit(fini);
 +
-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:21:06.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/Kconfig	2005-09-15 10:25:42.489508500 +0200
-@@ -748,5 +748,15 @@
- 	  If you want to compile it as a module, say M here and read
- 	  Documentation/modules.txt.  If unsure, say `N'.
- 
-+config IP_NF_MATCH_QUOTA
-+	tristate  'quota match support'
-+	depends on IP_NF_IPTABLES
-+	help
-+	  This match implements network quotas.
-+	
-+	  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:21:06.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/Makefile	2005-09-15 10:25:42.493508750 +0200
-@@ -0,0 +0,1 @@
-+obj-$(CONFIG_IP_NF_MATCH_QUOTA) += ipt_quota.o
================================================================

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