aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2013-03-11 20:52:20 +0000
committerJo-Philipp Wich <jow@openwrt.org>2013-03-11 20:52:20 +0000
commit8c7ed1cb7bcaaec8fa55d5695ab68ac9e9051791 (patch)
tree5eb9f1cc4b777369bb4ecd673b2ea3b135ea182b
parent14ca5fc98b31b75eecc367a6a5945ef57a8d6e3c (diff)
downloadupstream-8c7ed1cb7bcaaec8fa55d5695ab68ac9e9051791.tar.gz
upstream-8c7ed1cb7bcaaec8fa55d5695ab68ac9e9051791.tar.bz2
upstream-8c7ed1cb7bcaaec8fa55d5695ab68ac9e9051791.zip
firewall3: update to git head
* Fixes compilation against eglibc * Fixes tracking logic when selectively restarting IPv4 or IPv6 firewall * Fixes tracking logic for user chains by differentiating between reloads and restarts * Introduces per-zone user chains {input,output,forwarding,prerouting,postrouting}_$zone_rule * Supports legacy "tcpudp" protocol notation again SVN-Revision: 35969
-rw-r--r--package/network/config/firewall3/Makefile4
-rw-r--r--package/network/config/firewall3/files/firewall.user3
2 files changed, 5 insertions, 2 deletions
diff --git a/package/network/config/firewall3/Makefile b/package/network/config/firewall3/Makefile
index cd9405eae4..5b20dadefe 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-02
+PKG_VERSION:=2013-03-11
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:=87c4f12e16ae726e20774ee58468fa751a79a2c1
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.user b/package/network/config/firewall3/files/firewall.user
index 1ccbd01657..6f799063f5 100644
--- a/package/network/config/firewall3/files/firewall.user
+++ b/package/network/config/firewall3/files/firewall.user
@@ -2,3 +2,6 @@
# Put your custom iptables rules here, they will
# be executed with each firewall (re-)start.
+# Internal uci firewall chains are flushed and recreated on reload, so
+# put custom rules into the root chains e.g. INPUT or FORWARD or into the
+# special user chains, e.g. input_wan_rule or postrouting_lan_rule.