diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-05-21 10:15:14 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-05-21 10:15:14 +0000 |
| commit | 9d75416aa2759ea75671aae8eb341a8b0c288f71 (patch) | |
| tree | 53926be697e5b7291eff84961198a8cbb79e6368 /package/network | |
| parent | 1fe7b86b6dcaf68160dc1afcb95dbbb9c6b474e2 (diff) | |
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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36681 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network')
| -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 |