update 2026-09-07 16:50:29

This commit is contained in:
action
2026-09-07 16:50:29 +08:00
parent e7e55d191d
commit 2ff8b68fd7
9 changed files with 67 additions and 98 deletions
+4 -4
View File
@@ -1,8 +1,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=clashoo
PKG_SHORT_SHA:=fd74ecb
PKG_COMMIT_DATE:=2026.09.05
PKG_SHORT_SHA:=8f54283
PKG_COMMIT_DATE:=2026.09.07
PKG_VERSION:=$(PKG_COMMIT_DATE)~$(PKG_SHORT_SHA)
PKG_RELEASE:=1
@@ -11,8 +11,8 @@ 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:=fd74ecb6e22bbdba17a4d7441531fea69ee43036
PKG_HASH:=b88239c01871ba771b1e80caadf247feab42130783f5ab40be0c9fe27a9cc836
PKG_SOURCE_VERSION:=8f54283e97728859d88f45025bab250504337687
PKG_HASH:=28db96ba63d8f4e79df122c1efe02fed485e1997cf1888e5d045c17908aa34a9
PKG_BUILD_VERSION:=alpha-$(PKG_SHORT_SHA)
PKG_LICENSE:=GPL3.0+
@@ -6,12 +6,14 @@ set clashoo_china6 {
2001:250::/30,
2001:254::/33,
2001:255::/32,
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::/45,
2001:dc7:9::/48,
@@ -117,7 +119,6 @@ set clashoo_china6 {
2400:5280:1400::/38,
2400:5280:1c00::/38,
2400:5280:3400::/38,
2400:5280:4000::/38,
2400:5280:4c00::/38,
2400:5280:5000::/36,
2400:5280:6000::/35,
@@ -757,9 +758,7 @@ set clashoo_china6 {
2401:f860:10::/44,
2401:f860:20::/43,
2401:f860:40::/42,
2401:f860:80::/46,
2401:f860:84::/48,
2401:f860:86::/47,
2401:f860:80::/45,
2401:f860:89::/48,
2401:f860:8a::/47,
2401:f860:8c::/46,
@@ -781,7 +780,6 @@ set clashoo_china6 {
2401:f860:2000::/35,
2401:f860:4000::/34,
2401:f860:8000::/33,
2401:fa00:40::/48,
2401:fa80::/32,
2401:fb80::/32,
2401:fc60::/32,
@@ -939,6 +937,7 @@ set clashoo_china6 {
2402:7140::/32,
2402:71c0::/32,
2402:7240::/32,
2402:72a0::/32,
2402:72c0::/32,
2402:7540::/32,
2402:75c0::/32,
@@ -1458,15 +1457,7 @@ set clashoo_china6 {
2404:1880::/32,
2404:1c80::/32,
2404:1cc0::/32,
2404:1d80::/44,
2404:1d80:10::/45,
2404:1d80:18::/47,
2404:1d80:1b::/48,
2404:1d80:1c::/46,
2404:1d80:20::/43,
2404:1d80:40::/42,
2404:1d80:80::/41,
2404:1d80:100::/40,
2404:1d80::/39,
2404:1d80:200::/44,
2404:1d80:210::/47,
2404:1d80:212::/48,
@@ -1765,10 +1756,9 @@ set clashoo_china6 {
2405:84c0:8008::/45,
2405:84c0:8010::/48,
2405:84c0:8019::/48,
2405:84c0:801b::/48,
2405:84c0:801c::/46,
2405:84c0:8020::/47,
2405:84c0:8034::/46,
2405:84c0:8036::/47,
2405:84c0:8038::/46,
2405:84c0:803c::/47,
2405:84c0:803e::/48,
@@ -1943,7 +1933,13 @@ set clashoo_china6 {
2406:840:190::/44,
2406:840:1a0::/43,
2406:840:1c0::/42,
2406:840:200::/41,
2406:840:201::/48,
2406:840:202::/47,
2406:840:204::/46,
2406:840:208::/45,
2406:840:210::/44,
2406:840:220::/43,
2406:840:240::/42,
2406:840:280::/42,
2406:840:2c0::/43,
2406:840:2e1::/48,
@@ -1952,7 +1948,6 @@ set clashoo_china6 {
2406:840:2e8::/45,
2406:840:2f0::/44,
2406:840:300::/41,
2406:840:381::/48,
2406:840:382::/47,
2406:840:384::/46,
2406:840:388::/45,
@@ -2274,18 +2269,7 @@ set clashoo_china6 {
2406:840:9fc0::/43,
2406:840:9fe0::/44,
2406:840:a000::/35,
2406:840:c000::/41,
2406:840:c080::/43,
2406:840:c0a0::/45,
2406:840:c0a9::/48,
2406:840:c0aa::/47,
2406:840:c0ac::/46,
2406:840:c0b0::/44,
2406:840:c0c0::/42,
2406:840:c100::/40,
2406:840:c200::/39,
2406:840:c400::/38,
2406:840:c800::/37,
2406:840:c000::/36,
2406:840:e000::/41,
2406:840:e090::/44,
2406:840:e0a0::/43,
@@ -2294,7 +2278,7 @@ set clashoo_china6 {
2406:840:e0cc::/47,
2406:840:e0ce::/48,
2406:840:e0d0::/44,
2406:840:e0e6::/47,
2406:840:e0e4::/46,
2406:840:e0e9::/48,
2406:840:e0ea::/47,
2406:840:e0ec::/46,
@@ -2436,14 +2420,7 @@ set clashoo_china6 {
2406:840:f120::/43,
2406:840:f140::/42,
2406:840:f180::/41,
2406:840:f201::/48,
2406:840:f202::/48,
2406:840:f204::/46,
2406:840:f208::/45,
2406:840:f210::/44,
2406:840:f220::/43,
2406:840:f240::/42,
2406:840:f280::/41,
2406:840:f200::/40,
2406:840:f300::/43,
2406:840:f320::/44,
2406:840:f330::/46,
@@ -2527,13 +2504,7 @@ set clashoo_china6 {
2406:840:fc68::/45,
2406:840:fc74::/46,
2406:840:fc78::/45,
2406:840:fc80::/48,
2406:840:fc82::/48,
2406:840:fc84::/48,
2406:840:fc86::/48,
2406:840:fc88::/46,
2406:840:fc8c::/47,
2406:840:fc8e::/48,
2406:840:fc80::/44,
2406:840:fc94::/46,
2406:840:fc98::/45,
2406:840:fca4::/46,
@@ -2612,19 +2583,17 @@ set clashoo_china6 {
2406:840:fe52::/47,
2406:840:fe54::/46,
2406:840:fe58::/45,
2406:840:fe60::/44,
2406:840:fe70::/47,
2406:840:fe72::/48,
2406:840:fe75::/48,
2406:840:fe76::/47,
2406:840:fe78::/45,
2406:840:fe60::/43,
2406:840:fe80::/44,
2406:840:fe95::/48,
2406:840:fe9c::/48,
2406:840:fe9f::/48,
2406:840:fea0::/48,
2406:840:fea9::/48,
2406:840:feb0::/44,
2406:840:feb0::/47,
2406:840:feb2::/48,
2406:840:feb4::/46,
2406:840:feb8::/45,
2406:840:fec1::/48,
2406:840:fec6::/47,
2406:840:fec8::/47,
@@ -3236,7 +3205,6 @@ set clashoo_china6 {
2605:9d80:9042::/48,
2605:9d80:9071::/48,
2605:9d80:9092::/48,
2804:1e48:9001::/48,
2804:1e48:9002::/48,
2a03:f900::/29,
2a04:3e00:1002::/48,
@@ -3301,10 +3269,7 @@ set clashoo_china6 {
2a0a:d681:e200::/39,
2a0a:d681:e400::/38,
2a0a:d681:e800::/37,
2a0a:d681:f000::/37,
2a0a:d681:f800::/39,
2a0a:d681:fa00::/40,
2a0a:d681:fd00::/40,
2a0a:d681:f000::/36,
2a0a:d682::/33,
2a0a:d682:8000::/34,
2a0a:d682:c000::/36,
@@ -427,7 +427,6 @@ set clashoo_china {
43.240.128.0/21,
43.240.136.0/22,
43.240.156.0/22,
43.240.160.0/19,
43.240.192.0/19,
43.240.240.0/20,
43.241.0.0/20,
@@ -1325,7 +1324,7 @@ set clashoo_china {
103.36.96.0/22,
103.36.132.0/22,
103.36.136.0/22,
103.36.160.0/19,
103.36.160.0/20,
103.36.192.0/19,
103.36.224.0/20,
103.36.240.0/21,
@@ -1630,6 +1629,7 @@ set clashoo_china {
103.70.14.0/23,
103.70.148.0/22,
103.70.224.0/23,
103.70.227.0/24,
103.70.236.0/22,
103.70.252.0/22,
103.71.0.0/22,
@@ -1733,6 +1733,7 @@ set clashoo_china {
103.81.120.0/22,
103.81.148.0/22,
103.81.164.0/22,
103.81.184.0/23,
103.81.200.0/22,
103.81.232.0/22,
103.82.60.0/22,
@@ -1879,6 +1880,7 @@ set clashoo_china {
103.97.144.0/21,
103.97.188.0/22,
103.97.192.0/22,
103.97.229.0/24,
103.98.0.0/23,
103.98.40.0/21,
103.98.48.0/22,
@@ -2964,7 +2966,10 @@ set clashoo_china {
110.92.68.0/22,
110.93.32.0/19,
110.94.0.0/15,
110.96.0.0/12,
110.96.0.0/15,
110.98.0.0/16,
110.100.0.0/14,
110.104.0.0/13,
110.112.0.0/13,
110.120.0.0/16,
110.121.0.0/22,
@@ -3388,10 +3393,8 @@ set clashoo_china {
117.134.0.0/17,
117.134.128.0/18,
117.134.205.0/24,
117.134.206.0/23,
117.134.208.0/21,
117.134.216.0/22,
117.134.220.0/23,
117.134.207.0/24,
117.134.208.0/20,
117.134.232.0/21,
117.134.240.0/20,
117.135.0.0/16,
@@ -3498,7 +3501,13 @@ set clashoo_china {
119.48.0.0/13,
119.57.0.0/16,
119.58.0.0/16,
119.59.128.0/17,
119.59.128.0/24,
119.59.130.0/24,
119.59.132.0/22,
119.59.136.0/21,
119.59.144.0/20,
119.59.160.0/19,
119.59.192.0/18,
119.60.0.0/15,
119.62.0.0/16,
119.63.32.0/19,
@@ -3893,6 +3902,7 @@ set clashoo_china {
129.211.0.0/16,
132.232.0.0/16,
132.237.134.0/24,
134.49.240.0/22,
134.175.0.0/16,
137.59.59.0/24,
137.59.88.0/22,
@@ -4203,6 +4213,7 @@ set clashoo_china {
163.0.0.0/16,
163.47.4.0/22,
163.52.28.0/23,
163.52.76.0/23,
163.53.0.0/20,
163.53.36.0/22,
163.53.40.0/21,
@@ -4339,12 +4350,6 @@ set clashoo_china {
180.210.212.0/22,
180.212.0.0/15,
180.222.224.0/19,
180.223.196.0/24,
180.223.200.0/22,
180.223.212.0/24,
180.223.232.0/21,
180.223.240.0/21,
180.223.252.0/22,
180.233.0.0/18,
180.233.64.0/19,
180.233.144.0/22,
@@ -4416,14 +4421,14 @@ set clashoo_china {
183.182.12.0/22,
183.182.16.0/23,
183.182.23.0/24,
183.182.24.0/23,
183.182.26.0/24,
183.182.28.0/22,
183.182.24.0/21,
183.184.0.0/13,
183.192.0.0/10,
185.2.48.0/24,
185.2.51.0/24,
185.75.173.0/24,
185.75.174.0/24,
185.192.56.0/22,
188.131.128.0/17,
192.51.172.0/23,
192.55.46.0/23,
@@ -4654,7 +4659,9 @@ set clashoo_china {
202.55.4.0/24,
202.55.18.0/23,
202.55.20.0/22,
202.55.24.0/21,
202.55.24.0/22,
202.55.28.0/23,
202.55.31.0/24,
202.57.192.0/20,
202.57.212.0/22,
202.57.216.0/22,
@@ -4789,9 +4796,7 @@ set clashoo_china {
202.130.39.0/24,
202.130.224.0/19,
202.131.16.0/21,
202.131.48.0/22,
202.131.54.0/23,
202.131.56.0/21,
202.131.48.0/20,
202.131.208.0/20,
202.133.32.0/20,
202.134.58.0/24,
@@ -4815,6 +4820,8 @@ set clashoo_china {
202.143.56.0/21,
202.143.100.0/22,
202.143.104.0/22,
202.144.196.0/23,
202.144.198.0/24,
202.146.160.0/20,
202.146.184.0/23,
202.146.186.0/24,
@@ -5021,7 +5028,6 @@ set clashoo_china {
203.8.8.0/24,
203.8.23.0/24,
203.8.25.0/24,
203.8.30.0/24,
203.8.70.0/24,
203.8.82.0/24,
203.8.86.0/23,
@@ -5949,6 +5955,7 @@ set clashoo_china {
203.223.16.0/24,
203.223.21.0/24,
203.223.22.0/23,
206.109.70.0/23,
206.109.75.0/24,
210.2.0.0/19,
210.5.0.0/19,
@@ -5971,8 +5978,6 @@ set clashoo_china {
210.26.0.0/15,
210.28.0.0/14,
210.32.0.0/12,
210.48.140.0/23,
210.48.142.0/24,
210.51.0.0/16,
210.52.0.0/15,
210.56.192.0/19,
@@ -6043,7 +6048,9 @@ set clashoo_china {
218.24.0.0/14,
218.28.0.0/15,
218.30.0.0/19,
218.30.32.0/21,
218.30.32.0/22,
218.30.36.0/23,
218.30.38.0/24,
218.30.40.0/22,
218.30.45.0/24,
218.30.46.0/23,
@@ -6154,7 +6161,6 @@ set clashoo_china {
221.128.224.0/21,
221.128.232.0/22,
221.128.238.0/23,
221.128.244.0/22,
221.129.0.0/16,
221.130.0.0/15,
221.133.224.0/19,
Binary file not shown.
Binary file not shown.
@@ -4,7 +4,6 @@ set -u
XRAY_RELEASE_PAGE="https://github.com/fw876/helloworld/releases/latest"
MIHOMO_RELEASE_PAGE="https://github.com/MetaCubeX/mihomo/releases/latest"
HELLOWORLD_RELEASE_API="https://api.github.com/repos/fw876/helloworld/releases/latest"
XRAY_BINARY="/usr/bin/xray"
MIHOMO_BINARY="/usr/bin/mihomo"
@@ -990,7 +989,7 @@ v2ray_geosite_upgrade() {
return 0
}
get_xray_latest_tag() {
get_helloworld_latest_tag() {
local location tag
location="$(effective_url "$XRAY_RELEASE_PAGE")" || return 1
@@ -1050,7 +1049,7 @@ get_xray_latest_info() {
pm="$(detect_package_manager)" || return 2
arch="$(get_openwrt_arch)"
tag="$(get_xray_latest_tag)" || return 3
tag="$(get_helloworld_latest_tag)" || return 3
release_html="$(fetch_text "https://github.com/fw876/helloworld/releases/expanded_assets/$tag")" || return 3
asset_list="$(printf '%s\n' "$release_html" | sed -n 's#.*href="/fw876/helloworld/releases/download/[^/]*/\([^"]*\)".*#\1#p')"
asset="$(select_xray_asset "$asset_list" "$pm" "$arch")" || return 4
@@ -1195,7 +1194,7 @@ get_naiveproxy_latest_info() {
pm="$(detect_package_manager)" || return 2
arch="$(get_openwrt_arch)"
tag="$(get_xray_latest_tag)" || return 3
tag="$(get_helloworld_latest_tag)" || return 3
release_html="$(fetch_text "https://github.com/fw876/helloworld/releases/expanded_assets/$tag")" || return 3
asset_list="$(printf '%s\n' "$release_html" | sed -n 's#.*href="/fw876/helloworld/releases/download/[^/]*/\([^"]*\)".*#\1#p')"
asset="$(select_naiveproxy_asset "$asset_list" "$pm" "$arch")" || return 4
@@ -1264,13 +1263,12 @@ mainprogram_asset_version() {
}
get_mainprogram_latest_info() {
local pm release_json tag version asset asset_list url
local pm release_html tag version asset asset_list url
pm="$(detect_package_manager)" || return 2
release_json="$(fetch_text "$HELLOWORLD_RELEASE_API")" || return 3
tag="$(printf '%s\n' "$release_json" | sed -n 's/.*"tag_name":[[:space:]]*"\([^"]*\)".*/\1/p' | sed -n '1p')"
[ -n "$tag" ] || return 3
asset_list="$(printf '%s\n' "$release_json" | sed -n 's/.*"name":[[:space:]]*"\([^"]*\.\(ipk\|apk\)\)".*/\1/p')"
tag="$(get_helloworld_latest_tag)" || return 3
release_html="$(fetch_text "https://github.com/fw876/helloworld/releases/expanded_assets/$tag")" || return 3
asset_list="$(printf '%s\n' "$release_html" | sed -n 's#.*href="/fw876/helloworld/releases/download/[^/]*/\([^"]*\)".*#\1#p')"
asset="$(select_mainprogram_asset "$asset_list" "$pm")" || return 4
version="$(mainprogram_asset_version "$asset" 2>/dev/null || trim_version "$tag")"
url="$(mirror_wrap_url "https://github.com/fw876/helloworld/releases/download/$tag/$asset")"
+1 -1
View File
@@ -30,7 +30,7 @@ define Download/geosite
HASH:=8d401b06cde720cdfa9eb0e03751cc73ded08c6d53fa80f92d3f24798382eb92
endef
GEOSITE_IRAN_VER:=202608310142
GEOSITE_IRAN_VER:=202609070121
GEOSITE_IRAN_FILE:=iran.dat.$(GEOSITE_IRAN_VER)
define Download/geosite-ir
URL:=https://github.com/bootmortis/iran-hosted-domains/releases/download/$(GEOSITE_IRAN_VER)/