From 71880def69c91072edad57eb4b179ec23da5f994 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 3 May 2026 23:45:50 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=93=20Sync=202026-05-03=2023:45:50?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luci-app-passwall/Makefile | 4 ++-- luci-app-passwall/luasrc/passwall/util_xray.lua | 13 ++++++++++--- luci-theme-design/Makefile | 2 +- .../ucode/template/themes/design/header.ut | 2 +- xray-core/Makefile | 4 ++-- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index 912286fe3..88c07897c 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall -PKG_VERSION:=26.4.15 -PKG_RELEASE:=109 +PKG_VERSION:=26.5.3 +PKG_RELEASE:=110 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall/luasrc/passwall/util_xray.lua b/luci-app-passwall/luasrc/passwall/util_xray.lua index 2f0ab9f4b..925466d34 100644 --- a/luci-app-passwall/luasrc/passwall/util_xray.lua +++ b/luci-app-passwall/luasrc/passwall/util_xray.lua @@ -460,7 +460,7 @@ function gen_config_server(node) local settings = nil local routing = nil local outbounds = { - { protocol = "freedom", tag = "direct" }, { protocol = "blackhole", tag = "blocked" } + { protocol = "freedom", tag = "direct", settings = { finalRules = {{ action = "allow" }}}}, { protocol = "blackhole", tag = "blocked" } } if node.protocol == "vmess" or node.protocol == "vless" then @@ -582,6 +582,9 @@ function gen_config_server(node) mark = 255, interface = node.outbound_node_iface } + }, + settings = { + finalRules = {{ action = "allow" }} } } sys.call(string.format("mkdir -p %s && touch %s/%s", api.TMP_IFACE_PATH, api.TMP_IFACE_PATH, node.outbound_node_iface)) @@ -1238,6 +1241,9 @@ function gen_config(var) mark = 255, interface = node.iface } + }, + settings = { + finalRules = {{ action = "allow" }} } } sys.call(string.format("mkdir -p %s && touch %s/%s", api.TMP_IFACE_PATH, api.TMP_IFACE_PATH, node.iface)) @@ -1848,7 +1854,8 @@ function gen_config(var) protocol = "freedom", tag = "direct", settings = { - domainStrategy = (direct_dns_query_strategy and direct_dns_query_strategy ~= "") and direct_dns_query_strategy or "UseIP" + domainStrategy = (direct_dns_query_strategy and direct_dns_query_strategy ~= "") and direct_dns_query_strategy or "UseIP", + finalRules = (api.compare_versions(xray_version, ">", "26.4.25")) and {{ action = "allow" }} or nil -- Todo: Remove version check }, streamSettings = { sockopt = { @@ -1975,7 +1982,7 @@ function gen_proto_config(var) -- 额外传出连接 table.insert(outbounds, { - protocol = "freedom", tag = "direct", settings = {keep = ""}, sockopt = {mark = 255} + protocol = "freedom", tag = "direct", settings = {finalRules = {{ action = "allow" }}}, sockopt = {mark = 255} }) local config = { diff --git a/luci-theme-design/Makefile b/luci-theme-design/Makefile index 5ac930b73..f469c682a 100644 --- a/luci-theme-design/Makefile +++ b/luci-theme-design/Makefile @@ -9,7 +9,7 @@ LUCI_TITLE:=Design Theme LUCI_DEPENDS:= PKG_LICENSE:=Apache-2.0 PKG_VERSION:=7.1 -PKG_RELEASE:=4 +PKG_RELEASE:=5 LUCI_MINIFY_CSS:= CONFIG_LUCI_CSSTIDY:= diff --git a/luci-theme-design/ucode/template/themes/design/header.ut b/luci-theme-design/ucode/template/themes/design/header.ut index 23cf3f63e..99d96ea48 100644 --- a/luci-theme-design/ucode/template/themes/design/header.ut +++ b/luci-theme-design/ucode/template/themes/design/header.ut @@ -76,7 +76,7 @@