aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2013-05-27 15:13:19 +0000
committerJo-Philipp Wich <jow@openwrt.org>2013-05-27 15:13:19 +0000
commit63603ee47865b15f3ecf288a82d0692b913620ec (patch)
treeb3a37ac3bcb4af4fee7b29bb79dada20557bea08
parentfe42794fe680f3d1d13522d33d563f264000b397 (diff)
downloadupstream-63603ee47865b15f3ecf288a82d0692b913620ec.tar.gz
upstream-63603ee47865b15f3ecf288a82d0692b913620ec.tar.bz2
upstream-63603ee47865b15f3ecf288a82d0692b913620ec.zip
firewall3: update to git head
- allows building without IPv6 support - uses more robust rules to cope with missing libext.a - uses better linking strategy to avoid symbol clashes with older iptables - introduces source compatiblity layer for different libxtables versions SVN-Revision: 36736
-rw-r--r--package/network/config/firewall3/Makefile17
1 files changed, 9 insertions, 8 deletions
diff --git a/package/network/config/firewall3/Makefile b/package/network/config/firewall3/Makefile
index 8b03958f7a..7a396847be 100644
--- a/package/network/config/firewall3/Makefile
+++ b/package/network/config/firewall3/Makefile
@@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=firewall3
-PKG_VERSION:=2013-05-26
+PKG_VERSION:=2013-05-27
PKG_RELEASE:=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://nbd.name/firewall3.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=d2a8a3f6a29746a3a07d2e3415737bcc2241afce
+PKG_SOURCE_VERSION:=73805dcc03e242fe5e25c9764ed33456acebdb95
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
@@ -27,7 +27,7 @@ define Package/firewall3
SECTION:=net
CATEGORY:=Network
TITLE:=UCI C Firewall
- DEPENDS:=+libubox +libubus +libuci +libip4tc +libip6tc +libxtables
+ DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libxtables
endef
define Package/firewall3/description
@@ -39,15 +39,16 @@ define Package/firewall3/conffiles
/etc/firewall.user
endef
-define Build/Compile
- $(CP) $(lastword $(wildcard $(KERNEL_BUILD_DIR)/iptables-*/extensions/libext.a)) $(PKG_BUILD_DIR)/libext.a
- $(CP) $(lastword $(wildcard $(KERNEL_BUILD_DIR)/iptables-*/extensions/libext4.a)) $(PKG_BUILD_DIR)/libext4.a
- $(CP) $(lastword $(wildcard $(KERNEL_BUILD_DIR)/iptables-*/extensions/libext6.a)) $(PKG_BUILD_DIR)/libext6.a
- $(call Build/Compile/Default)
+define Build/Configure
+ $(foreach file,$(lastword $(wildcard $(KERNEL_BUILD_DIR)/iptables-*/extensions/libext.a)),$(CP) $(file) $(PKG_BUILD_DIR)/libext.a)
+ $(foreach file,$(lastword $(wildcard $(KERNEL_BUILD_DIR)/iptables-*/extensions/libext4.a)),$(CP) $(file) $(PKG_BUILD_DIR)/libext4.a)
+ $(foreach file,$(lastword $(wildcard $(KERNEL_BUILD_DIR)/iptables-*/extensions/libext6.a)),$(CP) $(file) $(PKG_BUILD_DIR)/libext6.a)
+ $(call Build/Configure/Default)
endef
TARGET_CFLAGS += -ffunction-sections -fdata-sections
TARGET_LDFLAGS += -Wl,--gc-sections
+CMAKE_OPTIONS += $(if $(CONFIG_IPV6),,-DDISABLE_IPV6=1)
define Package/firewall3/install
$(INSTALL_DIR) $(1)/sbin