From a9954e9900b46f58e821cd5d8d4e5763b9aed3f5 Mon Sep 17 00:00:00 2001 From: actions-user Date: Sat, 17 May 2025 00:10:03 +0800 Subject: [PATCH] update 2025-05-17 00:10:03 --- .../luasrc/model/cbi/passwall/client/acl_config.lua | 5 ++++- .../luasrc/model/cbi/passwall/client/global.lua | 10 ++++++++-- luci-app-passwall/po/zh-cn/passwall.po | 3 +++ xray-core/Makefile | 4 ++-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua index 48466286..b97cae9b 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua @@ -312,7 +312,10 @@ o.default = "0" o:depends({ _tcp_node_bool = "1" }) ---- DNS Forward Mode -o = s:option(ListValue, "dns_mode", translate("Filter Mode")) +o = s:option(ListValue, "dns_mode", translate("Filter Mode"), + "" .. translate( + "If the node uses Xray/Sing-Box shunt, select the matching filter mode (Xray/Sing-Box).") .. + "") o:depends({ _tcp_node_bool = "1" }) if api.is_finded("dns2socks") then o:value("dns2socks", "dns2socks") diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua index 1c9b2e5a..2eaa276f 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -381,7 +381,10 @@ o = s:taboption("DNS", Flag, "filter_proxy_ipv6", translate("Filter Proxy Host I o.default = "0" ---- DNS Forward Mode -o = s:taboption("DNS", ListValue, "dns_mode", translate("Filter Mode")) +o = s:taboption("DNS", ListValue, "dns_mode", translate("Filter Mode"), + "" .. translate( + "If the node uses Xray/Sing-Box shunt, select the matching filter mode (Xray/Sing-Box).") .. + "") o:value("udp", translatef("Requery DNS By %s", "UDP")) o:value("tcp", translatef("Requery DNS By %s", "TCP")) if chinadns_tls == 0 then @@ -402,7 +405,10 @@ end ---- SmartDNS Forward Mode if api.is_finded("smartdns") then - o = s:taboption("DNS", ListValue, "smartdns_dns_mode", translate("Filter Mode")) + o = s:taboption("DNS", ListValue, "smartdns_dns_mode", translate("Filter Mode"), + "" .. translate( + "If the node uses Xray/Sing-Box shunt, select the matching filter mode (Xray/Sing-Box).") .. + "") o:value("socks", "Socks") if has_singbox then o:value("sing-box", "Sing-Box") diff --git a/luci-app-passwall/po/zh-cn/passwall.po b/luci-app-passwall/po/zh-cn/passwall.po index 21c35cf2..bc0f4f9d 100644 --- a/luci-app-passwall/po/zh-cn/passwall.po +++ b/luci-app-passwall/po/zh-cn/passwall.po @@ -124,6 +124,9 @@ msgstr "不允许使用私有 IP 地址：%s" msgid "Filter Mode" msgstr "过滤模式" +msgid "If the node uses Xray/Sing-Box shunt, select the matching filter mode (Xray/Sing-Box)." +msgstr "当节点使用 Xray/Sing-Box 分流时，过滤模式需对应选择 Xray/Sing-Box 。" + msgid "A/AAAA type" msgstr "A/AAAA 类型" diff --git a/xray-core/Makefile b/xray-core/Makefile index 9cef3cd9..d08fab0b 100644 --- a/xray-core/Makefile +++ b/xray-core/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xray-core -PKG_VERSION:=25.4.30 +PKG_VERSION:=25.5.16 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=4caff81848262684934022dca91cd00b3f28287c29c8229654e226a2ff7990c3 +PKG_HASH:=c856cd9abed7d28d3c7b856c0661cec5c85ba0669affa740c979cf40c2f73ee4 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MPL-2.0