[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: fix dnsmasq resolvfile path (coolsnowwolf#5159) Bump v2ray-plugin to 1.3.4 (coolsnowwolf#5152)
wdza1234 · Jul 22, 2020 · 3f66210 · 3f66210
2 parents bf4f41f + 0866d17
commit 3f66210
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/package/lean/dnsforwarder/files/etc/init.d/dnsforwarder b/package/lean/dnsforwarder/files/etc/init.d/dnsforwarder
@@ -202,7 +202,7 @@ stop()
     local addr=$(uci get dnsforwarder.@arguments[0].addr 2>/dev/null)
     addr=${addr/:/#}
     uci del_list dhcp.@dnsmasq[0].server=$addr 2>/dev/null
-    uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto 2>/dev/null
+    uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto 2>/dev/null
     uci delete dhcp.@dnsmasq[0].noresolv 2>/dev/null
 	uci delete dhcp.@dnsmasq[0].serversfile 2>/dev/null
     uci commit dhcp	

diff --git a/package/lean/luci-app-flowoffload/root/etc/init.d/flowoffload b/package/lean/luci-app-flowoffload/root/etc/init.d/flowoffload
@@ -139,14 +139,14 @@ stop_pdnsd() {
 change_dns() {
  	uci delete dhcp.@dnsmasq[0].server >/dev/null 2>&1
 	uci add_list dhcp.@dnsmasq[0].server=127.0.0.1#5333
-	uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto
+	uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto
 	uci set dhcp.@dnsmasq[0].noresolv=0
 	uci commit dhcp
 }
 
 revert_dns() {
 	uci del_list dhcp.@dnsmasq[0].server=127.0.0.1#5333 >/dev/null 2>&1
-	uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto
+	uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto
 	uci set dhcp.@dnsmasq[0].noresolv=0
 	uci commit dhcp
 }

diff --git a/package/lean/luci-app-sfe/root/etc/init.d/sfe b/package/lean/luci-app-sfe/root/etc/init.d/sfe
@@ -133,14 +133,14 @@ EOF
 change_dns() {
  	uci delete dhcp.@dnsmasq[0].server >/dev/null 2>&1
 	uci add_list dhcp.@dnsmasq[0].server=127.0.0.1#5333
-	uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto
+	uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto
 	uci set dhcp.@dnsmasq[0].noresolv=0
 	uci commit dhcp
 }
 
 revert_dns() {
 	uci del_list dhcp.@dnsmasq[0].server=127.0.0.1#5333 >/dev/null 2>&1
-	uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto
+	uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto
 	uci set dhcp.@dnsmasq[0].noresolv=0
 	uci commit dhcp
 }
@@ -203,4 +203,4 @@ restart(){
 	  stop
 	  start
 	  /etc/init.d/dnsmasq restart && echo "DNSMASQ restart"
-}
+}
diff --git a/package/lean/v2ray-plugin/Makefile b/package/lean/v2ray-plugin/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2ray-plugin
-PKG_VERSION:=1.3.3
+PKG_VERSION:=1.3.4
 PKG_RELEASE:=1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/teddysun/v2ray-plugin/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=913c6e1b6f8c57bca07685eb854ff0e00de4fd09f42b88c3b399880934410cc1
+PKG_HASH:=59f91575953e8289d0f6d007836eab169b8ee62e44b31b1a3eef61525db1e69c
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE