diff --git a/filebrowser-q/files/config.yaml b/filebrowser-q/files/config.yaml
deleted file mode 100644
index f290aec7..00000000
--- a/filebrowser-q/files/config.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-server:
- port: 8989
- database: "/etc/filebrowser-q/database.db"
- sources:
- - path: "/" # Do not use a root "/" directory or include the "/var" folder
- config:
- defaultEnabled: true
-auth:
- adminUsername: admin
- adminPassword: "admin"
-userDefaults:
- ui:
- locale: "zhCN"
diff --git a/filebrowser-q/files/filebrowser.config b/filebrowser-q/files/filebrowser.config
index b28f95d3..d42f3440 100644
--- a/filebrowser-q/files/filebrowser.config
+++ b/filebrowser-q/files/filebrowser.config
@@ -1,5 +1,5 @@
config filebrowser 'config'
option enabled '0'
- option listen_port '8989'
+ option listen_port '8787'
option root_path '/'
diff --git a/gn/Makefile b/gn/Makefile
index 4922bad3..aef82837 100644
--- a/gn/Makefile
+++ b/gn/Makefile
@@ -9,9 +9,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gn.googlesource.com/gn.git
-PKG_SOURCE_DATE:=2026-08-28
-PKG_SOURCE_VERSION:=c1b663788ed1ecf2ffd53781c98ae2291ee002cf
-PKG_MIRROR_HASH:=aa635f1ce4b0cf2b7776dc44ad28671eb0fb79276097addca503ce4708ccdc5d
+PKG_SOURCE_DATE:=2026-09-03
+PKG_SOURCE_VERSION:=4f6a76b64b8279e98004f541f8e136307efe5e01
+PKG_MIRROR_HASH:=933dc8c8d745923437c9e730ab7c2a23a53562144513a4f634ad10381c23be44
PKG_LICENSE:=BSD 3-Clause
PKG_LICENSE_FILES:=LICENSE
diff --git a/gn/src/out/last_commit_position.h b/gn/src/out/last_commit_position.h
index 39f96381..d2a5e9e7 100644
--- a/gn/src/out/last_commit_position.h
+++ b/gn/src/out/last_commit_position.h
@@ -3,7 +3,7 @@
#ifndef OUT_LAST_COMMIT_POSITION_H_
#define OUT_LAST_COMMIT_POSITION_H_
-#define LAST_COMMIT_POSITION_NUM 2539
-#define LAST_COMMIT_POSITION "2539 (c1b663788ed1)"
+#define LAST_COMMIT_POSITION_NUM 2553
+#define LAST_COMMIT_POSITION "2553 (4f6a76b64b82)"
#endif // OUT_LAST_COMMIT_POSITION_H_
diff --git a/lean/mt/luci-app-mtwifi/luasrc/view/admin_mtk/mtk_wifi_dev_cfg.htm b/lean/mt/luci-app-mtwifi/luasrc/view/admin_mtk/mtk_wifi_dev_cfg.htm
index 50cd5d6f..1ade86bd 100644
--- a/lean/mt/luci-app-mtwifi/luasrc/view/admin_mtk/mtk_wifi_dev_cfg.htm
+++ b/lean/mt/luci-app-mtwifi/luasrc/view/admin_mtk/mtk_wifi_dev_cfg.htm
@@ -236,7 +236,7 @@ if next(diff) ~= nil then
checked="checked"<% end %>/> 启用
checked="checked"<% end %>/> 禁用
- checked="checked"<% end %>/> Dynamic
+ checked="checked"<% end %>/> Dynamic
|
|
diff --git a/luci-app-syncthing b/luci-app-syncthing
deleted file mode 160000
index b7a197a9..00000000
--- a/luci-app-syncthing
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b7a197a93c549992e9bc47f59d0690b6bb967bcd
diff --git a/luci-app-syncthing/Makefile b/luci-app-syncthing/Makefile
new file mode 100644
index 00000000..2219fcb2
--- /dev/null
+++ b/luci-app-syncthing/Makefile
@@ -0,0 +1,22 @@
+# Copyright (C) 2020 Gyj1109
+# 适配 OpenWrt 25.12 修改版
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luci-app-syncthing
+PKG_VERSION:=1.0
+PKG_RELEASE:=3
+
+LUCI_TITLE:=LuCI support for Syncthing
+LUCI_PKGARCH:=all
+# 适配 25.12:确保安装了 syncthing 后,LuCI 界面能正确拉起
+LUCI_DEPENDS:=+syncthing
+
+include $(TOPDIR)/feeds/luci/luci.mk
+
+# 明确定义配置文件的归属,这对 25.12 的 apk 管理器非常重要
+define Package/$(PKG_NAME)/conffiles
+/etc/config/syncthing
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/luci-app-syncthing/README.md b/luci-app-syncthing/README.md
new file mode 100644
index 00000000..b07298c1
--- /dev/null
+++ b/luci-app-syncthing/README.md
@@ -0,0 +1,2 @@
+# luci-app-syncthing
+在Potat0000源码基础上进行了汉化优化,官方openwrt23.05.3编译后可使用
diff --git a/luci-app-syncthing/luasrc/controller/syncthing.lua b/luci-app-syncthing/luasrc/controller/syncthing.lua
new file mode 100644
index 00000000..ee2ca7ef
--- /dev/null
+++ b/luci-app-syncthing/luasrc/controller/syncthing.lua
@@ -0,0 +1,17 @@
+module("luci.controller.syncthing", package.seeall)
+
+function index()
+ if not nixio.fs.access("/etc/config/syncthing") then
+ return
+ end
+
+ entry({"admin", "services", "syncthing"}, cbi("syncthing"), _("文件同步"), 10).dependent = true
+ entry({"admin", "services", "syncthing", "status"}, call("act_status")).leaf = true
+end
+
+function act_status()
+ local e = {}
+ e.running = luci.sys.call("pgrep syncthing >/dev/null") == 0
+ luci.http.prepare_content("application/json")
+ luci.http.write_json(e)
+end
diff --git a/luci-app-syncthing/luasrc/model/cbi/syncthing.lua b/luci-app-syncthing/luasrc/model/cbi/syncthing.lua
new file mode 100644
index 00000000..324ea054
--- /dev/null
+++ b/luci-app-syncthing/luasrc/model/cbi/syncthing.lua
@@ -0,0 +1,48 @@
+require("nixio.fs")
+
+m = Map("syncthing", translate("Syncthing同步工具"))
+
+m:section(SimpleSection).template = "syncthing/syncthing_status"
+
+s = m:section(TypedSection, "syncthing")
+
+s.anonymous = true
+
+o = s:option(Flag, "enabled", translate("启用"))
+o.default = 0
+o.rmempty = false
+
+gui_address = s:option(Value, "gui_address", translate("GUI访问地址"))
+gui_address.description = translate("使用0.0.0.0以监控所有访问。")
+gui_address.default = "http://0.0.0.0:8384"
+gui_address.placeholder = "http://0.0.0.0:8384"
+gui_address.rmempty = false
+
+home = s:option(Value, "home", translate("配置文件目录"))
+home.description = translate("只有保存在/etc/syncthing中的配置会自动备份!")
+home.default = "/etc/syncthing"
+home.placeholder = "/etc/syncthing"
+home.rmempty = false
+
+user = s:option(ListValue, "user", translate("用户"))
+user.description = translate("默认是syncthing,但这可能会导致权限被拒绝。Syncthing官方不建议以root身份运行。")
+user:value("", translate("syncthing"))
+for u in luci.util.execi("cat /etc/passwd | cut -d ':' -f1") do
+ user:value(u)
+end
+
+macprocs = s:option(Value, "macprocs", translate("线程限制"))
+macprocs.description = translate("0表示匹配CPU数量(默认),>0表示显式指定并发数。")
+macprocs.default = "0"
+macprocs.placeholder = "0"
+macprocs.datatype = "range(0,32)"
+macprocs.rmempty = false
+
+nice = s:option(Value, "nice", translate("优先级"))
+nice.description = translate("显式指定优先级值。0是最高,19是最低。(暂时不允许设置负值)")
+nice.default = "19"
+nice.placeholder = "19"
+nice.datatype = "range(0,19)"
+nice.rmempty = false
+
+return m
diff --git a/luci-app-syncthing/luasrc/view/syncthing/syncthing_status.htm b/luci-app-syncthing/luasrc/view/syncthing/syncthing_status.htm
new file mode 100644
index 00000000..566cc020
--- /dev/null
+++ b/luci-app-syncthing/luasrc/view/syncthing/syncthing_status.htm
@@ -0,0 +1,27 @@
+
+
+
diff --git a/luci-app-syncthing/root/etc/uci-defaults/luci-syncthing b/luci-app-syncthing/root/etc/uci-defaults/luci-syncthing
new file mode 100644
index 00000000..3adb7997
--- /dev/null
+++ b/luci-app-syncthing/root/etc/uci-defaults/luci-syncthing
@@ -0,0 +1,12 @@
+#!/bin/sh
+touch /etc/config/syncthing
+
+uci -q batch <<-EOF >/dev/null
+ delete ucitrack.@syncthing[-1]
+ add ucitrack syncthing
+ set ucitrack.@syncthing[-1].exec='/etc/init.d/syncthing stop && /etc/init.d/syncthing start'
+ commit ucitrack
+EOF
+# remove LuCI cache
+rm -f /tmp/luci*
+exit 0
diff --git a/luci-app-syncthing/root/usr/share/rpcd/acl.d/luci-app-syncthing.json b/luci-app-syncthing/root/usr/share/rpcd/acl.d/luci-app-syncthing.json
new file mode 100644
index 00000000..9fc9cc54
--- /dev/null
+++ b/luci-app-syncthing/root/usr/share/rpcd/acl.d/luci-app-syncthing.json
@@ -0,0 +1,11 @@
+{
+ "luci-app-syncthing": {
+ "description": "Grant UCI access for luci-app-syncthing",
+ "read": {
+ "uci": [ "syncthing" ]
+ },
+ "write": {
+ "uci": [ "syncthing" ]
+ }
+ }
+}