X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5ca0f209d11408421dbf1e5f26e83003b0c90c88..c8ff8610bfef399cbbd968acd395aca5acb6902f:/package/iptables/Makefile?ds=sidebyside diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 962ca7d0e..7d34cc68e 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.7 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:=dd965bdacbb86ce2a6498829fddda6b7 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 \\\ @@ -147,7 +145,8 @@ define Package/iptables-mod-extra - libipt_owner \\\ - libipt_physdev \\\ - libipt_pkttype \\\ - - libipt_recent + - libipt_recent \\\ + - libipt_NOTRACK endef define Package/iptables-utils @@ -163,6 +162,9 @@ define Package/ip6tables endef define Build/Configure + rm -f $(PKG_BUILD_DIR)/.configured* + $(MAKE) -C $(PKG_BUILD_DIR) \ + clean endef define Build/Compile @@ -171,6 +173,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 @@ -188,6 +191,7 @@ define Build/InstallDev endef define Build/UninstallDev + rm -rf $(STAGING_DIR)/usr/include/libipq.h rm -rf $(STAGING_DIR)/usr/include/libipulog rm -rf $(STAGING_DIR)/usr/include/libipq rm -rf $(STAGING_DIR)/usr/include/libiptc @@ -240,7 +244,8 @@ 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))