update 2023-09-27 16:22:58

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

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:= \

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"

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)