diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2013-05-21 10:15:14 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2013-05-21 10:15:14 +0000 |
| commit | e8050c6c35166beeec4b1d9c80dbb8b9576c433c (patch) | |
| tree | 8e4e9f1a2363ac33db5fb1b481ccb2469e5f627d | |
| parent | a9a9644efd21e9bd907055f42e6a4351c9f48fad (diff) | |
| download | upstream-e8050c6c35166beeec4b1d9c80dbb8b9576c433c.tar.gz upstream-e8050c6c35166beeec4b1d9c80dbb8b9576c433c.tar.bz2 upstream-e8050c6c35166beeec4b1d9c80dbb8b9576c433c.zip | |
firewall3: update to git head
* use libiptc and libxtables directly to manage ruleset, iptables-restore is unreliable and prone to race conditions
* make ipset integration more reliable
SVN-Revision: 36681
| -rw-r--r-- | package/network/config/firewall3/Makefile | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/package/network/config/firewall3/Makefile b/package/network/config/firewall3/Makefile index 027fbc8d72..1ab4eaa472 100644 --- a/package/network/config/firewall3/Makefile +++ b/package/network/config/firewall3/Makefile @@ -8,25 +8,26 @@ include $(TOPDIR)/rules.mk PKG_NAME:=firewall3 -PKG_VERSION:=2013-05-13 +PKG_VERSION:=2013-05-21 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:=8875f2d067b84a40731983fd495f3e0e4daa493b +PKG_SOURCE_VERSION:=54904110e3122f4fcded32f5ff6ef30f7de7363c PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org> include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/cmake.mk define Package/firewall3 SECTION:=net CATEGORY:=Network TITLE:=UCI C Firewall - DEPENDS:=+libubox +libubus +libuci + DEPENDS:=+libubox +libubus +libuci +libip4tc +libip6tc +libxtables endef define Package/firewall3/description @@ -38,6 +39,16 @@ define Package/firewall3/conffiles /etc/firewall.user endef +define Build/Prepare + $(call Build/Prepare/Default) + $(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 +endef + +TARGET_CFLAGS += -ffunction-sections -fdata-sections +TARGET_LDFLAGS += -Wl,--gc-sections + define Package/firewall3/install $(INSTALL_DIR) $(1)/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/firewall3 $(1)/sbin/fw3 |