From 321573fa35139995a857c08225fc68718fef5543 Mon Sep 17 00:00:00 2001 From: gitea-action Date: Thu, 27 Mar 2025 23:30:26 +0800 Subject: [PATCH] luci-app-passwall: sync upstream last commit: https://github.com/xiaorouji/openwrt-passwall/commit/a998426839fc3f6d6f94c222cd8f9296e6303dd2 --- .../luasrc/model/cbi/passwall/client/acl_config.lua | 2 +- luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua | 2 +- .../luasrc/model/cbi/passwall/client/node_subscribe.lua | 2 +- .../luasrc/model/cbi/passwall/client/node_subscribe_config.lua | 2 +- luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua | 2 +- luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua | 2 +- .../luasrc/model/cbi/passwall/client/socks_config.lua | 2 +- .../luasrc/model/cbi/passwall/client/type/sing-box.lua | 2 +- .../luasrc/model/cbi/passwall/server/type/sing-box.lua | 2 +- luci-app-passwall/luasrc/passwall/com.lua | 2 +- luci-app-passwall/luasrc/passwall/server_app.lua | 2 +- luci-app-passwall/luasrc/passwall/util_sing-box.lua | 2 +- luci-app-passwall/root/usr/share/passwall/subscribe.lua | 2 +- patch-luci-app-passwall.patch | 2 +- 14 files changed, 14 insertions(+), 14 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 101b81548..00f54184e 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 @@ -11,7 +11,7 @@ end local fs = api.fs local sys = api.sys -local has_singbox = api.finded_com("singbox") +local has_singbox = api.finded_com("sing-box") local has_xray = api.finded_com("xray") local has_geoview = api.is_finded("geoview") local has_gfwlist = fs.access("/usr/share/passwall/rules/gfwlist") 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 fa97b4a90..4cf51591c 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -2,7 +2,7 @@ local api = require "luci.passwall.api" local appname = "passwall" local datatypes = api.datatypes local fs = api.fs -local has_singbox = api.finded_com("singbox") +local has_singbox = api.finded_com("sing-box") local has_xray = api.finded_com("xray") local has_geoview = api.is_finded("geoview") local has_gfwlist = fs.access("/usr/share/passwall/rules/gfwlist") diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua index b279f18fe..1df3decd6 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua @@ -4,7 +4,7 @@ local appname = "passwall" local has_ss = api.is_finded("ss-redir") local has_ss_rust = api.is_finded("sslocal") local has_trojan_plus = api.is_finded("trojan-plus") -local has_singbox = api.finded_com("singbox") +local has_singbox = api.finded_com("sing-box") local has_xray = api.finded_com("xray") local has_hysteria2 = api.finded_com("hysteria") local ss_type = {} diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua index 8caa1ffb3..14adc205e 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua @@ -25,7 +25,7 @@ end local has_ss = api.is_finded("ss-redir") local has_ss_rust = api.is_finded("sslocal") local has_trojan_plus = api.is_finded("trojan-plus") -local has_singbox = api.finded_com("singbox") +local has_singbox = api.finded_com("sing-box") local has_xray = api.finded_com("xray") local has_hysteria2 = api.finded_com("hysteria") local ss_type = {} diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua index 87501e9ca..37e2d3bf3 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua @@ -1,7 +1,7 @@ local api = require "luci.passwall.api" local appname = "passwall" local fs = api.fs -local has_singbox = api.finded_com("singbox") +local has_singbox = api.finded_com("sing-box") local has_xray = api.finded_com("xray") local has_fw3 = api.is_finded("fw3") local has_fw4 = api.is_finded("fw4") diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua index 592823e3d..a76184a76 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua @@ -1,7 +1,7 @@ local api = require "luci.passwall.api" local appname = "passwall" local has_xray = api.finded_com("xray") -local has_singbox = api.finded_com("singbox") +local has_singbox = api.finded_com("sing-box") m = Map(appname) api.set_apply_on_parse(m) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua index 84a4ab269..ffb269b0e 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua @@ -9,7 +9,7 @@ if not arg[1] or not m:get(arg[1]) then luci.http.redirect(m.redirect) end -local has_singbox = api.finded_com("singbox") +local has_singbox = api.finded_com("sing-box") local has_xray = api.finded_com("xray") local nodes_table = {} diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua index 189be90f1..f20b2cf0e 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua @@ -2,7 +2,7 @@ local m, s = ... local api = require "luci.passwall.api" -local singbox_bin = api.finded_com("singbox") +local singbox_bin = api.finded_com("sing-box") local geoview_bin = api.is_finded("geoview") if not singbox_bin then diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/sing-box.lua b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/sing-box.lua index 054848d93..df52d1f45 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/sing-box.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/sing-box.lua @@ -2,7 +2,7 @@ local m, s = ... local api = require "luci.passwall.api" -local singbox_bin = api.finded_com("singbox") +local singbox_bin = api.finded_com("sing-box") if not singbox_bin then return diff --git a/luci-app-passwall/luasrc/passwall/com.lua b/luci-app-passwall/luasrc/passwall/com.lua index 68407ee80..8f658899d 100644 --- a/luci-app-passwall/luasrc/passwall/com.lua +++ b/luci-app-passwall/luasrc/passwall/com.lua @@ -24,7 +24,7 @@ _M.hysteria = { } } -_M.singbox = { +_M["sing-box"] = { name = "Sing-Box", repo = "SagerNet/sing-box", get_url = gh_release_url, diff --git a/luci-app-passwall/luasrc/passwall/server_app.lua b/luci-app-passwall/luasrc/passwall/server_app.lua index 50357056b..9083ce2a6 100644 --- a/luci-app-passwall/luasrc/passwall/server_app.lua +++ b/luci-app-passwall/luasrc/passwall/server_app.lua @@ -142,7 +142,7 @@ local function start() bin = ln_run("/usr/bin/ssserver", "ssserver", "-c " .. config_file, log_path) elseif type == "sing-box" then config = require(require_dir .. "util_sing-box").gen_config_server(user) - bin = ln_run(api.get_app_path("singbox"), "sing-box", "run -c " .. config_file, log_path) + bin = ln_run(api.get_app_path("sing-box"), "sing-box", "run -c " .. config_file, log_path) elseif type == "Xray" then config = require(require_dir .. "util_xray").gen_config_server(user) bin = ln_run(api.get_app_path("xray"), "xray", "run -c " .. config_file, log_path) diff --git a/luci-app-passwall/luasrc/passwall/util_sing-box.lua b/luci-app-passwall/luasrc/passwall/util_sing-box.lua index 5c916d97e..56cee54f5 100644 --- a/luci-app-passwall/luasrc/passwall/util_sing-box.lua +++ b/luci-app-passwall/luasrc/passwall/util_sing-box.lua @@ -7,7 +7,7 @@ local appname = "passwall" local fs = api.fs local split = api.split -local local_version = api.get_app_version("singbox") +local local_version = api.get_app_version("sing-box") local version_ge_1_11_0 = api.compare_versions(local_version:match("[^v]+"), ">=", "1.11.0") local geosite_all_tag = {} diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua index b1f8aca1f..8dfb782c6 100755 --- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua +++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua @@ -24,7 +24,7 @@ uci:revert(appname) local has_ss = api.is_finded("ss-redir") local has_ss_rust = api.is_finded("sslocal") local has_trojan_plus = api.is_finded("trojan-plus") -local has_singbox = api.finded_com("singbox") +local has_singbox = api.finded_com("sing-box") local has_xray = api.finded_com("xray") local has_hysteria2 = api.finded_com("hysteria") local allowInsecure_default = nil diff --git a/patch-luci-app-passwall.patch b/patch-luci-app-passwall.patch index 14f8cb5b5..3733105e7 100644 --- a/patch-luci-app-passwall.patch +++ b/patch-luci-app-passwall.patch @@ -20,7 +20,7 @@ index ae464ba..54b5f1a 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 12adebe..fa97b4a 100644 +index 7bdfb3e..4cf5159 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -509,6 +509,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9)")