From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 13 Mar 2013 15:46:30 +0000 (+0000)
Subject: firewall3: update to git head
X-Git-Tag: reboot~10960
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9faa312dbb3391ffb97516802331d86da2b2ee6b;p=oweals%2Fopenwrt.git

firewall3: update to git head

 * Adds support for emitting hotplug events when creating and clearing zones (fixes miniupnpd)
 * Make NAT reflection direction configurable
 * Map init script stop action to flush
 * Map init script reload action to reload
 * Respect init script disabled state in hotplug handler

SVN-Revision: 35998
---

diff --git a/package/network/config/firewall3/Makefile b/package/network/config/firewall3/Makefile
index 5b20dadefe..342f4ad58d 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-03-11
+PKG_VERSION:=2013-03-13
 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:=87c4f12e16ae726e20774ee58468fa751a79a2c1
+PKG_SOURCE_VERSION:=ff9d5e13c9150c62fe698e4bc5541e6f92b241d0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
 
diff --git a/package/network/config/firewall3/files/firewall.hotplug b/package/network/config/firewall3/files/firewall.hotplug
index dbb98cdcd2..34f3afec9b 100644
--- a/package/network/config/firewall3/files/firewall.hotplug
+++ b/package/network/config/firewall3/files/firewall.hotplug
@@ -2,6 +2,8 @@
 
 [ "$ACTION" = ifup ] || exit 0
 
+/etc/init.d/firewall enabled || exit 0
+
 fw3 -q network "$INTERFACE" >/dev/null || exit 0
 
 logger -t firewall "Reloading firewall due to ifup of $INTERFACE ($DEVICE)"
diff --git a/package/network/config/firewall3/files/firewall.init b/package/network/config/firewall3/files/firewall.init
index 8c1dbd94ca..64e3a8c12b 100755
--- a/package/network/config/firewall3/files/firewall.init
+++ b/package/network/config/firewall3/files/firewall.init
@@ -13,9 +13,13 @@ start() {
 }
 
 stop() {
-	fw3 stop
+	fw3 flush
 }
 
 restart() {
 	fw3 restart
 }
+
+reload() {
+	fw3 reload
+}