🌈 Sync 2026-09-19 10:52:18

luci-app-passwall/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
 PKG_VERSION:=26.9.16
-PKG_RELEASE:=280
+PKG_RELEASE:=281
 PKG_PO_VERSION:=$(PKG_VERSION)
 
 PKG_CONFIG_DEPENDS:= \

luci-app-passwall/luasrc/model/cbi/passwall/server/type/1_sing-box.lua

@@ -258,7 +258,7 @@ o.validate = function(self, value, t)
 			local ca = s.fields["tls_certificateFile"] and s.fields["tls_certificateFile"]:formvalue(t) or ""
 			local key = s.fields["tls_keyFile"] and s.fields["tls_keyFile"]:formvalue(t) or ""
 			if ca == "" or key == "" then
-				return nil, translate("Public key and Private key path can not be empty!")
+				return nil, translate("Certificate or Private key path can not be empty!")
 			end
 		end
 		return value
@@ -311,8 +311,8 @@ o:depends({ protocol = "hysteria" })
 
 -- [[ TLS部分 ]] --
 
-o = s:option(FileUpload, "tls_certificateFile", translate("Public key absolute path"), translate("as:") .. "/etc/ssl/fullchain.pem")
+o = s:option(FileUpload, "tls_certificateFile", translate("Path to the certificate file"), translate("as:") .. "/etc/ssl/fullchain.crt")
-o.default = m:get(s.section, "tls_certificateFile") or "/etc/config/ssl/" .. arg[1] .. ".pem"
+o.default = m:get(s.section, "tls_certificateFile") or "/etc/config/ssl/" .. arg[1] .. ".crt"
 if o and o:formvalue(arg[1]) then o.default = o:formvalue(arg[1]) end
 o:depends({ tls = true, reality = false })
 o:depends({ protocol = "naive" })
@@ -330,7 +330,7 @@ o.validate = function(self, value, t)
 	return nil
 end
 
-o = s:option(FileUpload, "tls_keyFile", translate("Private key absolute path"), translate("as:") .. "/etc/ssl/private.key")
+o = s:option(FileUpload, "tls_keyFile", translate("Path to the private key file"), translate("as:") .. "/etc/ssl/private.key")
 o.default = m:get(s.section, "tls_keyFile") or "/etc/config/ssl/" .. arg[1] .. ".key"
 if o and o:formvalue(arg[1]) then o.default = o:formvalue(arg[1]) end
 o:depends({ tls = true, reality = false })

luci-app-passwall/luasrc/model/cbi/passwall/server/type/2_xray.lua

@@ -198,7 +198,7 @@ o.validate = function(self, value, t)
 			local ca = s.fields["tls_certificateFile"] and s.fields["tls_certificateFile"]:formvalue(t) or ""
 			local key = s.fields["tls_keyFile"] and s.fields["tls_keyFile"]:formvalue(t) or ""
 			if ca == "" or key == "" then
-				return nil, translate("Public key and Private key path can not be empty!")
+				return nil, translate("Certificate or Private key path can not be empty!")
 			end
 		end
 		return value
@@ -263,8 +263,8 @@ end
 
 -- [[ TLS部分 ]] --
 
-o = s:option(FileUpload, "tls_certificateFile", translate("Public key absolute path"), translate("as:") .. "/etc/ssl/fullchain.pem")
+o = s:option(FileUpload, "tls_certificateFile", translate("Path to the certificate file"), translate("as:") .. "/etc/ssl/fullchain.crt")
-o.default = m:get(s.section, "tls_certificateFile") or "/etc/config/ssl/" .. s.section .. ".pem"
+o.default = m:get(s.section, "tls_certificateFile") or "/etc/config/ssl/" .. s.section .. ".crt"
 if o and o:formvalue(s.section) then o.default = o:formvalue(s.section) end
 o:depends({ tls = true, reality = false })
 o:depends({ protocol = "hysteria2"})
@@ -279,7 +279,7 @@ o.validate = function(self, value, t)
 	return nil
 end
 
-o = s:option(FileUpload, "tls_keyFile", translate("Private key absolute path"), translate("as:") .. "/etc/ssl/private.key")
+o = s:option(FileUpload, "tls_keyFile", translate("Path to the private key file"), translate("as:") .. "/etc/ssl/private.key")
 o.default = m:get(s.section, "tls_keyFile") or "/etc/config/ssl/" .. s.section .. ".key"
 if o and o:formvalue(s.section) then o.default = o:formvalue(s.section) end
 o:depends({ tls = true, reality = false })

luci-app-passwall/luasrc/model/cbi/passwall/server/type/5_hysteria2.lua

@@ -120,8 +120,8 @@ o.default = "0"
 o.rewrite_option = o.option
 o:depends({ custom = false })
 
-o = s:option(FileUpload, "tls_certificateFile", translate("Public key absolute path"), translate("as:") .. "/etc/ssl/fullchain.pem")
+o = s:option(FileUpload, "tls_certificateFile", translate("Path to the certificate file"), translate("as:") .. "/etc/ssl/fullchain.crt")
-o.default = m:get(s.section, "tls_certificateFile") or "/etc/config/ssl/" .. arg[1] .. ".pem"
+o.default = m:get(s.section, "tls_certificateFile") or "/etc/config/ssl/" .. arg[1] .. ".crt"
 if o and o:formvalue(arg[1]) then o.default = o:formvalue(arg[1]) end
 o.validate = function(self, value, t)
 	if value and value ~= "" then
@@ -135,7 +135,7 @@ o.validate = function(self, value, t)
 end
 o:depends({ custom = false })
 
-o = s:option(FileUpload, "tls_keyFile", translate("Private key absolute path"), translate("as:") .. "/etc/ssl/private.key")
+o = s:option(FileUpload, "tls_keyFile", translate("Path to the private key file"), translate("as:") .. "/etc/ssl/private.key")
 o.default = m:get(s.section, "tls_keyFile") or "/etc/config/ssl/" .. arg[1] .. ".key"
 if o and o:formvalue(arg[1]) then o.default = o:formvalue(arg[1]) end
 o.validate = function(self, value, t)
@@ -150,7 +150,7 @@ o.validate = function(self, value, t)
 end
 o:depends({ custom = false })
 
-o = s:option(FileUpload, "ech_keyFile", translate("ECH key absolute path"), translate("as:") .. "/etc/ssl/ech.pem")
+o = s:option(FileUpload, "ech_keyFile", translate("Path to the ECH key file"), translate("as:") .. "/etc/ssl/ech.pem")
 o.validate = function(self, value, t)
 	if value and value ~= "" then
 		if not fs.access(value) then

luci-app-passwall/luasrc/passwall/util_sing-box.lua

@@ -741,7 +741,7 @@ function gen_config_server(node)
 	if node.tls == "1" and node.ech == "1" then
 		tls.ech = {
 			enabled = true,
-			key = node.ech_key and { node.ech_key } or nil
+			key = node.ech_key and api.split(node.ech_key:gsub("\\n", "\n"), "\n") or nil
 		}
 	end
 

luci-app-passwall/po/zh-cn/passwall.po

@@ -1643,20 +1643,20 @@ msgstr "远程端口"
 msgid "as:"
 msgstr "如："
 
-msgid "Public key absolute path"
+msgid "Path to the certificate file"
-msgstr "公钥文件绝对路径"
+msgstr "证书文件路径"
 
-msgid "Private key absolute path"
+msgid "Path to the private key file"
-msgstr "私钥文件绝对路径"
+msgstr "私钥文件路径"
 
-msgid "ECH key absolute path"
+msgid "Path to the ECH key file"
-msgstr "ECH 密钥绝对路径"
+msgstr "ECH 密钥路径"
 
 msgid "Can't find this file!"
 msgstr "找不到这个文件！"
 
-msgid "Public key and Private key path can not be empty!"
+msgid "Certificate or Private key path can not be empty!"
-msgstr "公钥和私钥文件路径不能为空！"
+msgstr "证书或私钥文件路径不能为空！"
 
 msgid "Server-Side"
 msgstr "服务器端"

luci-app-wwand/Makefile

@@ -17,12 +17,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-wwand
-PKG_VERSION:=1.6.7
+PKG_VERSION:=1.6.7_p2
-PKG_RELEASE:=21
+PKG_RELEASE:=22
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/ddimension/luci-app-wwand.git
-PKG_SOURCE_VERSION:=0b9a6efdc0b597bec1a95612a940d6df792ff94e
+PKG_SOURCE_VERSION:=7ac9dd73b7b9aaa3b5fe53ce0ce7719e25f58d13
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPL-2.0-only

luci-app-xray/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-xray
 PKG_VERSION:=3.7.2
-PKG_RELEASE:=8
+PKG_RELEASE:=9
 
 PKG_LICENSE:=MPLv2
 PKG_LICENSE_FILES:=LICENSE

luci-app-xray/root/usr/share/xray/firewall_include.ut

@@ -318,7 +318,7 @@
     set tp_spec_dv4_dd {
         type ipv4_addr
         size 65536
-        flags timeout
+        flags dynamic,timeout
     }
 {% endif %}
 
@@ -326,7 +326,7 @@
     set tp_spec_dv6_dd {
         type ipv6_addr
         size 65536
-        flags timeout
+        flags dynamic,timeout
     }
 {% endif %}
 
@@ -334,7 +334,7 @@
     set tp_spec_ctt_dd {
         typeof meta nfproto . tcp sport
         size 65536
-        flags timeout
+        flags dynamic,timeout
     }
 {% endif %}
 
@@ -342,7 +342,7 @@
     set tp_spec_ctu_dd {
         typeof meta nfproto . udp sport
         size 65536
-        flags timeout
+        flags dynamic,timeout
     }
 {% endif %}
 

wwand/Makefile

@@ -49,12 +49,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wwand
-PKG_VERSION:=1.6.7_p13
+PKG_VERSION:=1.6.7_p17
-PKG_RELEASE:=44
+PKG_RELEASE:=45
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/ddimension/wwand.git
-PKG_SOURCE_VERSION:=ed7f363b1333cee454db8a1ad5f8c23a0f17524a
+PKG_SOURCE_VERSION:=245058186b1ee22b8e6eb92ca9745d4ea811b116
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPL-2.0-only
@@ -387,7 +387,8 @@ define Package/wwand-mhi/install
 endef
 
 # ---------------------------------------------------------------------------
-# wwand-esim: eSIM (eUICC) profile management. Needs a QMI UIM/APDU channel.
+# wwand-esim: eSIM (eUICC) profile management. Backend-neutral — the APDU
+# ladder (MBIM UICC -> QMI UIM -> AT) lives in the base package's sim.uc.
 # ---------------------------------------------------------------------------
 define Package/wwand-esim
   SECTION:=net