diff --git a/docker/Makefile b/docker/Makefile index fe4ebe1b6..3e6562d89 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=docker -PKG_VERSION:=29.2.0-rc.2 +PKG_VERSION:=29.2.0 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:=7ee49a8fe2fcaa0b7a8ac63a4055425ba1a08e4ee5f5eee56b8076db836b96bb +PKG_HASH:=f2bdc2b7ee7f7840a4d5b845f6c1fdf8bd7a123bba7cf9f1056220794b07ba9c 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/dockerd/Makefile b/dockerd/Makefile index a991e6416..68a1a75ff 100644 --- a/dockerd/Makefile +++ b/dockerd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dockerd -PKG_VERSION:=29.1.5 +PKG_VERSION:=29.2.0 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/luci-app-nekobox/Makefile b/luci-app-nekobox/Makefile index f335c8eee..3abfdf40d 100644 --- a/luci-app-nekobox/Makefile +++ b/luci-app-nekobox/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_MAINTAINER:=Thaolga PKG_NAME:=luci-app-nekobox PKG_VERSION:=2.0.9 -PKG_RELEASE:=rc13 +PKG_RELEASE:=rc14 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/luci-app-nekobox/htdocs/nekobox/mihomo_manager.php b/luci-app-nekobox/htdocs/nekobox/mihomo_manager.php index 6f2ba470e..6a10b2a97 100644 --- a/luci-app-nekobox/htdocs/nekobox/mihomo_manager.php +++ b/luci-app-nekobox/htdocs/nekobox/mihomo_manager.php @@ -325,7 +325,7 @@ function autoCleanInvalidSubInfo($subscriptions) { } function isValidSubscriptionContent($content) { - $keywords = ['ss', 'shadowsocks', 'vmess', 'vless', 'trojan', 'hysteria2', 'socks5', 'http']; + $keywords = ['ss', 'anytls', 'vmess', 'vless', 'trojan', 'hysteria2', 'socks5', 'http']; foreach ($keywords as $keyword) { if (stripos($content, $keyword) !== false) { return true; @@ -1139,7 +1139,7 @@ $(document).ready(function() { $size = file_exists($filePath) ? formatSize(filesize($filePath)) : ($translations['fileNotExist'] ?? 'Not Exist'); $modified = file_exists($filePath) ? date('Y-m-d H:i:s', filemtime($filePath)) : '-'; - $validProtocols = '/^(ss|shadowsocks|vmess|vless|trojan|hysteria2|socks5|http)$/i'; + $validProtocols = '/^(ss|shadowsocks|anytls|vmess|vless|trojan|hysteria2|socks5|http)$/i'; $nodeCount = 0; if (file_exists($filePath)) { @@ -1215,12 +1215,12 @@ $(document).ready(function() { } } } - elseif (preg_match('/^(ss|vmess|vless|trojan|hysteria2|socks5|http):\/\//im', $content)) { + elseif (preg_match('/^(ss|shadowsocks|anytls|vmess|vless|trojan|hysteria2|socks5|http):\/\//im', $content)) { $lines = preg_split("/\r?\n/", $content); foreach ($lines as $line) { $line = trim($line); if ($line === '' || str_starts_with($line, '#')) continue; - if (preg_match('/^(ss|vmess|vless|trojan|hysteria2|socks5|http):\/\//i', $line)) { + if (preg_match('/^(ss|shadowsocks|anytls|vmess|vless|trojan|hysteria2|socks5|http):\/\//i', $line)) { $nodeCount++; } } diff --git a/luci-app-nekobox/htdocs/nekobox/ping.php b/luci-app-nekobox/htdocs/nekobox/ping.php index 85db427fa..b9f1b112b 100644 --- a/luci-app-nekobox/htdocs/nekobox/ping.php +++ b/luci-app-nekobox/htdocs/nekobox/ping.php @@ -751,7 +751,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+ style="width: 80px; height: 50px; background: rgba(255,255,255,0.05); border: var(--border-strong);">
+ style="height: 50px; flex: 1; cursor: pointer; background: #333; border: var(--border-strong); transition: all 0.3s ease;">