🎨 Sync 2026-10-01 18:52:09
Merge-upstream / merge (push) Canceled after 0s

This commit is contained in:
github-actions[bot] committed 2026-10-01 18:52:09 +08:00
1 parent 3459c744b6
commit 310bf34ffd
12 files changed
+30 -45

No files matched your search

+3 -3
View File
@@ -1,17 +1,17 @@
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:=3
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:=0165638d50cfe2125ce47770bd75e2e007bbaffa
PKG_SOURCE_VERSION:=f0c95853839454a5d1a9eda873d94b3d6c8cc8c3
PKG_HASH:=skip
PKG_BUILD_VERSION:=alpha-$(PKG_SHORT_SHA)
+1 -1
View File
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-argon-config
PKG_VERSION:=1.0
PKG_RELEASE:=5
PKG_RELEASE:=7
PKG_MAINTAINER:=jerrykuku <jerrykuku@qq.com>
@@ -342,7 +342,7 @@ start_core() {
config_get ip6addr settings ip6addr ''
config_get external_node settings external_node ''
config_get rpc_port settings rpc_port '15888'
config_get encryption_algorithm settings encryption_algorithm ''
config_get encryption_algorithm settings encryption_algorithm 'aes-gcm'
config_get dev_name settings dev_name 'easytier0'
config_get custom_config_file settings custom_config_file '/etc/easytier/config.toml'
config_get web_config settings web_config ''
@@ -10,8 +10,14 @@
fi
if [ -n "$new_uuid" ]; then
uci -q set easytier.settings.machine_id="$new_uuid"
uci -q commit easytier
fi
# 检测 SoC 是否支持硬件 AES 加速,不支持则切换默认加密算法为 chacha20-poly1305
if ! grep -q -i -E '^(flags|Features)[[:space:]]*:.*[[:space:]]aes([[:space:]]|$)' /proc/cpuinfo 2>/dev/null; then
uci -q set easytier.settings.encryption_algorithm='chacha20-poly1305'
fi
uci -q commit easytier
}
rm -f /tmp/luci-indexcache* 2>/dev/null
+1 -1
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
LUCI_TITLE:=Argon Theme
LUCI_DEPENDS:=+USE_APK:wget-any +!USE_APK:wget +jsonfilter
PKG_VERSION:=2.4.7
PKG_RELEASE:=23
PKG_RELEASE:=24
CONFIG_LUCI_CSSTIDY:=
@@ -868,10 +868,6 @@ select[multiple="multiple"] {
box-shadow: 0 3px 2px rgba(233, 236, 239, 0.05);
transition: all 0.3s cubic-bezier(0.68, -0.55, 0.265, 1.55);
}
.login-page .login-container .login-form .form-login .input-group input:focus-visible {
outline: 2px solid var(--primary);
outline-offset: 2px;
}
.login-page .login-container .login-form .form-login .input-group input:focus + .border {
transform: scaleX(1);
}
-5
View File
@@ -201,11 +201,6 @@
box-shadow: 0 3px 2px rgba(233, 236, 239, 0.05);
transition: all 0.3s cubic-bezier(0.68, -0.55, 0.265, 1.55);
&:focus-visible {
outline: 2px solid var(--primary);
outline-offset: 2px;
}
&:focus+.border {
transform: scaleX(1);
}
+1 -1
View File
@@ -9,7 +9,7 @@ LUCI_TITLE:=Design Theme
LUCI_DEPENDS:=
PKG_LICENSE:=Apache-2.0
PKG_VERSION:=7.1
PKG_RELEASE:=9
PKG_RELEASE:=10
LUCI_MINIFY_CSS:=
CONFIG_LUCI_CSSTIDY:=
@@ -19,10 +19,7 @@ return baseclass.extend({
this.dynamicMenuTargets = {};
this.syncConditionalMenuCache()
.then(L.bind(function(reloading) {
if (reloading)
return;
.then(L.bind(function() {
return this.resolveDynamicMenuTargets()
.then(L.bind(function() {
return ui.menu.load().then(L.bind(this.render, this));
@@ -70,13 +67,6 @@ return baseclass.extend({
return L.url(url, child.name);
},
reloadPageWithMenuFlush: function() {
var url = new URL(window.location.href);
url.searchParams.set('menu', 'flush');
window.location.replace(url.toString());
},
getFileListStamp: function(path, suffix) {
return L.resolveDefault(fs.list(path), []).then(function(entries) {
return entries.filter(function(entry) {
@@ -126,12 +116,11 @@ return baseclass.extend({
if (previousStamp === stamp)
return false;
window.localStorage.setItem(storageKey, stamp);
return this.flushBackendMenuCache().then(L.bind(function() {
this.reloadPageWithMenuFlush();
return true;
}, this));
return this.flushBackendMenuCache().then(function() {
// Reload only the menu: navigating here can abort form saves.
ui.menu.menu = null;
window.localStorage.setItem(storageKey, stamp);
});
}, this));
},
+2 -2
View File
@@ -5,8 +5,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mihomo
PKG_VERSION:=1.19.31
PKG_RELEASE:=33
PKG_VERSION:=1.19.32
PKG_RELEASE:=34
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/metacubex/mihomo/tar.gz/v$(PKG_VERSION)?
+1 -1
View File
@@ -9,7 +9,7 @@ PKG_NAME:=natmapt
PKG_UPSTREAM_VERSION:=20260214
PKG_UPSTREAM_GITHASH:=
PKG_VERSION:=$(PKG_UPSTREAM_VERSION)$(if $(PKG_UPSTREAM_GITHASH),~$(call version_abbrev,$(PKG_UPSTREAM_GITHASH)))
PKG_RELEASE:=9
PKG_RELEASE:=10
SCRIPTS_VERSION:=0.2026.01.24
PKG_SOURCE_SUBDIR:=$(PKG_UPSTREAM_NAME)-$(PKG_UPSTREAM_VERSION)
+7 -8
View File
@@ -450,17 +450,16 @@ service_triggers() {
procd_add_validation validate_section_natmap
}
boot() {
sleep $(uci -q get $NAME.@$GLOBALSECTION[0].boot_delay || echo 0)
network_flush_cache
define_nic
start "$@"
}
start_service() {
local sid="$1"
if [ -z "$DEF_WAN$DEF_WAN6" ]; then
>&2 echo "$(basename $0): default WAN not detected. service startup will be delayed."
sleep $(uci -q get $NAME.@$GLOBALSECTION[0].boot_delay || echo 0)
network_flush_cache
define_nic
fi
config_foreach validate_section_global "$GLOBALSECTION" define_global || return $?
[ "${GLOBAL_enable:=0}" == "0" ] && return 1