X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fnetwork%2Fconfig%2Ffirewall%2FMakefile;h=9a077241a31347d136093f5971a86baa2b9ed90c;hb=f6abd042c29f5a69d56151f884fbf4f4e834e674;hp=558e8633dbd1289a451611c617d7132c77d26940;hpb=2d506f46fb68d5290d4cfc4ebb43edeabe1595d6;p=openwrt%2Fopenwrt.git diff --git a/package/network/config/firewall/Makefile b/package/network/config/firewall/Makefile index 558e8633db..9a077241a3 100644 --- a/package/network/config/firewall/Makefile +++ b/package/network/config/firewall/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2013 OpenWrt.org +# Copyright (C) 2013-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,15 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=firewall -PKG_VERSION:=2013-06-29 +PKG_VERSION:=2015-07-22 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:=635d8b088607ccb7a3124ce43469cda52150f484 +PKG_SOURCE_VERSION:=980b7859bbd1db1e5e46422fccccbce38f9809ab PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MAINTAINER:=Jo-Philipp Wich +PKG_LICENSE:=ISC include $(INCLUDE_DIR)/package.mk @@ -26,7 +27,7 @@ define Package/firewall SECTION:=net CATEGORY:=Base system TITLE:=OpenWrt C Firewall - DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libxtables + DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libxtables +kmod-ipt-core +kmod-ipt-nat endef define Package/firewall/description @@ -38,11 +39,6 @@ define Package/firewall/conffiles /etc/firewall.user endef -define Build/Configure - $(foreach file,$(wildcard $(STAGING_DIR)/usr/lib/iptables/libext*.a),$(CP) $(file) $(PKG_BUILD_DIR)/$(notdir $(file));) - $(call Build/Configure/Default) -endef - TARGET_CFLAGS += -ffunction-sections -fdata-sections TARGET_LDFLAGS += -Wl,--gc-sections CMAKE_OPTIONS += $(if $(CONFIG_IPV6),,-DDISABLE_IPV6=1)