Author: cieciwa Date: Fri Oct 28 12:13:52 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- snap 20051028
---- Files affected:
SOURCES:
linux-2.6-nf-fuzzy.patch (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-nf-fuzzy.patch
diff -u SOURCES/linux-2.6-nf-fuzzy.patch:1.1.2.1
SOURCES/linux-2.6-nf-fuzzy.patch:1.1.2.2
--- SOURCES/linux-2.6-nf-fuzzy.patch:1.1.2.1 Thu Sep 15 10:03:31 2005
+++ SOURCES/linux-2.6-nf-fuzzy.patch Fri Oct 28 14:13:47 2005
@@ -1,16 +1,16 @@
include/linux/netfilter_ipv4/ipt_fuzzy.h | 21 +++
include/linux/netfilter_ipv6/ip6t_fuzzy.h | 21 +++
net/ipv4/netfilter/Kconfig | 10 +
- net/ipv4/netfilter/Makefile | 2
+ net/ipv4/netfilter/Makefile | 1
net/ipv4/netfilter/ipt_fuzzy.c | 185 +++++++++++++++++++++++++++++
net/ipv6/netfilter/Kconfig | 10 +
net/ipv6/netfilter/Makefile | 1
net/ipv6/netfilter/ip6t_fuzzy.c | 188
++++++++++++++++++++++++++++++
- 8 files changed, 438 insertions(+)
+ 8 files changed, 437 insertions(+)
-diff -uNr linux-2.6.13.1/include.orig/linux/netfilter_ipv4/ipt_fuzzy.h
linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_fuzzy.h
---- linux-2.6.13.1/include.orig/linux/netfilter_ipv4/ipt_fuzzy.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_fuzzy.h 2005-09-15
10:02:28.111719000 +0200
+diff -Nur --exclude '*.orig'
linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_fuzzy.h
linux-2.6.14/include/linux/netfilter_ipv4/ipt_fuzzy.h
+--- linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_fuzzy.h 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.14/include/linux/netfilter_ipv4/ipt_fuzzy.h 2005-10-28
13:53:15.000000000 +0200
@@ -0,0 +1,21 @@
+#ifndef _IPT_FUZZY_H
+#define _IPT_FUZZY_H
@@ -33,9 +33,9 @@
+};
+
+#endif /*_IPT_FUZZY_H*/
-diff -uNr linux-2.6.13.1/include.orig/linux/netfilter_ipv6/ip6t_fuzzy.h
linux-2.6.13.1/include/linux/netfilter_ipv6/ip6t_fuzzy.h
---- linux-2.6.13.1/include.orig/linux/netfilter_ipv6/ip6t_fuzzy.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/include/linux/netfilter_ipv6/ip6t_fuzzy.h 2005-09-15
10:02:28.115717250 +0200
+diff -Nur --exclude '*.orig'
linux-2.6.14.org/include/linux/netfilter_ipv6/ip6t_fuzzy.h
linux-2.6.14/include/linux/netfilter_ipv6/ip6t_fuzzy.h
+--- linux-2.6.14.org/include/linux/netfilter_ipv6/ip6t_fuzzy.h 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.14/include/linux/netfilter_ipv6/ip6t_fuzzy.h 2005-10-28
13:53:15.000000000 +0200
@@ -0,0 +1,21 @@
+#ifndef _IP6T_FUZZY_H
+#define _IP6T_FUZZY_H
@@ -58,9 +58,33 @@
+};
+
+#endif /*_IP6T_FUZZY_H*/
-diff -uNr linux-2.6.13.1/net.orig/ipv4/netfilter/ipt_fuzzy.c
linux-2.6.13.1/net/ipv4/netfilter/ipt_fuzzy.c
---- linux-2.6.13.1/net.orig/ipv4/netfilter/ipt_fuzzy.c 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.13.1/net/ipv4/netfilter/ipt_fuzzy.c 2005-09-15
10:02:28.115717250 +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:53:15.000000000
+0200
+@@ -821,5 +821,15 @@
+ Allows altering the ARP packet payload: source and destination
+ hardware and network addresses.
+
++config IP_NF_MATCH_FUZZY
++ tristate 'fuzzy match support'
++ depends on IP_NF_IPTABLES
++ help
++ This option adds a `fuzzy' match, which allows you to match
++ packets according to a fuzzy logic based law.
++
++ 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:53:15.000000000
+0200
+@@ -0,0 +0,1 @@
++obj-$(CONFIG_IP_NF_MATCH_FUZZY) += ipt_fuzzy.o
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/ipt_fuzzy.c
linux-2.6.14/net/ipv4/netfilter/ipt_fuzzy.c
+--- linux-2.6.14.org/net/ipv4/netfilter/ipt_fuzzy.c 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.14/net/ipv4/netfilter/ipt_fuzzy.c 2005-10-28
13:53:15.000000000 +0200
@@ -0,0 +1,185 @@
+/*
+ * This module implements a simple TSK FLC
@@ -247,16 +271,16 @@
+
+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-10
04:42:58.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/Kconfig 2005-09-15 10:02:28.123713750
+0200
-@@ -692,5 +692,15 @@
- 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:53:15.000000000
+0200
+@@ -278,5 +278,15 @@
+ 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_FUZZY
-+ tristate 'fuzzy match support'
-+ depends on IP_NF_IPTABLES
++config IP6_NF_MATCH_FUZZY
++ tristate 'Fuzzy match support'
++ depends on IP6_NF_FILTER
+ help
+ This option adds a `fuzzy' match, which allows you to match
+ packets according to a fuzzy logic based law.
@@ -266,21 +290,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 10:02:28.127712000
+0200
-@@ -45,6 +45,8 @@
- obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o
- obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_owner.o
- obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
-+
-+obj-$(CONFIG_IP_NF_MATCH_FUZZY) += ipt_fuzzy.o
- obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
- obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
- obj-$(CONFIG_IP_NF_MATCH_DSCP) += ipt_dscp.o
-diff -uNr linux-2.6.13.1/net.orig/ipv6/netfilter/ip6t_fuzzy.c
linux-2.6.13.1/net/ipv6/netfilter/ip6t_fuzzy.c
---- linux-2.6.13.1/net.orig/ipv6/netfilter/ip6t_fuzzy.c 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.13.1/net/ipv6/netfilter/ip6t_fuzzy.c 2005-09-15
10:02:28.119715500 +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:53:15.000000000
+0200
+@@ -0,0 +0,1 @@
++obj-$(CONFIG_IP6_NF_MATCH_FUZZY) += ip6t_fuzzy.o
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv6/netfilter/ip6t_fuzzy.c
linux-2.6.14/net/ipv6/netfilter/ip6t_fuzzy.c
+--- linux-2.6.14.org/net/ipv6/netfilter/ip6t_fuzzy.c 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.14/net/ipv6/netfilter/ip6t_fuzzy.c 2005-10-28
13:53:15.000000000 +0200
@@ -0,0 +1,188 @@
+/*
+ * This module implements a simple TSK FLC
@@ -470,27 +487,3 @@
+
+module_init(init);
+module_exit(fini);
-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 10:02:28.131710250
+0200
-@@ -238,5 +238,15 @@
- 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_FUZZY
-+ tristate 'Fuzzy match support'
-+ depends on IP6_NF_FILTER
-+ help
-+ This option adds a `fuzzy' match, which allows you to match
-+ packets according to a fuzzy logic based law.
-+
-+ 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 10:02:28.131710250
+0200
-@@ -0,0 +0,1 @@
-+obj-$(CONFIG_IP6_NF_MATCH_FUZZY) += ip6t_fuzzy.o
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-nf-fuzzy.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
