From 840b4418e31124b45dc27557c4caec474113ea25 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 6 Apr 2026 16:34:19 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=B6=20Sync=202026-04-06=2016:34:19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../luasrc/model/cbi/passwall/client/type/ray.lua | 1 + .../luasrc/model/cbi/passwall/server/type/ray.lua | 1 + .../view/passwall/node_config/link_share_man.htm | 2 +- .../root/usr/share/passwall/subscribe.lua | 4 +--- netdata/Makefile | 10 +++------- netdata/files/netdata.uci-defaults | 5 ----- 6 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 netdata/files/netdata.uci-defaults 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 3351ff02..0701c514 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 @@ -297,6 +297,7 @@ o = s:option(ListValue, _n("flow"), translate("flow")) o.default = "" o:value("", translate("Disable")) o:value("xtls-rprx-vision") +o:value("xtls-rprx-vision-udp443") o:depends({ [_n("protocol")] = "vless" }) ---- [[hysteria2]] 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 c2ab3548..76114ad2 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 @@ -121,6 +121,7 @@ o = s:option(ListValue, _n("flow"), translate("flow")) o.default = "" o:value("", translate("Disable")) o:value("xtls-rprx-vision") +o:value("xtls-rprx-vision-udp443") o:depends({ [_n("protocol")] = "vless" }) ---- [[ hysteria2 ]] diff --git a/luci-app-passwall/luasrc/view/passwall/node_config/link_share_man.htm b/luci-app-passwall/luasrc/view/passwall/node_config/link_share_man.htm index 17c35949..4398f36e 100644 --- a/luci-app-passwall/luasrc/view/passwall/node_config/link_share_man.htm +++ b/luci-app-passwall/luasrc/view/passwall/node_config/link_share_man.htm @@ -1461,7 +1461,7 @@ local current_node = map:get(section) opt.set(dom_prefix + 'port', m.port || "443"); opt.set(dom_prefix + 'encryption', queryParam.encryption || "none"); - opt.set(dom_prefix + 'flow', (queryParam.flow || '').replace('-udp443', '')); + opt.set(dom_prefix + 'flow', queryParam.flow || ''); if (queryParam.security) { if (queryParam.security == "tls") { opt.set(dom_prefix + 'tls', true); diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua index 6d8e928c..4d12d6e3 100755 --- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua +++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua @@ -1233,10 +1233,8 @@ local function processData(szType, content, add_mode, group) result.httpupgrade_host = params.host result.httpupgrade_path = params.path end - result.encryption = params.encryption or "none" - - result.flow = params.flow and params.flow:gsub("-udp443", "") or nil + result.flow = params.flow result.tls = "0" if params.security == "tls" or params.security == "reality" then diff --git a/netdata/Makefile b/netdata/Makefile index c1a722e5..bf3ddd57 100644 --- a/netdata/Makefile +++ b/netdata/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netdata PKG_VERSION:=2.9.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Josef Schlehofer , Daniel Engberg PKG_LICENSE:=GPL-3.0-or-later @@ -126,11 +126,9 @@ define Package/netdata/install #netdata webdir and remove uneeded files $(INSTALL_DIR) $(1)/usr/share/netdata $(CP) $(PKG_INSTALL_DIR)/usr/share/netdata $(1)/usr/share + $(CP) $(1)/usr/share/netdata/web/v3/* $(1)/usr/share/netdata/web/ + rm -r $(1)/usr/share/netdata/web/v3/* rm $(1)/usr/share/netdata/build-info-cmake-cache.gz - rm $(1)/usr/share/netdata/web/v3/3D_PARTY_LICENSES.txt - rm $(1)/usr/share/netdata/web/v3/LICENSE.md - rm $(1)/usr/share/netdata/web/v3/*.LICENSE.txt - rm -r $(1)/usr/share/netdata/web/static/* $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/netdata.init $(1)/etc/init.d/netdata $(INSTALL_DIR) $(1)/etc/config @@ -138,8 +136,6 @@ define Package/netdata/install $(INSTALL_DIR) $(1)/etc/nginx/conf.d $(INSTALL_DATA) ./files/netdata.locations $(1)/etc/nginx/conf.d/netdata.locations $(INSTALL_DATA) ./files/netdata.htpasswd $(1)/etc/nginx/conf.d/netdata.htpasswd - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_DATA) ./files/netdata.uci-defaults $(1)/etc/uci-defaults/luci-netdata endef $(eval $(call Download,netdata-dashboard)) diff --git a/netdata/files/netdata.uci-defaults b/netdata/files/netdata.uci-defaults deleted file mode 100644 index 7a9fb138..00000000 --- a/netdata/files/netdata.uci-defaults +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -sed -i "s/initTabs();$/initTabs();loadDashboard();/" /usr/share/netdata/web/index.html - -exit 0