diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index 4c1a2db8e..274201b89 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=26.6.2 -PKG_RELEASE:=148 +PKG_RELEASE:=149 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua index 0be45708c..5a73d7aa3 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua @@ -44,10 +44,10 @@ local header_type_list = { local xray_version = api.get_app_version("xray") o = s:option(ListValue, _n("protocol"), translate("Protocol")) +o:value("socks", translate("Socks")) +o:value("http", translate("HTTP")) o:value("vmess", translate("Vmess")) o:value("vless", translate("VLESS")) -o:value("http", translate("HTTP")) -o:value("socks", translate("Socks")) o:value("shadowsocks", translate("Shadowsocks")) o:value("trojan", translate("Trojan")) o:value("wireguard", translate("WireGuard")) @@ -399,8 +399,6 @@ o = s:option(Flag, _n("tls"), translate("TLS")) o.default = 0 o:depends({ [_n("protocol")] = "vmess" }) o:depends({ [_n("protocol")] = "vless" }) -o:depends({ [_n("protocol")] = "http" }) -o:depends({ [_n("protocol")] = "socks" }) o:depends({ [_n("protocol")] = "trojan" }) o:depends({ [_n("protocol")] = "shadowsocks" }) @@ -533,7 +531,6 @@ o:value("httpupgrade", "HttpUpgrade") o:value("xhttp", "XHTTP") o:depends({ [_n("protocol")] = "vmess" }) o:depends({ [_n("protocol")] = "vless" }) -o:depends({ [_n("protocol")] = "socks" }) o:depends({ [_n("protocol")] = "shadowsocks" }) o:depends({ [_n("protocol")] = "trojan" }) @@ -726,8 +723,6 @@ o:depends({ [_n("protocol")] = "vless", [_n("transport")] = "raw" }) o:depends({ [_n("protocol")] = "vless", [_n("transport")] = "ws" }) o:depends({ [_n("protocol")] = "vless", [_n("transport")] = "grpc" }) o:depends({ [_n("protocol")] = "vless", [_n("transport")] = "httpupgrade" }) -o:depends({ [_n("protocol")] = "http" }) -o:depends({ [_n("protocol")] = "socks" }) o:depends({ [_n("protocol")] = "shadowsocks" }) o:depends({ [_n("protocol")] = "trojan" }) 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 545011ff5..78dc624a1 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 @@ -560,7 +560,6 @@ if singbox_tags:find("with_utls") then o:depends({ [_n("protocol")] = "vless", [_n("tls")] = true }) o:depends({ [_n("protocol")] = "vmess", [_n("tls")] = true }) o:depends({ [_n("protocol")] = "shadowsocks", [_n("tls")] = true }) - o:depends({ [_n("protocol")] = "socks", [_n("tls")] = true }) o:depends({ [_n("protocol")] = "trojan", [_n("tls")] = true }) o:depends({ [_n("protocol")] = "anytls", [_n("tls")] = true }) @@ -585,7 +584,6 @@ else o:value("grpc", "gRPC-lite") end o:depends({ [_n("protocol")] = "vmess" }) o:depends({ [_n("protocol")] = "vless" }) -o:depends({ [_n("protocol")] = "socks" }) o:depends({ [_n("protocol")] = "shadowsocks" }) o:depends({ [_n("protocol")] = "trojan" }) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/ray.lua b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/ray.lua index e12e3c7e9..9c63beea2 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/ray.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/ray.lua @@ -34,10 +34,10 @@ local header_type_list = { o = s:option(Flag, _n("custom"), translate("Use Custom Config")) o = s:option(ListValue, _n("protocol"), translate("Protocol")) +o:value("socks", "Socks") +o:value("http", "HTTP") o:value("vmess", "Vmess") o:value("vless", "VLESS") -o:value("http", "HTTP") -o:value("socks", "Socks") o:value("shadowsocks", "Shadowsocks") o:value("trojan", "Trojan") o:value("hysteria2", translate("Hysteria2")) @@ -181,8 +181,6 @@ o.validate = function(self, value, t) end o:depends({ [_n("protocol")] = "vmess" }) o:depends({ [_n("protocol")] = "vless" }) -o:depends({ [_n("protocol")] = "http" }) -o:depends({ [_n("protocol")] = "socks" }) o:depends({ [_n("protocol")] = "shadowsocks" }) o:depends({ [_n("protocol")] = "trojan" }) @@ -308,7 +306,6 @@ o:value("httpupgrade", "HttpUpgrade") o:value("xhttp", "XHTTP") o:depends({ [_n("protocol")] = "vmess" }) o:depends({ [_n("protocol")] = "vless" }) -o:depends({ [_n("protocol")] = "socks" }) o:depends({ [_n("protocol")] = "shadowsocks" }) o:depends({ [_n("protocol")] = "trojan" }) diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile index 2479f41d7..df0d6eba0 100644 --- a/luci-app-ssr-plus/Makefile +++ b/luci-app-ssr-plus/Makefile @@ -4,7 +4,7 @@ LUCI_TITLE:=luci-app-ssr-plus LUCI_PKGARCH:=all PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=190 -PKG_RELEASE:=17 +PKG_RELEASE:=18 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ diff --git a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua index 567989ba0..ea91a088a 100644 --- a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua +++ b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua @@ -1456,11 +1456,9 @@ o:depends("type", "tuic") o.description = translate("If true, allowss insecure connection at TLS client, e.g., TLS server uses unverifiable certificates.") -- Xray 支持时间判断 -- if os.time() < os.time({year=2026,month=6,day=1}) then -if os.date("%Y.%m.%d") < "2026.06.01" then -- Xray 支持到 26.06.01 o:depends("tls", true) o:depends({ type = "v2ray", v2ray_protocol = "vless", reality = true }) -end if xray_version_val >= 260131 then -- Xray 版本大于等于 26.1.31 diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua index e226697bc..94d8c0164 100755 --- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua +++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua @@ -389,10 +389,7 @@ Xray.outbounds = { fingerprint = server.fingerprint, allowInsecure = (function() if server.tls_CertSha and server.tls_CertSha ~= "" then return nil end - if os.date("%Y.%m.%d") < "2026.06.01" then - return server.insecure == "1" - end - return nil + return server.insecure == "1" end)(), serverName = server.tls_host, certificates = server.certificate and {