From 6757d608ad55494d72912ce083f646171e418d73 Mon Sep 17 00:00:00 2001 From: gitea-action Date: Fri, 16 May 2025 23:30:47 +0800 Subject: [PATCH] luci-app-passwall: sync upstream last commit: https://github.com/xiaorouji/openwrt-passwall/commit/019e8e5db77c3e1d7e8a13afb23791f21f12f5ea --- .../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 +++ patch-luci-app-passwall.patch | 6 +++--- 4 files changed, 18 insertions(+), 6 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 48466286d..b97cae9b3 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 cf112295a..2206b05a1 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 21c35cf2e..bc0f4f9d8 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/patch-luci-app-passwall.patch b/patch-luci-app-passwall.patch index 652939828..a5619a444 100644 --- a/patch-luci-app-passwall.patch +++ b/patch-luci-app-passwall.patch @@ -20,10 +20,10 @@ index 8ff84e0..dd660dc 100644 define Package/$(PKG_NAME)/postrm 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 1c9b2e5..cf11229 100644 +index 2eaa276..2206b05 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua -@@ -521,6 +521,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9)") +@@ -527,6 +527,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9)") o:value("149.112.112.112", "149.112.112.112 (Quad9)") o:value("208.67.220.220", "208.67.220.220 (OpenDNS)") o:value("208.67.222.222", "208.67.222.222 (OpenDNS)") @@ -36,7 +36,7 @@ index 1c9b2e5..cf11229 100644 o:depends({dns_mode = "dns2socks"}) o:depends({dns_mode = "tcp"}) o:depends({dns_mode = "udp"}) -@@ -633,7 +639,7 @@ o:depends({direct_dns_mode = "dot"}) +@@ -639,7 +645,7 @@ o:depends({direct_dns_mode = "dot"}) o:depends({dns_mode = "dot"}) o = s:taboption("DNS", Flag, "dns_redirect", translate("DNS Redirect"), translate("Force special DNS server to need proxy devices."))