[netfilter-cvslog] r3271 - in trunk/patch-o-matic-ng/nf_conntrack: . linux-2.6/net/netfilter

[yasuyuki at netfilter.org]

Author: yasuyuki at netfilter.org
Date: 2004-11-10 20:57:53 +0100 (Wed, 10 Nov 2004)
New Revision: 3271

Modified:
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6.patch
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/Kconfig
Log:
fixed dependencies



Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/Kconfig
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/Kconfig	2004-11-10 19:53:41 UTC (rev 3270)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/Kconfig	2004-11-10 19:57:53 UTC (rev 3271)
@@ -31,8 +31,9 @@
 
 	  If unsure, say `N'.
 
-config IP_NF_CONNTRACK_MARK
+config NF_CONNTRACK_MARK
 	bool  'Connection mark tracking support'
+	depends on NF_CONNTRACK
 	help
 	  This option enables support for connection marks, used by the
 	  `CONNMARK' target and `connmark' match. Similar to the mark value
@@ -41,7 +42,7 @@
 
 config NF_CT_PROTO_SCTP
 	tristate 'SCTP protocol on new connection tracking support (EXPERIMENTAL)'
-	depends on EXPERIMENTAL && NET && NF_CONNTRACK
+	depends on EXPERIMENTAL && NF_CONNTRACK
 	default n
 	help
 	  With this option enabled, the layer 3 independent connection

Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6.patch
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6.patch	2004-11-10 19:53:41 UTC (rev 3270)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6.patch	2004-11-10 19:57:53 UTC (rev 3271)
@@ -87,15 +87,14 @@
 +# l3 independent conntrack
 +obj-$(CONFIG_NF_CONNTRACK_IPV6) += nf_conntrack_ipv6.o
 --- linux-2.6.10-rc1/net/ipv6/netfilter/Kconfig	2004-10-19 06:55:06.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/net/ipv6/netfilter/Kconfig	2004-11-11 04:23:17.879109160 +0900
-@@ -239,5 +239,20 @@ config IP6_NF_RAW
++++ linux-2.6.10-rc1-nfct/net/ipv6/netfilter/Kconfig	2004-11-10 23:49:32.000000000 +0900
+@@ -239,5 +239,19 @@ config IP6_NF_RAW
  	  <file:Documentation/modules.txt>.  If unsure, say `N'.
  	  help
  
 +config NF_CONNTRACK_IPV6
 +	tristate "IPv6 support on new connection tracking (EXPERIMENTAL)"
-+	depends on EXPERIMENTAL && ! IP6_NF_CONNTRACK
-+	select NF_CONNTRACK
++	depends on EXPERIMENTAL && NF_CONNTRACK
 +	---help---
 +	  Connection tracking keeps a record of what packets have passed
 +	  through your machine, in order to figure out how they are related
@@ -122,15 +121,14 @@
 +# l3 independent conntrack
 +obj-$(CONFIG_NF_CONNTRACK_IPV4) += nf_conntrack_ipv4.o
 --- linux-2.6.10-rc1/net/ipv4/netfilter/Kconfig	2004-11-10 21:58:52.000000000 +0900
-+++ linux-2.6.10-rc1-nfct/net/ipv4/netfilter/Kconfig	2004-11-11 04:23:22.683378800 +0900
-@@ -732,5 +732,20 @@ config IP_NF_COMPAT_IPFWADM
++++ linux-2.6.10-rc1-nfct/net/ipv4/netfilter/Kconfig	2004-11-10 23:49:09.000000000 +0900
+@@ -732,5 +732,19 @@ config IP_NF_COMPAT_IPFWADM
  
  	  To compile it as a module, choose M here.  If unsure, say N.
  
 +config NF_CONNTRACK_IPV4
 +	tristate "IPv4 support on new connection tracking (EXPERIMENTAL)"
-+	depends on EXPERIMENTAL && !IP_NF_CONNTRACK
-+	select NF_CONNTRACK
++	depends on EXPERIMENTAL && NF_CONNTRACK && IP_NF_CONNTRACK!=y
 +	---help---
 +	  Connection tracking keeps a record of what packets have passed
 +	  through your machine, in order to figure out how they are related