From 78e796c13a1a7860c0e69967c6a792907ebae81b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 20 May 2023 23:34:57 +0800
Subject: [PATCH] update 2023-05-20 23:34:57

---
 luci-app-passwall2/Makefile                               | 2 +-
 luci-app-passwall2/luasrc/passwall2/server_app.lua        | 8 ++++----
 luci-app-passwall2/root/etc/hotplug.d/iface/98-passwall2  | 2 +-
 luci-app-passwall2/root/etc/init.d/passwall2              | 1 +
 .../root/usr/share/passwall2/0_default_config             | 2 +-
 .../root/usr/share/passwall2/helper_dnsmasq.sh            | 4 ++--
 sing-box/Makefile                                         | 4 ++--
 v2ray-geodata/Makefile                                    | 4 ++--
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile
index eb773a39f..11a627489 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.15-4
+PKG_VERSION:=1.15-5
 PKG_RELEASE:=
 
 PKG_CONFIG_DEPENDS:= \
diff --git a/luci-app-passwall2/luasrc/passwall2/server_app.lua b/luci-app-passwall2/luasrc/passwall2/server_app.lua
index d7c051f20..10ea586f3 100644
--- a/luci-app-passwall2/luasrc/passwall2/server_app.lua
+++ b/luci-app-passwall2/luasrc/passwall2/server_app.lua
@@ -130,10 +130,10 @@ local function start()
 				bin = ln_run("/usr/bin/ssserver", "ssserver", "-c " .. config_file, log_path)
 			elseif type == "V2ray" then
 				config = require(require_dir .. "util_xray").gen_config_server(user)
-				bin = ln_run(api.get_v2ray_path(), "v2ray", "run -c " .. config_file, log_path)
+				bin = ln_run(api.get_app_path("v2ray"), "v2ray", "run -c " .. config_file, log_path)
 			elseif type == "Xray" then
 				config = require(require_dir .. "util_xray").gen_config_server(user)
-				bin = ln_run(api.get_xray_path(), "xray", "run -c " .. config_file, log_path)
+				bin = ln_run(api.get_app_path("xray"), "xray", "run -c " .. config_file, log_path)
 			elseif type == "Brook" then
 				local brook_protocol = user.protocol
 				local brook_password = user.password
@@ -142,10 +142,10 @@ local function start()
 				if brook_protocol == "wsserver" and brook_path then
 					brook_path_arg = " --path " .. brook_path
 				end
-				bin = ln_run(api.get_brook_path(), "brook_" .. id, string.format("--debug %s -l :%s -p %s%s", brook_protocol, port, brook_password, brook_path_arg), log_path)
+				bin = ln_run(api.get_app_path("brook"), "brook_" .. id, string.format("--debug %s -l :%s -p %s%s", brook_protocol, port, brook_password, brook_path_arg), log_path)
 			elseif type == "Hysteria" then
 				config = require(require_dir .. "util_hysteria").gen_config_server(user)
-				bin = ln_run(api.get_hysteria_path(), "hysteria", "-c " .. config_file .. " server", log_path)
+				bin = ln_run(api.get_app_path("hysteria"), "hysteria", "-c " .. config_file .. " server", log_path)
 			end
 
 			if next(config) then
diff --git a/luci-app-passwall2/root/etc/hotplug.d/iface/98-passwall2 b/luci-app-passwall2/root/etc/hotplug.d/iface/98-passwall2
index 3aa0df3f6..688ccb072 100644
--- a/luci-app-passwall2/root/etc/hotplug.d/iface/98-passwall2
+++ b/luci-app-passwall2/root/etc/hotplug.d/iface/98-passwall2
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[[ "$ACTION" == "ifup" && $(uci get "passwall2.@global[0].enabled") == "1" ]] && {
+[[ "$ACTION" == "ifup" && $(uci get "passwall2.@global[0].enabled") == "1" ]] && [ -f /var/lock/passwall2_ready.lock ] && {
 	default_device=$(ip route | grep default | awk -F 'dev ' '{print $2}' | awk '{print $1}')
 	[ "$default_device" == "$DEVICE" ] && {
 		LOCK_FILE_DIR=/var/lock
diff --git a/luci-app-passwall2/root/etc/init.d/passwall2 b/luci-app-passwall2/root/etc/init.d/passwall2
index 6eb0d7a60..faa7fd096 100755
--- a/luci-app-passwall2/root/etc/init.d/passwall2
+++ b/luci-app-passwall2/root/etc/init.d/passwall2
@@ -39,6 +39,7 @@ boot() {
 		sleep $delay
 	fi
 	restart
+	touch ${LOCK_FILE_DIR}/${CONFIG}_ready.lock
 }
 
 start() {
diff --git a/luci-app-passwall2/root/usr/share/passwall2/0_default_config b/luci-app-passwall2/root/usr/share/passwall2/0_default_config
index 4cb152163..2f4127652 100644
--- a/luci-app-passwall2/root/usr/share/passwall2/0_default_config
+++ b/luci-app-passwall2/root/usr/share/passwall2/0_default_config
@@ -22,7 +22,7 @@ config global_haproxy
 config global_delay
 	option auto_on '0'
 	option start_daemon '1'
-	option start_delay '1'
+	option start_delay '60'
 
 config global_forwarding
 	option tcp_no_redir_ports 'disable'
diff --git a/luci-app-passwall2/root/usr/share/passwall2/helper_dnsmasq.sh b/luci-app-passwall2/root/usr/share/passwall2/helper_dnsmasq.sh
index 94cb23524..66be74866 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/helper_dnsmasq.sh
+++ b/luci-app-passwall2/root/usr/share/passwall2/helper_dnsmasq.sh
@@ -94,8 +94,8 @@ add() {
 	
 	#始终用国内DNS解析节点域名
 	servers=$(uci show "${CONFIG}" | grep ".address=" | cut -d "'" -f 2)
-	hosts_foreach "servers" host_from_url | grep '[a-zA-Z]$' | sort -u | gen_items ipsets="passwall2_vpsiplist,passwall2_vpsiplist6" dnss="${LOCAL_DNS:-${DEFAULT_DNS}}" outf="${TMP_DNSMASQ_PATH}/10-vpsiplist_host.conf" ipsetoutf="${TMP_DNSMASQ_PATH}/ipset.conf"
-	echolog "  - [$?]节点列表中的域名(vpsiplist)：${DEFAULT_DNS:-默认}"
+	hosts_foreach "servers" host_from_url | grep '[a-zA-Z]$' | sort -u | gen_items ipsets="passwall2_vpslist,passwall2_vpslist6" dnss="${LOCAL_DNS:-${DEFAULT_DNS}}" outf="${TMP_DNSMASQ_PATH}/10-vpslist_host.conf" ipsetoutf="${TMP_DNSMASQ_PATH}/ipset.conf"
+	echolog "  - [$?]节点列表中的域名(vpslist)：${DEFAULT_DNS:-默认}"
 	
 	echo "conf-dir=${TMP_DNSMASQ_PATH}" > $DNSMASQ_CONF_FILE
 	[ -n "${TUN_DNS}" ] && {
diff --git a/sing-box/Makefile b/sing-box/Makefile
index 9c2d80468..b74126690 100644
--- a/sing-box/Makefile
+++ b/sing-box/Makefile
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sing-box
-PKG_VERSION:=1.2.6
+PKG_VERSION:=1.2.7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=8f7adf55ed9afe6ec0dd8b04ed64dd3a6243578ee779f909dfb3778fa2dbda10
+PKG_HASH:=49b829f4cf148b59789eeaf8d01987e7526a44d0290cf608a6350c57562ae177
 
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=LICENSE
diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile
index b47f6f830..70354c4b3 100644
--- a/v2ray-geodata/Makefile
+++ b/v2ray-geodata/Makefile
@@ -21,13 +21,13 @@ define Download/geoip
   HASH:=4d0a5784471992dccc26e0ffd525f44cc9c9b8c6ab90fb922582b0bccb2613de
 endef
 
-GEOSITE_VER:=20230519184410
+GEOSITE_VER:=20230520021741
 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
 define Download/geosite
   URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
   URL_FILE:=dlc.dat
   FILE:=$(GEOSITE_FILE)
-  HASH:=677e0cafe8d335bb286253d8f20a38cfa1e4c8b1793ff700ff21560d5b46a5ad
+  HASH:=5eec2292b1d7dc4831a48be0eef432251117c07a7ea3f234ebb334c27fd124ed
 endef
 
 define Package/v2ray-geodata/template