🎁 Sync 2026-09-06 02:50:41

This commit is contained in:
github-actions[bot] committed 2026-09-06 02:50:41 +08:00
1 parent e70e8fddee
commit dbdd70b00d
8 files changed
+82 -103

No files matched your search

+7 -4
View File
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=filebrowser PKG_NAME:=filebrowser
PKG_VERSION:=2.63.23 PKG_VERSION:=2.63.23
PKG_RELEASE:=21 PKG_RELEASE:=22
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/filebrowser/filebrowser/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/filebrowser/filebrowser/tar.gz/v$(PKG_VERSION)?
@@ -48,17 +48,20 @@ define Package/filebrowser/conffiles
/etc/config/filebrowser /etc/config/filebrowser
endef endef
define Build/Compile define Build/Prepare
$(call Build/Prepare/Default)
( \ ( \
export PNPM_HOME="$(PKG_BUILD_DIR)/frontend" ; \ export PNPM_HOME="$(PKG_BUILD_DIR)/frontend" ; \
pushd "$(PKG_BUILD_DIR)/frontend" ; \ pushd "$(PKG_BUILD_DIR)/frontend" ; \
pnpm install --frozen-lockfile ; \ pnpm install --frozen-lockfile ; \
pnpm run build ; \ pnpm run build ; \
popd ; \
$(call GoPackage/Build/Compile) ; \
) )
endef endef
define Build/Compile
$(call GoPackage/Build/Compile)
endef
define Package/filebrowser/install define Package/filebrowser/install
$(call GoPackage/Package/Install/Bin,$(1)) $(call GoPackage/Package/Install/Bin,$(1))
+1 -1
View File
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall2 PKG_NAME:=luci-app-passwall2
PKG_VERSION:=26.9.2 PKG_VERSION:=26.9.2
PKG_RELEASE:=111 PKG_RELEASE:=112
PKG_PO_VERSION:=$(PKG_VERSION) PKG_PO_VERSION:=$(PKG_VERSION)
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
@@ -272,9 +272,17 @@ o = s:option(ListValue, "remote_dns_protocol", translate("Remote DNS Protocol"))
o:value("tcp", "TCP") o:value("tcp", "TCP")
o:value("doh", "DoH") o:value("doh", "DoH")
o:value("udp", "UDP") o:value("udp", "UDP")
o:value("tls", "TLS(DoT)", { _is_singbox = "1" }) if m.is_js_luci then
o:value("quic", "QUIC(DoQ)", { _is_singbox = "1" }) if current_node.type == "sing-box" then
o:value("http3", "HTTP3(DoH3)", { _is_singbox = "1" }) o:value("tls", "TLS(DoT)")
o:value("quic", "QUIC(DoQ)")
o:value("http3", "HTTP3(DoH3)")
end
else
o:value("tls", "TLS(DoT)", { _is_singbox = "1" })
o:value("quic", "QUIC(DoQ)", { _is_singbox = "1" })
o:value("http3", "HTTP3(DoH3)", { _is_singbox = "1" })
end
o:depends("_show_dns_option", "1") o:depends("_show_dns_option", "1")
---- DNS over TCP or UDP or TLS (DoT) or QUIC (DoQ) ---- DNS over TCP or UDP or TLS (DoT) or QUIC (DoQ)
@@ -382,9 +390,8 @@ for k, v in pairs(nodes_table) do
end end
end end
--m:appendTemplate("/acl/options", {section = arg[1]}) --[[
-- Shunt
-- Shunt Start
if current_node.protocol == "_shunt" then if current_node.protocol == "_shunt" then
local shunt_lua = loadfile("/usr/lib/lua/luci/model/cbi/passwall2/client/include/shunt_options.lua") local shunt_lua = loadfile("/usr/lib/lua/luci/model/cbi/passwall2/client/include/shunt_options.lua")
setfenv(shunt_lua, getfenv(1))(m, s, { setfenv(shunt_lua, getfenv(1))(m, s, {
@@ -396,5 +403,6 @@ if current_node.protocol == "_shunt" then
end end
m:appendTemplate("/acl/shunt", { shunt_list = api.jsonc.stringify(shunt_list), section = s.section }) m:appendTemplate("/acl/shunt", { shunt_list = api.jsonc.stringify(shunt_list), section = s.section })
]]--
return api.return_map(m) return api.return_map(m)
@@ -201,9 +201,17 @@ o = s:taboption("DNS", ListValue, "remote_dns_protocol", translate("Remote DNS P
o:value("tcp", "TCP") o:value("tcp", "TCP")
o:value("doh", "DoH") o:value("doh", "DoH")
o:value("udp", "UDP") o:value("udp", "UDP")
o:value("tls", "TLS(DoT)", { _is_singbox = "1" }) if m.is_js_luci then
o:value("quic", "QUIC(DoQ)", { _is_singbox = "1" }) if current_node.type == "sing-box" then
o:value("http3", "HTTP3(DoH3)", { _is_singbox = "1" }) o:value("tls", "TLS(DoT)")
o:value("quic", "QUIC(DoQ)")
o:value("http3", "HTTP3(DoH3)")
end
else
o:value("tls", "TLS(DoT)", { _is_singbox = "1" })
o:value("quic", "QUIC(DoQ)", { _is_singbox = "1" })
o:value("http3", "HTTP3(DoH3)", { _is_singbox = "1" })
end
---- DNS over TCP or UDP or TLS (DoT) or QUIC (DoQ) ---- DNS over TCP or UDP or TLS (DoT) or QUIC (DoQ)
o = s:taboption("DNS", Value, "remote_dns", translate("Remote DNS")) o = s:taboption("DNS", Value, "remote_dns", translate("Remote DNS"))
@@ -259,11 +267,10 @@ o:value("UseIP")
o:value("UseIPv4") o:value("UseIPv4")
o:value("UseIPv6") o:value("UseIPv6")
if current_node.type == "sing-box" then o = s:taboption("DNS", Value, "remote_rewrite_ttl", translate("Remote DNS") .. " TTL")
o = s:taboption("DNS", Value, "remote_rewrite_ttl", translate("Remote DNS") .. " TTL") o.datatype = "min(1)"
o.datatype = "min(1)" o.default = "30"
o.default = "30" o:depends("_is_singbox", "1")
end
o = s:taboption("DNS", TextValue, "dns_hosts", translate("Domain Override")) o = s:taboption("DNS", TextValue, "dns_hosts", translate("Domain Override"))
o.rows = 5 o.rows = 5
@@ -1,56 +0,0 @@
<%
local map = self.map
local api = map.api
local config = map.config
local section = self.section
-%>
<script type="text/javascript">
//<![CDATA[
function setOption(option, val) {
const dom = document.getElementById('cbid.<%=config%>.<%=section%>.' + option);
if (dom) {
dom.value = val;
}
const combobox_dom = document.getElementById('cbi.combobox.cbid.<%=config%>.<%=section%>.' + option);
if (combobox_dom) {
combobox_dom.value = val;
//combobox_dom.selectedIndex = val;
//combobox_dom.dispatchEvent(new Event("change", { bubbles: true }));
}
}
document.addEventListener("DOMContentLoaded", function () {
function dom_event() {
waitForElementId('cbi.combobox.cbid.<%=config%>.<%=section%>.tcp_no_redir_ports', function(el) {
const o_val = el.value;
el.addEventListener("change", () => {
const udp_no_redir_ports = getOption("<%=config%>", "<%=section%>", "udp_no_redir_ports");
if (el.value == "1:65535" && udp_no_redir_ports && udp_no_redir_ports.value == "1:65535") {
setOption("tcp_no_redir_ports", "");
setOption("udp_no_redir_ports", "");
setOption("mode", 0);
cbi_d_update();
}
});
});
waitForElementId('cbi.combobox.cbid.<%=config%>.<%=section%>.udp_no_redir_ports', function(el) {
const o_val = el.value;
el.addEventListener("change", () => {
const tcp_no_redir_ports = getOption("<%=config%>", "<%=section%>", "tcp_no_redir_ports");
if (el.value == "1:65535" && tcp_no_redir_ports && tcp_no_redir_ports.value == "1:65535") {
setOption("tcp_no_redir_ports", "");
setOption("udp_no_redir_ports", "");
setOption("mode", 0);
cbi_d_update();
}
});
});
}
const ori_cbi_d_update = cbi_d_update;
cbi_d_update = function() {
ori_cbi_d_update();
dom_event();
};
dom_event();
});
//]]>
</script>
@@ -1507,15 +1507,17 @@ table td, .table .td {
//Node list option saving logic //Node list option saving logic
document.addEventListener("DOMContentLoaded", function () { document.addEventListener("DOMContentLoaded", function () {
function onChange(option, value) { function onChange(option, value, refresh) {
ajax.abortAll(); ajax.abortAll();
XHR.get('<%=api.url("save_node_list_opt")%>', { XHR.get('<%=api.url("save_node_list_opt")%>', {
option: option, option: option,
value: value value: value
}, function(x) { }, function(x) {
if (x && x.status == 200) { if (x && x.status == 200) {
document.getElementById("node_list").innerHTML = ""; if (refresh) {
loadNodeList(); document.getElementById("node_list").innerHTML = "";
loadNodeList();
}
} else { } else {
alert("<%:Error%>"); alert("<%:Error%>");
} }
@@ -1527,7 +1529,7 @@ table td, .table .td {
el.addEventListener("change", () => { el.addEventListener("change", () => {
el.blur(); el.blur();
show_node_info = el.checked ? "1" : "0"; show_node_info = el.checked ? "1" : "0";
onChange("show_node_info", show_node_info); onChange("show_node_info", show_node_info, true);
}); });
}); });
@@ -1535,32 +1537,47 @@ table td, .table .td {
el.addEventListener("change", () => { el.addEventListener("change", () => {
el.blur(); el.blur();
auto_detection_time = el.value; auto_detection_time = el.value;
onChange("auto_detection_time", auto_detection_time); onChange("auto_detection_time", auto_detection_time, true);
}); });
}); });
waitForElement('select[id*="<%=appname%>"][id*="url_test_url"]', function(el) { <% if api.is_js_luci() then -%>
el.addEventListener("change", () => { waitForElement('div[id*="cbid.<%=appname%>"][id*="url_test_url"]', function(el) {
if (el.value) { el.addEventListener("cbi-dropdown-change", () => {
onChange("url_test_url", el.value); if (el.value && (!el.new_val || el.new_val != el.value)) {
} onChange("url_test_url", el.value, false);
el.new_val = el.value;
}
});
});
<% else -%>
waitForElement('select[id*="<%=appname%>"][id*="url_test_url"]', function(el) {
el.addEventListener("change", () => {
if (el.value && (!el.new_val || el.new_val != el.value)) {
onChange("url_test_url", el.value, false);
el.new_val = el.value;
}
});
}); });
});
waitForElement('input[id*="<%=appname%>"][id*="url_test_url"]', function(el) { waitForElement('input[id*="<%=appname%>"][id*="url_test_url"]', function(el) {
el.addEventListener("change", () => { el.addEventListener("change", () => {
if (el.value) { if (el.value && (!el.new_val || el.new_val != el.value)) {
onChange("url_test_url", el.value); onChange("url_test_url", el.value, false);
} el.new_val = el.value;
}
});
}); });
}); <% end -%>
} }
const ori_cbi_d_update = cbi_d_update; <% if not api.is_js_luci() then -%>
cbi_d_update = function() { const ori_cbi_d_update = cbi_d_update;
ori_cbi_d_update(); cbi_d_update = function() {
dom_event(); ori_cbi_d_update();
}; dom_event();
};
<% end -%>
dom_event(); dom_event();
const links = document.querySelectorAll('a'); const links = document.querySelectorAll('a');
+3 -3
View File
@@ -15,12 +15,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-wwand PKG_NAME:=luci-app-wwand
PKG_RELEASE:=9 PKG_RELEASE:=10
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/ddimension/luci-app-wwand.git PKG_SOURCE_URL:=https://github.com/ddimension/luci-app-wwand.git
PKG_SOURCE_VERSION:=88a711251296810ea3428d32a3da9c5b635cea0c PKG_SOURCE_VERSION:=bd773d76198d2a92063b349ed4f1e1f75475857c
PKG_SOURCE_DATE:=2026-08-31 PKG_SOURCE_DATE:=2026-09-05
PKG_MIRROR_HASH:=skip PKG_MIRROR_HASH:=skip
PKG_LICENSE:=GPL-2.0-only PKG_LICENSE:=GPL-2.0-only
+3 -3
View File
@@ -43,12 +43,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=wwand PKG_NAME:=wwand
PKG_RELEASE:=21 PKG_RELEASE:=22
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/ddimension/wwand.git PKG_SOURCE_URL:=https://github.com/ddimension/wwand.git
PKG_SOURCE_VERSION:=6ed882e3b53544c9e42f2cc681780d99205141eb PKG_SOURCE_VERSION:=1aff5270ef08b380e9c07ad5c62b79704212b779
PKG_SOURCE_DATE:=2026-09-03 PKG_SOURCE_DATE:=2026-09-05
PKG_MIRROR_HASH:=skip PKG_MIRROR_HASH:=skip
PKG_LICENSE:=GPL-2.0-only PKG_LICENSE:=GPL-2.0-only