diff --git a/.github/diy/.packages/luci-app-attendedsysupgrade/root/etc/config/attendedsysupgrade b/.github/diy/.packages/luci-app-attendedsysupgrade/root/etc/config/attendedsysupgrade index 3ecef3106..810ef300c 100644 --- a/.github/diy/.packages/luci-app-attendedsysupgrade/root/etc/config/attendedsysupgrade +++ b/.github/diy/.packages/luci-app-attendedsysupgrade/root/etc/config/attendedsysupgrade @@ -1,5 +1,5 @@ config server 'server' - option url 'https://op.supes.top' + option url 'https://supes.top' config client 'client' option upgrade_packages '1' diff --git a/.github/diy/.packages/opkg/patches/user_agent.patch b/.github/diy/.packages/opkg/patches/user_agent.patch deleted file mode 100644 index 1b495e8e2..000000000 --- a/.github/diy/.packages/opkg/patches/user_agent.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/libopkg/opkg_download.c -+++ b/libopkg/opkg_download.c -@@ -154,4 +154,5 @@ - argv[i++] = "wget"; - argv[i++] = "-q"; -+ argv[i++] = "--user-agent=Kiddin\'"; - if (conf->no_check_certificate) { - argv[i++] = "--no-check-certificate"; diff --git a/.github/diy/patches/autocore.patch b/.github/diy/patches/autocore.patch index ec5f41ba8..ba9c9b304 100644 --- a/.github/diy/patches/autocore.patch +++ b/.github/diy/patches/autocore.patch @@ -1,22 +1,15 @@ --- a/autocore/Makefile +++ b/autocore/Makefile -@@ -6,7 +6,6 @@ - include $(TOPDIR)/rules.mk - - PKG_NAME:=autocore --PKG_FLAGS:=nonshared - PKG_RELEASE:=$(COMMITCOUNT) - - PKG_CONFIG_DEPENDS:= \ -@@ -20,6 +19,7 @@ define Package/autocore-arm - TITLE:=ARM auto core script. - MAINTAINER:=CN_SZTL - DEPENDS:=@(arm||aarch64) \ -+ +ethtool \ +@@ -24,7 +24,7 @@ define Package/autocore +TARGET_bcm27xx:bcm27xx-userland \ - +TARGET_bcm53xx:nvram - VARIANT:=arm - + +TARGET_bcm53xx:nvram \ + +TARGET_mvebu:mhz \ +- +TARGET_x86:ethtool \ ++ +ethtool \ + +TARGET_x86:lm-sensors + PROVIDES:=autocore-arm autocore-x86 + endef + --- a/autocore/files/generic/cpuinfo +++ b/autocore/files/generic/cpuinfo @@ -7,7 +7,7 @@ CPUFREQ_PATH="/sys/devices/system/cpu/cpufreq" diff --git a/.github/diy/patches/depends.patch b/.github/diy/patches/depends.patch index 0850812c9..d527960f7 100644 --- a/.github/diy/patches/depends.patch +++ b/.github/diy/patches/depends.patch @@ -125,8 +125,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for UnblockNeteaseMusic (JavaScript) --LUCI_DEPENDS:=+dnsmasq-full +node \ -+LUCI_DEPENDS:=+dnsmasq-full +node +UnblockNeteaseMusic \ +-LUCI_DEPENDS:=+dnsmasq-full +firewall4 +node \ ++LUCI_DEPENDS:=+dnsmasq-full +UnblockNeteaseMusic +node \ @(PACKAGE_libustream-mbedtls||PACKAGE_libustream-openssl||PACKAGE_libustream-wolfssl) LUCI_PKGARCH:=all diff --git a/.github/diy/patches/luci-app-advanced.patch b/.github/diy/patches/luci-app-advanced.patch index 8b0100a10..8eea61241 100644 --- a/.github/diy/patches/luci-app-advanced.patch +++ b/.github/diy/patches/luci-app-advanced.patch @@ -13,10 +13,10 @@ --- a/luci-app-advanced/luasrc/model/cbi/advanced.lua +++ b/luci-app-advanced/luasrc/model/cbi/advanced.lua -@@ -169,6 +169,27 @@ e.remove("/tmp/firewall") - end +@@ -140,6 +140,28 @@ end end end + +if nixio.fs.access("/etc/config/nginx")then +s:tab("nginxconf",translate("NGINX"),translate("本页是配置/etc/config/nginx包含NGINX配置文档内容。应用保存后自动重启生效")) +conf=s:taboption("nginxconf",Value,"nginxconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。")) @@ -24,7 +24,7 @@ +conf.rows=20 +conf.wrap="off" +conf.cfgvalue=function(t,t) -+return e.readfile("/etc/config/nginx")or"" ++return e.readfile("/etc/config/nginx") or "" +end +conf.write=function(a,a,t) +if t then @@ -38,6 +38,7 @@ +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("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。")) diff --git a/.github/diy/patches/luci-app-attendedsysupgrade.patch b/.github/diy/patches/luci-app-attendedsysupgrade.patch index 5d230ac9c..a26da3543 100644 --- a/.github/diy/patches/luci-app-attendedsysupgrade.patch +++ b/.github/diy/patches/luci-app-attendedsysupgrade.patch @@ -92,7 +92,7 @@ this.data.revision = response[1].release.revision; this.data.efi = response[2]; -+ this.firmware.partsize = response[1].release.distribution; ++ this.firmware.rootfs_size_mb = Number(response[1].release.distribution); + if (this.data.efi) { + this.firmware.efi = "efi"; + } else { diff --git a/.github/diy/patches/luci-app-passwall.patch b/.github/diy/patches/luci-app-passwall.patch index 92b364605..3622ee598 100644 --- a/.github/diy/patches/luci-app-passwall.patch +++ b/.github/diy/patches/luci-app-passwall.patch @@ -21,7 +21,7 @@ index ed9770f070..1fea4ee29b 100644 LUCI_PKGARCH:=all LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \ + +lua-maxminddb +ipset +ipt2socks +iptables-mod-conntrack-extra +iptables-mod-iprange +iptables-mod-socket +iptables-mod-tproxy +kmod-ipt-nat \ - +dns2socks +dns2tcp +ip-full +libuci-lua +lua +luci-compat +luci-lib-jsonc \ + +chinadns-ng +dns2socks +dns2tcp +ip-full +libuci-lua +lua +luci-compat +luci-lib-jsonc \ +microsocks +resolveip +tcping +unzip \ +PACKAGE_$(PKG_NAME)_INCLUDE_Brook:brook \ @@ -55,7 +56,7 @@ LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \ @@ -33,15 +33,6 @@ index ed9770f070..1fea4ee29b 100644 +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin:v2ray-plugin \ +PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core \ +PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin:xray-plugin -@@ -95,7 +96,7 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Brook - config PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG - bool "Include ChinaDNS-NG" - select PACKAGE_ipset -- default n -+ default y - - config PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy - bool "Include Haproxy" @@ -150,11 +151,11 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_Plus config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray diff --git a/.github/diy/patches/luci-app-store.patch b/.github/diy/patches/luci-app-store.patch index dcf522763..0e4e37fe9 100644 --- a/.github/diy/patches/luci-app-store.patch +++ b/.github/diy/patches/luci-app-store.patch @@ -1,6 +1,25 @@ --- a/luci-app-store/luasrc/controller/store.lua +++ b/luci-app-store/luasrc/controller/store.lua -@@ -249,7 +249,7 @@ function store_action(param) +@@ -2,7 +2,7 @@ module("luci.controller.store", package.seeall) + + local myopkg = "is-opkg" + local is_backup = "/usr/libexec/istore/backup" +-local page_index = {"admin", "store", "pages"} ++local page_index = {"admin", "system", "store"} + + function index() + local function store_api(action, onlypost) +@@ -13,8 +13,7 @@ function index() + + local action + +- entry({"admin", "store"}, call("redirect_index"), _("iStore"), 31) +- entry({"admin", "store", "pages"}, call("store_index")).leaf = true ++ entry({"admin", "system", "store"}, call("store_index"), _("iStore"), 31) + if nixio.fs.access("/usr/lib/lua/luci/view/store/main_dev.htm") then + entry({"admin", "store", "dev"}, call("store_dev")).leaf = true + end +@@ -249,7 +248,7 @@ function store_action(param) local metapkg = pkg and (metapkgpre .. pkg) or "" if action == "update" or pkg then if action == "update" or action == "install" then @@ -9,7 +28,7 @@ else local meta = json_parse(fs.readfile(metadir .. "/" .. pkg .. ".json")) local pkgs = {} -@@ -316,7 +316,7 @@ function store_upload() +@@ -316,7 +315,7 @@ function store_upload() if string.lower(string.sub(path, -4, -1)) == ".run" then code, out, err = _action("sh", "-c", "ls -l \"%s\"; md5sum \"%s\" 2>/dev/null; chmod 755 \"%s\" && \"%s\"; RET=$?; rm -f \"%s\"; exit $RET" %{ path, path, path, path, path }) else @@ -18,3 +37,22 @@ end else code = 500 + +--- a/luci-app-store/luasrc/view/store/main.htm ++++ b/luci-app-store/luasrc/view/store/main.htm +@@ -26,6 +26,8 @@

<%:iStore%> + + v<%=id.version%> + ++
++ 更多插件, 请使用 系统->软件包 +

+ +
+@@ -58,4 +60,4 @@

<%:iStore%> + + + +-<%+footer%> +\ No newline at end of file ++<%+footer%> diff --git a/.github/diy/patches/quickstart.patch b/.github/diy/patches/quickstart.patch new file mode 100644 index 000000000..224c66b58 --- /dev/null +++ b/.github/diy/patches/quickstart.patch @@ -0,0 +1,11 @@ +--- a/luci-app-quickstart/Makefile ++++ b/luci-app-quickstart/Makefile +@@ -6,7 +6,7 @@ + include $(TOPDIR)/rules.mk + + LUCI_TITLE:=LuCI support for quickstart +-LUCI_DEPENDS:=+quickstart +luci-app-store ++LUCI_DEPENDS:=+quickstart +luci-app-store +ttyd + LUCI_PKGARCH:=all + + # PKG_RELEASE MUST be empty for luci.mk