From cf4082442be11e768c3d800a6d2d19096bbd5512 Mon Sep 17 00:00:00 2001
From: kenzok8 <kenzok8@users.noreply.github.com>
Date: Tue, 29 Jul 2025 20:52:41 +0800
Subject: [PATCH] update 2025-07-29 20:52:41

---
 cxxopts/Makefile                              | 44 -------------------
 dockerd/Makefile                              |  4 +-
 .../root/usr/share/passwall/haproxy_check.sh  |  8 +++-
 .../usr/share/passwall/socks_auto_switch.sh   |  5 +++
 4 files changed, 14 insertions(+), 47 deletions(-)
 delete mode 100644 cxxopts/Makefile

diff --git a/cxxopts/Makefile b/cxxopts/Makefile
deleted file mode 100644
index f891f8820..000000000
--- a/cxxopts/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-only
-#
-# Copyright (C) 2021 ImmortalWrt.org
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=cxxopts
-PKG_VERSION:=3.1.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/jarro2783/cxxopts/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=523175f792eb0ff04f9e653c90746c12655f10cb70f1d5e6d6d9491420298a08
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
-
-PKG_BUILD_PARALLEL:=1
-CMAKE_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-CMAKE_OPTIONS+= \
-	-DCXXOPTS_ENABLE_INSTALL=ON \
-	-DCXXOPTS_BUILD_EXAMPLES=OFF \
-	-DCXXOPTS_BUILD_TESTS=OFF
-
-define Package/cxxopts
-  SECTION:=lib
-  CATEGORY:=Libraries
-  URL:=https://github.com/jarro2783/cxxopts
-  TITLE:=Lightweight C++ command line option parser
-  DEPENDS:=+libc
-  BUILDONLY:=1
-endef
-
-define Package/cxxopts/description
-  This is a lightweight C++ option parser library, supporting the
-  standard GNU style syntax for options.
-endef
-
-$(eval $(call BuildPackage,cxxopts))
diff --git a/dockerd/Makefile b/dockerd/Makefile
index 087982033..259ed0732 100644
--- a/dockerd/Makefile
+++ b/dockerd/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dockerd
-PKG_VERSION:=28.3.2
+PKG_VERSION:=28.3.3
 PKG_RELEASE:=1
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
@@ -10,7 +10,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_GIT_URL:=github.com/moby/moby
 PKG_GIT_REF:=v$(PKG_VERSION)
 PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)?
-PKG_HASH:=e4828e32e474cef1b78f40278211648300071399c7498252dfe0b96e789b8a31
+PKG_HASH:=3727c8963ab4bcff12291e99e4d4a6b9a29ace5236fd245717bbff648f15f8cd
 PKG_GIT_SHORT_COMMIT:=c710b88 # SHA1 used within the docker executables
 
 PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
diff --git a/luci-app-passwall/root/usr/share/passwall/haproxy_check.sh b/luci-app-passwall/root/usr/share/passwall/haproxy_check.sh
index 56627ddc4..91c1531b1 100755
--- a/luci-app-passwall/root/usr/share/passwall/haproxy_check.sh
+++ b/luci-app-passwall/root/usr/share/passwall/haproxy_check.sh
@@ -1,12 +1,18 @@
 #!/bin/sh
 
 export PATH=/usr/sbin:/usr/bin:/sbin:/bin:/root/bin
+CONFIG=passwall
 
 listen_address=$1
 listen_port=$2
 server_address=$3
 server_port=$4
 
+pgrep -af "${CONFIG}/" | awk '/app\.sh.*(start|stop)/ || /nftables\.sh/ || /iptables\.sh/ { found = 1 } END { exit !found }' && {
+	# 特定任务执行中不检测
+	exit 0
+}
+
 probe_file="/tmp/etc/passwall/haproxy/Probe_URL"
 probeUrl="https://www.google.com/generate_204"
 if [ -f "$probe_file" ]; then
@@ -19,7 +25,7 @@ if /usr/bin/curl --help all | grep -q "\-\-retry-all-errors"; then
 	extra_params="${extra_params} --retry-all-errors"
 fi
 
-status=$(/usr/bin/curl -I -o /dev/null -skL ${extra_params} --connect-timeout 3 --retry 1 --max-time 10 -w "%{http_code}" "${probeUrl}")
+status=$(/usr/bin/curl -I -o /dev/null -skL ${extra_params} --connect-timeout 3 --retry 2 --max-time 10 -w "%{http_code}" "${probeUrl}")
 
 case "$status" in
 	200|204)
diff --git a/luci-app-passwall/root/usr/share/passwall/socks_auto_switch.sh b/luci-app-passwall/root/usr/share/passwall/socks_auto_switch.sh
index 5068dbbd7..91c69c355 100755
--- a/luci-app-passwall/root/usr/share/passwall/socks_auto_switch.sh
+++ b/luci-app-passwall/root/usr/share/passwall/socks_auto_switch.sh
@@ -177,6 +177,11 @@ start() {
 			sleep 6s
 			continue
 		}
+		pgrep -af "${CONFIG}/" | awk '/app\.sh.*(start|stop)/ || /nftables\.sh/ || /iptables\.sh/ { found = 1 } END { exit !found }' && {
+			# 特定任务执行中不检测
+			sleep 6s
+			continue
+		}
 		touch $LOCK_FILE
 		backup_node=$(echo $backup_node | tr -s ' ' '\n' | uniq | tr -s '\n' ' ')
 		test_auto_switch "$backup_node"