X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fnetfilter.mk;h=101550eac8c7e189e7ff73e72773bda8bd3335ae;hb=757f523019dd61e625d909fd5b5698e6844870ca;hp=c17c8a8def3116c673ef0e7f61af1d8565607917;hpb=92541a3db8fad83ec110efa3468aea0c0900fb45;p=openwrt.git

diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index c17c8a8def..101550eac8 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -1,10 +1,10 @@
+
 #
 # Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 NF_MENU:=Netfilter Extensions
 NF_KMOD:=1
@@ -79,14 +79,14 @@ define KernelPackage/ipt-filter
   KCONFIG:=$(KCONFIG_IPT_FILTER)
   FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_FILTER-m)))
-  DEPENDS:= kmod-ipt-core
+  DEPENDS:=kmod-ipt-core +LINUX_2_6:kmod-textsearch
 endef
 
 define KernelPackage/ipt-filter/description
  Netfilter (IPv4) kernel modules for packet content inspection
  Includes:
- - ipt_ipp2p
  - ipt_layer7
+ - ipt_string
 endef
 
 $(eval $(call KernelPackage,ipt-filter))
@@ -203,7 +203,7 @@ define KernelPackage/ipt-nathelper-extra
   KCONFIG:=$(KCONFIG_IPT_NATHELPER_EXTRA)
   FILES:=$(foreach mod,$(IPT_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER_EXTRA-m)))
-  DEPENDS:= kmod-ipt-core +kmod-ipt-nat
+  DEPENDS:= kmod-ipt-core +kmod-ipt-nat +kmod-textsearch
 endef
 
 define KernelPackage/ipt-nathelper-extra/description
@@ -229,7 +229,7 @@ define KernelPackage/ipt-imq
 	CONFIG_IMQ \
 	CONFIG_IMQ_BEHAVIOR_BA=y \
 	CONFIG_IMQ_NUM_DEVS=2 \
-	CONFIG_IP_NF_TARGET_IMQ
+	CONFIG_NETFILTER_XT_TARGET_IMQ
   FILES:= \
 	$(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX) \
 	$(foreach mod,$(IPT_IMQ-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
@@ -237,7 +237,7 @@ define KernelPackage/ipt-imq
 	imq \
 	$(IPT_IMQ-m) \
   ))
-  DEPENDS:= kmod-ipt-core @!LINUX_2_6_27 @!LINUX_2_6_28
+  DEPENDS:= kmod-ipt-core
 endef
 
 define KernelPackage/ipt-imq/description
@@ -328,14 +328,13 @@ endef
 $(eval $(call KernelPackage,ipt-ipset))
 
 
-# XXX: broken on 2.6.28 to xt_CHAOS module
 define KernelPackage/ipt-extra
   SUBMENU:=$(NF_MENU)
   TITLE:=Extra modules
   KCONFIG:=$(KCONFIG_IPT_EXTRA)
   FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_EXTRA-m)))
-  DEPENDS:= kmod-ipt-core @LINUX_2_6_28:BROKEN
+  DEPENDS:= kmod-ipt-core
 endef
 
 define KernelPackage/ipt-extra/description
@@ -347,9 +346,6 @@ define KernelPackage/ipt-extra/description
  - ipt_recent
  - iptable_raw
  - xt_NOTRACK
- - xt_TARPIT
- - xt_DELUDE
- - xt_CHAOS
 endef
 
 $(eval $(call KernelPackage,ipt-extra))