X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e465c308ee73e9c014cdec1cb5d13ee7c6a576ba..fd7d7215c62c223031426b1b84e96cd4186bd148:/package/iptables/Makefile?ds=sidebyside

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index d22310a0e..83f615250 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=iptables
-PKG_VERSION:=1.3.5
+PKG_VERSION:=1.3.8
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -18,16 +18,13 @@ PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
 	ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \
 	ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \
 	ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
-PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5
-PKG_CAT:=bzcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=0a9209f928002e5eee9cdff8fef4d4b3
 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
   -include $(LINUX_DIR)/.config
   include $(INCLUDE_DIR)/netfilter.mk
+  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep 'NETFILTER' $(LINUX_DIR)/.config | md5s)
 endif
 
 define Package/iptables/Default
@@ -74,7 +71,7 @@ endef
 
 define Package/iptables-mod-imq
   $(call Package/iptables/Default)
-  DEPENDS:=iptables
+  DEPENDS:=iptables +kmod-ipt-imq
   TITLE:=IMQ support
   DESCRIPTION:=\
 	iptables extension for IMQ support.\\\
@@ -91,6 +88,7 @@ define Package/iptables-mod-ipopt
 	iptables extensions for matching/changing IP packet options.\\\
 	\\\
 	Includes: \\\
+	- libipt_CLASSIFY \\\
 	- libipt_dscp/DSCP \\\
 	- libipt_ecn/ECN \\\
 	- libipt_length \\\
@@ -135,6 +133,17 @@ define Package/iptables-mod-ulog
 	- libipt_ULOG
 endef
 
+define Package/iptables-mod-iprange
+  $(call Package/iptables/Default)
+  DEPENDS:=iptables +kmod-ipt-iprange
+  TITLE:=ip range module
+  DESCRIPTION:=\
+	iptables extensions for matching ip ranges.\\\
+	\\\
+	Includes: \\\
+	- libipt_iprange
+endef
+
 define Package/iptables-mod-extra
   $(call Package/iptables/Default)
   DEPENDS:=iptables +kmod-ipt-extra
@@ -147,7 +156,16 @@ define Package/iptables-mod-extra
 	- libipt_owner \\\
 	- libipt_physdev \\\
 	- libipt_pkttype \\\
-	- libipt_recent
+	- libipt_recent \\\
+	- libipt_NOTRACK
+endef
+
+define Package/iptables-mod-ipset
+  $(call Package/iptables/Default)
+  DEPENDS:=iptables +kmod-ipt-ipset
+  TITLE:=ipset iptables extension
+  DESCRIPTION:=\
+    ipset
 endef
 
 define Package/iptables-utils
@@ -158,11 +176,15 @@ endef
 
 define Package/ip6tables
   $(call Package/iptables/Default)
+  DEPENDS:=+kmod-ipv6
   CATEGORY:=Network
   TITLE:=IPv6 firewall administration tool
 endef
 
 define Build/Configure
+	rm -f $(PKG_BUILD_DIR)/.configured*
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		clean
 endef
 
 define Build/Compile
@@ -171,6 +193,7 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		COPT_FLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="-rdynamic -static-libgcc" \
 		KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
@@ -241,17 +264,20 @@ define BuildPlugin
   $$(eval $$(call BuildPackage,$(1)))
 endef
 
-L7_INSTALL:=mkdir -p $$(1)/etc/l7-protocols; \
+L7_INSTALL:=\
+	$(INSTALL_DIR) $$(1)/etc/l7-protocols; \
 	$(CP) files/l7/*.pat $$(1)/etc/l7-protocols/
 
 $(eval $(call BuildPackage,iptables))
 $(eval $(call BuildPackage,iptables-utils))
 $(eval $(call BuildPlugin,iptables-mod-conntrack,$(IPT_CONNTRACK-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-nat,$(IPT_NAT-m)))
+$(eval $(call BuildPlugin,iptables-mod-iprange,$(IPT_IPRANGE-m)))
 $(eval $(call BuildPlugin,iptables-mod-ulog,$(IPT_ULOG-m)))
 $(eval $(call BuildPackage,ip6tables))