🌴 Sync 2026-09-01 11:16:04

baidudrive/Makefile

@@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk
 PKG_ARCH_BAIDUDRIVE:=$(ARCH)
 
 PKG_NAME:=baidudrive
-PKG_VERSION:=dockermanager-runtime-v0.1.1
+PKG_VERSION:=linkeasefull-runtime-v3.0.15
-PKG_RELEASE:=16
+PKG_RELEASE:=17
 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/istoreos/istoreos-app-hub/releases/download/baidudrive-runtime-v$(PKG_VERSION)/
 PKG_HASH:=skip

dockermanager/Makefile

@@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk
 PKG_ARCH_DOCKERMANAGER:=$(ARCH)
 
 PKG_NAME:=dockermanager
-PKG_VERSION:=dockermanager-runtime-v0.1.1
+PKG_VERSION:=linkeasefull-runtime-v3.0.15
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/istoreos/istoreos-app-hub/releases/download/dockermanager-runtime-v$(PKG_VERSION)/
 PKG_HASH:=skip

istoreenhance/Makefile

@@ -11,8 +11,8 @@ PKG_ARCH_ISTOREENHANCE:=$(ARCH)
 
 PKG_NAME:=istoreenhance
 # use PKG_SOURCE_DATE instead of PKG_VERSION for compitable
-PKG_SOURCE_DATE:=0.7.16
+PKG_SOURCE_DATE:=0.7.17
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 ARCH_HEXCODE:=
 ifeq ($(ARCH),x86_64)
 ARCH_HEXCODE=8664

istoreenhance/files/kspeeder-plugin.json

@@ -27,9 +27,9 @@
     "host": "127.0.0.1",
     "portFromUci": "istoreenhance.@istoreenhance[0].adminport",
     "defaultPort": 5003,
-    "upstreamBasePath": "/apps/kspeeder/",
+    "upstreamBasePath": "/",
     "apiPath": "api/",
-    "pathMode": "preserve"
+    "pathMode": "strip-public-base"
   },
   "window": {
     "width": 1040,

kaiplus/Makefile

@@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk
 PKG_ARCH_kaiplus:=$(ARCH)
 
 PKG_NAME:=kaiplus
-PKG_VERSION:=dockermanager-runtime-v0.1.1
+PKG_VERSION:=linkeasefull-runtime-v3.0.15
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/istoreos/istoreos-app-hub/releases/download/kaiplus-runtime-v$(PKG_VERSION)/
 PKG_HASH:=skip

linkease-common-bin/Makefile

@@ -12,7 +12,7 @@ PKG_ARCH_LINKEASE:=$(ARCH)
 PKG_NAME:=linkease-common-bin
 # use PKG_SOURCE_DATE instead of PKG_VERSION for compitable
 PKG_SOURCE_DATE:=1.7.5
-PKG_RELEASE:=18
+PKG_RELEASE:=19
 
 ARCH_HEXCODE:=
 ifeq ($(ARCH),x86_64)
@@ -28,7 +28,7 @@ else ifeq ($(ARCH),mipsel)
 ARCH_HEXCODE=1b0c
 endif
 
-PKG_SOURCE_VERSION:=07e52ab850002972866a2a05677e64ea31e3f4e1
+PKG_SOURCE_VERSION:=ff87526d94aaa464981d5111c8631ca66396bef7
 PKG_SOURCE:=linkease-common-bin-$(PKG_SOURCE_DATE)-linux-$(PKG_ARCH_LINKEASE).tar.gz
 PKG_SOURCE_URL:=https://github.com/istoreos/istoreos-app-hub/releases/download/linkease-runtime-v$(PKG_SOURCE_DATE)/
 PKG_BUILD_DIR:=$(BUILD_DIR)/linkease-common-bin-$(PKG_SOURCE_DATE)-linux-$(PKG_ARCH_LINKEASE)

linkease/Makefile

@@ -12,7 +12,7 @@ PKG_ARCH_LINKEASE:=$(ARCH)
 PKG_NAME:=linkease
 # use PKG_SOURCE_DATE instead of PKG_VERSION for compitable
 PKG_SOURCE_DATE:=1.7.5
-PKG_RELEASE:=21
+PKG_RELEASE:=22
 
 ARCH_HEXCODE:=
 ifeq ($(ARCH),x86_64)
@@ -28,7 +28,7 @@ else ifeq ($(ARCH),mipsel)
 ARCH_HEXCODE=1b0c
 endif
 
-PKG_SOURCE_VERSION:=07e52ab850002972866a2a05677e64ea31e3f4e1
+PKG_SOURCE_VERSION:=ff87526d94aaa464981d5111c8631ca66396bef7
 PKG_SOURCE:=linkease-bin-$(PKG_SOURCE_DATE)-linux-$(PKG_ARCH_LINKEASE).tar.gz
 PKG_SOURCE_URL:=https://github.com/istoreos/istoreos-app-hub/releases/download/linkease-runtime-v$(PKG_SOURCE_DATE)/
 PKG_BUILD_DIR:=$(BUILD_DIR)/linkease-bin-$(PKG_SOURCE_DATE)-linux-$(PKG_ARCH_LINKEASE)

linkeasefull/Makefile

@@ -11,7 +11,7 @@ PKG_ARCH_LINKEASE:=$(ARCH)
 PKG_NAME:=linkeasefull
 # use PKG_SOURCE_DATE instead of PKG_VERSION for compitable
 PKG_SOURCE_DATE:=3.0.13
-PKG_RELEASE:=20
+PKG_RELEASE:=21
 
 ARCH_HEXCODE:=
 ifeq ($(ARCH),x86_64)
@@ -24,7 +24,7 @@ LINKEASE_RUNTIME_ARCH:=arm64
 PKG_HASH:=skip
 endif
 
-PKG_SOURCE_VERSION:=07e52ab850002972866a2a05677e64ea31e3f4e1
+PKG_SOURCE_VERSION:=ff87526d94aaa464981d5111c8631ca66396bef7
 PKG_SOURCE:=linkease-runtime-$(PKG_SOURCE_DATE)-linux-$(LINKEASE_RUNTIME_ARCH).tar.gz
 PKG_SOURCE_URL:=https://github.com/istoreos/istoreos-app-hub/releases/download/linkeasefull-runtime-v$(PKG_SOURCE_DATE)/
 PKG_BUILD_DIR:=$(BUILD_DIR)/linkease-runtime-$(PKG_SOURCE_DATE)-linux-$(LINKEASE_RUNTIME_ARCH)

luci-app-fwlive/Makefile

@@ -12,7 +12,7 @@ LUCI_DEPENDS:=+luci-base +logd +jsonfilter
 LUCI_PKGARCH:=all
 
 PKG_VERSION:=0.1.37
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 # Reproducible build: honor SOURCE_DATE_EPOCH from the build environment (set by docker-sdk.sh / CI).
 ifdef SOURCE_DATE_EPOCH

luci-app-fwlive/root/usr/libexec/fwlive-logging.sh

@@ -143,31 +143,106 @@ wan_zone_log_value() {
 	uci -q get "firewall.${zone}.log" 2>/dev/null
 }
 
+# True when two firewall section ids refer to the same WAN zone (issue #239).
+wan_firewall_zone_same() {
+	_a="$1"
+	_b="$2"
+	[ -n "$_a" ] && [ -n "$_b" ] || return 1
+	[ "$_a" = "$_b" ] && return 0
+	_na=$(uci -q get "firewall.${_a}.name" 2>/dev/null) || return 1
+	_nb=$(uci -q get "firewall.${_b}.name" 2>/dev/null) || return 1
+	_ta=$(uci -q get "firewall.${_a}" 2>/dev/null) || return 1
+	_tb=$(uci -q get "firewall.${_b}" 2>/dev/null) || return 1
+	[ "$_na" = "wan" ] && [ "$_nb" = "wan" ] && [ "$_ta" = "zone" ] && [ "$_tb" = "zone" ]
+}
+
+wan_log_staged_line_section() {
+	_line="$1"
+	case "$_line" in
+		firewall.*.log=*)
+		_rest=${_line#firewall.}
+		printf '%s' "${_rest%%.log=*}"
+		;;
+		-firewall.*.log)
+		_rest=${_line#-firewall.}
+		printf '%s' "${_rest%.log}"
+		;;
+		"- firewall."*.log)
+		_rest=${_line#- firewall.}
+		printf '%s' "${_rest%.log}"
+		;;
+	esac
+}
+
+# Zone ids that may appear in `uci changes` for firewall.<id>.log (issue #239).
+wan_log_staged_zone_ids() {
+	_zone="$1"
+	_staged="$2"
+	_seen="|${_zone}|"
+	printf '%s\n' "$_zone"
+	while IFS= read -r _line || [ -n "$_line" ]; do
+		[ -n "$_line" ] || continue
+		_sid=$(wan_log_staged_line_section "$_line")
+		[ -n "$_sid" ] || continue
+		case "$_seen" in *"|${_sid}|"*) continue ;; esac
+		wan_firewall_zone_same "$_zone" "$_sid" || continue
+		_seen="${_seen}${_sid}|"
+		printf '%s\n' "$_sid"
+	done <<EOF
+$_staged
+EOF
+}
+
 # Match only firewall.<zone>.log deltas in `uci changes` — not log_limit.
 wan_log_foreign_staged_lines() {
 	_zone="$1"
 	_staged="$2"
-	_ours_prefix="firewall.${_zone}.log="
+	_ids=$(wan_log_staged_zone_ids "$_zone" "$_staged")
-	_del="-firewall.${_zone}.log"
+	printf '%s\n' "$_staged" | awk -v ids="$_ids" '
-	_del_sp="- firewall.${_zone}.log"
+		BEGIN {
-	printf '%s\n' "$_staged" | awk -v p="$_ours_prefix" -v d="$_del" -v ds="$_del_sp" '
+			n = split(ids, id, "\n")
+			for (i = 1; i <= n; i++) {
+				if (id[i] == "") continue
+				np++
+				p[np] = "firewall." id[i] ".log="
+				d[np] = "-firewall." id[i] ".log"
+				ds[np] = "- firewall." id[i] ".log"
+			}
+		}
 		NF == 0 { next }
-		index($0, p) == 1 { next }
+		{
-		$0 == d || $0 == ds { next }
+			ours = 0
-		{ print }
+			for (i = 1; i <= np; i++) {
+				if (index($0, p[i]) == 1) { ours = 1; break }
+				if ($0 == d[i] || $0 == ds[i]) { ours = 1; break }
+			}
+			if (!ours) print
+		}
 	'
 }
 
 wan_log_count_our_staged_lines() {
 	_zone="$1"
 	_staged="$2"
-	_ours_prefix="firewall.${_zone}.log="
+	_ids=$(wan_log_staged_zone_ids "$_zone" "$_staged")
-	_del="-firewall.${_zone}.log"
+	printf '%s\n' "$_staged" | awk -v ids="$_ids" '
-	_del_sp="- firewall.${_zone}.log"
+		BEGIN {
-	printf '%s\n' "$_staged" | awk -v p="$_ours_prefix" -v d="$_del" -v ds="$_del_sp" '
+			n = split(ids, id, "\n")
+			for (i = 1; i <= n; i++) {
+				if (id[i] == "") continue
+				np++
+				p[np] = "firewall." id[i] ".log="
+				d[np] = "-firewall." id[i] ".log"
+				ds[np] = "- firewall." id[i] ".log"
+			}
+		}
 		NF == 0 { next }
-		index($0, p) == 1 { c++; next }
+		{
-		$0 == d || $0 == ds { c++; next }
+			for (i = 1; i <= np; i++) {
+				if (index($0, p[i]) == 1) { c++; break }
+				if ($0 == d[i] || $0 == ds[i]) { c++; break }
+			}
+		}
 		END { print c+0 }
 	'
 }

luci-app-passwall/Makefile

@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
-PKG_VERSION:=26.8.26
+PKG_VERSION:=26.9.1
-PKG_RELEASE:=255
+PKG_RELEASE:=256
 PKG_PO_VERSION:=$(PKG_VERSION)
 
 PKG_CONFIG_DEPENDS:= \

luci-app-passwall/root/usr/share/passwall/rules/chnroute6

@@ -1,31 +1,28 @@
 2001:250::/30
 2001:254::/31
-2001:256:100::/48
 2001:4510:1480::/41
 2001:4510:400::/40
 2001:4511:1480::/41
-2001:678:10d0::/48
-2001:678:120::/48
 2001:678:53c::/48
-2001:67c:c28::/48
+2001:678:970::/48
-2001:67c:ebc::/48
+2001:7fa:5::/48
 2001:c68::/32
 2001:cc0::/32
 2001:da8::/32
 2001:daa:1::/48
 2001:daa:2::/47
 2001:daa:4::/47
-2001:daa:6::/48
 2001:daa:9::/48
 2001:dc7::/32
 2001:dd8:1::/48
 2001:dd9::/48
-2001:df5:4740::/48
+2001:df1:61c0::/48
 2001:df6:40::/48
 2400:1160::/32
 2400:3200::/32
 2400:5280:f803::/48
 2400:5a00::/32
+2400:5a60:2::/48
 2400:6000::/32
 2400:6600::/32
 2400:6e60:1301::/48
@@ -73,6 +70,7 @@
 2400:9380:90b1::/48
 2400:9380:90b2::/47
 2400:9380:90b4::/46
+2400:9380:9109::/48
 2400:9380:9121::/48
 2400:9380:9220::/47
 2400:9380:9250::/47
@@ -83,10 +81,10 @@
 2400:9380:92b1::/48
 2400:9380:92b2::/47
 2400:9380:92b4::/46
+2400:9580:300::/48
 2400:95e0::/48
 2400:9600:8800::/48
 2400:9620::/32
-2400:a040::/32
 2400:a860:1::/48
 2400:a860:2::/47
 2400:a860:4::/47
@@ -111,9 +109,6 @@
 2401:1200::/48
 2401:1320::/32
 2401:1d40::/32
-2401:20:1330::/46
-2401:20:2104::/46
-2401:20::/40
 2401:2780::/32
 2401:2a00:f000::/43
 2401:2e00::/32
@@ -186,7 +181,6 @@
 2401:de00::/32
 2401:ec00::/32
 2401:f860:100::/40
-2401:f860:85::/48
 2401:f860:88::/48
 2401:f860:90::/48
 2401:f860:92::/47
@@ -198,6 +192,7 @@
 2402:2000::/32
 2402:34e0::/32
 2402:36e0::/44
+2402:3d20::/35
 2402:3f80:1400::/40
 2402:4440:9000::/39
 2402:4440:9200::/48
@@ -214,7 +209,6 @@
 2402:4440:a000::/39
 2402:4440:a800::/46
 2402:4440:a810::/46
-2402:4820::/32
 2402:4b80::/32
 2402:4e00::/32
 2402:5920::/48
@@ -258,6 +252,7 @@
 2402:f140:ff04::/48
 2402:f140:ff10::/46
 2402:f140:ff14::/48
+2402:f140:ff24::/48
 2402:f8c0::/42
 2403:1b80::/48
 2403:1ec0:1200::/48
@@ -270,11 +265,13 @@
 2403:4280::/47
 2403:4300::/32
 2403:4c80::/48
+2403:4fc0::/32
 2403:5c80::/48
 2403:600::/32
 2403:6740::/48
 2403:6a00::/32
-2403:7580::/32
+2403:7580:10::/46
+2403:7580::/44
 2403:8080:101::/48
 2403:8c00::/32
 2403:9b00:2000::/48
@@ -296,6 +293,7 @@
 2403:ffc0:1200::/39
 2404:1c40:503::/48
 2404:1c80::/32
+2404:2280:103::/48
 2404:2280:105::/48
 2404:2280:106::/47
 2404:2280:109::/48
@@ -325,7 +323,6 @@
 2404:2280:154::/48
 2404:2280:156::/47
 2404:2280:159::/48
-2404:2280:15d::/48
 2404:2280:15e::/47
 2404:2280:160::/48
 2404:2280:170::/48
@@ -340,7 +337,9 @@
 2404:2280:190::/48
 2404:2280:193::/48
 2404:2280:196::/48
-2404:2280:198::/45
+2404:2280:198::/46
+2404:2280:19c::/47
+2404:2280:19e::/48
 2404:2280:1a4::/46
 2404:2280:1a8::/47
 2404:2280:1b0::/48
@@ -389,7 +388,10 @@
 2404:2280:265::/48
 2404:2280:266::/47
 2404:2280:268::/45
-2404:2280:270::/44
+2404:2280:270::/45
+2404:2280:278::/47
+2404:2280:27b::/48
+2404:2280:27c::/46
 2404:2280:282::/47
 2404:2280:284::/47
 2404:2280:288::/46
@@ -428,11 +430,14 @@
 2404:2280:2f8::/47
 2404:2280:2fb::/48
 2404:2280:2fc::/48
+2404:2280:303::/48
+2404:2280:304::/46
 2404:2280:308::/46
-2404:2280:30d::/48
+2404:2280:30c::/47
+2404:2280:30e::/48
 2404:2280:313::/48
 2404:2280:314::/48
-2404:2280:317::/48
+2404:2280:316::/47
 2404:3700::/48
 2404:4dc0::/32
 2404:6380:1000::/48
@@ -466,6 +471,8 @@
 2404:bc0:4500::/43
 2404:bc0:4620::/44
 2404:bc0:4f00::/43
+2404:c2c0:111::/48
+2404:c2c0:112::/48
 2404:c2c0:240::/44
 2404:c2c0:280::/44
 2404:c2c0:2c0::/44
@@ -492,7 +499,6 @@
 2405:3140:31::/48
 2405:3140:3a::/48
 2405:68c0:21::/48
-2405:6940::/48
 2405:6c0:2::/48
 2405:6c0:4::/48
 2405:6f00:c101::/48
@@ -525,7 +531,7 @@
 2406:5340:6666::/48
 2406:5340:8888::/48
 2406:6100::/32
-2406:840:1000::/47
+2406:840:1001::/48
 2406:840:100::/47
 2406:840:103::/48
 2406:840:10::/45
@@ -536,7 +542,7 @@
 2406:840:20::/48
 2406:840:2380::/48
 2406:840:2800::/48
-2406:840:2880::/47
+2406:840:2881::/48
 2406:840:2::/48
 2406:840:2e0::/48
 2406:840:3800::/48
@@ -566,22 +572,23 @@
 2406:840:806::/48
 2406:840:80::/47
 2406:840:8100::/40
+2406:840:841::/48
 2406:840:842::/48
 2406:840:860::/48
 2406:840:880::/46
 2406:840:90::/48
 2406:840:9178::/48
 2406:840:9200::/40
-2406:840:9680::/44
 2406:840:9700::/40
 2406:840:9804::/46
 2406:840:981a::/48
 2406:840:981c::/46
 2406:840:9962::/47
+2406:840:9964::/48
 2406:840:9966::/47
 2406:840:996c::/48
 2406:840:9970::/44
-2406:840:a10::/48
+2406:840:a10::/47
 2406:840:a31::/48
 2406:840:c02::/48
 2406:840:c60::/48
@@ -589,8 +596,6 @@
 2406:840:cc2::/48
 2406:840:e080::/44
 2406:840:e0cf::/48
-2406:840:e0e0::/46
-2406:840:e0e4::/47
 2406:840:e10f::/48
 2406:840:e14f::/48
 2406:840:e280::/44
@@ -599,22 +604,20 @@
 2406:840:e304::/48
 2406:840:e306::/48
 2406:840:e330::/44
+2406:840:e57e::/48
 2406:840:e600::/44
-2406:840:e620::/47
 2406:840:e80f::/48
-2406:840:eb01::/48
+2406:840:eb00::/46
-2406:840:eb02::/47
 2406:840:eb04::/47
 2406:840:eb07::/48
 2406:840:eb08::/48
 2406:840:eb0b::/48
+2406:840:eb0f::/48
 2406:840:eb80::/42
 2406:840:ee40::/47
 2406:840:ee44::/48
 2406:840:ee4b::/48
 2406:840:ee4d::/48
-2406:840:eee5::/48
-2406:840:eff0::/44
 2406:840:f0a1::/48
 2406:840:f0aa::/48
 2406:840:f380::/44
@@ -622,30 +625,47 @@
 2406:840:f402::/48
 2406:840:f44f::/48
 2406:840:f680::/44
-2406:840:f860::/46
-2406:840:f868::/47
-2406:840:f86c::/48
 2406:840:f889::/48
 2406:840:fa01::/48
 2406:840:fa40::/48
 2406:840:fa60::/44
-2406:840:fc10::/44
+2406:840:fc10::/46
-2406:840:fc20::/43
+2406:840:fc20::/46
-2406:840:fc40::/42
+2406:840:fc30::/46
-2406:840:fc90::/44
+2406:840:fc40::/46
-2406:840:fca0::/43
+2406:840:fc50::/46
+2406:840:fc60::/46
+2406:840:fc70::/46
+2406:840:fc90::/46
+2406:840:fca0::/46
+2406:840:fcb0::/46
 2406:840:fcd0::/48
-2406:840:fcf0::/46
+2406:840:fd30::/48
-2406:840:fcf4::/47
+2406:840:fd40::/48
-2406:840:fd30::/44
+2406:840:fd45::/48
-2406:840:fd40::/42
+2406:840:fd46::/48
-2406:840:fd80::/43
+2406:840:fd48::/47
+2406:840:fd50::/48
+2406:840:fd55::/48
+2406:840:fd56::/48
+2406:840:fd58::/47
+2406:840:fd60::/48
+2406:840:fd65::/48
+2406:840:fd66::/48
+2406:840:fd68::/47
+2406:840:fd70::/48
+2406:840:fd75::/48
+2406:840:fd76::/48
+2406:840:fd78::/47
+2406:840:fd80::/48
+2406:840:fd85::/48
+2406:840:fd86::/48
+2406:840:fd88::/47
+2406:840:fd90::/46
+2406:840:fd9f::/48
 2406:840:fda0::/48
-2406:840:fda7::/48
 2406:840:fdb0::/48
-2406:840:fdb7::/48
 2406:840:fdc0::/48
-2406:840:fdc7::/48
 2406:840:fe50::/47
 2406:840:fe73::/48
 2406:840:fe90::/46
@@ -654,12 +674,12 @@
 2406:840:fe98::/46
 2406:840:fe9d::/48
 2406:840:fe9e::/48
-2406:840:fea1::/48
 2406:840:fea2::/47
 2406:840:fea4::/46
 2406:840:fea8::/48
 2406:840:feaa::/47
 2406:840:feac::/46
+2406:840:feb3::/48
 2406:840:fec0::/48
 2406:840:fec2::/47
 2406:840:fec4::/48
@@ -670,7 +690,7 @@
 2406:840:fed4::/48
 2406:840:fed8::/48
 2406:840:fedb::/48
-2406:840:fedc::/47
+2406:840:fedc::/48
 2406:840:feed::/48
 2406:840:fef2::/47
 2406:840:fef4::/46
@@ -758,6 +778,7 @@
 2408:8181:a220::/44
 2408:8181:e000::/40
 2408:8182:6000::/40
+2408:8182:8000::/40
 2408:8182:c000::/40
 2408:8183:4000::/40
 2408:8183:8000::/40
@@ -852,7 +873,7 @@
 2408:8406:b580::/42
 2408:8406:d00::/41
 2408:8406:d80::/42
-2408:8407:500::/42
+2408:8407:520::/43
 2408:8409:100::/41
 2408:8409:1800::/40
 2408:8409:1900::/41
@@ -1195,6 +1216,7 @@
 2408:8818::/31
 2408:882c::/32
 2408:883a::/32
+2408:8844:40::/43
 2408:8844::/43
 2408:8856::/31
 2408:8858::/30
@@ -1367,23 +1389,24 @@
 240c:4000::/22
 240c:c000::/20
 240d:4000::/21
+240d:c000:f1e0::/47
+240d:c000:f1ef::/48
 240e::/20
-2602:f46d:6::/48
+2602:f46d:1::/48
 2602:f92a:a460::/48
 2602:f92a:a462::/48
 2602:f92a:a468::/48
 2602:f92a:a46d::/48
-2602:f92a:a470::/48
 2602:f92a:a474::/48
 2602:f92a:a47d::/48
-2602:f92a:dead::/48
 2602:f9ba:10c::/48
 2602:f9f6:400::/47
 2602:f9f6:402::/48
 2602:f9f6:450::/48
+2602:fa02:36::/48
+2602:fa02:d00::/40
 2602:faa8:702::/48
 2602:faa8:708::/47
-2602:faa8:70c::/47
 2602:faa8:70f::/48
 2602:fbda:600::/48
 2602:fbda:610::/48
@@ -1402,10 +1425,7 @@
 2605:9d80:9042::/48
 2605:9d80:9071::/48
 2605:9d80:9092::/48
-2804:1e48:9001::/48
 2804:1e48:9002::/48
-2a01:e281:a400::/48
-2a01:e281:a410::/44
 2a04:3e00:1002::/48
 2a04:f580:8010::/47
 2a04:f580:8090::/48
@@ -1431,45 +1451,28 @@
 2a04:f580:9280::/48
 2a04:f580:9290::/48
 2a05:1085::/32
-2a05:1087::/32
+2a05:1086::/31
 2a06:3600:e000::/40
-2a06:3600:fb00::/40
+2a06:9801:1300::/40
-2a06:3600:fc00::/38
+2a06:9801:2ba::/48
-2a06:3605::/32
+2a06:9801:f95::/48
-2a06:3606::/31
+2a06:9f81:4600::/44
-2a06:9801:74c::/48
+2a06:9f81:4620::/44
-2a06:9f81:4600::/42
 2a06:9f81:4640::/43
 2a06:9f81:4660::/44
-2a06:a005:2040::/44
 2a06:a005:260::/43
 2a06:a005:280::/43
 2a06:a005:2a0::/44
-2a06:a005:e50::/44
+2a06:de07:f800::/38
-2a06:a005:e70::/44
+2a07:e000:20::/44
-2a07:54c1:2200::/46
-2a07:54c1:2205::/48
-2a0a:6040:6c40::/44
-2a0a:6040:c700::/42
-2a0a:6040:c770::/44
-2a0a:6040:c7a0::/48
-2a0a:6040:d600::/44
-2a0a:6040:d610::/46
-2a0a:6040:d615::/48
-2a0a:6040:d616::/48
-2a0a:6040:d618::/47
-2a0a:6040:d623::/48
-2a0a:6040:d624::/48
-2a0a:6040:d629::/48
-2a0a:6040:e541::/48
-2a0a:6040:e543::/48
-2a0a:6040:e544::/48
-2a0a:6040:e54c::/48
 2a0a:d680:8100::/47
 2a0a:d680:a31::/48
 2a0a:d681:e000::/40
-2a0a:d681:fb00::/40
+2a0a:d682:d000::/36
-2a0a:d681:fc00::/38
+2a0a:d682:e000::/35
+2a0a:d685:1e0::/47
+2a0a:d685:1fb::/48
+2a0a:d685:1fd::/48
 2a0a:d685:1fe::/47
 2a0a:d685:200::/47
 2a0a:d685:300::/40
@@ -1477,92 +1480,71 @@
 2a0a:d687:f004::/47
 2a0a:d687:f007::/48
 2a0a:d687:f008::/48
-2a0b:4340:90::/48
+2a0b:2542:300::/40
 2a0b:4340:97::/48
-2a0b:4e07:b8::/47
+2a0b:4e07:230::/44
-2a0c:b641:570::/47
+2a0c:b641:571::/48
 2a0c:b641:573::/48
+2a0c:e641::/32
+2a0d:2681::/32
 2a0d:c7c7:400::/38
-2a0e:4005:ff13::/48
+2a0d:d941::/36
+2a0e:4001:9000::/36
 2a0e:4005:ff20::/48
-2a0e:97c0:5ef::/48
+2a0e:4005:ffdd::/48
 2a0e:aa06:400::/44
 2a0e:aa06:440::/48
 2a0e:aa06:450::/44
 2a0e:aa06:490::/44
-2a0e:aa06:4ea::/48
-2a0e:aa06::/40
-2a0e:aa07:e144::/48
-2a0e:aa07:e146::/48
-2a0e:aa07:e148::/48
-2a0e:aa07:e1a0::/44
-2a0e:aa07:e280::/47
-2a0e:aa07:e284::/46
-2a0e:aa07:e288::/46
-2a0e:aa07:e28d::/48
-2a0e:aa07:e28e::/48
-2a0e:aa07:f0d0::/46
-2a0e:aa07:f0d4::/47
-2a0e:aa07:f0d8::/48
-2a0e:aa07:f0de::/47
 2a0e:b107:14a0::/44
 2a0e:b107:1522::/48
-2a0e:b107:1a40::/46
+2a0e:b107:1f0::/47
-2a0e:b107:2440::/44
 2a0e:b107:740::/44
 2a0e:b107:da0::/44
-2a0f:1cc5:1000::/48
-2a0f:1cc5:1010::/44
-2a0f:1cc5:1032::/47
-2a0f:1cc5:1034::/47
-2a0f:1cc5:1041::/48
 2a0f:1cc5:110::/44
 2a0f:1cc5:130::/44
-2a0f:1cc5:1310::/44
 2a0f:1cc5:140::/42
 2a0f:1cc5:14::/46
 2a0f:1cc5:1600::/44
-2a0f:1cc5:1901::/48
+2a0f:1cc5:1c01::/48
-2a0f:1cc5:1c00::/47
 2a0f:1cc5:1c02::/48
-2a0f:1cc5:1c20::/48
 2a0f:1cc5:1c30::/48
-2a0f:1cc5:1cc0::/48
-2a0f:1cc5:1f::/48
 2a0f:1cc5:2000::/40
 2a0f:1cc5:2510::/44
 2a0f:1cc5:2520::/44
 2a0f:1cc5:2600::/41
 2a0f:1cc5:2680::/42
 2a0f:1cc5:2d01::/48
-2a0f:1cc5:2d03::/48
+2a0f:1cc5:3203::/48
+2a0f:1cc5:3222::/48
 2a0f:1cc5:3700::/43
-2a0f:1cc5:40::/48
+2a0f:1cc5:4300::/40
-2a0f:1cc5:4508::/46
+2a0f:1cc5:4508::/45
-2a0f:1cc5:450c::/47
+2a0f:1cc5:4510::/45
+2a0f:1cc5:451c::/46
 2a0f:1cc5:45ff::/48
-2a0f:1cc5:4700::/40
+2a0f:1cc5:4600::/39
+2a0f:1cc5:49f0::/48
 2a0f:1cc5:600::/47
 2a0f:1cc5:603::/48
 2a0f:1cc5:642::/48
-2a0f:1cc5:661::/48
+2a0f:1cc5:644::/48
 2a0f:1cc5:662::/48
-2a0f:1cc5:6a0::/48
+2a0f:1cc5:6a0::/47
-2a0f:1cc5:a00::/48
+2a0f:1cc5:f00::/46
-2a0f:1cc5:c01::/48
+2a0f:1cc5:f05::/48
-2a0f:1cc5:f00::/45
+2a0f:1cc5:f06::/47
 2a0f:1cc5:f08::/47
 2a0f:1cc5:fff::/48
 2a0f:1cc6:b110::/47
-2a0f:1cc6:b210::/47
+2a0f:1cc6:b210::/48
 2a0f:1cc6:b212::/48
+2a0f:1cc6:b240::/43
 2a0f:2706::/32
-2a0f:6280:1400::/44
+2a0f:6280:1400::/43
-2a0f:6280:1430::/44
+2a0f:6280:1440::/42
-2a0f:6280:1440::/43
-2a0f:6280:1460::/44
 2a0f:6280:1480::/44
-2a0f:6284:4c00::/43
+2a0f:6281::/32
 2a0f:6284:4c20::/44
 2a0f:6284:4c30::/48
 2a0f:6284:4c40::/43
@@ -1572,134 +1554,77 @@
 2a0f:6284:4cc0::/43
 2a0f:85c1:bfe::/48
 2a0f:9400:6110::/48
+2a0f:9fc0::/29
+2a0f:a140::/29
 2a10:ccc0:cc1::/48
 2a10:ccc0:cc2::/48
 2a10:ccc0:ccc::/48
-2a12:3fc2:aa40::/44
+2a10:fa81:d00::/40
+2a10:fa86:4000::/36
+2a10:fa86::/34
+2a10:fa86:c000::/34
+2a12:3fc6:2::/48
+2a12:3fc6::/47
+2a12:cb40:1::/48
+2a12:cb40:2::/48
 2a12:cb41:1200::/44
-2a12:cb41:1300::/43
+2a12:cb41:1300::/44
 2a12:cb41:13f0::/44
 2a12:cb41:600::/44
-2a12:cb41::/44
 2a12:cb46::/36
 2a12:cb47:ffff::/48
-2a13:1800:10::/48
-2a13:1800:300::/44
-2a13:1800:80::/44
-2a13:1800::/48
 2a13:1801:180::/43
 2a13:1801:200::/44
 2a13:1802::/43
 2a13:8c87::/32
 2a13:9500:194::/47
 2a13:a5c3:f000::/40
-2a13:a5c3:ff41::/48
 2a13:a5c3:ff50::/44
 2a13:a5c5::/48
 2a13:aac4:f000::/44
 2a13:b487:1200::/42
-2a13:b487:1330::/47
+2a13:c8c3:e803::/48
-2a14:67c1:70::/48
+2a13:e5c0:ee02::/48
-2a14:67c1:74::/47
+2a14:4380::/29
-2a14:67c1:a020::/48
+2a14:5f00::/29
-2a14:67c1:a023::/48
+2a14:67c1:b500::/40
-2a14:67c1:a024::/48
+2a14:67c2:519::/48
-2a14:67c1:a02a::/48
+2a14:67c2:520::/48
-2a14:67c1:a02f::/48
+2a14:67c3:1100::/47
-2a14:67c1:a110::/44
-2a14:67c1:a123::/48
-2a14:67c1:a125::/48
-2a14:67c1:a128::/48
-2a14:67c1:a144::/48
-2a14:67c1:b100::/46
-2a14:67c1:b105::/48
-2a14:67c1:b107::/48
-2a14:67c1:b110::/48
-2a14:67c1:b130::/46
-2a14:67c1:b134::/48
-2a14:67c1:b136::/48
-2a14:67c1:b141::/48
-2a14:67c1:b142::/47
-2a14:67c1:b146::/47
-2a14:67c1:b148::/48
-2a14:67c1:b511::/48
-2a14:67c1:b514::/48
-2a14:67c1:b530::/44
-2a14:67c1:b563::/48
-2a14:67c1:b578::/48
-2a14:67c1:b582::/48
-2a14:67c1:b586::/47
-2a14:67c1:b588::/47
-2a14:67c1:b590::/48
-2a14:67c1:b5e0::/44
-2a14:67c1:c300::/40
-2a14:67c1:c600::/40
-2a14:67c2:500::/40
-2a14:67c2:a10::/47
-2a14:67c2:a21::/48
-2a14:67c2:a22::/47
-2a14:67c2:a2f::/48
-2a14:67c2:a30::/48
-2a14:67c2:a41::/48
-2a14:67c2:a50::/48
-2a14:67c2:a70::/47
-2a14:67c2:a80::/47
-2a14:67c2:a90::/48
-2a14:67c2:aa1::/48
-2a14:67c2:c05::/48
-2a14:67c2:c08::/47
-2a14:67c2:c0c::/47
 2a14:67c3:190::/47
 2a14:67c3:192::/48
 2a14:67c3:30::/44
-2a14:67c3:360::/48
-2a14:67c3:9990::/44
-2a14:67c3:c0::/48
-2a14:67c3:caf0::/44
-2a14:67c3:fff0::/44
-2a14:7580:730::/44
 2a14:7580:740::/44
-2a14:7580:d00::/43
+2a14:7580:d10::/44
 2a14:7580:d20::/46
-2a14:7580:d41::/48
+2a14:7580:ffee::/48
-2a14:7580:d42::/47
+2a14:7580:fff3::/48
-2a14:7580:dff::/48
 2a14:7580:fffa::/48
-2a14:7581:30b6::/48
-2a14:7581:3100::/40
 2a14:7581:3810::/48
 2a14:7581:3814::/48
-2a14:7581:ffb::/48
+2a14:7581:3818::/48
-2a14:7583:efff::/48
+2a14:7582:7000::/36
-2a14:7583:f220::/43
+2a14:7583:efe7::/48
-2a14:7583:f240::/42
+2a14:7583:efef::/48
-2a14:7583:f300::/46
-2a14:7583:f304::/47
-2a14:7583:f306::/48
 2a14:7583:f411::/48
-2a14:7583:f4f0::/47
+2a14:7583:f4f0::/48
 2a14:7583:f4f4::/48
 2a14:7583:f4fe::/48
-2a14:7583:f500::/48
 2a14:7583:f701::/48
 2a14:7583:f703::/48
-2a14:7583:f704::/46
+2a14:7583:f704::/47
-2a14:7583:f708::/46
+2a14:7583:f707::/48
+2a14:7583:f708::/47
 2a14:7583:f70c::/48
 2a14:7583:f743::/48
 2a14:7583:f744::/48
 2a14:7583:f764::/48
-2a14:7586:6100::/47
 2a14:7586:6103::/48
-2a14:7586:6104::/46
+2a14:7586:6104::/47
+2a14:7586:6106::/48
 2a14:7586:6108::/48
 2a14:7586:6110::/48
-2a14:7586:6113::/48
 2a14:7586:6300::/44
-2a14:7586:6500::/48
-2a14:7dc0:506::/48
-2a14:7dc0:520::/48
-2a14:7dc0:52f::/48
 2a14:ae00:50::/44
 2c0f:f7a8:8011::/48
 2c0f:f7a8:8050::/48
@@ -1709,5 +1634,4 @@
 2c0f:f7a8:8211::/48
 2c0f:f7a8:9020::/48
 2c0f:f7a8:9041::/48
-2c0f:f7a8:9211::/48
 2c0f:f7a8:9220::/48

luci-app-passwall/root/usr/share/passwall/rules/domains_excluded

@@ -23,4 +23,4 @@ rbspsxp.vivox.com
 rbswxp.vivox.com
 Mijia Cloud
 dlg.io.mi.com
-marscdn.c2c.wechat.com
+regexp:(^|.*\.)c2c\.wechat\.com$

luci-app-passwall/root/usr/share/passwall/rules/gfwlist

@@ -13,6 +13,7 @@
 173ng.com
 18board.com
 18comic.org
+18comic.vip
 18mh.net
 1984bbs.com
 1991way.com
@@ -127,6 +128,7 @@ agoogleaday.com
 agro.hk
 ai.dev
 ai.studio
+aihub.top
 aiosearch.com
 aiph.net
 airconsole.com
@@ -221,6 +223,7 @@ api.moomoobull.com
 api.palworldgame.com
 api.pureapk.com
 api.recaptcha.net
+api.shuaiapi.com
 api.steampowered.com
 api5.futunn.com
 apiary.io
@@ -294,7 +297,6 @@ atlanta168.com
 atnext.com
 auctions.yahoo.co.jp
 audacy.com
-auntology.fandom.com
 autodraw.com
 av.movie
 av01.tv
@@ -342,6 +344,7 @@ baramangaonline.com
 barnabu.co.uk
 bartender.dowjones.com
 barton.de
+basemaps.arcgis.com
 bastillepost.com
 bayvoice.net
 bb-chat.tv
@@ -560,6 +563,7 @@ break.com
 breakgfw.com
 breakingtweets.com
 breakwall.net
+briarproject.org
 brill.com
 brizzly.com
 broadpressinc.com
@@ -686,6 +690,7 @@ centauro.com.br
 centerforhumanreprod.com
 centralnation.com
 centurys.net
+cerebras.ai
 certificate-transparency.org
 certificate.revocationcheck.com
 cfr.org
@@ -701,6 +706,7 @@ character.ai
 chat.com
 chat.lmsys.org
 chatgpt.com
+chatgpt.site
 chatpdf.com
 chaturbate.com
 checkgfw.com
@@ -766,10 +772,12 @@ chrome.com
 chromecast.com
 chromeexperiments.com
 chromestatus.com
+cht.com.tw
 ci-en.jp
 cia.gov
 cici.com
 ciciai.com
+circle19.org
 cirosantilli.com
 citizencn.com
 citizenlab.ca
@@ -782,6 +790,7 @@ civilmedia.tw
 civitai.com
 cixiaoya.club
 ck101.com
+clashyun.com
 classicalguitarblog.net
 claude.ai
 claude.com
@@ -991,6 +1000,7 @@ disneyplus.com
 disp.cc
 disqus.com
 dit-inc.us
+divdyn.com
 diyin.org
 dizhuzhishang.com
 dl-laby.jp
@@ -1140,6 +1150,7 @@ eromanga-kingdom.com
 eromangadouzin.com
 eromon.net
 esg.t91y.com
+esim.redteago.com
 eslite.com
 esurance.com
 etherdelta.com
@@ -1162,6 +1173,7 @@ exmormon.org
 expatshield.com
 expecthim.com
 expekt.com
+experience.arcgis.com
 exploader.net
 expressnews.com
 expressvpn.com
@@ -1201,6 +1213,7 @@ falundafaindia.org
 falunhr.org
 famunion.com
 fanbox.cc
+fandom.com
 fangeqiang.com
 fanglizhi.info
 fangong.org
@@ -1439,6 +1452,7 @@ geti2p.net
 getlantern.org
 getmalus.com
 getmdl.io
+getmonero.org
 getoutline.org
 getsession.org
 getsync.com
@@ -1852,6 +1866,7 @@ himalayan-foundation.org
 himemix.com
 hindustantimes.com
 hinet.net
+historylines.net
 hitbtc.com
 hitomi.la
 hive.blog
@@ -1891,7 +1906,6 @@ holyspiritspeaks.org
 home.saxo
 homedepot.com
 homeservershow.com
-hongkong.fandom.com
 hongkongfp.com
 hongzhi.li
 honven.xyz
@@ -2170,6 +2184,7 @@ kanshifang.com
 kantie.org
 kaotic.com
 karayou.com
+kards.com
 kathmandupost.com
 kawaiikawaii.jp
 kawase.com
@@ -2194,6 +2209,7 @@ kinmen.org.tw
 kinmen.travel
 kinokuniya.com
 kiwi.kz
+kiwix.org
 kk-whys.co.jp
 kkbox.com
 kknews.cc
@@ -2254,6 +2270,7 @@ lenwhite.com
 leonardo.ai
 lesoir.be
 letscorp.net
+level-plus.net
 lexica.art
 lhakar.org
 li.taipei
@@ -2300,6 +2317,7 @@ liveleak.com
 livemint.com
 livestream.com
 livevideo.com
+livingatlas.arcgis.com
 livingstream.com
 lmarena.ai
 localbitcoins.com
@@ -2387,6 +2405,7 @@ mattwilcox.net
 maven.neoforged.net
 mcadforums.com
 mcaf.ee
+mceindex.com
 mcusercontent.com
 md-t.org
 me.me
@@ -2517,7 +2536,6 @@ mosavi.io
 motherless.com
 movements.org
 moviefap.com
-mozilla.ai
 mpettis.com
 mpfinance.com
 mpinews.com
@@ -2632,6 +2650,7 @@ nga.mil
 nhentai.net
 nic.cz.cc
 nic.gov
+nicoseiga.jp
 nicovideo.jp
 nightswatch.top
 nikke-en.com
@@ -2672,6 +2691,7 @@ ntd.tv
 ntdtv.com
 ntdtv.com.tw
 ntdtv.cz
+nthlink.com
 nuexpo.com
 nurgo-software.com
 nusatrip.com
@@ -2716,6 +2736,7 @@ oklink.com
 okpool.me
 okx.com
 old.honeynet.org
+oldmapsonline.org
 olehdtv.com
 olelive.com
 olevod.com
@@ -2986,7 +3007,6 @@ puffinbrowser.com
 pullfolio.co
 pure18.com
 pureconcepts.net
-puredns.org
 pureinsight.org
 purepdf.com
 purevpn.com
@@ -3031,7 +3051,6 @@ radio.co
 radio.garden
 radioaustralia.net.au
 radiohilight.net
-radiojar.com
 radioline.co
 radiovaticana.org
 radiovncr.com
@@ -3137,6 +3156,7 @@ rxhj.net
 s-cute.com
 s.yimg.com
 s3-ap-northeast-1.amazonaws.com
+s3.dualstack.us-west-2.amazonaws.com
 sacks.com
 sacom.hk
 sadistic-v.com
@@ -3144,7 +3164,6 @@ sadpanda.us
 safechat.com
 safeguarddefenders.com
 safervpn.com
-sagernet.org
 saintyculture.com
 sakuralive.com
 salvation.org.hk
@@ -3157,6 +3176,7 @@ savetibet.de
 savetibet.org
 savetibetstore.org
 saveuighur.org
+sb.sb
 sbme.me
 sbti.unun.dev
 schema.org
@@ -3433,6 +3453,7 @@ synapse.org
 syncback.com
 synergyse.com
 syosetu.com
+sysub.com
 t-g.com
 t.co
 t.me
@@ -3646,6 +3667,7 @@ to-porno.com
 togetter.com
 token.im
 tokenlon.im
+tokenplus.app
 tokyo-porn-tube.com
 tokyocn.com
 tomp3.cc
@@ -3687,6 +3709,7 @@ trtworld.com
 truebuddha-md.org
 trustwallet.com
 truthsocial.com
+tryai.dev
 tryheart.jp
 tsdr.uspto.gov
 tt1069.com
@@ -3868,6 +3891,7 @@ uyghurstudies.org
 uyghurtribunal.com
 uygur.fc2web.com
 uymaarip.com
+v.recipes
 v2.help
 v2.hysteria.network
 v2ex.com
@@ -4078,6 +4102,7 @@ wiktionary.org
 willw.net
 wilsoncenter.org
 windscribe.com
+windy.com
 wingamestore.com
 wingy.site
 wionews.com
@@ -4120,6 +4145,7 @@ woyaolian.org
 wp.com
 wplace.live
 wpoforum.com
+write.as
 writesonic.com
 wsj.com
 wsj.net
@@ -4132,7 +4158,6 @@ wwitv.com
 www.ajsands.com
 www.antd.org
 www.aolnews.com
-www.clashverge.dev
 www.cmoinc.org
 www.dmm.com
 www.eastturkistan.net
@@ -4168,6 +4193,7 @@ x.co
 x.com
 x.company
 x3guide.com
+x86.fr
 xbabe.com
 xbookcn.com
 xbtce.com
@@ -4310,6 +4336,7 @@ zdnet.com.tw
 zello.com
 zenmate.com
 zenmate.com.ru
+zenmux.ai
 zerohedge.com
 zeronet.io
 zh-hans.cfsh99.com