diff --git a/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh b/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh index 3b6c553ab..6625276ee 100755 --- a/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh +++ b/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh @@ -52,7 +52,7 @@ get_adlist() ( fi ) -adlist_update() ( +adlist_update() { [ "$(uci -q get mosdns.config.adblock)" != 1 ] && exit 0 ad_source=$(uci -q get mosdns.config.ad_source) AD_TMPDIR=$(mktemp -d) || exit 1 @@ -83,10 +83,9 @@ adlist_update() ( rm -rf /etc/mosdns/rule/adlist/* \cp $AD_TMPDIR/* /etc/mosdns/rule/adlist rm -rf "$AD_TMPDIR" - restart_service } fi -) +} geodat_update() ( TMPDIR=$(mktemp -d) || exit 1 @@ -120,7 +119,7 @@ geodat_update() ( exit 1 fi rm -rf "$TMPDIR"/*.sha256sum - cp -f "$TMPDIR"/* /usr/share/v2ray + \cp -a "$TMPDIR"/* /usr/share/v2ray rm -rf "$TMPDIR" ) @@ -179,7 +178,7 @@ case $script_action in logfile_path ;; "adlist_update") - adlist_update + adlist_update && [ "$has_update" -eq 1 ] && restart_service ;; "ecs_remote") ecs_remote diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile index dd3cc6979..3252150bf 100644 --- a/luci-app-passwall2/Makefile +++ b/luci-app-passwall2/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall2 -PKG_VERSION:=1.20-16 +PKG_VERSION:=1.20-17 PKG_RELEASE:= PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/acl_config.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/acl_config.lua index b85ec2a2d..e6b3c9798 100644 --- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/acl_config.lua +++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/acl_config.lua @@ -232,10 +232,13 @@ o.datatype = "ipaddr" o:depends("remote_dns_protocol", "tcp") o:depends("remote_dns_protocol", "doh") -o = s:taboption("DNS", ListValue, "remote_dns_detour", translate("Remote DNS Outbound")) +o = s:option(ListValue, "remote_dns_detour", translate("Remote DNS Outbound")) o.default = "remote" o:value("remote", translate("Remote")) o:value("direct", translate("Direct")) +o:depends("remote_dns_protocol", "tcp") +o:depends("remote_dns_protocol", "doh") +o:depends("remote_dns_protocol", "udp") o = s:option(Flag, "remote_fakedns", "FakeDNS", translate("Use FakeDNS work in the shunt domain that proxy.")) o.default = "0" diff --git a/quickstart/Makefile b/quickstart/Makefile index 2b0535f05..bab4c1bae 100644 --- a/quickstart/Makefile +++ b/quickstart/Makefile @@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk PKG_ARCH_quickstart:=$(ARCH) PKG_NAME:=quickstart -PKG_VERSION:=0.7.17 +PKG_VERSION:=0.7.18 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/linkease/istore-packages/releases/download/prebuilt/ -PKG_HASH:=5bbbb6a1ad07b679d8d19d9bcdc8536d7fe5be11364fd3be2eb8f71193af4a45 +PKG_HASH:=24abd2883f8f10094d712ae28cc9f644637f21dd3b5bdf01fb9ead0da8fae8f3 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION)