From f5b06268b4ff80b0e57ba0b77e765367c88cd296 Mon Sep 17 00:00:00 2001 From: ricksuzade-maker <58425544+ricksuzade-maker@users.noreply.github.com> Date: Wed, 22 Jul 2020 12:16:43 +0800 Subject: [PATCH 1/2] Bump v2ray-plugin to 1.3.4 (#5152) --- package/lean/v2ray-plugin/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/v2ray-plugin/Makefile b/package/lean/v2ray-plugin/Makefile index 0b89c1540bd7c1..dd32a5fdfe2894 100644 --- 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 From 0866d17f4f86b286a92ababad96b217b2d16627b Mon Sep 17 00:00:00 2001 From: Hugo Yuan <429632952@163.com> Date: Wed, 22 Jul 2020 16:43:42 +0800 Subject: [PATCH 2/2] fix dnsmasq resolvfile path (#5159) --- package/lean/dnsforwarder/files/etc/init.d/dnsforwarder | 2 +- .../lean/luci-app-flowoffload/root/etc/init.d/flowoffload | 4 ++-- package/lean/luci-app-sfe/root/etc/init.d/sfe | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/lean/dnsforwarder/files/etc/init.d/dnsforwarder b/package/lean/dnsforwarder/files/etc/init.d/dnsforwarder index 4b105ba3024114..4af8971985dc2c 100644 --- 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 index e3925f692e76c3..97863924aa1afd 100755 --- 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 index f00256dd7be7d5..6920e79b00c05b 100755 --- 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" -} \ No newline at end of file +}