update 2023-04-18 20:29:51

Author: github-actions[bot]

gn/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gn
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gn.googlesource.com/gn.git
-PKG_SOURCE_DATE:=2023-02-17
-PKG_SOURCE_VERSION:=b25a2f8c2d33f02082f0f258350f5e22c0973108
+PKG_SOURCE_DATE:=2023-04-05
+PKG_SOURCE_VERSION:=28b7b6c507eb808567e3aea446cd259f7691fddc
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=BSD 3-Clause

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 2081
-#define LAST_COMMIT_POSITION "2081 (b25a2f8c2d33)"
+#define LAST_COMMIT_POSITION_NUM 2085
+#define LAST_COMMIT_POSITION "2085 (28b7b6c507eb)"
 
 #endif  // OUT_LAST_COMMIT_POSITION_H_

luci-app-advanced/README.md

@@ -7,24 +7,38 @@ luci-app-advanced 高级设置，包括smartdns，openclash，防火墙，DHCP
 
 ![screenshots](https://raw.githubusercontent.com/sirpdboy/openwrt/master/doc/说明2.jpg)
 
+
+
+## 使用与授权相关说明
+ 
+- 本人开源的所有源码，任何引用需注明本处出处，如需修改二次发布必告之本人，未经许可不得做于任何商用用途。
+
+
 # My other project
 
-网络速度测试 ：https://github.com/sirpdboy/NetSpeedTest
+- 网络速度测试 ：https://github.com/sirpdboy/NetSpeedTest
 
-定时设置插件 : https://github.com/sirpdboy/luci-app-autotimeset
+- 定时设置插件 : https://github.com/sirpdboy/luci-app-autotimeset
 
-关机功能插件 : https://github.com/sirpdboy/luci-app-poweroffdevice
+- 关机功能插件 : https://github.com/sirpdboy/luci-app-poweroffdevice
 
-opentopd主题 : https://github.com/sirpdboy/luci-theme-opentopd
+- opentopd主题 : https://github.com/sirpdboy/luci-theme-opentopd
 
-opentoks 主题: https://github.com/sirpdboy/luci-theme-opentoks [仿KOOLSAHRE主题]
+- kucat 主题: https://github.com/sirpdboy/luci-theme-kucat
 
-btmob 主题: https://github.com/sirpdboy/luci-theme-btmob
+- 家长控制: https://github.com/sirpdboy/luci-theme-parentcontrol
 
-系统高级设置 : https://github.com/sirpdboy/luci-app-advanced
+- 系统高级设置 : https://github.com/sirpdboy/luci-app-advanced
 
-ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
+- ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
 
+- 进阶设置（系统高级设置+主题设置kucat/agron/opentopd）: https://github.com/sirpdboy/luci-app-advancedplus
+
+- 设置向导: https://github.com/sirpdboy/luci-app-wizard
+
+- 分区扩容: https://github.com/sirpdboy/luci-app-partexp
+
+- lukcy大吉: https://github.com/sirpdboy/luci-app-lukcy
 
 ## 捐助
 
@@ -37,4 +51,3 @@ ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
 <a href="#readme">
     <img src="https://img.shields.io/badge/-返回顶部-orange.svg" alt="图飞了😂" title="返回顶部" align="right"/>
 </a>
-

luci-app-advanced/luasrc/model/cbi/advanced.lua

@@ -6,38 +6,6 @@ m.apply_on_parse=true
 s=m:section(TypedSection,"advanced")
 s.anonymous=true
 
-if nixio.fs.access("/bin/nuc")then
-  s:tab("mode",translate("模式设置"),translate("<br />可以在这里切换旁路由和正常模式，重置你的网络设置。<br /><font color=\"Red\"><strong>点击后会立即重启设备，没有确认过程，请谨慎操作！</strong></font><br/>"))
-  o=s:taboption("mode",Button,"nucmode",translate("切换为旁路由模式"),translate("<font color=\"green\"><strong>本模式适合于单口和多网口主机，自动将网口全桥接好！<br />默认gateway是：192.168.1.1，ipaddr是192.168.1.2。用本机接口LAN接上级LAN当旁路由，主路由关闭DHCP服务。应用生效会重启软路由！</strong></font><br/>"))
-  o.inputtitle = translate("Apply")
-  o.inputstyle = "reset"
-  o.write = function()
-    luci.sys.exec("/bin/nuc &> /dev/null &")
-  end
-  o=s:taboption("mode",Button,"normalmode",translate("切换成路由模式"),translate("<font color=\"green\"><strong>本模式适合于有两个网口或以上的设备使用，如多网口软路由或者虚拟了两个以上网口的虚拟机使用！应用生效会重启软路由！。</strong></font><br/>"))
-  o.inputtitle = translate("Apply")
-  o.inputstyle = "reset"
-  o.write = function()
-   luci.sys.exec("/bin/normalmode &> /dev/null &")
-  end
-
-	o=s:taboption("mode",Button,"ipmode6",translate("设置为IPV6网络"),translate("<font color=\"green\"><strong>点击应用切换到IPV6模式！保存应用后即刻有效！</strong></font><br/>"))
-
-	o.inputtitle = translate("Apply")
-	o.inputstyle = "add"
-	o.write = function(self, section)
-  		luci.sys.exec("ipmode6  &> /dev/null &")
-	end
-
-	o=s:taboption("mode",Button,"ipmode4",translate("设置为IPV4网络"),translate("<font color=\"green\"><strong>点击应用切换到IPV4模式！保存应用后即刻有效！</strong></font><br/>"))
-
-	o.inputtitle = translate("Apply")
-	o.inputstyle = "add"
-	o.write = function(self, section)
-  		luci.sys.exec("ipmode4  &> /dev/null &")
-	end
-
-end
 if nixio.fs.access("/etc/dnsmasq.conf")then
 
 s:tab("dnsmasqconf",translate("dnsmasq"),translate("本页是配置/etc/dnsmasq.conf的文档内容。应用保存后自动重启生效"))
@@ -127,6 +95,7 @@ e.remove("/tmp/hosts.tmp")
 end
 end
 end
+
 if nixio.fs.access("/etc/config/arpbind")then
 s:tab("arpbindconf",translate("ARP绑定"),translate("本页是配置/etc/config/arpbind包含APR绑定MAC地址文档内容。应用保存后自动重启生效"))
 conf=s:taboption("arpbindconf",Value,"arpbindconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
@@ -148,6 +117,7 @@ e.remove("/tmp/arpbind")
 end
 end
 end
+
 if nixio.fs.access("/etc/config/firewall")then
 s:tab("firewallconf",translate("防火墙"),translate("本页是配置/etc/config/firewall包含防火墙协议设置文档内容。应用保存后自动重启生效"))
 conf=s:taboption("firewallconf",Value,"firewallconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
@@ -169,6 +139,7 @@ e.remove("/tmp/firewall")
 end
 end
 end
+
 if nixio.fs.access("/etc/config/mwan3")then
 s:tab("mwan3conf",translate("负载均衡"),translate("本页是配置/etc/config/mwan3包含负载均衡设置文档内容。应用保存后自动重启生效"))
 conf=s:taboption("mwan3conf",Value,"mwan3conf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
@@ -211,6 +182,7 @@ e.remove("/tmp/dhcp")
 end
 end
 end
+
 if nixio.fs.access("/etc/config/ddns")then
 s:tab("ddnsconf",translate("DDNS"),translate("本页是配置/etc/config/ddns包含动态域名设置文档内容。应用保存后自动重启生效"))
 conf=s:taboption("ddnsconf",Value,"ddnsconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
@@ -233,48 +205,50 @@ end
 end
 end
 
-if nixio.fs.access("/etc/config/timecontrol")then
-s:tab("timecontrolconf",translate("时间控制"),translate("本页是配置/etc/config/timecontrol包含上网时间控制配置文档内容。应用保存后自动重启生效"))
-conf=s:taboption("timecontrolconf",Value,"timecontrolconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
+if nixio.fs.access("/etc/config/parentcontrol")then
+s:tab("parentcontrolconf",translate("家长控制"),translate("本页是配置/etc/config/parentcontrol包含家长控制配置文档内容。应用保存后自动重启生效"))
+conf=s:taboption("parentcontrolconf",Value,"parentcontrolconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
 conf.template="cbi/tvalue"
 conf.rows=20
 conf.wrap="off"
 conf.cfgvalue=function(t,t)
-return e.readfile("/etc/config/timecontrol")or""
+return e.readfile("/etc/config/parentcontrol")or""
 end
 conf.write=function(a,a,t)
 if t then
 t=t:gsub("\r\n?","\n")
-e.writefile("/tmp/timecontrol",t)
-if(luci.sys.call("cmp -s /tmp/timecontrol /etc/config/timecontrol")==1)then
-e.writefile("/etc/config/timecontrol",t)
-luci.sys.call("/etc/init.d/timecontrol restart >/dev/null")
+e.writefile("/tmp/parentcontrol",t)
+if(luci.sys.call("cmp -s /tmp/parentcontrol /etc/config/parentcontrol")==1)then
+e.writefile("/etc/config/parentcontrol",t)
+luci.sys.call("/etc/init.d/parentcontrol restart >/dev/null")
 end
-e.remove("/tmp/timecontrol")
+e.remove("/tmp/parentcontrol")
 end
 end
 end
-if nixio.fs.access("/etc/config/rebootschedule")then
-s:tab("rebootscheduleconf",translate("定时设置"),translate("本页是配置/etc/config/rebootschedule包含定时设置任务配置文档内容。应用保存后自动重启生效"))
-conf=s:taboption("rebootscheduleconf",Value,"rebootscheduleconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
+
+if nixio.fs.access("/etc/config/autotimeset")then
+s:tab("autotimesetconf",translate("定时设置"),translate("本页是配置/etc/config/autotimeset包含定时设置任务配置文档内容。应用保存后自动重启生效"))
+conf=s:taboption("autotimesetconf",Value,"autotimesetconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
 conf.template="cbi/tvalue"
 conf.rows=20
 conf.wrap="off"
 conf.cfgvalue=function(t,t)
-return e.readfile("/etc/config/rebootschedule")or""
+return e.readfile("/etc/config/autotimeset")or""
 end
 conf.write=function(a,a,t)
 if t then
 t=t:gsub("\r\n?","\n")
-e.writefile("/tmp/rebootschedule",t)
-if(luci.sys.call("cmp -s /tmp/rebootschedule /etc/config/rebootschedule")==1)then
-e.writefile("/etc/config/rebootschedule",t)
-luci.sys.call("/etc/init.d/rebootschedule restart >/dev/null")
+e.writefile("/tmp/autotimeset",t)
+if(luci.sys.call("cmp -s /tmp/autotimeset /etc/config/autotimeset")==1)then
+e.writefile("/etc/config/autotimeset",t)
+luci.sys.call("/etc/init.d/autotimeset restart >/dev/null")
 end
-e.remove("/tmp/rebootschedule")
+e.remove("/tmp/autotimeset")
 end
 end
 end
+
 if nixio.fs.access("/etc/config/wolplus")then
 s:tab("wolplusconf",translate("网络唤醒"),translate("本页是配置/etc/config/wolplus包含网络唤醒配置文档内容。应用保存后自动重启生效"))
 conf=s:taboption("wolplusconf",Value,"wolplusconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
@@ -318,6 +292,29 @@ e.remove("/tmp/smartdns")
 end
 end
 end
+
+if nixio.fs.access("/etc/config/bypass")then
+s:tab("bypassconf",translate("BYPASS"),translate("本页是配置/etc/config/bypass包含bypass配置文档内容。应用保存后自动重启生效"))
+conf=s:taboption("bypassconf",Value,"bypassconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
+conf.template="cbi/tvalue"
+conf.rows=20
+conf.wrap="off"
+conf.cfgvalue=function(t,t)
+return e.readfile("/etc/config/bypass")or""
+end
+conf.write=function(a,a,t)
+if t then
+t=t:gsub("\r\n?","\n")
+e.writefile("/tmp/bypass",t)
+if(luci.sys.call("cmp -s /tmp/bypass /etc/config/bypass")==1)then
+e.writefile("/etc/config/bypass",t)
+luci.sys.call("/etc/init.d/bypass restart >/dev/null")
+end
+e.remove("/tmp/bypass")
+end
+end
+end
+
 if nixio.fs.access("/etc/config/openclash")then
 s:tab("openclashconf",translate("openclash"),translate("本页是配置/etc/config/openclash的文档内容。应用保存后自动重启生效"))
 conf=s:taboption("openclashconf",Value,"openclashconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
@@ -340,5 +337,4 @@ end
 end
 end
 
-
 return m

luci-app-lucky/README.md

@@ -126,31 +126,42 @@ luci-app-lucky 动态域名ddns-go服务,替代socat主要用于公网IPv6 tcp/u
 ![screenshots](https://raw.githubusercontent.com/sirpdboy/openwrt/master/doc/lucky3.jpg)
 
 
+
+
+## 使用与授权相关说明
+ 
+- 本人开源的所有源码，任何引用需注明本处出处，如需修改二次发布必告之本人，未经许可不得做于任何商用用途。
+
+
 # My other project
 
-网络速度测试 ：https://github.com/sirpdboy/NetSpeedTest
+- 网络速度测试 ：https://github.com/sirpdboy/NetSpeedTest
+
+- 定时设置插件 : https://github.com/sirpdboy/luci-app-autotimeset
 
-定时设置插件 : https://github.com/sirpdboy/luci-app-autotimeset
+- 关机功能插件 : https://github.com/sirpdboy/luci-app-poweroffdevice
 
-关机功能插件 : https://github.com/sirpdboy/luci-app-poweroffdevice
+- opentopd主题 : https://github.com/sirpdboy/luci-theme-opentopd
 
-opentopd主题 : https://github.com/sirpdboy/luci-theme-opentopd
+- kucat 主题: https://github.com/sirpdboy/luci-theme-kucat
 
-opentoks 主题: https://github.com/sirpdboy/luci-theme-opentoks [仿KOOLSAHRE主题]
+- 家长控制: https://github.com/sirpdboy/luci-theme-parentcontrol
 
-btmob 主题: https://github.com/sirpdboy/luci-theme-btmob
+- 系统高级设置 : https://github.com/sirpdboy/luci-app-advanced
 
-系统高级设置 : https://github.com/sirpdboy/luci-app-advanced
+- ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
 
-DDNS-GO动态域名: https://github.com/sirpdboy/luci-app-DDNS-GO
+- 进阶设置（系统高级设置+主题设置kucat/agron/opentopd）: https://github.com/sirpdboy/luci-app-advancedplus
 
-Lucky(大吉): https://github.com/sirpdboy/luci-app-lucky 
+- 设置向导: https://github.com/sirpdboy/luci-app-wizard
 
+- 分区扩容: https://github.com/sirpdboy/luci-app-partexp
+
+- lukcy大吉: https://github.com/sirpdboy/luci-app-lukcy
 
 ## 捐助
 
--如果你觉得此项目对你有帮助，请捐助我们，以使项目能持续发展，更加完善。··请作者喝杯咖啡~~~**
--你们的支持就是我的动力！**
+![screenshots](https://raw.githubusercontent.com/sirpdboy/openwrt/master/doc/说明3.jpg)
 
 |     <img src="https://img.shields.io/badge/-支付宝-F5F5F5.svg" href="#赞助支持本项目-" height="25" alt="图飞了😂"/>  |  <img src="https://img.shields.io/badge/-微信-F5F5F5.svg" height="25" alt="图飞了😂" href="#赞助支持本项目-"/>  | 
 | :-----------------: | :-------------: |
@@ -159,4 +170,3 @@ Lucky(大吉): https://github.com/sirpdboy/luci-app-lucky
 <a href="#readme">
     <img src="https://img.shields.io/badge/-返回顶部-orange.svg" alt="图飞了😂" title="返回顶部" align="right"/>
 </a>
-

luci-app-passwall/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
-PKG_VERSION:=4.64-3
+PKG_VERSION:=4.64-5
 PKG_RELEASE:=
 
 PKG_CONFIG_DEPENDS:= \