[packages] iptables: add an iptables-mod-ipset package (closes: #6327)

[openwrt/svn-archive/archive.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index b8164458ee78bdbfdc8117fb2a551780bcba4b1b..60f4754ca9842c2738d03d5dee138250be59f282 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=iptables
 PKG_VERSION:=1.4.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_MD5SUM:=08cd9196881657ea0615d926334cb7e9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -19,11 +19,7 @@ PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
        ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \
        ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
 
-ifeq ($(CONFIG_EXTERNAL_KERNEL_TREE),)
-PATCH_DIR:=
-else
 PATCH_DIR:=./patches/$(PKG_VERSION)
-endif
 
 PKG_FIXUP = libtool
 
@@ -37,7 +33,7 @@ endif
 
 define Package/iptables/Default
   SECTION:=net
-  CATEGORY:=Base system
+  CATEGORY:=Network
   URL:=http://netfilter.org/
 endef
 
@@ -56,6 +52,7 @@ endef
 define Package/iptables/description
  IPv4 firewall administration tool.
  Includes support for:
+ - comment
  - limit
  - LOG
  - mac
@@ -145,6 +142,18 @@ define Package/iptables-mod-ipsec/description
  - libipt_policy
 endef
 
+define Package/iptables-mod-ipset
+$(call Package/iptables/Module, @LINUX_2_6)
+  TITLE:=IPset iptables extensions
+endef
+
+define Package/iptables-mod-ipset/description
+ IPset iptables extensions.
+ Includes:
+ - libipt_set
+ - libipt_SET
+endef
+
 define Package/iptables-mod-nat
 $(call Package/iptables/Module, +kmod-ipt-nat)
   TITLE:=Basic NAT extensions
@@ -207,11 +216,6 @@ define Package/iptables-mod-extra/description
  - libipt_NOTRACK
 endef
 
-define Package/iptables-mod-ipset
-$(call Package/iptables/Module, +kmod-ipt-ipset)
-  TITLE:=IPset extension
-endef
-
 define Package/iptables-utils
 $(call Package/iptables/Module, )
   TITLE:=iptables save and restore utilities
@@ -252,7 +256,6 @@ TARGET_CPPFLAGS := \
        -I$(LINUX_DIR)/arch/$(LINUX_KARCH)/include \
        $(TARGET_CPPFLAGS)
 
-TARGET_CFLAGS += $(FPIC)
 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
@@ -365,11 +368,11 @@ $(eval $(call BuildPackage,iptables-utils))
 $(eval $(call BuildPlugin,iptables-mod-conntrack,$(IPT_CONNTRACK-m)))
 $(eval $(call BuildPlugin,iptables-mod-conntrack-extra,$(IPT_CONNTRACK_EXTRA-m)))
 $(eval $(call BuildPlugin,iptables-mod-extra,$(IPT_EXTRA-m)))
-$(eval $(call BuildPlugin,iptables-mod-ipset,$(IPT_IPSET-m)))
 $(eval $(call BuildPlugin,iptables-mod-filter,$(IPT_FILTER-m),$(L7_INSTALL)))
 $(eval $(call BuildPlugin,iptables-mod-imq,$(IPT_IMQ-m)))
 $(eval $(call BuildPlugin,iptables-mod-ipopt,$(IPT_IPOPT-m)))
 $(eval $(call BuildPlugin,iptables-mod-ipsec,$(IPT_IPSEC-m)))
+$(eval $(call BuildPlugin,iptables-mod-ipset,ipt_set ipt_SET))
 $(eval $(call BuildPlugin,iptables-mod-nat,$(IPT_NAT-m)))
 $(eval $(call BuildPlugin,iptables-mod-nat-extra,$(IPT_NAT_EXTRA-m)))
 $(eval $(call BuildPlugin,iptables-mod-iprange,$(IPT_IPRANGE-m)))