From 82331a7c2e6f3b865662b2618918146919aeb3fa Mon Sep 17 00:00:00 2001
From: action <actions@github.com>
Date: Thu, 1 Oct 2026 18:39:33 +0800
Subject: [PATCH] update 2026-10-01 18:39:33

---
 clashoo/Makefile                                          | 8 ++++----
 docker/Makefile                                           | 4 ++--
 luci-app-passwall2/root/usr/share/passwall2/nftables.sh   | 6 +++---
 .../files/etc/uci-defaults/99-default-settings            | 7 -------
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/clashoo/Makefile b/clashoo/Makefile
index 9419833b..87fe0f31 100644
--- a/clashoo/Makefile
+++ b/clashoo/Makefile
@@ -1,18 +1,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=clashoo
-PKG_SHORT_SHA:=1341769
+PKG_SHORT_SHA:=88dcbf7
 PKG_COMMIT_DATE:=2026.09.30
 
 PKG_VERSION:=$(PKG_COMMIT_DATE)~$(PKG_SHORT_SHA)
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-alpha-$(PKG_SHORT_SHA).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-alpha-$(PKG_SHORT_SHA)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-alpha-$(PKG_SHORT_SHA)
 PKG_SOURCE_URL:=https://github.com/kenzok8/openwrt-clashoo/releases/download/mihomo-src
-PKG_SOURCE_VERSION:=134176994f6624bf5a20cbe5e3bd9b48ba8c5c47
-PKG_HASH:=92ce64ea7ccb5748008cb571b6bc72f2121e9974bc435416b5c0d0b9ce6ceeae
+PKG_SOURCE_VERSION:=88dcbf7f1614a67c3b36b848ee3592dfa92ada36
+PKG_HASH:=7976eab9de5b7d651a75726b16b21173ac533d11d09ccac927ab226b519d562b
 PKG_BUILD_VERSION:=alpha-$(PKG_SHORT_SHA)
 
 PKG_LICENSE:=GPL3.0+
diff --git a/docker/Makefile b/docker/Makefile
index 66b223e8..8402e9b6 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=docker
-PKG_VERSION:=29.8.1
+PKG_VERSION:=29.8.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/docker/cli/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=55bcae5053f0914118d229658e2ac3a877dbdead6cb2c322e525d0c1e8bf78d2
+PKG_HASH:=12990af6e98ecc545914820c2c835bdb3303c71439ee3ad0f27ab5341f97f37c
 PKG_BUILD_DIR:=$(BUILD_DIR)/cli-$(PKG_VERSION)
 PKG_GIT_SHORT_COMMIT:=$(shell $(CURDIR)/git-short-commit.sh 'github.com/docker/cli' 'v$(PKG_VERSION)' '$(TMP_DIR)/git-short-commit/$(PKG_NAME)-$(PKG_VERSION)')
 
diff --git a/luci-app-passwall2/root/usr/share/passwall2/nftables.sh b/luci-app-passwall2/root/usr/share/passwall2/nftables.sh
index 12b76c8c..45fb6428 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/nftables.sh
+++ b/luci-app-passwall2/root/usr/share/passwall2/nftables.sh
@@ -149,7 +149,7 @@ gen_nft_tables() {
 
 insert_nftset() {
 	local nftset_name="${1}"; shift
-	local timeout_argument="${1}"; shift
+	local timeout_argument="${1:--1}"; shift
 	local default_timeout="365d"
 	local suffix=""
 
@@ -692,13 +692,13 @@ update_wan_sets() {
 		local WAN_IP=$(get_wan_ips ip4)
 		[ -n "$WAN_IP" ] && {
 			# nft flush set $NFTABLE_NAME $NFTSET_WAN
-			echo "$WAN_IP" | insert_nftset $NFTSET_WAN
+			echo "$WAN_IP" | insert_nftset $NFTSET_WAN "-1"
 		}
 
 		local WAN6_IP=$(get_wan_ips ip6)
 		[ -n "${WAN6_IP}" ] && {
 			# nft flush set $NFTABLE_NAME $NFTSET_WAN6
-			echo "$WAN6_IP" | insert_nftset $NFTSET_WAN6
+			echo "$WAN6_IP" | insert_nftset $NFTSET_WAN6 "-1"
 		}
 	) 9>"${LOCK_PATH}/${CONFIG}_update_wan_sets.lock"
 }
diff --git a/my-default-settings/files/etc/uci-defaults/99-default-settings b/my-default-settings/files/etc/uci-defaults/99-default-settings
index 49a60932..5a8d7a9a 100644
--- a/my-default-settings/files/etc/uci-defaults/99-default-settings
+++ b/my-default-settings/files/etc/uci-defaults/99-default-settings
@@ -36,13 +36,6 @@ c=1024; nf=16384
 [ "$mem" -ge 524288 ]  && { c=10000; nf=131072; }
 [ "$mem" -ge 1048576 ] && { c=10000; nf=262144; }
 
-if ! grep -q '/etc/firewall.user' /etc/config/firewall 2>/dev/null; then
-	uci -q set firewall.firewall_user=include
-	uci -q set firewall.firewall_user.path='/etc/firewall.user'
-	uci -q set firewall.firewall_user.type='script'
-	uci -q set firewall.firewall_user.reload='1'
-fi
-
 # 4. 首次开机参数统一批量预设
 if [ "$version" -lt 1 ]; then
 	uci -q batch <<-EOF