[backfire] merge r26382

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26383 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index a8a62c287d033d153a0b20f2a11e3778a9599b69..7103a176db965571b7d11227c4d68b08468871ee 100644 (file)
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=2
 PKG_NAME:=firewall
 
 PKG_VERSION:=2

-PKG_RELEASE:=23
+PKG_RELEASE:=24

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/package/firewall/files/lib/core_interface.sh b/package/firewall/files/lib/core_interface.sh
index aff66418079f0934530c75907217e478d8f39f69..ed6a4b150fd9414f0a229903445d86b30fc1f375 100644 (file)
--- a/package/firewall/files/lib/core_interface.sh
+++ b/package/firewall/files/lib/core_interface.sh
@@ -4,7 +4,10 @@ fw__uci_state_add() {
        local var="$1"
        local item="$2"
 
        local var="$1"
        local item="$2"
 

-       local val="$(uci_get_state firewall core $var)"
+       local val=" $(uci_get_state firewall core $var) "
+       val="${val// $item / }"
+       val="${val# }"
+       val="${val% }"

        uci_set_state firewall core $var "${val:+$val }$item"
 }
 
        uci_set_state firewall core $var "${val:+$val }$item"
 }