Author: arekm Date: Wed Aug 6 18:44:02 2008 GMT
Module: SOURCES Tag: LINUX_2_6_25
---- Log message:
- apply Makefile/Kconfig chunks so this patch is actually useful
---- Files affected:
SOURCES:
kernel-pom-ng-set.patch (1.1.2.11 -> 1.1.2.11.4.1)
---- Diffs:
================================================================
Index: SOURCES/kernel-pom-ng-set.patch
diff -u SOURCES/kernel-pom-ng-set.patch:1.1.2.11
SOURCES/kernel-pom-ng-set.patch:1.1.2.11.4.1
--- SOURCES/kernel-pom-ng-set.patch:1.1.2.11 Tue Jul 8 18:23:29 2008
+++ SOURCES/kernel-pom-ng-set.patch Wed Aug 6 20:43:56 2008
@@ -7493,10 +7493,12 @@
+
+module_init(ipt_SET_init);
+module_exit(ipt_SET_fini);
-diff -uNrp --exclude=.svn a/net/ipv4/netfilter/Kconfig.ladd
linux-2.6/net/ipv4/netfilter/Kconfig.ladd
---- a/net/ipv4/netfilter/Kconfig.ladd 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6/net/ipv4/netfilter/Kconfig.ladd 2008-07-08 16:52:53.965201208
+0200
-@@ -0,0 +1,116 @@
+--- kernel/net/ipv4/netfilter/Kconfig.org 2008-08-06 20:35:42.768202192
+0200
++++ kernel/net/ipv4/netfilter/Kconfig 2008-08-06 20:35:58.478614819 +0200
+@@ -402,5 +402,122 @@
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+config IP_NF_SET
+ tristate "IP set support"
+ depends on INET && NETFILTER
@@ -7613,17 +7615,24 @@
+
+ To compile it as a module, choose M here. If unsure, say N.
+
-diff -uNrp --exclude=.svn a/net/ipv4/netfilter/Makefile.ladd
linux-2.6/net/ipv4/netfilter/Makefile.ladd
---- a/net/ipv4/netfilter/Makefile.ladd 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6/net/ipv4/netfilter/Makefile.ladd 2008-07-08 16:52:53.965201208
+0200
-@@ -0,0 +1,2 @@
-+obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
++
+ endmenu
+
+diff -uNrp --exclude=.svn a/net/ipv4/netfilter/Makefile
linux-2.6/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6/net/ipv4/netfilter/Makefile 2008-07-08 16:52:53.965201208
+0200
+@@ -46,6 +46,7 @@
+ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
+ obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
+ obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
+obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
-diff -uNrp --exclude=.svn a/net/ipv4/netfilter/Makefile.ladd_2
linux-2.6/net/ipv4/netfilter/Makefile.ladd_2
---- a/net/ipv4/netfilter/Makefile.ladd_2 1970-01-01 01:00:00.000000000
+0100
-+++ linux-2.6/net/ipv4/netfilter/Makefile.ladd_2 2008-07-08
16:52:53.965201208 +0200
-@@ -0,0 +1,13 @@
-+obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
+
+ # targets
+ obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
+@@ -58,6 +59,18 @@
+ obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
+ obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
+ obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
+obj-$(CONFIG_IP_NF_TARGET_SET) += ipt_SET.o
+
+# sets
@@ -7636,3 +7645,6 @@
+obj-$(CONFIG_IP_NF_SET_IPPORTHASH) += ip_set_ipporthash.o
+obj-$(CONFIG_IP_NF_SET_IPTREE) += ip_set_iptree.o
+obj-$(CONFIG_IP_NF_SET_IPTREEMAP) += ip_set_iptreemap.o
+
+ obj-$(CONFIG_IP_NF_MATCH_IPV4OPTIONS) += ipt_ipv4options.o
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-pom-ng-set.patch?r1=1.1.2.11&r2=1.1.2.11.4.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
