From: Jo-Philipp Wich Date: Tue, 1 Mar 2011 18:05:03 +0000 (+0000) Subject: [backfire] merge r25813 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=26563ec3d9b73375444e5e99e369d20d3d8059a8;p=openwrt%2Fsvn-archive%2Farchive.git [backfire] merge r25813 SVN-Revision: 25814 --- diff --git a/package/firewall/Makefile b/package/firewall/Makefile index 4a8a5d3199..3d61e09889 100644 --- a/package/firewall/Makefile +++ b/package/firewall/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2010 OpenWrt.org +# Copyright (C) 2008-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=firewall PKG_VERSION:=2 -PKG_RELEASE:=21 +PKG_RELEASE:=22 include $(INCLUDE_DIR)/package.mk diff --git a/package/firewall/files/lib/core_interface.sh b/package/firewall/files/lib/core_interface.sh index f08975952c..aff6641807 100644 --- a/package/firewall/files/lib/core_interface.sh +++ b/package/firewall/files/lib/core_interface.sh @@ -70,6 +70,9 @@ fw_configure_interface() { # Need v4 while zone is v6 */*.*) fw_log info "zone $zone does not support IPv4 address family, skipping"; return ;; + + # Strip prefix + *) mode="${mode#G}" ;; esac lock /var/run/firewall-interface.lock