luci-app-vpn-policy-routing: support phys-dev policies

Signed-off-by: Stan Grishin <[email protected]>

diff --git a/applications/luci-app-vpn-policy-routing/Makefile b/applications/luci-app-vpn-policy-routing/Makefile
index 7b1b2f6928f32fe9b9acfcfb9ac94424e6b81b7f..6daf81b5c8eb7e53268f351a1f61dcca1fd8f012 100644 (file)
--- a/applications/luci-app-vpn-policy-routing/Makefile
+++ b/applications/luci-app-vpn-policy-routing/Makefile
@@ -10,7 +10,7 @@ LUCI_TITLE:=VPN Policy-Based Routing Service Web UI
 LUCI_DESCRIPTION:=Provides Web UI for vpn-policy-routing service.
 LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +vpn-policy-routing
 LUCI_PKGARCH:=all
-PKG_RELEASE:=72
+PKG_RELEASE:=73
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua b/applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua
index 1004f827533516c5ea7f23da2d4f9dc0c5cadf64..692c771a43d1935f391265247ac170b231d62cc8 100644 (file)
--- a/applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua
+++ b/applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua
@@ -282,7 +282,7 @@ if laPlaceholder then
        la.placeholder = laPlaceholder
 end
 la.rmempty = true
-la.datatype    = 'list(neg(or(host,network,macaddr)))'
+la.datatype    = 'list(neg(or(host,network,macaddr,string)))'
 
 lp = p:option(Value, "src_port", translate("Local ports"))
 lp.datatype    = 'list(neg(or(portrange, string)))'

diff --git a/applications/luci-app-vpn-policy-routing/po/templates/vpn-policy-routing.pot b/applications/luci-app-vpn-policy-routing/po/templates/vpn-policy-routing.pot
index 55c9cd15e83ab2854d04ef2efb35f9cf80a09acb..49959784478beb29b0f661405804c20f90cbd2db 100644 (file)
--- a/applications/luci-app-vpn-policy-routing/po/templates/vpn-policy-routing.pot
+++ b/applications/luci-app-vpn-policy-routing/po/templates/vpn-policy-routing.pot
@@ -161,10 +161,6 @@ msgstr ""
 msgid "Force the ICMP protocol interface."
 msgstr ""
 
-#: applications/luci-app-vpn-policy-routing/root/usr/share/rpcd/acl.d/luci-app-vpn-policy-routing.json:3
-msgid "Grant UCI access for luci-app-vpn-policy-routing"
-msgstr ""
-
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:200
 msgid "IP Rules Support"
 msgstr ""