X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fnetwork%2Fconfig%2Ffirewall3%2FMakefile;h=73941dae2f604bd9c27eadcb3d1212bdf2e5d69d;hb=44f73b0dc3d2d513c7bda1d47e9f9dc7bde99570;hp=cd9405eae44a6bcd2a9eb2172ea51b8d04853306;hpb=db9eb03b3f0cc017aa29ab804fadf63006bb9b24;p=openwrt.git

diff --git a/package/network/config/firewall3/Makefile b/package/network/config/firewall3/Makefile
index cd9405eae4..73941dae2f 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-03-02
+PKG_VERSION:=2013-05-23
 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:=46536e5263c4bf57a91c38b5d08d78c774649dda
+PKG_SOURCE_VERSION:=c3a5b984f6cec4014c1120ee900a53b452eb9e32
 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/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)
+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