From 6ac928f1d554a13e131d93355281e28d58353eef Mon Sep 17 00:00:00 2001 From: ElonH Date: Sat, 6 Jun 2020 12:36:01 +0800 Subject: [PATCH 01/39] Rclone-OpenWRT: upgrade (#4737) * feat(rcloneng): an angular web application for rclone * feat(backup): backup rclone configuration files during system upgrade * :bug: luci-app-rclone: rclone service without bash * :mute: filter out duplicate log * :bug: luci-app-rclone: proxy work around * :page_facing_up: add license header * rclone: set /etc/rclone/rclone.conf as default config path --- package/lean/luci-app-rclone/Makefile | 4 +- .../luasrc/model/cbi/rclone.lua | 11 ++-- .../po/templates/luci-app-rclone.pot | 50 ++++++++-------- .../po/zh_Hans/luci-app-rclone.po | 50 ++++++++-------- .../luci-app-rclone/root/etc/init.d/rclone | 9 ++- package/lean/rclone-ng/Makefile | 58 +++++++++++++++++++ .../010-change-default-config-path.patch | 45 ++++++++++++++ ...ccess-Control-Allow-Origin-only-once.patch | 44 ++++++++++++++ 8 files changed, 216 insertions(+), 55 deletions(-) create mode 100644 package/lean/rclone-ng/Makefile create mode 100644 package/lean/rclone/patches/010-change-default-config-path.patch create mode 100644 package/lean/rclone/patches/020-Notice-Access-Control-Allow-Origin-only-once.patch diff --git a/package/lean/luci-app-rclone/Makefile b/package/lean/luci-app-rclone/Makefile index 5a02e53868..15e63a9944 100644 --- a/package/lean/luci-app-rclone/Makefile +++ b/package/lean/luci-app-rclone/Makefile @@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for Rclone -LUCI_DEPENDS:=+rclone +rclone-webui-react +fuse-utils +LUCI_DEPENDS:=+rclone +rclone-webui-react +fuse-utils +rclone-ng LUCI_PKGARCH:=all PKG_NAME:=luci-app-rclone -PKG_VERSION:=1.3.21 +PKG_VERSION:=1.4.0 PKG_RELEASE:=1 PKG_LICENSE:=GPLv3.0+ PKG_MAINTAINER:=ElonH diff --git a/package/lean/luci-app-rclone/luasrc/model/cbi/rclone.lua b/package/lean/luci-app-rclone/luasrc/model/cbi/rclone.lua index aa9312aa0d..cd11dd0476 100644 --- a/package/lean/luci-app-rclone/luasrc/model/cbi/rclone.lua +++ b/package/lean/luci-app-rclone/luasrc/model/cbi/rclone.lua @@ -38,10 +38,13 @@ m = translate('Rclone ("rsync for cloud storage") is a command line program to sync root/usr/bin and directories to and from different cloud storage providers.') .. '

' .. translate('rclone state') .. ' : ' .. state_msg .. '

' .. address_msg .. - translate('Installed Web Interface') .. - '      

" + translate('Installed Web Interface') .. + '      " .. + '      

" ) s = m:section(TypedSection, 'global', translate('global')) diff --git a/package/lean/luci-app-rclone/po/templates/luci-app-rclone.pot b/package/lean/luci-app-rclone/po/templates/luci-app-rclone.pot index 7df760f2bc..984d16157c 100644 --- a/package/lean/luci-app-rclone/po/templates/luci-app-rclone.pot +++ b/package/lean/luci-app-rclone/po/templates/luci-app-rclone.pot @@ -1,7 +1,7 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" -#: luasrc/model/cbi/rclone.lua:118 +#: luasrc/model/cbi/rclone.lua:121 msgid "FAQ" msgstr "" @@ -23,11 +23,15 @@ msgid "" "usr/bin and directories to and from different cloud storage providers." msgstr "" -#: luasrc/model/cbi/rclone.lua:75 +#: luasrc/model/cbi/rclone.lua:46 +msgid "RcloneNg" +msgstr "" + +#: luasrc/model/cbi/rclone.lua:78 msgid "Recommand: run" msgstr "" -#: luasrc/model/cbi/rclone.lua:127 +#: luasrc/model/cbi/rclone.lua:130 msgid "" "The content of the variable is protocol://server:port. The protocol value is " "commonly either http or socks5." @@ -37,63 +41,63 @@ msgstr "" msgid "Webui React" msgstr "" -#: luasrc/model/cbi/rclone.lua:61 +#: luasrc/model/cbi/rclone.lua:64 msgid "all address" msgstr "" -#: luasrc/model/cbi/rclone.lua:54 +#: luasrc/model/cbi/rclone.lua:57 msgid "configure" msgstr "" -#: luasrc/model/cbi/rclone.lua:80 +#: luasrc/model/cbi/rclone.lua:83 msgid "download" msgstr "" -#: luasrc/model/cbi/rclone.lua:79 +#: luasrc/model/cbi/rclone.lua:82 msgid "download configuration" msgstr "" -#: luasrc/model/cbi/rclone.lua:120 +#: luasrc/model/cbi/rclone.lua:123 msgid "enable proxy" msgstr "" -#: luasrc/model/cbi/rclone.lua:47 +#: luasrc/model/cbi/rclone.lua:50 msgid "global" msgstr "" -#: luasrc/model/cbi/rclone.lua:58 +#: luasrc/model/cbi/rclone.lua:61 msgid "listen address" msgstr "" -#: luasrc/model/cbi/rclone.lua:65 +#: luasrc/model/cbi/rclone.lua:68 msgid "listen port" msgstr "" -#: luasrc/model/cbi/rclone.lua:60 +#: luasrc/model/cbi/rclone.lua:63 msgid "local network address" msgstr "" -#: luasrc/model/cbi/rclone.lua:59 +#: luasrc/model/cbi/rclone.lua:62 msgid "localhost address" msgstr "" -#: luasrc/model/cbi/rclone.lua:129 +#: luasrc/model/cbi/rclone.lua:132 msgid "log" msgstr "" -#: luasrc/model/cbi/rclone.lua:108 +#: luasrc/model/cbi/rclone.lua:111 msgid "password" msgstr "" -#: luasrc/model/cbi/rclone.lua:133 +#: luasrc/model/cbi/rclone.lua:136 msgid "path" msgstr "" -#: luasrc/model/cbi/rclone.lua:114 +#: luasrc/model/cbi/rclone.lua:117 msgid "proxy" msgstr "" -#: luasrc/model/cbi/rclone.lua:123 +#: luasrc/model/cbi/rclone.lua:126 msgid "proxy address" msgstr "" @@ -101,7 +105,7 @@ msgstr "" msgid "rclone address" msgstr "" -#: luasrc/model/cbi/rclone.lua:71 +#: luasrc/model/cbi/rclone.lua:74 msgid "rclone configuration file path" msgstr "" @@ -117,18 +121,18 @@ msgstr "" msgid "rclone state" msgstr "" -#: luasrc/model/cbi/rclone.lua:51 +#: luasrc/model/cbi/rclone.lua:54 msgid "run Rclone as daemon" msgstr "" -#: luasrc/model/cbi/rclone.lua:77 +#: luasrc/model/cbi/rclone.lua:80 msgid "than updaload configuration to here." msgstr "" -#: luasrc/model/cbi/rclone.lua:77 +#: luasrc/model/cbi/rclone.lua:80 msgid "to setup configuration on pc," msgstr "" -#: luasrc/model/cbi/rclone.lua:103 +#: luasrc/model/cbi/rclone.lua:106 msgid "username" msgstr "" diff --git a/package/lean/luci-app-rclone/po/zh_Hans/luci-app-rclone.po b/package/lean/luci-app-rclone/po/zh_Hans/luci-app-rclone.po index 3afed25cc9..3e515c5293 100644 --- a/package/lean/luci-app-rclone/po/zh_Hans/luci-app-rclone.po +++ b/package/lean/luci-app-rclone/po/zh_Hans/luci-app-rclone.po @@ -11,7 +11,7 @@ msgstr "" "PO-Revision-Date: \n" "X-Generator: Poedit 2.0.6\n" -#: luasrc/model/cbi/rclone.lua:118 +#: luasrc/model/cbi/rclone.lua:121 msgid "FAQ" msgstr "常见问题" @@ -34,11 +34,15 @@ msgid "" msgstr "" "Rclone是一款的命令行工具，支持在不同对象存储、网盘间同步、上传、下载数据。" -#: luasrc/model/cbi/rclone.lua:75 +#: luasrc/model/cbi/rclone.lua:46 +msgid "RcloneNg" +msgstr "RcloneNg" + +#: luasrc/model/cbi/rclone.lua:78 msgid "Recommand: run" msgstr "建议: 在 PC 上运行" -#: luasrc/model/cbi/rclone.lua:127 +#: luasrc/model/cbi/rclone.lua:130 msgid "" "The content of the variable is protocol://server:port. The protocol value is " "commonly either http or socks5." @@ -50,63 +54,63 @@ msgstr "" msgid "Webui React" msgstr "Webui React" -#: luasrc/model/cbi/rclone.lua:61 +#: luasrc/model/cbi/rclone.lua:64 msgid "all address" msgstr "全部地址" -#: luasrc/model/cbi/rclone.lua:54 +#: luasrc/model/cbi/rclone.lua:57 msgid "configure" msgstr "配置" -#: luasrc/model/cbi/rclone.lua:80 +#: luasrc/model/cbi/rclone.lua:83 msgid "download" msgstr "下载" -#: luasrc/model/cbi/rclone.lua:79 +#: luasrc/model/cbi/rclone.lua:82 msgid "download configuration" msgstr "下载配置文件" -#: luasrc/model/cbi/rclone.lua:120 +#: luasrc/model/cbi/rclone.lua:123 msgid "enable proxy" msgstr "启用代理" -#: luasrc/model/cbi/rclone.lua:47 +#: luasrc/model/cbi/rclone.lua:50 msgid "global" msgstr "全局" -#: luasrc/model/cbi/rclone.lua:58 +#: luasrc/model/cbi/rclone.lua:61 msgid "listen address" msgstr "监听地址" -#: luasrc/model/cbi/rclone.lua:65 +#: luasrc/model/cbi/rclone.lua:68 msgid "listen port" msgstr "监听端口" -#: luasrc/model/cbi/rclone.lua:60 +#: luasrc/model/cbi/rclone.lua:63 msgid "local network address" msgstr "局域网地址" -#: luasrc/model/cbi/rclone.lua:59 +#: luasrc/model/cbi/rclone.lua:62 msgid "localhost address" msgstr "本机地址" -#: luasrc/model/cbi/rclone.lua:129 +#: luasrc/model/cbi/rclone.lua:132 msgid "log" msgstr "日志" -#: luasrc/model/cbi/rclone.lua:108 +#: luasrc/model/cbi/rclone.lua:111 msgid "password" msgstr "密码" -#: luasrc/model/cbi/rclone.lua:133 +#: luasrc/model/cbi/rclone.lua:136 msgid "path" msgstr "路径" -#: luasrc/model/cbi/rclone.lua:114 +#: luasrc/model/cbi/rclone.lua:117 msgid "proxy" msgstr "代理" -#: luasrc/model/cbi/rclone.lua:123 +#: luasrc/model/cbi/rclone.lua:126 msgid "proxy address" msgstr "代理地址" @@ -114,7 +118,7 @@ msgstr "代理地址" msgid "rclone address" msgstr "rclone 地址" -#: luasrc/model/cbi/rclone.lua:71 +#: luasrc/model/cbi/rclone.lua:74 msgid "rclone configuration file path" msgstr "rclone 配置文件地址" @@ -130,19 +134,19 @@ msgstr "rclone 运行中" msgid "rclone state" msgstr "rclone 状态" -#: luasrc/model/cbi/rclone.lua:51 +#: luasrc/model/cbi/rclone.lua:54 msgid "run Rclone as daemon" msgstr "启动 rclone 后台服务" -#: luasrc/model/cbi/rclone.lua:77 +#: luasrc/model/cbi/rclone.lua:80 msgid "than updaload configuration to here." msgstr "然后上传配置文件到这里" -#: luasrc/model/cbi/rclone.lua:77 +#: luasrc/model/cbi/rclone.lua:80 msgid "to setup configuration on pc," msgstr "命令设置 rclone 配置文件," -#: luasrc/model/cbi/rclone.lua:103 +#: luasrc/model/cbi/rclone.lua:106 msgid "username" msgstr "用户名" diff --git a/package/lean/luci-app-rclone/root/etc/init.d/rclone b/package/lean/luci-app-rclone/root/etc/init.d/rclone index 15205215ce..03f8fc39c4 100755 --- a/package/lean/luci-app-rclone/root/etc/init.d/rclone +++ b/package/lean/luci-app-rclone/root/etc/init.d/rclone @@ -1,4 +1,4 @@ -#!/bin/bash /etc/rc.common +#!/bin/sh /etc/rc.common # Copyright (C) 2019 ElonH USE_PROCD=1 @@ -32,6 +32,9 @@ init_config() { [ -f "$config_path" ] || touch "$config_path" + [ -d "/lib/upgrade/keep.d" ] || mkdir -p /lib/upgrade/keep.d/luci-app-rclone 2>/dev/null + echo "$config_path" > /lib/upgrade/keep.d/luci-app-rclone + log_dir=${log_path%/*} [ -d "$log_dir" ] || mkdir -p "$log_dir" 2>/dev/null && echo /dev/null > "$log_path" @@ -81,8 +84,8 @@ start_service() { procd_append_param command "--rc-allow-origin=*" procd_append_param command "--log-file=${log_path}" if [[ "${proxy_enable}" == "1" ]]; then - procd_set_param env all_proxy="$proxy_addr" https_proxy="$proxy_addr" http_proxy="$proxy_addr" - procd_set_param env ALL_PROXY="$proxy_addr" HTTPS_PROXY="$proxy_addr" HTTP_PROXY="$proxy_addr" + procd_set_param env all_proxy="$proxy_addr" https_proxy="$proxy_addr" http_proxy="$proxy_addr" + procd_append_param env ALL_PROXY="$proxy_addr" HTTPS_PROXY="$proxy_addr" HTTP_PROXY="$proxy_addr" fi procd_set_param stdout 1 procd_set_param stderr 1 diff --git a/package/lean/rclone-ng/Makefile b/package/lean/rclone-ng/Makefile new file mode 100644 index 0000000000..49e4384856 --- /dev/null +++ b/package/lean/rclone-ng/Makefile @@ -0,0 +1,58 @@ +#### + # File: /rclone-ng/Makefile + # Project: Rclone-OpenWrt + # File Created: Friday, 5th June 2020 12:37:26 am + # Author: ElonH[EH](elonhhuang@gmail.com) + # License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html) + # Copyright (C) 2020 [ElonH] +#### + +include $(TOPDIR)/rules.mk + +PKG_NAME:=rclone-ng +PKG_VERSION:=0.2.4 +PKG_RELEASE:=1 + + +PKG_LICENSE:=GPLv3 +PKG_MAINTAINER:=ElonH + +include $(INCLUDE_DIR)/package.mk + +PKG_SOURCE:=RcloneNg-v$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://github.com/ElonH/RcloneNg/releases/download/v$(PKG_VERSION)/ +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_HASH:=3090a713253b17bfbb4d6a69b4b55b81d69e1768cf56d3abca8631e4a35f270b + +define Package/$(PKG_NAME) + SECTION:=net + CATEGORY:=Network + SUBMENU:=File Transfer + SUBMENU:=Cloud Manager + TITLE:=An angular web application for rclone + URL:=https://github.com/ElonH/RcloneNg + PKGARCH:=all +endef + +define Package/$(PKG_NAME)/description + An angular web application for rclone +endef + +define Build/Prepare + mkdir -vp $(PKG_BUILD_DIR) + tar -xzf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) +endef + +define Build/Configure +endef + +define Build/Compile + echo "$(PKG_NAME) Compile Skiped!" +endef + +define Package/$(PKG_NAME)/install + $(INSTALL_DIR) $(1)/www + $(CP) $(PKG_BUILD_DIR)/RcloneNg $(1)/www +endef + +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/lean/rclone/patches/010-change-default-config-path.patch b/package/lean/rclone/patches/010-change-default-config-path.patch new file mode 100644 index 0000000000..b1d381ecf2 --- /dev/null +++ b/package/lean/rclone/patches/010-change-default-config-path.patch @@ -0,0 +1,45 @@ +## +# File: /patches/010-change-default-config-path.patch +# Project: rclone +# File Created: Friday, 1st May 2020 10:54:31 pm +# Author: ElonH[EH](elonhhuang@gmail.com) +# License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html) +# Copyright (C) 2020 [ElonH] +## +# set /etc/rclone/rclone.conf as default configuration path +diff --git a/fs/config/config.go b/fs/config/config.go +index 53d67ef03..cc5d6436b 100644 +--- a/fs/config/config.go ++++ b/fs/config/config.go +@@ -25,7 +25,6 @@ import ( + "unicode/utf8" + + "github.com/Unknwon/goconfig" +- homedir "github.com/mitchellh/go-homedir" + "github.com/pkg/errors" + "github.com/rclone/rclone/fs" + "github.com/rclone/rclone/fs/accounting" +@@ -133,21 +132,10 @@ func makeConfigPath() string { + } + + // Find user's home directory +- homeDir, err := homedir.Dir() ++ homeDir := "/etc" + +- // Find user's configuration directory. +- // Prefer XDG config path, with fallback to $HOME/.config. +- // See XDG Base Directory specification +- // https://specifications.freedesktop.org/basedir-spec/latest/), +- xdgdir := os.Getenv("XDG_CONFIG_HOME") + var cfgdir string +- if xdgdir != "" { +- // User's configuration directory for rclone is $XDG_CONFIG_HOME/rclone +- cfgdir = filepath.Join(xdgdir, "rclone") +- } else if homeDir != "" { +- // User's configuration directory for rclone is $HOME/.config/rclone +- cfgdir = filepath.Join(homeDir, ".config", "rclone") +- } ++ cfgdir = filepath.Join(homeDir, "rclone") + + // Use rclone.conf from user's configuration directory if already existing + var cfgpath string diff --git a/package/lean/rclone/patches/020-Notice-Access-Control-Allow-Origin-only-once.patch b/package/lean/rclone/patches/020-Notice-Access-Control-Allow-Origin-only-once.patch new file mode 100644 index 0000000000..5317aa56f6 --- /dev/null +++ b/package/lean/rclone/patches/020-Notice-Access-Control-Allow-Origin-only-once.patch @@ -0,0 +1,44 @@ +## +# File: /patches/020-Notice-Access-Control-Allow-Origin-only-once.patch +# Project: rclone +# File Created: Sunday, 3rd May 2020 1:44:22 pm +# Author: ElonH[EH](elonhhuang@gmail.com) +# License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html) +# Copyright (C) 2020 [ElonH] +## +diff --git a/fs/rc/rcserver/rcserver.go b/fs/rc/rcserver/rcserver.go +index 4a2b5c71e..f00994e93 100644 +--- a/fs/rc/rcserver/rcserver.go ++++ b/fs/rc/rcserver/rcserver.go +@@ -14,6 +14,7 @@ import ( + "regexp" + "sort" + "strings" ++ "sync" + + "github.com/pkg/errors" + "github.com/rclone/rclone/cmd/serve/httplib" +@@ -29,6 +30,8 @@ import ( + "github.com/skratchdot/open-golang/open" + ) + ++var onlyOnce sync.Once ++ + // Start the remote control server if configured + // + // If the server wasn't configured the *Server returned may be nil +@@ -172,9 +175,11 @@ func (s *Server) handler(w http.ResponseWriter, r *http.Request) { + + allowOrigin := rcflags.Opt.AccessControlAllowOrigin + if allowOrigin != "" { +- if allowOrigin == "*" { +- fs.Logf(nil, "Warning: Allow origin set to *. This can cause serious security problems.") +- } ++ onlyOnce.Do(func() { ++ if allowOrigin == "*" { ++ fs.Logf(nil, "Warning: Allow origin set to *. This can cause serious security problems.") ++ } ++ }) + w.Header().Add("Access-Control-Allow-Origin", allowOrigin) + } else { + w.Header().Add("Access-Control-Allow-Origin", s.URL()) From f892bcdf96e59ca3d19501fafc2dcd6a4e9ce318 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sat, 6 Jun 2020 12:36:21 +0800 Subject: [PATCH 02/39] treewide: adjust sysupgrade script (#4720) This commit fix sysupgrade failed for bcm27xx. --- .../linux/apm821xx/base-files/lib/upgrade/wdbook.sh | 11 ++++++++--- .../linux/bcm27xx/base-files/lib/upgrade/platform.sh | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh b/target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh index c191271149..2287e0619d 100644 --- a/target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh +++ b/target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh @@ -7,7 +7,7 @@ mbl_do_platform_check() { [ "$#" -gt 1 ] && return 1 - export_bootdevice && export_partdevice diskdev 0 || { + export_bootdevice && export_partdevice diskdev -2 || { echo "Unable to determine upgrade device" return 1 } @@ -36,7 +36,7 @@ mbl_do_platform_check() { mbl_do_upgrade() { local diskdev partdev diff - export_bootdevice && export_partdevice diskdev 0 || { + export_bootdevice && export_partdevice diskdev -2 || { echo "Unable to determine upgrade device" return 1 } @@ -70,6 +70,10 @@ mbl_do_upgrade() { #iterate over each partition from the image and write it to the boot disk while read part start size; do + # root is /dev/sd[a|b]2 and not /dev/sd[a|b] this causes some problem + # one of which is this offset, I'm not sure what's the best fix, so + # here's a WA. + let part=$((part - 2)) if export_partdevice partdev $part; then echo "Writing image to /dev/$partdev..." get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync @@ -86,7 +90,8 @@ mbl_do_upgrade() { mbl_copy_config() { local partdev - if export_partdevice partdev 1; then + # Same as above /dev/sd[a|b]2 is root, so /boot is -1 + if export_partdevice partdev -1; then mount -t ext4 -o rw,noatime "/dev/$partdev" /mnt cp -af "$CONF_TAR" /mnt/ umount /mnt diff --git a/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh index 37e479272b..62eede53d3 100644 --- a/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh @@ -9,7 +9,7 @@ platform_check_image() { [ "$#" -gt 1 ] && return 1 - export_bootdevice && export_partdevice diskdev 0 || { + export_bootdevice && export_partdevice diskdev -2 || { echo "Unable to determine upgrade device" return 1 } @@ -38,7 +38,7 @@ platform_check_image() { platform_do_upgrade() { local diskdev partdev diff - export_bootdevice && export_partdevice diskdev 0 || { + export_bootdevice && export_partdevice diskdev -2 || { echo "Unable to determine upgrade device" return 1 } @@ -72,6 +72,10 @@ platform_do_upgrade() { #iterate over each partition from the image and write it to the boot disk while read part start size; do + # root is /dev/sd[a|b]2 and not /dev/sd[a|b] this causes some problem + # one of which is this offset, I'm not sure what's the best fix, so + # here's a WA. + let part=$((part - 2)) if export_partdevice partdev $part; then echo "Writing image to /dev/$partdev..." get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync @@ -88,7 +92,8 @@ platform_do_upgrade() { platform_copy_config() { local partdev - if export_partdevice partdev 1; then + # Same as above /dev/sd[a|b]2 is root, so /boot is -1 + if export_partdevice partdev -1; then mkdir -p /boot [ -f /boot/kernel.img ] || mount -t vfat -o rw,noatime "/dev/$partdev" /boot cp -af "$CONF_TAR" /boot/ From 901efc2d12cbbd4665636a2d28741bc79a4dba20 Mon Sep 17 00:00:00 2001 From: Chuck Date: Sun, 7 Jun 2020 21:52:06 +0800 Subject: [PATCH 03/39] default-settings: i18n: add space between Chinese and English characters (#4616) --- .../lean/default-settings/i18n/default.zh-cn.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package/lean/default-settings/i18n/default.zh-cn.po b/package/lean/default-settings/i18n/default.zh-cn.po index 5cf797d2df..f6c36823c0 100644 --- a/package/lean/default-settings/i18n/default.zh-cn.po +++ b/package/lean/default-settings/i18n/default.zh-cn.po @@ -5,19 +5,19 @@ msgid "Architecture" msgstr "架构" msgid "CPU Temperature" -msgstr "CPU温度" +msgstr "CPU 温度" msgid "CPU Info" -msgstr "CPU信息" +msgstr "CPU 信息" msgid "CPU Model" msgstr "处理器型号" msgid "CPU frequency" -msgstr "CPU频率" +msgstr "CPU 频率" msgid "RAM frequency" -msgstr "RAM频率" +msgstr "RAM 频率" msgid "Flash Size" msgstr "闪存大小" @@ -44,7 +44,7 @@ msgid "ZRam Size" msgstr "ZRam 大小" msgid "Size of the ZRam device in megabytes" -msgstr "划分给ZRam 分区的内存大小（MB），推荐留空由系统自动管理" +msgstr "划分给 ZRam 分区的内存大小（MB），推荐留空由系统自动管理" msgid "Number of parallel threads used for compression" msgstr "用于压缩内存数据的CPU并发线程数" @@ -53,15 +53,15 @@ msgid "Swap" msgstr "虚拟内存" msgid "Force 40MHz mode" -msgstr "强制40MHz频宽" +msgstr "强制 40MHz 频宽" msgid "" "Always use 40MHz channels even if the secondary channel overlaps. Using this " "option does not comply with IEEE 802.11n-2009!" -msgstr "强制启用40MHz频宽并忽略辅助信道重叠。此选项可能不兼容某些无线硬件导致无法启用!" +msgstr "强制启用 40MHz 频宽并忽略辅助信道重叠。此选项可能不兼容某些无线硬件导致无法启用!" msgid "Disassociate On Low Acknowledgement" msgstr "弱信号剔除" msgid "Allow AP mode to disconnect STAs based on low ACK condition" -msgstr "允许AP模式基于低ACK条件判断剔除弱信号的客户端" +msgstr "允许 AP 模式基于低 ACK 条件判断剔除弱信号的客户端" From bae6e7fc28b8645e6f96df80a0b57ae2387cd847 Mon Sep 17 00:00:00 2001 From: hyird <31695447+hyird@users.noreply.github.com> Date: Tue, 9 Jun 2020 16:11:41 +0800 Subject: [PATCH 04/39] luci-app-frpc: add plugin "https2http" (#4754) * Update config.lua * Update frp * Update frp.po --- .../luasrc/model/cbi/frp/config.lua | 21 +++++++++++++++++++ package/lean/luci-app-frpc/po/zh-cn/frp.po | 17 ++++++++++++++- .../lean/luci-app-frpc/root/etc/init.d/frp | 16 ++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/package/lean/luci-app-frpc/luasrc/model/cbi/frp/config.lua b/package/lean/luci-app-frpc/luasrc/model/cbi/frp/config.lua index b015ff7ad4..039d1ae40c 100644 --- a/package/lean/luci-app-frpc/luasrc/model/cbi/frp/config.lua +++ b/package/lean/luci-app-frpc/luasrc/model/cbi/frp/config.lua @@ -105,6 +105,27 @@ e:depends("type","http") e = t:taboption("other",Value, "host_header_rewrite", translate("Host Header"), translate("The Host header will be rewritten to match the hostname portion of the forwarding address.")) e.default = "dev.yourdomain.com" e:depends("enable_host_header_rewrite",1) +e=t:taboption("other",Flag,"enable_https_plugin",translate("Use Plugin")) +e.default="0" +e:depends("type","https") +e=t:taboption("other",ListValue,"https_plugin",translate("Choose Plugin"),translate("If plugin is defined, local_ip and local_port is useless, plugin will handle connections got from frps.")) +e:value("https2http",translate("https2http")) +e:depends("enable_https_plugin",1) +e=t:taboption("other",Value,"plugin_local_addr",translate("Plugin_Local_Addr")) +e.default="127.0.0.1:80" +e:depends("https_plugin","https2http") +e=t:taboption("other",Value,"plugin_crt_path",translate("plugin_crt_path")) +e.default="./server.crt" +e:depends("https_plugin","https2http") +e=t:taboption("other",Value,"plugin_key_path",translate("plugin_key_path")) +e.default="./server.key" +e:depends("https_plugin","https2http") +e=t:taboption("other",Value,"plugin_host_header_rewrite",translate("plugin_host_header_rewrite")) +e.default="127.0.0.1" +e:depends("https_plugin","https2http") +e=t:taboption("other",Value,"plugin_header_X_From_Where",translate("plugin_header_X-From-Where")) +e.default="frp" +e:depends("https_plugin","https2http") e = t:taboption("base",ListValue, "proxy_protocol_version", translate("Proxy-Protocol Version"), translate("Proxy Protocol to send user's real IP to local services.")) e.default = "disable" e:value("disable",translate("Disable")) diff --git a/package/lean/luci-app-frpc/po/zh-cn/frp.po b/package/lean/luci-app-frpc/po/zh-cn/frp.po index 13f7f9adde..17f775a70a 100644 --- a/package/lean/luci-app-frpc/po/zh-cn/frp.po +++ b/package/lean/luci-app-frpc/po/zh-cn/frp.po @@ -252,4 +252,19 @@ msgid "STCP Server Name is Service Remark Name of STCP Server" msgstr "STCP服务器别名" msgid "Please ensure the remark name is unique." -msgstr "确保备注名唯一" \ No newline at end of file +msgstr "确保备注名唯一" + +msgid "Plugin_Local_Addr" +msgstr "插件本地地址（格式 IP:Port）" + +msgid "plugin_crt_path" +msgstr "插件证书路径" + +msgid "plugin_key_path" +msgstr "插件私钥路径" + +msgid "plugin_host_header_rewrite" +msgstr "插件 Host Header 重写" + +msgid "plugin_header_X-From-Where" +msgstr "插件X-From-Where请求头" diff --git a/package/lean/luci-app-frpc/root/etc/init.d/frp b/package/lean/luci-app-frpc/root/etc/init.d/frp index cde1c0ebea..53fee3ba3a 100755 --- a/package/lean/luci-app-frpc/root/etc/init.d/frp +++ b/package/lean/luci-app-frpc/root/etc/init.d/frp @@ -32,6 +32,7 @@ conf_proxy_add() { local enable type domain_type custom_domains remote_port local_ip local_port enable_http_auth enable_host_header_rewrite host_header_rewrite local subdomain proxy_protocol_version use_encryption use_compression http_user http_pwd remark locations local enable_plugin plugin plugin_http_user plugin_http_passwd plugin_unix_path stcp_role stcp_secretkey stcp_servername + local enable_https_plugin https_plugin plugin_local_addr plugin_crt_path plugin_key_path plugin_host_header_rewrite plugin_header_X_From_Where config_get_bool enable "$cfg" enable 1 [ "$enable" -gt 0 ] || return 1 @@ -55,6 +56,12 @@ conf_proxy_add() { config_get stcp_secretkey "$cfg" stcp_secretkey config_get stcp_servername "$cfg" stcp_servername config_get proxy_protocol_version "$cfg" proxy_protocol_version + config_get https_plugin "$cfg" https_plugin + config_get plugin_local_addr "$cfg" plugin_local_addr + config_get plugin_crt_path "$cfg" plugin_crt_path + config_get plugin_key_path "$cfg" plugin_key_path + config_get plugin_host_header_rewrite "$cfg" plugin_host_header_rewrite + config_get plugin_header_X_From_Where "$cfg" plugin_header_X_From_Where [ -n "$remark" ] && [ -n "$type" ] || return 1 @@ -99,6 +106,15 @@ conf_proxy_add() { fi } + [ -n "$https_plugin" ] && echo "plugin=$https_plugin" >>$tmpconf + [ -n "$plugin_local_addr" ] && echo "plugin_local_addr=$plugin_local_addr" >>$tmpconf + [ -n "$plugin_crt_path" -a -n "$plugin_key_path" ] && { + echo "plugin_crt_path=$plugin_crt_path" >>$tmpconf + echo "plugin_key_path=$plugin_key_path" >>$tmpconf + } + [ -n "$plugin_host_header_rewrite" ] && echo "plugin_host_header_rewrite=$plugin_host_header_rewrite" >>$tmpconf + [ -n "$plugin_header_X_From_Where" ] && echo "plugin_header_X_From_Where=$plugin_header_X_From_Where" >>$tmpconf + frp_write_bool use_encryption $cfg 1 frp_write_bool use_compression $cfg 1 From e0c345df71ee9555f20235a6eaa35fd70b0ab3eb Mon Sep 17 00:00:00 2001 From: HiGarfield <32226909+HiGarfield@users.noreply.github.com> Date: Tue, 9 Jun 2020 16:14:26 +0800 Subject: [PATCH 05/39] ppp: syncppp: further fix grep's regex match (#4623) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit /etc/config/network这个文件里的写法可以各种各样，pppoe外面可以有引号，也可以没引号。proto与pppoe之间可以有不同类型、不同数量的空格（或Tab）。用uci show，可以把输出格式统一掉，省得考虑配置文件不同写法的区别。 --- package/network/services/ppp/files/ppp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/ppp/files/ppp.sh b/package/network/services/ppp/files/ppp.sh index eea4220a34..78e8c32136 100755 --- a/package/network/services/ppp/files/ppp.sh +++ b/package/network/services/ppp/files/ppp.sh @@ -233,8 +233,8 @@ proto_pppoe_setup() { #By 蝈蝈：并发拨号同步的前期准备 syncppp_option="" - [ "$(uci get syncdial.config.enabled)" == "1" ] && { - ppp_if_cnt=$(cat /etc/config/network | grep -E -c "proto\s+?'pppoe'") + [ "$(uci get syncdial.config.enabled)" -eq "1" ] && { + ppp_if_cnt=$(uci show network | grep -c "\.proto=\'pppoe\'$") syncppp_option="syncppp $ppp_if_cnt" shellsync $ppp_if_cnt 10 } From 23699790539fb8b30b29c2ef5fff8a57af73dade Mon Sep 17 00:00:00 2001 From: ElonH Date: Wed, 10 Jun 2020 13:10:29 +0800 Subject: [PATCH 06/39] RcloneNg: bump version to 0.3.0 (#4757) --- package/lean/rclone-ng/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/rclone-ng/Makefile b/package/lean/rclone-ng/Makefile index 49e4384856..5e1e09ca2d 100644 --- a/package/lean/rclone-ng/Makefile +++ b/package/lean/rclone-ng/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone-ng -PKG_VERSION:=0.2.4 +PKG_VERSION:=0.3.0 PKG_RELEASE:=1 @@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk PKG_SOURCE:=RcloneNg-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/ElonH/RcloneNg/releases/download/v$(PKG_VERSION)/ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_HASH:=3090a713253b17bfbb4d6a69b4b55b81d69e1768cf56d3abca8631e4a35f270b +PKG_HASH:=b6f7254fcb82d380ad621859a216fbf510059c95ad2df0e27bcf2872892f7c6f define Package/$(PKG_NAME) SECTION:=net From 4798e5314b8b4a328f9f4b6469af135804d630b4 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Wed, 10 Jun 2020 16:01:15 +0800 Subject: [PATCH 07/39] luci-app-unblockmusic: fix update version display --- package/lean/luci-app-unblockmusic/Makefile | 2 +- .../root/usr/share/UnblockNeteaseMusic/update_core.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index b1b84517ef..9de04a6ba7 100644 --- a/package/lean/luci-app-unblockmusic/Makefile +++ b/package/lean/luci-app-unblockmusic/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockmusic PKG_VERSION:=2.3.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_CONFIG_DEPENDS := \ CONFIG_UnblockNeteaseMusic_Go \ diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/update_core.sh b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/update_core.sh index 65953b9353..eea7b08ca8 100755 --- a/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/update_core.sh +++ b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/update_core.sh @@ -49,7 +49,7 @@ function update_core(){ exit 1 else echo -e "${latest_ver}" > /usr/share/UnblockNeteaseMusic/local_ver - cat /usr/share/UnblockNeteaseMusic/package-lock.json | grep version |awk -F ':' '{print $2}' | cut -c3-8 > /usr/share/UnblockNeteaseMusic/core_ver + cat /usr/share/UnblockNeteaseMusic/package.json | grep version |awk -F ':' '{print $2}' | cut -c3-8 > /usr/share/UnblockNeteaseMusic/core_ver fi echo -e "Succeeded in updating core." >/tmp/unblockmusic_update.log From 4676dd368cb7c970c4ffcbfa01d337d3deac9448 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Wed, 10 Jun 2020 16:03:00 +0800 Subject: [PATCH 08/39] luci-app-unblockmusic: allow revert to <320Kbps mp3 --- package/lean/luci-app-unblockmusic/Makefile | 2 +- package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index 9de04a6ba7..9ef04f6ec4 100644 --- a/package/lean/luci-app-unblockmusic/Makefile +++ b/package/lean/luci-app-unblockmusic/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockmusic PKG_VERSION:=2.3.5 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_CONFIG_DEPENDS := \ CONFIG_UnblockNeteaseMusic_Go \ diff --git a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic index 9389ab2d26..b3de31158c 100755 --- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic +++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic @@ -176,6 +176,8 @@ start() fi if [ $FORCE -eq 1 ]; then sed -i '/item.code != 200/ { s/item.code != 200 || item.freeTrialInfo/item.br < 320000/g; }' /usr/share/UnblockNeteaseMusic/src/hook.js + else + sed -i '/item.br < 320000/ { s/item.br < 320000/item.code != 200 || item.freeTrialInfo/g; }' /usr/share/UnblockNeteaseMusic/src/hook.js fi node /usr/share/UnblockNeteaseMusic/app.js -e http://music.163.com -p 5200 $musictype >>/tmp/unblockmusic.log 2>&1 & node /usr/share/UnblockNeteaseMusic/app.js -e https://music.163.com -p 5203:5201 $musictype >>/tmp/unblockmusic.log 2>&1 & From e707c9fb1b755cc7d7981a3f33b03978c4341369 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Wed, 10 Jun 2020 23:33:17 +0800 Subject: [PATCH 09/39] verysync: update to 1.4.1 (#4765) --- package/lean/verysync/Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/package/lean/verysync/Makefile b/package/lean/verysync/Makefile index 296143fabe..5a96495a44 100644 --- a/package/lean/verysync/Makefile +++ b/package/lean/verysync/Makefile @@ -19,21 +19,18 @@ ifeq ($(ARCH),i386) PKG_ARCH_VERYSYNC:=386 endif ifeq ($(ARCH),arm) - PKG_ARCH_VERYSYNC:=arm7 -endif -ifeq ($(BOARD),bcm53xx) - PKG_ARCH_VERYSYNC:=arm6 -endif -ifeq ($(BOARD),kirkwood) PKG_ARCH_VERYSYNC:=arm endif ifeq ($(ARCH),aarch64) PKG_ARCH_VERYSYNC:=arm64 endif +ifeq ($(ARCH),powerpc64) + PKG_ARCH_VERYSYNC:=ppc64 +endif PKG_NAME:=verysync -PKG_VERSION:=v1.3.1 -PKG_RELEASE:=2 +PKG_VERSION:=v1.4.1 +PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-linux-$(PKG_ARCH_VERYSYNC)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://releases-cdn.verysync.com/releases/$(PKG_VERSION)/ From 468b3f56533cbc5af82ce61cd6ecf001c651d78a Mon Sep 17 00:00:00 2001 From: barton0426 Date: Thu, 11 Jun 2020 11:33:36 +0800 Subject: [PATCH 10/39] Update v2ray version to v4.24.2 (#4771) --- package/lean/v2ray/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile index ec1b6726fc..a54e2fbe16 100644 --- a/package/lean/v2ray/Makefile +++ b/package/lean/v2ray/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray -PKG_VERSION:=4.23.4 +PKG_VERSION:=4.24.2 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-core-$(PKG_VERSION) PKG_SOURCE:=v2ray-core-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=726dd98d674bd73150158b1d4c8bc0d59dbb672ba10096ac61548d6278213c78 +PKG_HASH:=ad8a042a334586f9456eccdbe074d4c3b4dad9b5a39c6ee390a5e631d1c389ae PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE From 7cb2c5c970fe850b0b786fcc91c3b1011d9da36a Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Mon, 8 Jun 2020 20:13:15 +0100 Subject: [PATCH 11/39] umdnsd: update to latest git HEAD d13290b Fix advertised IPv6 addresses Don't just serve link-local addresses via mdns, offer all. Signed-off-by: Kevin Darbyshire-Bryant --- package/network/services/umdns/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/services/umdns/Makefile b/package/network/services/umdns/Makefile index 42048c374c..01cf968679 100644 --- a/package/network/services/umdns/Makefile +++ b/package/network/services/umdns/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_URL=$(PROJECT_GIT)/project/mdnsd.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2020-04-25 -PKG_SOURCE_VERSION:=cdac0460ba50dc45735f0be2e19a5a8efc3dafe1 -PKG_MIRROR_HASH:=261cb929dfc03c1f293156cfdec8c2cd1541dcdc57ae42a323f9df5d26e6f7d2 +PKG_SOURCE_DATE:=2020-06-08 +PKG_SOURCE_VERSION:=d13290b427487bb05581e11875af3bfe74d6da2d +PKG_MIRROR_HASH:=6cd38b41b341212359ddc723fc54ea16a2a7009519db015fb51cd2afb7324369 PKG_MAINTAINER:=John Crispin PKG_LICENSE:=LGPL-2.1 From 116c126633326cb2e69bd9a1d13b26fb85eaccaf Mon Sep 17 00:00:00 2001 From: "Joseph C. Lehner" Date: Fri, 22 Mar 2019 15:19:54 +0100 Subject: [PATCH 12/39] mkchkimg: use higher version code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch changes the version code of the image header from `1.1.99_0.0.0.0` to `99.99.99_99.99.99.99`. This is neccessary on some devices where the stock firmware checks the version field, possibly preventing third-party firmware from being installed. Reviewed-by: Thibaut VARÈNE Signed-off-by: Joseph C. Lehner --- tools/firmware-utils/src/mkchkimg.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/firmware-utils/src/mkchkimg.c b/tools/firmware-utils/src/mkchkimg.c index 5f2823f154..dff5169a25 100644 --- a/tools/firmware-utils/src/mkchkimg.c +++ b/tools/firmware-utils/src/mkchkimg.c @@ -264,13 +264,8 @@ main (int argc, char * argv[]) hdr->magic = htonl (0x2a23245e); hdr->header_len = htonl(header_len); hdr->reserved[0] = (unsigned char)(region & 0xff); - hdr->reserved[1] = 1; /* Major */ - hdr->reserved[2] = 1; /* Minor */ - hdr->reserved[3] = 99; /* Build */ - hdr->reserved[4] = 0; - hdr->reserved[5] = 0; - hdr->reserved[6] = 0; - hdr->reserved[7] = 0; + memset(&hdr->reserved[1], 99, sizeof(hdr->reserved) - 1); + message (" Board Id: %s", board_id); message (" Region: %s", region == 1 ? "World Wide (WW)" : (region == 2 ? "North America (NA)" : "Unknown")); From 6b2a90633206e2210bfdf312946c8296a2a0daf0 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sun, 7 Jun 2020 17:22:02 +0200 Subject: [PATCH 13/39] ca-certificates: update to version 20200601 This patch updates the ca-certificates and ca-bundle package. This version changed the files directory again, to work/, so PKG_BUILD_DIR was brought back. Signed-off-by: Christian Lamparter --- package/system/ca-certificates/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/system/ca-certificates/Makefile b/package/system/ca-certificates/Makefile index ea7d253fa2..239b442ebd 100644 --- a/package/system/ca-certificates/Makefile +++ b/package/system/ca-certificates/Makefile @@ -7,14 +7,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ca-certificates -PKG_VERSION:=20190110 -PKG_RELEASE:=2 +PKG_VERSION:=20200601 +PKG_RELEASE:=1 PKG_MAINTAINER:= PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/c/ca-certificates -PKG_HASH:=ee4bf0f4c6398005f5b5ca4e0b87b82837ac5c3b0280a1cb3a63c47555c3a675 - +PKG_HASH:=43766d5a436519503dfd65ab83488ae33ab4d4ca3d0993797b58c92eb9ed4e63 +PKG_BUILD_DIR:=$(BUILD_DIR)/work PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk From 90f4c469d8e71cb994724af447864178ebc3029e Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sun, 7 Jun 2020 22:57:46 +0200 Subject: [PATCH 14/39] ath79: wndr3700 series: fix wifi range & throughput Based on the PCB pictures, the WNDR3700(v1) really had eight independent antennae. Four antennae for each radio and all of those were printed on the circut board. Reported-by: Luca Bensi Reported-by: Maciej Mazur Reported-by: Hannu Nyman Debugged-by: Hannu Nyman Signed-off-by: Christian Lamparter --- .../ath79/dts/ar7161_netgear_wndr3700.dts | 21 +++++++++++++++++++ .../ath79/dts/ar7161_netgear_wndr3700.dtsi | 19 +++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dts b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dts index 75c68d83c7..38a1140968 100644 --- a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dts +++ b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dts @@ -32,3 +32,24 @@ read-only; }; }; + +&ath9k1 { + /* The original WNDR3700(v1) variant have four antennae dedicated + * to the 5GHz radio as well. Again, two antennae are available for + * each chain to switch between. The following configuration is the + * default setting which taken from the vendor's wifi + * code for that radio. + * + * All possible options [GPIO6,GPIO7,GPIO8,GPIO9]: + * [0,1,0,1], [0,1,1,0], [1,0,0,1], [1,0,1,0] + */ + antenna-demux { + gpio-hog; + line-name = "fixed antenna group 2"; + gpios = <6 GPIO_ACTIVE_LOW>, + <7 GPIO_ACTIVE_HIGH>, + <8 GPIO_ACTIVE_HIGH>, + <9 GPIO_ACTIVE_LOW>; + output-high; + }; +}; diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi index ab4f37da11..f1db1ffd58 100644 --- a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi +++ b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi @@ -160,6 +160,25 @@ qca,no-eeprom; #gpio-cells = <2>; gpio-controller; + + /* all WNDR3700 variants have four antennae dedicated + * to the 2.4GHz radio. Two antennae are available for + * each chain. The following configuration is the + * default setting which taken from the vendor's wifi + * code for that radio. + * + * All possible options [GPIO6,GPIO7,GPIO8,GPIO9]: + * [0,1,0,1], [0,1,1,0], [1,0,0,1], [1,0,1,0] + */ + antenna-demux { + gpio-hog; + line-name = "fixed antenna group 1"; + gpios = <6 GPIO_ACTIVE_LOW>, + <7 GPIO_ACTIVE_HIGH>, + <8 GPIO_ACTIVE_LOW>, + <9 GPIO_ACTIVE_HIGH>; + output-high; + }; }; ath9k1: wifi@0,12 { From c6a4b4f072389d3f4c8cbf894a7de16a6a7e4df3 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 6 Jun 2020 23:09:59 +0200 Subject: [PATCH 15/39] soloscli: fix uci-defaults file The folder for the uci-defaults file of this package is wrong, so the file most probably has not been executed at all for several years at least. Fix the folder and remove the useless shebang for the file. Signed-off-by: Adrian Schmutzler --- package/network/config/soloscli/Makefile | 2 +- .../soloscli/files/etc/{uci-default => uci-defaults}/solos | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) rename package/network/config/soloscli/files/etc/{uci-default => uci-defaults}/solos (97%) diff --git a/package/network/config/soloscli/Makefile b/package/network/config/soloscli/Makefile index 877a0f275b..52a53dc0fa 100644 --- a/package/network/config/soloscli/Makefile +++ b/package/network/config/soloscli/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=soloscli PKG_VERSION:=1.04 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=solos-pci-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/openadsl diff --git a/package/network/config/soloscli/files/etc/uci-default/solos b/package/network/config/soloscli/files/etc/uci-defaults/solos similarity index 97% rename from package/network/config/soloscli/files/etc/uci-default/solos rename to package/network/config/soloscli/files/etc/uci-defaults/solos index 7f69da62c6..6645fc370a 100755 --- a/package/network/config/soloscli/files/etc/uci-default/solos +++ b/package/network/config/soloscli/files/etc/uci-defaults/solos @@ -1,5 +1,3 @@ -#!/bin/sh - uci batch <<__EOF__ delete network.wan.solos0 From 8bf7ff91685d181d39d02667eca646cee0e1c41f Mon Sep 17 00:00:00 2001 From: Jun Liu Date: Thu, 11 Jun 2020 17:18:52 +0800 Subject: [PATCH 16/39] V2ray hash fix (#4773) --- package/lean/v2ray/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile index a54e2fbe16..89a58cc226 100644 --- a/package/lean/v2ray/Makefile +++ b/package/lean/v2ray/Makefile @@ -15,7 +15,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-core-$(PKG_VERSION) PKG_SOURCE:=v2ray-core-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=ad8a042a334586f9456eccdbe074d4c3b4dad9b5a39c6ee390a5e631d1c389ae +PKG_HASH:=b58b4477020034b67a7649341fae65ea7bdc81851cad47ae7e4a591c0663e4c9 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE From 299da0ae6c1523b0ae7836302bde98b98b31887e Mon Sep 17 00:00:00 2001 From: hyird <31695447+hyird@users.noreply.github.com> Date: Thu, 11 Jun 2020 17:19:12 +0800 Subject: [PATCH 17/39] Update Makefile (#4776) --- package/lean/verysync/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lean/verysync/Makefile b/package/lean/verysync/Makefile index 5a96495a44..a0d469b714 100644 --- a/package/lean/verysync/Makefile +++ b/package/lean/verysync/Makefile @@ -29,7 +29,7 @@ ifeq ($(ARCH),powerpc64) endif PKG_NAME:=verysync -PKG_VERSION:=v1.4.1 +PKG_VERSION:=v1.4.3 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-linux-$(PKG_ARCH_VERYSYNC)-$(PKG_VERSION).tar.gz From 5d9b16cb7d62cde757d5159544abdce64a383cdb Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Thu, 11 Jun 2020 17:58:48 +0800 Subject: [PATCH 18/39] kernel: bump 4.9 to 4.9.227 Signed-off-by: CN_SZTL --- include/kernel-version.mk | 4 ++-- .../backport-4.9/090-net-generalize-napi_complete_done.patch | 2 +- ...-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch | 4 ++-- .../generic/pending-4.9/332-arc-add-OWRTDTB-section.patch | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index e421af841f..d8d553865e 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,11 +6,11 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .226 +LINUX_VERSION-4.9 = .227 LINUX_VERSION-4.14 = .183 LINUX_VERSION-4.19 = .126 -LINUX_KERNEL_HASH-4.9.226 = 460a8c168fe5c60ce5b30015a4e4bf348d93a89f8b949de1f90779567ef345ca +LINUX_KERNEL_HASH-4.9.227 = 38c485b411a14e825f8a66a5c2e64f1480397325a5f692b4929f68d228070c5f LINUX_KERNEL_HASH-4.14.183 = 4265afef56819b04656107a5abecde205c5bc5fb04b2e81447955e7e45db8085 LINUX_KERNEL_HASH-4.19.126 = 6e2a7e0adbe31e39cc8f1a3bd7bfa0d92ec0a4ca5360bb25829db831378f3f89 diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch index 712348c835..2de053f354 100644 --- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch @@ -657,7 +657,7 @@ Signed-off-by: David S. Miller gfar_write(®s->rstat, gfargrp->rstat); --- a/drivers/net/ethernet/freescale/ucc_geth.c +++ b/drivers/net/ethernet/freescale/ucc_geth.c -@@ -3303,7 +3303,7 @@ static int ucc_geth_poll(struct napi_str +@@ -3304,7 +3304,7 @@ static int ucc_geth_poll(struct napi_str howmany += ucc_geth_rx(ugeth, i, budget - howmany); if (howmany < budget) { diff --git a/target/linux/generic/backport-4.9/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch b/target/linux/generic/backport-4.9/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch index 0989d280d0..ed4d65c5db 100644 --- a/target/linux/generic/backport-4.9/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch +++ b/target/linux/generic/backport-4.9/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch @@ -48,7 +48,7 @@ Reviewed-by: John Gilmore #define INADDR_ANY ((unsigned long int) 0x00000000) --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c -@@ -911,7 +911,7 @@ static int inet_abc_len(__be32 addr) +@@ -912,7 +912,7 @@ static int inet_abc_len(__be32 addr) { int rc = -1; /* Something else, probably a multicast. */ @@ -57,7 +57,7 @@ Reviewed-by: John Gilmore rc = 0; else { __u32 haddr = ntohl(addr); -@@ -922,6 +922,8 @@ static int inet_abc_len(__be32 addr) +@@ -923,6 +923,8 @@ static int inet_abc_len(__be32 addr) rc = 16; else if (IN_CLASSC(haddr)) rc = 24; diff --git a/target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch b/target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch index 6f248343ab..66455a6b2e 100644 --- a/target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch +++ b/target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch @@ -38,7 +38,7 @@ Signed-off-by: Alexey Brodkin ;---------------------------------------------------------------- --- a/arch/arc/kernel/setup.c +++ b/arch/arc/kernel/setup.c -@@ -404,6 +404,8 @@ static inline bool uboot_arg_invalid(uns +@@ -405,6 +405,8 @@ static inline bool uboot_arg_invalid(uns /* We always pass 0 as magic from U-boot */ #define UBOOT_MAGIC_VALUE 0 @@ -47,7 +47,7 @@ Signed-off-by: Alexey Brodkin void __init handle_uboot_args(void) { bool use_embedded_dtb = true; -@@ -444,7 +446,7 @@ ignore_uboot_args: +@@ -445,7 +447,7 @@ ignore_uboot_args: #endif if (use_embedded_dtb) { From d2202e9c270e340429391e4a456d5e35622d172e Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Tue, 9 Jun 2020 22:24:29 -0400 Subject: [PATCH 19/39] imagebuilder: pass IB=1 on checking requirements The patch 4a1a58a3 build, imagebuilder: Do not require libncurses-dev was supposed to remove libncurses as a requirement for the ImageBuilder. However as the IB=1 is only exported during building, not for checking requirements, it did never actually work. This commit export IB=1 to the requirement check. Signed-off-by: Paul Spooren --- target/imagebuilder/files/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 76ea19028e..902e238786 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -81,7 +81,7 @@ PROFILE_LIST = $(foreach p,$(PROFILE_NAMES), \ staging_dir/host/.prereq-build: include/prereq-build.mk mkdir -p tmp - @$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \ + @$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f $(TOPDIR)/include/prereq-build.mk prereq IB=1 2>/dev/null || { \ echo "Prerequisite check failed. Use FORCE=1 to override."; \ false; \ } From 98e108fea74f5e5ea2e738dceec0cda54ae8d9e9 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Mon, 8 Jun 2020 18:15:05 -1000 Subject: [PATCH 20/39] imagebuilder: Remove json_info_files/ before build The folder `json_info_files` contains multiple JSON files which describe created firmware images. The folder is not removed between builds as the ImageBuilder does not use `image.mk`. Not removing the JSON files result in a merged `profiles.json` file containing entries for outdated or non-existing images. This commit adds the `json_info_files/` cleanup step to the ImageBuilder Makefile. Signed-off-by: Paul Spooren --- target/imagebuilder/files/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 902e238786..8aef0a3640 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -162,6 +162,7 @@ prepare_rootfs: FORCE build_image: FORCE @echo @echo Building images... + rm -rf $(BUILD_DIR)/json_info_files/ $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \ $(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)") From a690d9ec7b325a30354bb13a1fc3a478fabc6ecb Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Wed, 10 Jun 2020 17:27:27 +0100 Subject: [PATCH 21/39] odhcpd: remove bogus IPKG_INSTROOT reference IPKG_INSTROOT is only set under image builder and we won't be running this script at build time either, so remove the reference before it gets cargo-culted into other scripts. Signed-off-by: Kevin Darbyshire-Bryant Acked-by: Hans Dedecker --- package/network/services/odhcpd/Makefile | 2 +- package/network/services/odhcpd/files/odhcpd-update | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile index 6510ce6c80..07d7d7d673 100644 --- a/package/network/services/odhcpd/Makefile +++ b/package/network/services/odhcpd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=odhcpd -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcpd.git diff --git a/package/network/services/odhcpd/files/odhcpd-update b/package/network/services/odhcpd/files/odhcpd-update index 9bc7abcc1c..c1814e00b0 100755 --- a/package/network/services/odhcpd/files/odhcpd-update +++ b/package/network/services/odhcpd/files/odhcpd-update @@ -1,6 +1,6 @@ #!/bin/sh # Make dnsmasq reread hostfile by sending SIGHUP signal -. $IPKG_INSTROOT/lib/functions/procd.sh +. /lib/functions/procd.sh procd_send_signal dnsmasq From ad0a71dadc98318a266a9fd4a97aea319f3543bc Mon Sep 17 00:00:00 2001 From: ElonH Date: Fri, 12 Jun 2020 12:18:15 +0800 Subject: [PATCH 22/39] luci-app-nps: monitor uci configuration changes (#4784) when uci configuration about nps has been changed, service doesn't restart itself --- package/lean/luci-app-nps/root/etc/init.d/nps | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/lean/luci-app-nps/root/etc/init.d/nps b/package/lean/luci-app-nps/root/etc/init.d/nps index 3ea722b618..8773054926 100755 --- a/package/lean/luci-app-nps/root/etc/init.d/nps +++ b/package/lean/luci-app-nps/root/etc/init.d/nps @@ -62,9 +62,7 @@ start_service() { fi } -reload_service() -{ - stop - start +service_triggers() { + procd_add_reload_trigger "nps" } From e7e68c33520e5edc37d5360ee22f34fedae6513a Mon Sep 17 00:00:00 2001 From: ricksuzade-maker <58425544+ricksuzade-maker@users.noreply.github.com> Date: Fri, 12 Jun 2020 12:18:29 +0800 Subject: [PATCH 23/39] Bump wireguard to v1.0.20200611 (#4778) Bump wireguard to the newest version --- package/network/services/wireguard/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile index ce91fbe9b5..c796aa82f9 100644 --- a/package/network/services/wireguard/Makefile +++ b/package/network/services/wireguard/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard -PKG_VERSION:=1.0.20200520 +PKG_VERSION:=1.0.20200611 PKG_RELEASE:=1 PKG_SOURCE:=wireguard-linux-compat-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-linux-compat/snapshot/ -PKG_HASH:=16e7ae4bef734b243428eea07f3b3c3d4721880c3ea8eb8f98628fd6ae5b77c3 +PKG_HASH:=9b0478c3b1f3a7b488916e632e2fcbb1383bb1a2ef294489858ce2ba1da3246d PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING From 5715e22bbbac051d1ab486a60415d6ef431262b1 Mon Sep 17 00:00:00 2001 From: swxk <61259428+swxk521@users.noreply.github.com> Date: Fri, 12 Jun 2020 12:18:51 +0800 Subject: [PATCH 24/39] Update trojan 1.16.0 (#4772) * Update Makefile * Update Makefile --- package/lean/trojan/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/trojan/Makefile b/package/lean/trojan/Makefile index 432f9246ad..fc8f35e572 100644 --- a/package/lean/trojan/Makefile +++ b/package/lean/trojan/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=trojan -PKG_VERSION:=1.15.1 +PKG_VERSION:=1.16.0 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/trojan-gfw/trojan.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=0bad2988c60200c15786baf6b9ea42d66ba2109c +PKG_SOURCE_VERSION:=8606b7110fe79f8ab02d60c897f87ffb0a9b23f0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz CMAKE_INSTALL:=1 From e074e65b0556b634fe502dc3d930c17da6e78a06 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 12 Jun 2020 18:00:37 +0800 Subject: [PATCH 25/39] kernel: bump 4.14 to 4.14.184 Refreshed all patches. Signed-off-by: CN_SZTL --- include/kernel-version.mk | 4 ++-- ...030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch | 2 +- ...-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch | 4 ++-- .../generic/pending-4.14/332-arc-add-OWRTDTB-section.patch | 4 ++-- .../644-net-pppoe-support-hardware-flow-table-offload.patch | 2 +- .../linux/ipq40xx/patches-4.14/995-4g-add-u9300-driver.patch | 2 +- .../linux/ipq806x/patches-4.14/995-4g-add-u9300-driver.patch | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index d8d553865e..42ee8f92bd 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,11 +7,11 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-4.9 = .227 -LINUX_VERSION-4.14 = .183 +LINUX_VERSION-4.14 = .184 LINUX_VERSION-4.19 = .126 LINUX_KERNEL_HASH-4.9.227 = 38c485b411a14e825f8a66a5c2e64f1480397325a5f692b4929f68d228070c5f -LINUX_KERNEL_HASH-4.14.183 = 4265afef56819b04656107a5abecde205c5bc5fb04b2e81447955e7e45db8085 +LINUX_KERNEL_HASH-4.14.184 = 2ff51e278fb3dab918f5014f7966bdfd839b108bc6644d9f9b559d169801d940 LINUX_KERNEL_HASH-4.19.126 = 6e2a7e0adbe31e39cc8f1a3bd7bfa0d92ec0a4ca5360bb25829db831378f3f89 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch index 6d6c575ae7..2e08e514b7 100644 --- a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch +++ b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch @@ -30,7 +30,7 @@ Signed-off-by: Johan Hovold --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -1983,7 +1983,8 @@ static const struct usb_device_id option +@@ -1987,7 +1987,8 @@ static const struct usb_device_id option { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) }, /* D-Link DWM-156 (variant) */ { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) }, { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) }, diff --git a/target/linux/generic/backport-4.14/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch b/target/linux/generic/backport-4.14/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch index e3f77ab9da..e2698dd02e 100644 --- a/target/linux/generic/backport-4.14/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch +++ b/target/linux/generic/backport-4.14/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch @@ -48,7 +48,7 @@ Reviewed-by: John Gilmore #define INADDR_ANY ((unsigned long int) 0x00000000) --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c -@@ -934,7 +934,7 @@ static int inet_abc_len(__be32 addr) +@@ -935,7 +935,7 @@ static int inet_abc_len(__be32 addr) { int rc = -1; /* Something else, probably a multicast. */ @@ -57,7 +57,7 @@ Reviewed-by: John Gilmore rc = 0; else { __u32 haddr = ntohl(addr); -@@ -945,6 +945,8 @@ static int inet_abc_len(__be32 addr) +@@ -946,6 +946,8 @@ static int inet_abc_len(__be32 addr) rc = 16; else if (IN_CLASSC(haddr)) rc = 24; diff --git a/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch b/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch index 4c8d6e9d37..1b75bf2a06 100644 --- a/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch +++ b/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch @@ -42,7 +42,7 @@ Signed-off-by: Evgeniy Didin ;---------------------------------------------------------------- --- a/arch/arc/kernel/setup.c +++ b/arch/arc/kernel/setup.c -@@ -437,6 +437,8 @@ static inline bool uboot_arg_invalid(uns +@@ -438,6 +438,8 @@ static inline bool uboot_arg_invalid(uns /* We always pass 0 as magic from U-boot */ #define UBOOT_MAGIC_VALUE 0 @@ -51,7 +51,7 @@ Signed-off-by: Evgeniy Didin void __init handle_uboot_args(void) { bool use_embedded_dtb = true; -@@ -477,7 +479,7 @@ ignore_uboot_args: +@@ -478,7 +480,7 @@ ignore_uboot_args: #endif if (use_embedded_dtb) { diff --git a/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch index ae8c4ca921..191cbcfb82 100644 --- a/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch +++ b/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch @@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau #include #include #include -@@ -978,8 +983,36 @@ static int pppoe_xmit(struct ppp_channel +@@ -981,8 +986,36 @@ static int pppoe_xmit(struct ppp_channel return __pppoe_xmit(sk, skb); } diff --git a/target/linux/ipq40xx/patches-4.14/995-4g-add-u9300-driver.patch b/target/linux/ipq40xx/patches-4.14/995-4g-add-u9300-driver.patch index 558893798a..9943da7f9c 100644 --- a/target/linux/ipq40xx/patches-4.14/995-4g-add-u9300-driver.patch +++ b/target/linux/ipq40xx/patches-4.14/995-4g-add-u9300-driver.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c -@@ -1291,6 +1291,7 @@ static const struct usb_device_id produc +@@ -1292,6 +1292,7 @@ static const struct usb_device_id produc {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */ {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */ {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */ diff --git a/target/linux/ipq806x/patches-4.14/995-4g-add-u9300-driver.patch b/target/linux/ipq806x/patches-4.14/995-4g-add-u9300-driver.patch index 558893798a..9943da7f9c 100644 --- a/target/linux/ipq806x/patches-4.14/995-4g-add-u9300-driver.patch +++ b/target/linux/ipq806x/patches-4.14/995-4g-add-u9300-driver.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c -@@ -1291,6 +1291,7 @@ static const struct usb_device_id produc +@@ -1292,6 +1292,7 @@ static const struct usb_device_id produc {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */ {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */ {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */ From ac60170397af978d58c1b6513c3392acd54f0a02 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 12 Jun 2020 23:14:36 +0800 Subject: [PATCH 26/39] kernel: bump 4.19 to 4.19.128 Refreshed all patches. Signed-off-by: CN_SZTL --- include/kernel-version.mk | 4 ++-- ...-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch | 4 ++-- .../generic/pending-4.19/332-arc-add-OWRTDTB-section.patch | 4 ++-- .../linux/ipq40xx/patches-4.19/995-4g-add-u9300-driver.patch | 2 +- .../linux/ipq806x/patches-4.19/995-4g-add-u9300-driver.patch | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 42ee8f92bd..1661f58253 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,11 +8,11 @@ endif LINUX_VERSION-4.9 = .227 LINUX_VERSION-4.14 = .184 -LINUX_VERSION-4.19 = .126 +LINUX_VERSION-4.19 = .128 LINUX_KERNEL_HASH-4.9.227 = 38c485b411a14e825f8a66a5c2e64f1480397325a5f692b4929f68d228070c5f LINUX_KERNEL_HASH-4.14.184 = 2ff51e278fb3dab918f5014f7966bdfd839b108bc6644d9f9b559d169801d940 -LINUX_KERNEL_HASH-4.19.126 = 6e2a7e0adbe31e39cc8f1a3bd7bfa0d92ec0a4ca5360bb25829db831378f3f89 +LINUX_KERNEL_HASH-4.19.128 = 29aba6849c972c0079ddee4aaf476a500ef52d937c7ba02ceec4c7cf4753613c remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/generic/backport-4.19/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch b/target/linux/generic/backport-4.19/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch index 24f796dcfa..e473c8918b 100644 --- a/target/linux/generic/backport-4.19/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch +++ b/target/linux/generic/backport-4.19/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch @@ -48,7 +48,7 @@ Reviewed-by: John Gilmore #define INADDR_ANY ((unsigned long int) 0x00000000) --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c -@@ -954,7 +954,7 @@ static int inet_abc_len(__be32 addr) +@@ -955,7 +955,7 @@ static int inet_abc_len(__be32 addr) { int rc = -1; /* Something else, probably a multicast. */ @@ -57,7 +57,7 @@ Reviewed-by: John Gilmore rc = 0; else { __u32 haddr = ntohl(addr); -@@ -965,6 +965,8 @@ static int inet_abc_len(__be32 addr) +@@ -966,6 +966,8 @@ static int inet_abc_len(__be32 addr) rc = 16; else if (IN_CLASSC(haddr)) rc = 24; diff --git a/target/linux/generic/pending-4.19/332-arc-add-OWRTDTB-section.patch b/target/linux/generic/pending-4.19/332-arc-add-OWRTDTB-section.patch index ec89547726..2f7c7b4588 100644 --- a/target/linux/generic/pending-4.19/332-arc-add-OWRTDTB-section.patch +++ b/target/linux/generic/pending-4.19/332-arc-add-OWRTDTB-section.patch @@ -42,7 +42,7 @@ Signed-off-by: Evgeniy Didin ;---------------------------------------------------------------- --- a/arch/arc/kernel/setup.c +++ b/arch/arc/kernel/setup.c -@@ -526,7 +526,7 @@ void __init handle_uboot_args(void) +@@ -527,7 +527,7 @@ void __init handle_uboot_args(void) ignore_uboot_args: if (use_embedded_dtb) { @@ -51,7 +51,7 @@ Signed-off-by: Evgeniy Didin if (!machine_desc) panic("Embedded DT invalid\n"); } -@@ -542,6 +542,8 @@ ignore_uboot_args: +@@ -543,6 +543,8 @@ ignore_uboot_args: } } diff --git a/target/linux/ipq40xx/patches-4.19/995-4g-add-u9300-driver.patch b/target/linux/ipq40xx/patches-4.19/995-4g-add-u9300-driver.patch index e2d73a5288..9492c74116 100644 --- a/target/linux/ipq40xx/patches-4.19/995-4g-add-u9300-driver.patch +++ b/target/linux/ipq40xx/patches-4.19/995-4g-add-u9300-driver.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c -@@ -1302,6 +1302,7 @@ static const struct usb_device_id produc +@@ -1303,6 +1303,7 @@ static const struct usb_device_id produc {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */ {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */ {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */ diff --git a/target/linux/ipq806x/patches-4.19/995-4g-add-u9300-driver.patch b/target/linux/ipq806x/patches-4.19/995-4g-add-u9300-driver.patch index e2d73a5288..9492c74116 100644 --- a/target/linux/ipq806x/patches-4.19/995-4g-add-u9300-driver.patch +++ b/target/linux/ipq806x/patches-4.19/995-4g-add-u9300-driver.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c -@@ -1302,6 +1302,7 @@ static const struct usb_device_id produc +@@ -1303,6 +1303,7 @@ static const struct usb_device_id produc {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */ {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */ {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */ From cad7fb2a5a4f5e7538122ced0f02894b69ee671c Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sat, 13 Jun 2020 00:27:53 +0800 Subject: [PATCH 27/39] luci-app-ps3netsrv: add package luci --- package/lean/luci-app-ps3netsrv/Makefile | 18 +++++++++++++ .../luasrc/controller/ps3netsrv.lua | 21 +++++++++++++++ .../luasrc/model/cbi/ps3netsrv.lua | 24 +++++++++++++++++ .../view/ps3netsrv/ps3netsrv_status.htm | 22 ++++++++++++++++ .../luci-app-ps3netsrv/po/zh-cn/ps3netsrv.po | 26 +++++++++++++++++++ .../root/etc/uci-defaults/ps3netsrv | 11 ++++++++ 6 files changed, 122 insertions(+) create mode 100644 package/lean/luci-app-ps3netsrv/Makefile create mode 100644 package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua create mode 100644 package/lean/luci-app-ps3netsrv/luasrc/model/cbi/ps3netsrv.lua create mode 100644 package/lean/luci-app-ps3netsrv/luasrc/view/ps3netsrv/ps3netsrv_status.htm create mode 100644 package/lean/luci-app-ps3netsrv/po/zh-cn/ps3netsrv.po create mode 100755 package/lean/luci-app-ps3netsrv/root/etc/uci-defaults/ps3netsrv diff --git a/package/lean/luci-app-ps3netsrv/Makefile b/package/lean/luci-app-ps3netsrv/Makefile new file mode 100644 index 0000000000..89c3dc0fd1 --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/Makefile @@ -0,0 +1,18 @@ +# +# Copyright (C) 2008-2014 The LuCI Team +# +# This is free software, licensed under the Apache License, Version 2.0 . +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=Luci for PS3NETSRV +LUCI_DEPENDS:=+ps3netsrv +LUCI_PKGARCH:=all +PKG_VERSION:=1 +PKG_RELEASE:=2 + +include $(TOPDIR)/feeds/luci/luci.mk + +# call BuildPackage - OpenWrt buildroot signature + diff --git a/package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua b/package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua new file mode 100644 index 0000000000..66dc6307a8 --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua @@ -0,0 +1,21 @@ +module("luci.controller.ps3netsrv",package.seeall) + +function index() +if not nixio.fs.access("/etc/config/ps3netsrv")then + return +end + +entry({"admin", "nas"}, firstchild(), "NAS", 44).dependent = false + +local page + +entry({"admin", "nas","ps3netsrv"},cbi("ps3netsrv"),_("PS3 NET Server"),40).dependent=true +entry({"admin", "nas","ps3netsrv","status"},call("act_status")).leaf=true +end + +function act_status() + local e={} + e.running=luci.sys.call("ps | grep ps3netsrv |grep -v grep >/dev/null") == 0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) +end diff --git a/package/lean/luci-app-ps3netsrv/luasrc/model/cbi/ps3netsrv.lua b/package/lean/luci-app-ps3netsrv/luasrc/model/cbi/ps3netsrv.lua new file mode 100644 index 0000000000..94db16034a --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/luasrc/model/cbi/ps3netsrv.lua @@ -0,0 +1,24 @@ +-- Copyright 2020 Lean +-- Licensed to the public under the Apache License 2.0. + +m = Map("ps3netsrv", translate("PS3 NET Server"), translate("PS3NETSRV is ISO/PKG server for Sony PlayStation 3 webMAN-MOD plugin")) + +m:section(SimpleSection).template = "ps3netsrv/ps3netsrv_status" + +s = m:section(TypedSection, "ps3netsrv") +s.addremove = false +s.anonymous = true + +enable=s:option(Flag, "enabled", translate("Enabled")) +enable.default = "0" +enable.rmempty = false + +db_path=s:option(Value, "dir", translate("Dir Path")) +db_path.default = "/root" +db_path.rmempty = false + +port=s:option(Value, "port", translate("Port")) +port.rmempty = false +port.datatype = "port" + +return m \ No newline at end of file diff --git a/package/lean/luci-app-ps3netsrv/luasrc/view/ps3netsrv/ps3netsrv_status.htm b/package/lean/luci-app-ps3netsrv/luasrc/view/ps3netsrv/ps3netsrv_status.htm new file mode 100644 index 0000000000..ebd057020f --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/luasrc/view/ps3netsrv/ps3netsrv_status.htm @@ -0,0 +1,22 @@ + + +
+

+ <%:Collecting data...%> +

+
\ No newline at end of file diff --git a/package/lean/luci-app-ps3netsrv/po/zh-cn/ps3netsrv.po b/package/lean/luci-app-ps3netsrv/po/zh-cn/ps3netsrv.po new file mode 100644 index 0000000000..81c9734887 --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/po/zh-cn/ps3netsrv.po @@ -0,0 +1,26 @@ +msgid "" +msgstr "" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-06-23 20:16+0800\n" +"PO-Revision-Date: 2015-06-23 20:17+0800\n" +"Last-Translator: coolsnowwolf \n" +"Language-Team: PandoraBox Team\n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 1.8.1\n" +"X-Poedit-SourceCharset: UTF-8\n" + +msgid "PS3 NET Server" +msgstr "PS3 NET 服务器" + +msgid "PS3NETSRV is ISO/PKG server for Sony PlayStation 3 webMAN-MOD plugin" +msgstr "PS3NETSRV 是一个 Sony PlayStation 3 自制系统 webMAN-MOD 插件的服务器端（用于加载蓝光/游戏ISO/PKG）" + +msgid "Dir Path" +msgstr "目录路径" + +msgid "Port" +msgstr "端口" diff --git a/package/lean/luci-app-ps3netsrv/root/etc/uci-defaults/ps3netsrv b/package/lean/luci-app-ps3netsrv/root/etc/uci-defaults/ps3netsrv new file mode 100755 index 0000000000..40b8f9fa05 --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/root/etc/uci-defaults/ps3netsrv @@ -0,0 +1,11 @@ +#!/bin/sh + +uci -q batch <<-EOF >/dev/null + delete ucitrack.@ps3netsrv[-1] + add ucitrack ps3netsrv + set ucitrack.@ps3netsrv[-1].init=ps3netsrv + commit ucitrack +EOF + +rm -f /tmp/luci-indexcache +exit 0 From ad618bc6fbde9ef79b5cd34baabffa665b258992 Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Sat, 30 May 2020 23:31:30 +0800 Subject: [PATCH 28/39] ipq40xx: disable DSA and Switchdev ipq40xx is still using swconfig based switch management. This might change in he future, however disable the DSA and Switchdev support for now. Signed-off-by: DENG Qingfang [rephrased commit message] Signed-off-by: David Bauer --- target/linux/ipq40xx/config-4.14 | 4 ---- target/linux/ipq40xx/config-4.19 | 5 ----- 2 files changed, 9 deletions(-) diff --git a/target/linux/ipq40xx/config-4.14 b/target/linux/ipq40xx/config-4.14 index 0339dda207..49151d4707 100644 --- a/target/linux/ipq40xx/config-4.14 +++ b/target/linux/ipq40xx/config-4.14 @@ -319,12 +319,8 @@ CONFIG_MULTI_IRQ_HANDLER=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEON=y -CONFIG_NET_DSA=y -CONFIG_NET_DSA_QCA8K=y -CONFIG_NET_DSA_TAG_QCA=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_PTP_CLASSIFY=y -CONFIG_NET_SWITCHDEV=y CONFIG_NLS=y CONFIG_NO_BOOTMEM=y CONFIG_NO_HZ=y diff --git a/target/linux/ipq40xx/config-4.19 b/target/linux/ipq40xx/config-4.19 index d01ae3cebc..52cee7a464 100644 --- a/target/linux/ipq40xx/config-4.19 +++ b/target/linux/ipq40xx/config-4.19 @@ -317,13 +317,9 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEON=y -CONFIG_NET_DSA=y -CONFIG_NET_DSA_QCA8K=y -CONFIG_NET_DSA_TAG_QCA=y # CONFIG_NET_DSA_VITESSE_VSC73XX is not set CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_PTP_CLASSIFY=y -CONFIG_NET_SWITCHDEV=y CONFIG_NLS=y CONFIG_NO_BOOTMEM=y CONFIG_NO_HZ=y @@ -362,7 +358,6 @@ CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PGTABLE_LEVELS=2 CONFIG_PHYLIB=y -CONFIG_PHYLINK=y # CONFIG_PHY_QCOM_APQ8064_SATA is not set CONFIG_PHY_QCOM_IPQ4019_USB=y # CONFIG_PHY_QCOM_IPQ806X_SATA is not set From b8f989253576bec9f26cc3af387ce82d9e633ef3 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sat, 13 Jun 2020 16:57:53 +0200 Subject: [PATCH 29/39] ipq40xx: use zImage for EX6100v2 and EX6150v2 The NETGEAR EX61500v2 and EX6150v2 U-Boot does not support booting LZMA compressed images. Currently, they are using GZIP compressed kernels, which results in ledd flash being available to the root and overlay filesystems. Using a zImage results in a smaller kernel and therefore increases available space for rootfs and overlayfs. Size reduced: ~1.1 MiB Signed-off-by: David Bauer --- target/linux/ipq40xx/image/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index 718caf340c..275366b5ac 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -41,9 +41,7 @@ define Device/UbiFit endef define Device/DniImage - KERNEL_SUFFIX := -fit-uImage.itb - KERNEL = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb - KERNEL_NAME := Image + $(call Device/FitzImage) NETGEAR_BOARD_ID := NETGEAR_HW_ID := IMAGES := factory.img sysupgrade.bin From e7aa26375bd3a82e71df80398c3e03033e17278e Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Sat, 13 Jun 2020 21:18:57 +0200 Subject: [PATCH 30/39] iproute2: update to 5.7.0 Update iproute2 to latest stable 5.7.0; for the changes see https://lwn.net/Articles/822152/ Signed-off-by: Hans Dedecker --- package/network/utils/iproute2/Makefile | 4 +- .../001-devlink-update-include-files.patch | 46 +++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 package/network/utils/iproute2/patches/001-devlink-update-include-files.patch diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index afaaec21de..5646560c3b 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=5.6.0 +PKG_VERSION:=5.7.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 -PKG_HASH:=1b5b0e25ce6e23da7526ea1da044e814ad85ba761b10dd29c2b027c056b04692 +PKG_HASH:=725dc7ba94aae54c6f8d4223ca055d9fb4fe89d6994b1c03bfb4411c4dd10f21 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=iptables PKG_LICENSE:=GPL-2.0 diff --git a/package/network/utils/iproute2/patches/001-devlink-update-include-files.patch b/package/network/utils/iproute2/patches/001-devlink-update-include-files.patch new file mode 100644 index 0000000000..ab43fb7700 --- /dev/null +++ b/package/network/utils/iproute2/patches/001-devlink-update-include-files.patch @@ -0,0 +1,46 @@ +From 12fafa27c7b306e6c397e858f4d5a8159500f659 Mon Sep 17 00:00:00 2001 +From: Stephen Hemminger +Date: Thu, 11 Jun 2020 09:46:46 -0700 +Subject: [PATCH] devlink: update include files + +Use the tool iwyu to get more complete list of includes for +all the bits used by devlink. + +This should also fix build with musl libc. + +Fixes: c4dfddccef4e ("fix JSON output of mon command") +Reported-off-by: Dan Robertson +Signed-off-by: Stephen Hemminger +--- + devlink/devlink.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +--- a/devlink/devlink.c ++++ b/devlink/devlink.c +@@ -19,18 +19,25 @@ + #include + #include + #include ++#include ++#include ++#include ++#include + #include + #define _LINUX_SYSINFO_H /* avoid collision with musl header */ + #include + #include ++#include + #include + #include ++#include ++#include + #include + + #include "SNAPSHOT.h" + #include "list.h" + #include "mnlg.h" +-#include "json_writer.h" ++#include "json_print.h" + #include "utils.h" + #include "namespace.h" + From a52f187d7a0f7b775474615737beeff665b80397 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Fri, 22 May 2020 12:48:47 +0200 Subject: [PATCH 31/39] musl: use official release tar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To prevent "wrong" musl packages which have a new version number but the package still contains an old version, because PKG_SOURCE_VERSION was unchanged. Ref: musl ml https://www.openwall.com/lists/musl/2020/05/22/4 Reviewed-by: Petr Štetiar Signed-off-by: Alexander Couzens --- toolchain/musl/common.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/toolchain/musl/common.mk b/toolchain/musl/common.mk index e1354f2635..6a59577108 100644 --- a/toolchain/musl/common.mk +++ b/toolchain/musl/common.mk @@ -11,12 +11,9 @@ PKG_NAME:=musl PKG_VERSION:=1.1.24 PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=ea9525c8bcf6170df59364c4bcd616de1acf8703 -PKG_MIRROR_HASH:=6975c45b9bfe586ac00dbfcd1b1a13ab110af0528028ab3dee03e23e2c0763e5 -PKG_SOURCE_URL:=https://git.musl-libc.org/git/musl -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://musl.libc.org/releases/ +PKG_HASH:=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 LIBC_SO_VERSION:=$(PKG_VERSION) PATCH_DIR:=$(PATH_PREFIX)/patches From 4db833bfbe332f333cc7a7109acea1d0484aad01 Mon Sep 17 00:00:00 2001 From: ElonH Date: Sun, 14 Jun 2020 18:25:00 +0800 Subject: [PATCH 32/39] RcloneNg: bump version to 0.3.2 (#4810) * RcloneNg: bump version to 0.3.1 Changelog [0.3.1](https://github.com/ElonH/RcloneNg/compare/v0.3.0...v0.3.1) (2020-06-13) Features * **about:** show changelog ([9d7bea5](https://github.com/ElonH/RcloneNg/commit/9d7bea5f62a04560601ef37c371bcef8f1834182)) * **breadcurmb:** edit mode, double click to edit path. double again, back to normal ([60c57b4](https://github.com/ElonH/RcloneNg/commit/60c57b4368bea4b9cd9be39524e59a32a90014ff)) * **file.detail:** enable download file ([1f578f7](https://github.com/ElonH/RcloneNg/commit/1f578f7d54ca772eec85a5eab744d7e7de91a1ce)) * **file.detail:** show spaces usage in file detail if selected is directory ([ff27df9](https://github.com/ElonH/RcloneNg/commit/ff27df91615c515b56f44fde5a7aa9de0462dd04)) * **list-view:** expend click area of checkbox to improving user experience ([988a219](https://github.com/ElonH/RcloneNg/commit/988a219dbb874e722b7f65bc6b1f8a17be3b58a1)) * **manager:** push a message to toastr before creating directory ([9e1091a](https://github.com/ElonH/RcloneNg/commit/9e1091a1f1a2e84d97416d2213b80b83dd8b43d1)) * **pages:** add star button ([5c23b9b](https://github.com/ElonH/RcloneNg/commit/5c23b9bfe3bfb0e4891f0674450ad8af39281797)) * **server-setting:** adding more description in schema ([4eee2f5](https://github.com/ElonH/RcloneNg/commit/4eee2f55d9ca2ff246114027a4041533d26b4993)) * **server-setting:** provide a powerful schema for server setting ([67223bf](https://github.com/ElonH/RcloneNg/commit/67223bf7e4a26b80893f6a16dc7afcb7216ed5bf)) Bug Fixes * check if "rc.Serve" is enabled in server options before downloading file ([6a484ca](https://github.com/ElonH/RcloneNg/commit/6a484ca3a7d2e727a17db5cb20f5ea90cee10576)) * remove debug code ([b5cb23c](https://github.com/ElonH/RcloneNg/commit/b5cb23c9db1dabbcd61217e1cda575f703c6b471)) * **breadcurmb:** set cursor as poniter in breadcurmb item ([f014edc](https://github.com/ElonH/RcloneNg/commit/f014edc11e9b7c31c81f6d23c59f76b3a0f10d16)) * **changelog.md:** copy RcloneNg CHANGELOG.md only ([ef76e1e](https://github.com/ElonH/RcloneNg/commit/ef76e1e5892cd805128101b9cc389d62d454007e)) * **list-view:** disable double click in manipulations column ([0e0d825](https://github.com/ElonH/RcloneNg/commit/0e0d825f57ecd90307d2da02b2441d541bb56042)) * **list-view:** disable double click surrounding area of checkbox ([bf03dd1](https://github.com/ElonH/RcloneNg/commit/bf03dd173ffd1ba00c4b07cd2966956e3f769bac)) * **list-view:** disable select types icon ([2ea540e](https://github.com/ElonH/RcloneNg/commit/2ea540ec15901d103a47a92c1f1742da92e03dd8)) * **manager:** show detail button when right sidebar is expended ([d69179e](https://github.com/ElonH/RcloneNg/commit/d69179e36e2d76fac6e6462a685636b1acf1f377)) * RcloneNg: bump version to 0.3.2 Changelog [0.3.2](https://github.com/ElonH/RcloneNg/compare/v0.3.1...v0.3.2) (2020-06-14) Features * **jobs-manager:** add animation on refresh button ([b7cc817](https://github.com/ElonH/RcloneNg/commit/b7cc817b2302b63415deb74617027078f862d05e)) Bug Fixes * **list-view:** table index except first page ([b9d7fcf](https://github.com/ElonH/RcloneNg/commit/b9d7fcfb1ce884c5d7625e13c9a89835f68ffab8)) --- package/lean/rclone-ng/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/rclone-ng/Makefile b/package/lean/rclone-ng/Makefile index 5e1e09ca2d..a5e9468ff9 100644 --- a/package/lean/rclone-ng/Makefile +++ b/package/lean/rclone-ng/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone-ng -PKG_VERSION:=0.3.0 +PKG_VERSION:=0.3.2 PKG_RELEASE:=1 @@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk PKG_SOURCE:=RcloneNg-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/ElonH/RcloneNg/releases/download/v$(PKG_VERSION)/ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_HASH:=b6f7254fcb82d380ad621859a216fbf510059c95ad2df0e27bcf2872892f7c6f +PKG_HASH:=441fdfa577bdda7f58f62f6e75174a4a48e44d7c1361f7123d9699d791c08b5a define Package/$(PKG_NAME) SECTION:=net From 55c5c30b485eeb635c09aa8f3fccf5d74c162925 Mon Sep 17 00:00:00 2001 From: ElonH Date: Sun, 14 Jun 2020 18:25:17 +0800 Subject: [PATCH 33/39] rclone: Bump version to 1.52.1 (#4805) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog v1.52.1 - 2020-06-10 [See commits](https://github.com/rclone/rclone/compare/v1.52.0...v1.52.1) * Bug Fixes * lib/file: Fix SetSparse on Windows 7 which fixes downloads of files > 250MB (Nick Craig-Wood) * build * Update go.mod to go1.14 to enable -mod=vendor build (Nick Craig-Wood) * Remove quicktest from Dockerfile (Nick Craig-Wood) * Build Docker images with GitHub actions (Matteo Pietro Dazzi) * Update Docker build workflows (Nick Craig-Wood) * Set user_allow_other in /etc/fuse.conf in the Docker image (Nick Craig-Wood) * Fix xgo build after go1.14 go.mod update (Nick Craig-Wood) * docs * Add link to source and modified time to footer of every page (Nick Craig-Wood) * Remove manually set dates and use git dates instead (Nick Craig-Wood) * Minor tense, punctuation, brevity and positivity changes for the home page (edwardxml) * Remove leading slash in page reference in footer when present (Nick Craig-Wood) * Note commands which need obscured input in the docs (Nick Craig-Wood) * obscure: Write more help as we are referencing it elsewhere (Nick Craig-Wood) * VFS * Fix OS vs Unix path confusion - fixes ChangeNotify on Windows (Nick Craig-Wood) * Drive * Fix missing items when listing using --fast-list / ListR (Nick Craig-Wood) * Putio * Fix panic on Object.Open (Cenk Alti) * S3 * Fix upload of single files into buckets without create permission (Nick Craig-Wood) * Fix --header-upload (Nick Craig-Wood) * Tardigrade * Fix listing bug by upgrading to v1.0.7 * Set UserAgent to rclone (Caleb Case) v1.52.0 - 2020-05-27 Special thanks to Martin Michlmayr for proof reading and correcting all the docs and Edward Barker for helping re-write the front page. [See commits](https://github.com/rclone/rclone/compare/v1.51.0...v1.52.0) * New backends * [Tardigrade](/tardigrade/) backend for use with storj.io (Caleb Case) * [Union](/union/) re-write to have multiple writable remotes (Max Sum) * [Seafile](/seafile) for Seafile server (Fred @creativeprojects) * New commands * backend: command for backend specific commands (see backends) (Nick Craig-Wood) * cachestats: Deprecate in favour of `rclone backend stats cache:` (Nick Craig-Wood) * dbhashsum: Deprecate in favour of `rclone hashsum DropboxHash` (Nick Craig-Wood) * New Features * Add `--header-download` and `--header-upload` flags for setting HTTP headers when uploading/downloading (Tim Gallant) * Add `--header` flag to add HTTP headers to every HTTP transaction (Nick Craig-Wood) * Add `--check-first` to do all checking before starting transfers (Nick Craig-Wood) * Add `--track-renames-strategy` for configurable matching criteria for `--track-renames` (Bernd Schoolmann) * Add `--cutoff-mode` hard,soft,catious (Shing Kit Chan & Franklyn Tackitt) * Filter flags (eg `--files-from -`) can read from stdin (fishbullet) * Add `--error-on-no-transfer` option (Jon Fautley) * Implement `--order-by xxx,mixed` for copying some small and some big files (Nick Craig-Wood) * Allow `--max-backlog` to be negative meaning as large as possible (Nick Craig-Wood) * Added `--no-unicode-normalization` flag to allow Unicode filenames to remain unique (Ben Zenker) * Allow `--min-age`/`--max-age` to take a date as well as a duration (Nick Craig-Wood) * Add rename statistics for file and directory renames (Nick Craig-Wood) * Add statistics output to JSON log (reddi) * Make stats be printed on non-zero exit code (Nick Craig-Wood) * When running `--password-command` allow use of stdin (Sébastien Gross) * Stop empty strings being a valid remote path (Nick Craig-Wood) * accounting: support WriterTo for less memory copying (Nick Craig-Wood) * build * Update to use go1.14 for the build (Nick Craig-Wood) * Add `-trimpath` to release build for reproduceable builds (Nick Craig-Wood) * Remove GOOS and GOARCH from Dockerfile (Brandon Philips) * config * Fsync the config file after writing to save more reliably (Nick Craig-Wood) * Add `--obscure` and `--no-obscure` flags to `config create`/`update` (Nick Craig-Wood) * Make `config show` take `remote:` as well as `remote` (Nick Craig-Wood) * copyurl: Add `--no-clobber` flag (Denis) * delete: Added `--rmdirs` flag to delete directories as well (Kush) * filter: Added `--files-from-raw` flag (Ankur Gupta) * genautocomplete: Add support for fish shell (Matan Rosenberg) * log: Add support for syslog LOCAL facilities (Patryk Jakuszew) * lsjson: Add `--hash-type` parameter and use it in lsf to speed up hashing (Nick Craig-Wood) * rc * Add `-o`/`--opt` and `-a`/`--arg` for more structured input (Nick Craig-Wood) * Implement `backend/command` for running backend specific commands remotely (Nick Craig-Wood) * Add `mount/mount` command for starting `rclone mount` via the API (Chaitanya) * rcd: Add Prometheus metrics support (Gary Kim) * serve http * Added a `--template` flag for user defined markup (calistri) * Add Last-Modified headers to files and directories (Nick Craig-Wood) * serve sftp: Add support for multiple host keys by repeating `--key` flag (Maxime Suret) * touch: Add `--localtime` flag to make `--timestamp` localtime not UTC (Nick Craig-Wood) * Bug Fixes * accounting * Restore "Max number of stats groups reached" log line (Michał Matczuk) * Correct exitcode on Transfer Limit Exceeded flag. (Anuar Serdaliyev) * Reset bytes read during copy retry (Ankur Gupta) * Fix race clearing stats (Nick Craig-Wood) * copy: Only create empty directories when they don't exist on the remote (Ishuah Kariuki) * dedupe: Stop dedupe deleting files with identical IDs (Nick Craig-Wood) * oauth * Use custom http client so that `--no-check-certificate` is honored by oauth token fetch (Mark Spieth) * Replace deprecated oauth2.NoContext (Lars Lehtonen) * operations * Fix setting the timestamp on Windows for multithread copy (Nick Craig-Wood) * Make rcat obey `--ignore-checksum` (Nick Craig-Wood) * Make `--max-transfer` more accurate (Nick Craig-Wood) * rc * Fix dropped error (Lars Lehtonen) * Fix misplaced http server config (Xiaoxing Ye) * Disable duplicate log (ElonH) * serve dlna * Cds: don't specify childCount at all when unknown (Dan Walters) * Cds: use modification time as date in dlna metadata (Dan Walters) * serve restic: Fix tests after restic project removed vendoring (Nick Craig-Wood) * sync * Fix incorrect "nothing to transfer" message using `--delete-before` (Nick Craig-Wood) * Only create empty directories when they don't exist on the remote (Ishuah Kariuki) * Mount * Add `--async-read` flag to disable asynchronous reads (Nick Craig-Wood) * Ignore `--allow-root` flag with a warning as it has been removed upstream (Nick Craig-Wood) * Warn if `--allow-non-empty` used on Windows and clarify docs (Nick Craig-Wood) * Constrain to go1.13 or above otherwise bazil.org/fuse fails to compile (Nick Craig-Wood) * Fix fail because of too long volume name (evileye) * Report 1PB free for unknown disk sizes (Nick Craig-Wood) * Map more rclone errors into file systems errors (Nick Craig-Wood) * Fix disappearing cwd problem (Nick Craig-Wood) * Use ReaddirPlus on Windows to improve directory listing performance (Nick Craig-Wood) * Send a hint as to whether the filesystem is case insensitive or not (Nick Craig-Wood) * Add rc command `mount/types` (Nick Craig-Wood) * Change maximum leaf name length to 1024 bytes (Nick Craig-Wood) * VFS * Add `--vfs-read-wait` and `--vfs-write-wait` flags to control time waiting for a sequential read/write (Nick Craig-Wood) * Change default `--vfs-read-wait` to 20ms (it was 5ms and not configurable) (Nick Craig-Wood) * Make `df` output more consistent on a rclone mount. (Yves G) * Report 1PB free for unknown disk sizes (Nick Craig-Wood) * Fix race condition caused by unlocked reading of Dir.path (Nick Craig-Wood) * Make File lock and Dir lock not overlap to avoid deadlock (Nick Craig-Wood) * Implement lock ordering between File and Dir to eliminate deadlocks (Nick Craig-Wood) * Factor the vfs cache into its own package (Nick Craig-Wood) * Pin the Fs in use in the Fs cache (Nick Craig-Wood) * Add SetSys() methods to Node to allow caching stuff on a node (Nick Craig-Wood) * Ignore file not found errors from Hash in Read.Release (Nick Craig-Wood) * Fix hang in read wait code (Nick Craig-Wood) * Local * Speed up multi thread downloads by using sparse files on Windows (Nick Craig-Wood) * Implement `--local-no-sparse` flag for disabling sparse files (Nick Craig-Wood) * Implement `rclone backend noop` for testing purposes (Nick Craig-Wood) * Fix "file not found" errors on post transfer Hash calculation (Nick Craig-Wood) * Cache * Implement `rclone backend stats` command (Nick Craig-Wood) * Fix Server Side Copy with Temp Upload (Brandon McNama) * Remove Unused Functions (Lars Lehtonen) * Disable race tests until bbolt is fixed (Nick Craig-Wood) * Move methods used for testing into test file (greatroar) * Add Pin and Unpin and canonicalised lookup (Nick Craig-Wood) * Use proper import path go.etcd.io/bbolt (Robert-André Mauchin) * Crypt * Calculate hashes for uploads from local disk (Nick Craig-Wood) * This allows crypted Jottacloud uploads without using local disk * This means crypted s3/b2 uploads will now have hashes * Added `rclone backend decode`/`encode` commands to replicate functionality of `cryptdecode` (Anagh Kumar Baranwal) * Get rid of the unused Cipher interface as it obfuscated the code (Nick Craig-Wood) * Azure Blob * Implement streaming of unknown sized files so `rcat` is now supported (Nick Craig-Wood) * Implement memory pooling to control memory use (Nick Craig-Wood) * Add `--azureblob-disable-checksum` flag (Nick Craig-Wood) * Retry `InvalidBlobOrBlock` error as it may indicate block concurrency problems (Nick Craig-Wood) * Remove unused `Object.parseTimeString()` (Lars Lehtonen) * Fix permission error on SAS URL limited to container (Nick Craig-Wood) * B2 * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Ignore directory markers at the root also (Nick Craig-Wood) * Force the case of the SHA1 to lowercase (Nick Craig-Wood) * Remove unused `largeUpload.clearUploadURL()` (Lars Lehtonen) * Box * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Implement About to read size used (Nick Craig-Wood) * Add token renew function for jwt auth (David Bramwell) * Added support for interchangeable root folder for Box backend (Sunil Patra) * Remove unnecessary iat from jws claims (David) * Drive * Follow shortcuts by default, skip with `--drive-skip-shortcuts` (Nick Craig-Wood) * Implement `rclone backend shortcut` command for creating shortcuts (Nick Craig-Wood) * Added `rclone backend` command to change `service_account_file` and `chunk_size` (Anagh Kumar Baranwal) * Fix missing files when using `--fast-list` and `--drive-shared-with-me` (Nick Craig-Wood) * Fix duplicate items when using `--drive-shared-with-me` (Nick Craig-Wood) * Extend `--drive-stop-on-upload-limit` to respond to `teamDriveFileLimitExceeded`. (harry) * Don't delete files with multiple parents to avoid data loss (Nick Craig-Wood) * Server side copy docs use default description if empty (Nick Craig-Wood) * Dropbox * Make error insufficient space to be fatal (harry) * Add info about required redirect url (Elan Ruusamäe) * Fichier * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Implement custom pacer to deal with the new rate limiting (buengese) * FTP * Fix lockup when using concurrency limit on failed connections (Nick Craig-Wood) * Fix lockup on failed upload when using concurrency limit (Nick Craig-Wood) * Fix lockup on Close failures when using concurrency limit (Nick Craig-Wood) * Work around pureftp sending spurious 150 messages (Nick Craig-Wood) * Google Cloud Storage * Add support for `--header-upload` and `--header-download` (Nick Craig-Wood) * Add `ARCHIVE` storage class to help (Adam Stroud) * Ignore directory markers at the root (Nick Craig-Wood) * Googlephotos * Make the start year configurable (Daven) * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Create feature/favorites directory (Brandon Philips) * Fix "concurrent map write" error (Nick Craig-Wood) * Don't put an image in error message (Nick Craig-Wood) * HTTP * Improved directory listing with new template from Caddy project (calisro) * Jottacloud * Implement `--jottacloud-trashed-only` (buengese) * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Use `RawURLEncoding` when decoding base64 encoded login token (buengese) * Implement cleanup (buengese) * Update docs regarding cleanup, removed remains from old auth, and added warning about special mountpoints. (albertony) * Mailru * Describe 2FA requirements (valery1707) * Onedrive * Implement `--onedrive-server-side-across-configs` (Nick Craig-Wood) * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Fix occasional 416 errors on multipart uploads (Nick Craig-Wood) * Added maximum chunk size limit warning in the docs (Harry) * Fix missing drive on config (Nick Craig-Wood) * Make error `quotaLimitReached` to be fatal (harry) * Opendrive * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Pcloud * Added support for interchangeable root folder for pCloud backend (Sunil Patra) * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Fix initial config "Auth state doesn't match" message (Nick Craig-Wood) * Premiumizeme * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Prune unused functions (Lars Lehtonen) * Putio * Add support for `--header-upload` and `--header-download` (Nick Craig-Wood) * Make downloading files use the rclone http Client (Nick Craig-Wood) * Fix parsing of remotes with leading and trailing / (Nick Craig-Wood) * Qingstor * Make `rclone cleanup` remove pending multipart uploads older than 24h (Nick Craig-Wood) * Try harder to cancel failed multipart uploads (Nick Craig-Wood) * Prune `multiUploader.list()` (Lars Lehtonen) * Lint fix (Lars Lehtonen) * S3 * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Use memory pool for buffer allocations (Maciej Zimnoch) * Add SSE-C support for AWS, Ceph, and MinIO (Jack Anderson) * Fail fast multipart upload (Michał Matczuk) * Report errors on bucket creation (mkdir) correctly (Nick Craig-Wood) * Specify that Minio supports URL encoding in listings (Nick Craig-Wood) * Added 500 as retryErrorCode (Michał Matczuk) * Use `--low-level-retries` as the number of SDK retries (Aleksandar Janković) * Fix multipart abort context (Aleksandar Jankovic) * Replace deprecated `session.New()` with `session.NewSession()` (Lars Lehtonen) * Use the provided size parameter when allocating a new memory pool (Joachim Brandon LeBlanc) * Use rclone's low level retries instead of AWS SDK to fix listing retries (Nick Craig-Wood) * Ignore directory markers at the root also (Nick Craig-Wood) * Use single memory pool (Michał Matczuk) * Do not resize buf on put to memBuf (Michał Matczuk) * Improve docs for `--s3-disable-checksum` (Nick Craig-Wood) * Don't leak memory or tokens in edge cases for multipart upload (Nick Craig-Wood) * Seafile * Implement 2FA (Fred) * SFTP * Added `--sftp-pem-key` to support inline key files (calisro) * Fix post transfer copies failing with 0 size when using `set_modtime=false` (Nick Craig-Wood) * Sharefile * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Sugarsync * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Swift * Add support for `--header-upload` and `--header-download` (Nick Craig-Wood) * Fix cosmetic issue in error message (Martin Michlmayr) * Union * Implement multiple writable remotes (Max Sum) * Fix server-side copy (Max Sum) * Implement ListR (Max Sum) * Enable ListR when upstreams contain local (Max Sum) * WebDAV * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Fix `X-OC-Mtime` header for Transip compatibility (Nick Craig-Wood) * Report full and consistent usage with `about` (Yves G) * Yandex * Add support for `--header-upload` and `--header-download` (Tim Gallant) --- package/lean/rclone/Makefile | 8 ++-- ...ccess-Control-Allow-Origin-only-once.patch | 44 ------------------- 2 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 package/lean/rclone/patches/020-Notice-Access-Control-Allow-Origin-only-once.patch diff --git a/package/lean/rclone/Makefile b/package/lean/rclone/Makefile index 747a8f1b7a..ab7e30b840 100644 --- a/package/lean/rclone/Makefile +++ b/package/lean/rclone/Makefile @@ -10,16 +10,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone -PKG_VERSION:=1.51.0 +PKG_VERSION:=1.52.1 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/rclone/rclone.git -PKG_SOURCE_DATE:=2020-02-01 -PKG_SOURCE_VERSION:=43daecd89b21292b112051340317927b42ccbdd3 +PKG_SOURCE_DATE:=2020-06-10 +PKG_SOURCE_VERSION:=31dc78905ea8dfb22c43724527b19e097e05c26a PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_HASH:=aca159c81971a9490a6a6c323b67879dccba3860955b66787d91590f4ba8ba29 +PKG_MIRROR_HASH:=fa79f62babc2f42691c9ad83ef906e90061d4ca6adcc97150c2906605312db66 PKG_LICENSE:=GPLv3 PKG_MAINTAINER:=ElonH diff --git a/package/lean/rclone/patches/020-Notice-Access-Control-Allow-Origin-only-once.patch b/package/lean/rclone/patches/020-Notice-Access-Control-Allow-Origin-only-once.patch deleted file mode 100644 index 5317aa56f6..0000000000 --- a/package/lean/rclone/patches/020-Notice-Access-Control-Allow-Origin-only-once.patch +++ /dev/null @@ -1,44 +0,0 @@ -## -# File: /patches/020-Notice-Access-Control-Allow-Origin-only-once.patch -# Project: rclone -# File Created: Sunday, 3rd May 2020 1:44:22 pm -# Author: ElonH[EH](elonhhuang@gmail.com) -# License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html) -# Copyright (C) 2020 [ElonH] -## -diff --git a/fs/rc/rcserver/rcserver.go b/fs/rc/rcserver/rcserver.go -index 4a2b5c71e..f00994e93 100644 ---- a/fs/rc/rcserver/rcserver.go -+++ b/fs/rc/rcserver/rcserver.go -@@ -14,6 +14,7 @@ import ( - "regexp" - "sort" - "strings" -+ "sync" - - "github.com/pkg/errors" - "github.com/rclone/rclone/cmd/serve/httplib" -@@ -29,6 +30,8 @@ import ( - "github.com/skratchdot/open-golang/open" - ) - -+var onlyOnce sync.Once -+ - // Start the remote control server if configured - // - // If the server wasn't configured the *Server returned may be nil -@@ -172,9 +175,11 @@ func (s *Server) handler(w http.ResponseWriter, r *http.Request) { - - allowOrigin := rcflags.Opt.AccessControlAllowOrigin - if allowOrigin != "" { -- if allowOrigin == "*" { -- fs.Logf(nil, "Warning: Allow origin set to *. This can cause serious security problems.") -- } -+ onlyOnce.Do(func() { -+ if allowOrigin == "*" { -+ fs.Logf(nil, "Warning: Allow origin set to *. This can cause serious security problems.") -+ } -+ }) - w.Header().Add("Access-Control-Allow-Origin", allowOrigin) - } else { - w.Header().Add("Access-Control-Allow-Origin", s.URL()) From f4e6ac28a7d10bf592e41c72aadfddb71e1ba11e Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sun, 14 Jun 2020 18:25:50 +0800 Subject: [PATCH 34/39] verysync: add auto select latest version support (#4790) --- package/lean/verysync/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/lean/verysync/Makefile b/package/lean/verysync/Makefile index a0d469b714..35e22eca21 100644 --- a/package/lean/verysync/Makefile +++ b/package/lean/verysync/Makefile @@ -28,8 +28,16 @@ ifeq ($(ARCH),powerpc64) PKG_ARCH_VERYSYNC:=ppc64 endif +LATEST_VERSION:=$(shell curl http://www.verysync.com/shell/latest) + PKG_NAME:=verysync -PKG_VERSION:=v1.4.3 + +ifneq ($(LATEST_VERSION),) + PKG_VERSION:=$(LATEST_VERSION) +else + PKG_VERSION:=v1.4.3 +endif + PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-linux-$(PKG_ARCH_VERYSYNC)-$(PKG_VERSION).tar.gz From 70a9891f4a5dc28d47c2a8161ec8d8f9ffa3b26b Mon Sep 17 00:00:00 2001 From: Lienol Date: Sun, 14 Jun 2020 18:26:17 +0800 Subject: [PATCH 35/39] luci-app-kodexplorer: update api new version (#4788) --- package/lean/luci-app-kodexplorer/Makefile | 6 +- .../luasrc/controller/kodexplorer.lua | 20 +- .../luasrc/model/cbi/kodexplorer/api.lua | 79 ++--- .../luasrc/view/kodexplorer/download.htm | 278 +++++++++--------- .../luasrc/view/kodexplorer/status.htm | 15 +- .../luasrc/view/kodexplorer/version.htm | 8 +- .../etc/uci-defaults/luci-app-kodexplorer | 2 +- .../rpcd/acl.d/luci-app-kodexplorer.json | 11 + 8 files changed, 198 insertions(+), 221 deletions(-) create mode 100644 package/lean/luci-app-kodexplorer/root/usr/share/rpcd/acl.d/luci-app-kodexplorer.json diff --git a/package/lean/luci-app-kodexplorer/Makefile b/package/lean/luci-app-kodexplorer/Makefile index 5327192857..91245e646a 100644 --- a/package/lean/luci-app-kodexplorer/Makefile +++ b/package/lean/luci-app-kodexplorer/Makefile @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for KodExplorer -LUCI_DEPENDS:=+nginx +zoneinfo-asia +php7 +php7-fpm +php7-mod-curl +php7-mod-gd +php7-mod-iconv +php7-mod-json +php7-mod-mbstring +php7-mod-opcache +php7-mod-session +php7-mod-zip +LUCI_DEPENDS:=+nginx +zoneinfo-asia +php7 +php7-fpm +php7-mod-curl +php7-mod-gd +php7-mod-iconv +php7-mod-json +php7-mod-mbstring +php7-mod-opcache +php7-mod-session +php7-mod-zip +php7-mod-sqlite3 +php7-mod-pdo +php7-mod-pdo-sqlite +php7-mod-pdo-mysql LUCI_PKGARCH:=all -PKG_VERSION:=1.1 -PKG_RELEASE:=20200210 +PKG_VERSION:=13 +PKG_DATE:=20200612 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua b/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua index 08ec22fba6..b8b2347c8f 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua +++ b/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua @@ -8,15 +8,11 @@ function index() if not nixio.fs.access("/etc/config/kodexplorer") then return end entry({"admin", "nas"}, firstchild(), "NAS", 44).dependent = false - entry({"admin", "nas", "kodexplorer"}, cbi("kodexplorer/settings"), - _("KodExplorer"), 3).dependent = true + entry({"admin", "nas", "kodexplorer"}, cbi("kodexplorer/settings"), _("KodExplorer"), 3).dependent = true - entry({"admin", "nas", "kodexplorer", "check"}, call("action_check")).leaf = - true - entry({"admin", "nas", "kodexplorer", "download"}, call("action_download")).leaf = - true - entry({"admin", "nas", "kodexplorer", "status"}, call("act_status")).leaf = - true + entry({"admin", "nas", "kodexplorer", "check"}, call("action_check")).leaf = true + entry({"admin", "nas", "kodexplorer", "download"}, call("action_download")).leaf = true + entry({"admin", "nas", "kodexplorer", "status"}, call("act_status")).leaf = true end local function http_write_json(content) @@ -26,12 +22,8 @@ end function act_status() local e = {} - e.nginx_status = luci.sys.call( - "ps -w | grep nginx | grep kodexplorer | grep -v grep > /dev/null") == - 0 - e.php_status = luci.sys.call( - "ps -w | grep php | grep kodexplorer | grep -v grep > /dev/null") == - 0 + e.nginx_status = luci.sys.call("ps -w | grep nginx | grep kodexplorer | grep -v grep > /dev/null") == 0 + e.php_status = luci.sys.call("ps -w | grep php | grep kodexplorer | grep -v grep > /dev/null") == 0 http_write_json(e) end diff --git a/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/api.lua b/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/api.lua index ac00a4cc61..949dd094f2 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/api.lua +++ b/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/api.lua @@ -7,26 +7,12 @@ local i18n = require "luci.i18n" module("luci.model.cbi.kodexplorer.api", package.seeall) local appname = "kodexplorer" -local api_url = - "https://api.github.com/repos/kalcaddle/KodExplorer/releases/latest" -local download_url = "https://github.com/kalcaddle/KodExplorer/archive/" +local api_url = "https://api.kodcloud.com/?app/version" local wget = "/usr/bin/wget" -local wget_args = { - "--no-check-certificate", "--quiet", "--timeout=10", "--tries=2" -} +local wget_args = { "--no-check-certificate", "--quiet", "--timeout=10", "--tries=2" } local command_timeout = 300 -function uci_get_type(type, config, default) - value = uci:get(appname, "@" .. type .. "[0]", config) or sys.exec( - "echo -n `uci -q get " .. appname .. ".@" .. type .. "[0]." .. - config .. "`") - if (value == nil or value == "") and (default and default ~= "") then - value = default - end - return value -end - local function _unpack(t, i) i = i or 1 if t[i] ~= nil then return t[i], _unpack(t, i + 1) end @@ -77,6 +63,15 @@ local function exec(cmd, args, writer, timeout) end end +function get_project_directory() + return uci:get(appname, "@global[0]", "project_directory") or "/tmp/kodcloud" +end + +function get_version() + local version = get_project_directory() .. "/config/version.php" + return sys.exec(string.format("echo -n $(cat %s 2>/dev/null | grep \"'KOD_VERSION'\" | cut -d \"'\" -f 4)", version)) +end + local function compare_versions(ver1, comp, ver2) local table = table @@ -108,42 +103,16 @@ local function get_api_json(url) -- function(chunk) output[#output + 1] = chunk end) -- local json_content = util.trim(table.concat(output)) - local json_content = luci.sys.exec("wget-ssl -q --no-check-certificate -O- " .. url) + local json_content = sys.exec(wget .. " --no-check-certificate --timeout=10 -t 1 -O- " .. url) if json_content == "" then return {} end return jsonc.parse(json_content) or {} end -function get_project_directory() - return uci_get_type("global", "project_directory", "/tmp/kodexplorer") -end - function to_check() local json = get_api_json(api_url) - if json.tag_name == nil then - return { - code = 1, - error = i18n.translate("Get remote version info failed.") - } - end - local remote_version = json.tag_name - local html_url = json.html_url - download_url = download_url .. json.tag_name .. ".tar.gz" - if not download_url then - return { - code = 1, - version = remote_version, - html_url = html_url, - error = i18n.translate( - "New version found, but failed to get new version download url.") - } - end - return { - code = 0, - version = remote_version, - url = {html = html_url, download = download_url} - } + return json end function to_download(url) @@ -151,13 +120,11 @@ function to_download(url) return {code = 1, error = i18n.translate("Download url is required.")} end - sys.call("/bin/rm -f /tmp/kodexplorer_download.*") + sys.call("/bin/rm -f /tmp/kodcloud_download.*") - local tmp_file = util.trim(util.exec( - "mktemp -u -t kodexplorer_download.XXXXXX")) + local tmp_file = util.trim(util.exec("mktemp -u -t kodcloud_download.XXXXXX")) - local result = exec(wget, {"-O", tmp_file, url, _unpack(wget_args)}, nil, - command_timeout) == 0 + local result = exec(wget, {"-O", tmp_file, url, _unpack(wget_args)}, nil, command_timeout) == 0 if not result then exec("/bin/rm", {"-f", tmp_file}) @@ -175,13 +142,11 @@ function to_extract(file) return {code = 1, error = i18n.translate("File path required.")} end - sys.call("/bin/rm -rf /tmp/kodexplorer_extract.*") - local tmp_dir = util.trim(util.exec( - "mktemp -d -t kodexplorer_extract.XXXXXX")) + sys.call("/bin/rm -rf /tmp/kodcloud_extract.*") + local tmp_dir = util.trim(util.exec("mktemp -d -t kodcloud_extract.XXXXXX")) local output = {} - exec("/bin/tar", {"-C", tmp_dir, "-zxvf", file}, - function(chunk) output[#output + 1] = chunk end) + exec("/usr/bin/unzip", {"-o", file, "-d", tmp_dir}, function(chunk) output[#output + 1] = chunk end) local files = util.split(table.concat(output)) @@ -192,14 +157,14 @@ end function to_move(file) if not file or file == "" or not fs.access(file) then - sys.call("/bin/rm -rf /tmp/kodexplorer_extract.*") + sys.call("/bin/rm -rf /tmp/kodcloud_extract.*") return {code = 1, error = i18n.translate("Client file is required.")} end local client_file = get_project_directory() sys.call("mkdir -p " .. client_file) - sys.call("cp -R " .. file .. "/KodExplorer*/* " .. client_file) - sys.call("/bin/rm -rf /tmp/kodexplorer_extract.*") + sys.call("cp -R " .. file .. "/* " .. client_file) + sys.call("/bin/rm -rf /tmp/kodcloud_extract.*") return {code = 0} end diff --git a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/download.htm b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/download.htm index fa271d6a6f..21e5228362 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/download.htm +++ b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/download.htm @@ -1,161 +1,163 @@ -<% -local dsp = require "luci.dispatcher" --%> + + // Move file to target dir + doAjaxGet(UpdateUrl, { + token: tokenStr, + task: 'move', + file: json.file + }, function (json) { + removePageNotice(); + if (json.code) { + onRequestError(btn, json.error); + } else { + onUpdateSuccess(btn); + } + }) + } + }) + } + }) + } + //]]> + <%+cbi/valueheader%> <% if self:cfgvalue(section) ~= false then %> diff --git a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/status.htm b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/status.htm index 8b0a84b122..61ab40ff6e 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/status.htm +++ b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/status.htm @@ -22,10 +22,17 @@ local dsp = require "luci.dispatcher" XHR.poll(3,'<%=dsp.build_url("admin/nas/kodexplorer/status")%>', null, function(x, json) { if (x && x.status == 200) { - if (nginx_status) - nginx_status.innerHTML = json.nginx_status ? '<%:RUNNING%> ✓' : '<%:NOT RUNNING%> X'; - if (php_status) + if (nginx_status) { + nginx_status.innerHTML = json.nginx_status ? '<%:RUNNING%> ✓' : '<%:NOT RUNNING%> X'; + } + if (php_status) { php_status.innerHTML = json.php_status ? '<%:RUNNING%> ✓' : '<%:NOT RUNNING%> X'; + } } - }); + } + ); + function openwebui(){ + var url = window.location.host+":<%=luci.sys.exec("uci -q get kodexplorer.@global[0].port"):gsub("^%s*(.-)%s*$", "%1")%>"; + window.open('http://'+url,'target',''); + } //]]> \ No newline at end of file diff --git a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/version.htm b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/version.htm index 1a9c6d61a8..c51541733d 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/version.htm +++ b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/version.htm @@ -1,16 +1,16 @@ <% -local kodexplorer_path = luci.sys.exec("echo -n `uci get kodexplorer.@global[0].project_directory`") -local kodexplorer_version = luci.sys.exec("[ -f '" .. kodexplorer_path .. "/ChangeLog.md' ] && echo -n `cat " .. kodexplorer_path .. "/ChangeLog.md | head -1 | awk '{print $2}'`") +local api = require "luci.model.cbi.kodexplorer.api" +local app_version = api.get_version() -%> -<% if kodexplorer_version ~= nil and kodexplorer_version~="" then %> +<% if app_version and app_version ~= "" then %>
- 【 <%=kodexplorer_version%> 】 + 【 <%=app_version%> 】
diff --git a/package/lean/luci-app-kodexplorer/root/etc/uci-defaults/luci-app-kodexplorer b/package/lean/luci-app-kodexplorer/root/etc/uci-defaults/luci-app-kodexplorer index 3b91962769..4ac2bb5029 100755 --- a/package/lean/luci-app-kodexplorer/root/etc/uci-defaults/luci-app-kodexplorer +++ b/package/lean/luci-app-kodexplorer/root/etc/uci-defaults/luci-app-kodexplorer @@ -8,5 +8,5 @@ uci -q batch <<-EOF >/dev/null EOF /etc/init.d/php7-fpm disable && /etc/init.d/php7-fpm stop -rm -f /tmp/luci-indexcache +rm -rf /tmp/luci-*cache exit 0 diff --git a/package/lean/luci-app-kodexplorer/root/usr/share/rpcd/acl.d/luci-app-kodexplorer.json b/package/lean/luci-app-kodexplorer/root/usr/share/rpcd/acl.d/luci-app-kodexplorer.json new file mode 100644 index 0000000000..96e28b0c81 --- /dev/null +++ b/package/lean/luci-app-kodexplorer/root/usr/share/rpcd/acl.d/luci-app-kodexplorer.json @@ -0,0 +1,11 @@ +{ + "luci-app-kodexplorer": { + "description": "Grant UCI access for luci-app-kodexplorer", + "read": { + "uci": [ "kodexplorer" ] + }, + "write": { + "uci": [ "kodexplorer" ] + } + } +} From a3aabfa96a3056fb2f900680867616cf6c7a2681 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Tue, 9 Jun 2020 15:23:04 +0200 Subject: [PATCH 36/39] ipq40xx: essedma: Disable TCP segmentation offload for IPv6 It was noticed that the the whole MAC can hang when transferring data from one ar40xx port (WAN ports) to the CPU and from the CPU back to another ar40xx port (LAN ports). The CPU was doing only NATing in that process. Usually, the problem first starts with a simple data corruption: $ wget https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-10.4.0-amd64-netinst.iso -O /dev/null ... Connecting to saimei.ftp.acc.umu.se (saimei.ftp.acc.umu.se)|2001:6b0:19::138|:443... connected. ... Read error at byte 48807936/352321536 (Decryption has failed.). Retrying. But after a short while, the whole MAC will stop to react. No traffic can be transported anymore from the CPU port from/to the AR40xx PHY/switch and the MAC has to be resetted. The whole problem can be avoided by disabling IPv6 TSO for this ethernet MAC driver. Signed-off-by: Sven Eckelmann Acked-by: John Crispin Signed-off-by: Christian Lamparter --- ...le-TCP-segmentation-offload-for-IPv6.patch | 46 +++++++++++++++++++ ...le-TCP-segmentation-offload-for-IPv6.patch | 46 +++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 target/linux/ipq40xx/patches-4.14/717-essedma-Disable-TCP-segmentation-offload-for-IPv6.patch create mode 100644 target/linux/ipq40xx/patches-4.19/717-essedma-Disable-TCP-segmentation-offload-for-IPv6.patch diff --git a/target/linux/ipq40xx/patches-4.14/717-essedma-Disable-TCP-segmentation-offload-for-IPv6.patch b/target/linux/ipq40xx/patches-4.14/717-essedma-Disable-TCP-segmentation-offload-for-IPv6.patch new file mode 100644 index 0000000000..bb36af7c73 --- /dev/null +++ b/target/linux/ipq40xx/patches-4.14/717-essedma-Disable-TCP-segmentation-offload-for-IPv6.patch @@ -0,0 +1,46 @@ +From: Sven Eckelmann +Date: Tue, 9 Jun 2020 14:08:44 +0200 +Subject: essedma: Disable TCP segmentation offload for IPv6 + +It was noticed that the the whole MAC can hang when transferring data from +one ar40xx port (WAN ports) to the CPU and from the CPU back to another +ar40xx port (LAN ports). The CPU was doing only NATing in that process. + +Usually, the problem first starts with a simple data corruption: + + $ wget https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-10.4.0-amd64-netinst.iso -O /dev/null + ... + Connecting to saimei.ftp.acc.umu.se (saimei.ftp.acc.umu.se)|2001:6b0:19::138|:443... connected. + ... + Read error at byte 48807936/352321536 (Decryption has failed.). Retrying. + +But after a short while, the whole MAC will stop to react. No traffic can +be transported anymore from the CPU port from/to the AR40xx PHY/switch and +the MAC has to be resetted. + +Signed-off-by: Sven Eckelmann + +--- a/drivers/net/ethernet/qualcomm/essedma/edma_axi.c ++++ b/drivers/net/ethernet/qualcomm/essedma/edma_axi.c +@@ -972,17 +972,14 @@ static int edma_axi_probe(struct platfor + edma_netdev[i]->features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM + | NETIF_F_HW_VLAN_CTAG_TX + | NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_SG | +- NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_GRO; ++ NETIF_F_TSO | NETIF_F_GRO; + edma_netdev[i]->hw_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM | + NETIF_F_HW_VLAN_CTAG_RX +- | NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 | +- NETIF_F_GRO; ++ | NETIF_F_SG | NETIF_F_TSO | NETIF_F_GRO; + edma_netdev[i]->vlan_features = NETIF_F_HW_CSUM | NETIF_F_SG | +- NETIF_F_TSO | NETIF_F_TSO6 | +- NETIF_F_GRO; ++ NETIF_F_TSO | NETIF_F_GRO; + edma_netdev[i]->wanted_features = NETIF_F_HW_CSUM | NETIF_F_SG | +- NETIF_F_TSO | NETIF_F_TSO6 | +- NETIF_F_GRO; ++ NETIF_F_TSO | NETIF_F_GRO; + + #ifdef CONFIG_RFS_ACCEL + edma_netdev[i]->features |= NETIF_F_RXHASH | NETIF_F_NTUPLE; diff --git a/target/linux/ipq40xx/patches-4.19/717-essedma-Disable-TCP-segmentation-offload-for-IPv6.patch b/target/linux/ipq40xx/patches-4.19/717-essedma-Disable-TCP-segmentation-offload-for-IPv6.patch new file mode 100644 index 0000000000..bb36af7c73 --- /dev/null +++ b/target/linux/ipq40xx/patches-4.19/717-essedma-Disable-TCP-segmentation-offload-for-IPv6.patch @@ -0,0 +1,46 @@ +From: Sven Eckelmann +Date: Tue, 9 Jun 2020 14:08:44 +0200 +Subject: essedma: Disable TCP segmentation offload for IPv6 + +It was noticed that the the whole MAC can hang when transferring data from +one ar40xx port (WAN ports) to the CPU and from the CPU back to another +ar40xx port (LAN ports). The CPU was doing only NATing in that process. + +Usually, the problem first starts with a simple data corruption: + + $ wget https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-10.4.0-amd64-netinst.iso -O /dev/null + ... + Connecting to saimei.ftp.acc.umu.se (saimei.ftp.acc.umu.se)|2001:6b0:19::138|:443... connected. + ... + Read error at byte 48807936/352321536 (Decryption has failed.). Retrying. + +But after a short while, the whole MAC will stop to react. No traffic can +be transported anymore from the CPU port from/to the AR40xx PHY/switch and +the MAC has to be resetted. + +Signed-off-by: Sven Eckelmann + +--- a/drivers/net/ethernet/qualcomm/essedma/edma_axi.c ++++ b/drivers/net/ethernet/qualcomm/essedma/edma_axi.c +@@ -972,17 +972,14 @@ static int edma_axi_probe(struct platfor + edma_netdev[i]->features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM + | NETIF_F_HW_VLAN_CTAG_TX + | NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_SG | +- NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_GRO; ++ NETIF_F_TSO | NETIF_F_GRO; + edma_netdev[i]->hw_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM | + NETIF_F_HW_VLAN_CTAG_RX +- | NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 | +- NETIF_F_GRO; ++ | NETIF_F_SG | NETIF_F_TSO | NETIF_F_GRO; + edma_netdev[i]->vlan_features = NETIF_F_HW_CSUM | NETIF_F_SG | +- NETIF_F_TSO | NETIF_F_TSO6 | +- NETIF_F_GRO; ++ NETIF_F_TSO | NETIF_F_GRO; + edma_netdev[i]->wanted_features = NETIF_F_HW_CSUM | NETIF_F_SG | +- NETIF_F_TSO | NETIF_F_TSO6 | +- NETIF_F_GRO; ++ NETIF_F_TSO | NETIF_F_GRO; + + #ifdef CONFIG_RFS_ACCEL + edma_netdev[i]->features |= NETIF_F_RXHASH | NETIF_F_NTUPLE; From 95d52b6014681dabf03bdc17a0729f01df9ac0b4 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Tue, 16 Jun 2020 11:56:59 +0800 Subject: [PATCH 37/39] luci-app-unblockmusic: fix golang version can't unlock iOS newversion issue --- package/lean/UnblockNeteaseMusic/Makefile | 4 ++-- package/lean/UnblockNeteaseMusicGo/Makefile | 5 ++--- .../patches/01-fix-endpoint.patch | 13 +++++++++++++ package/lean/luci-app-unblockmusic/Makefile | 2 +- .../root/etc/init.d/unblockmusic | 5 +++-- 5 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 package/lean/UnblockNeteaseMusicGo/patches/01-fix-endpoint.patch diff --git a/package/lean/UnblockNeteaseMusic/Makefile b/package/lean/UnblockNeteaseMusic/Makefile index bcd8ef581c..ff8e77606b 100644 --- a/package/lean/UnblockNeteaseMusic/Makefile +++ b/package/lean/UnblockNeteaseMusic/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=UnblockNeteaseMusic PKG_VERSION:=0.25.3 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_LICENSE:=MIT PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/nondanee/UnblockNeteaseMusic.git -PKG_SOURCE_VERSION:=610ff1716aa3698cd2e9391ff808a35a05719586 +PKG_SOURCE_VERSION:=1193e29a2c8f72c738d2988d5cf5afbb2fee7463 PKG_SOURCE_SUBDIR:=$(PKG_NAME) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz diff --git a/package/lean/UnblockNeteaseMusicGo/Makefile b/package/lean/UnblockNeteaseMusicGo/Makefile index 7f451f1466..e86f9711f8 100644 --- a/package/lean/UnblockNeteaseMusicGo/Makefile +++ b/package/lean/UnblockNeteaseMusicGo/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=UnblockNeteaseMusicGo PKG_VERSION:=0.2.0 -PKG_RELEASE:=1 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/cnsilvan/UnblockNeteaseMusic.git @@ -43,7 +43,7 @@ define Build/Prepare endef define Build/Configure - + patch -p1 -d $(BUILD_DIR)/$(PKG_NAME) <./patches/01-fix-endpoint.patch endef define Build/Compile @@ -59,7 +59,6 @@ define Package/$(PKG_NAME)/install $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/UnblockNeteaseMusic $(1)/usr/bin/UnblockNeteaseMusic $(INSTALL_DIR) $(1)/usr/share/UnblockNeteaseMusicGo $(CP) ./files/* $(1)/usr/share/UnblockNeteaseMusicGo/ - endef $(eval $(call GoBinPackage,$(PKG_NAME))) $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/lean/UnblockNeteaseMusicGo/patches/01-fix-endpoint.patch b/package/lean/UnblockNeteaseMusicGo/patches/01-fix-endpoint.patch new file mode 100644 index 0000000000..c67f83ef2c --- /dev/null +++ b/package/lean/UnblockNeteaseMusicGo/patches/01-fix-endpoint.patch @@ -0,0 +1,13 @@ +diff --git a/processor/processor.go b/processor/processor.go +index a35f8df..a7e3015 100644 +--- a/processor/processor.go ++++ b/processor/processor.go +@@ -393,7 +393,7 @@ + //data["url"] = uri.Scheme + "://" + uri.Host + uri.EscapedPath() + //data["url"] = uri.String() + if *config.EndPoint { +- data["url"] = "http://music.163.com/unblockmusic/" + uri.String() ++ data["url"] = "https://music.163.com/unblockmusic/" + uri.String() + } else { + data["url"] = uri.String() + } diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index 9ef04f6ec4..9b7971cd52 100644 --- a/package/lean/luci-app-unblockmusic/Makefile +++ b/package/lean/luci-app-unblockmusic/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockmusic PKG_VERSION:=2.3.5 -PKG_RELEASE:=3 +PKG_RELEASE:=6 PKG_CONFIG_DEPENDS := \ CONFIG_UnblockNeteaseMusic_Go \ diff --git a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic index b3de31158c..1020406812 100755 --- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic +++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic @@ -179,13 +179,14 @@ start() else sed -i '/item.br < 320000/ { s/item.br < 320000/item.code != 200 || item.freeTrialInfo/g; }' /usr/share/UnblockNeteaseMusic/src/hook.js fi - node /usr/share/UnblockNeteaseMusic/app.js -e http://music.163.com -p 5200 $musictype >>/tmp/unblockmusic.log 2>&1 & + node /usr/share/UnblockNeteaseMusic/app.js -p 5200 $musictype >>/tmp/unblockmusic.log 2>&1 & node /usr/share/UnblockNeteaseMusic/app.js -e https://music.163.com -p 5203:5201 $musictype >>/tmp/unblockmusic.log 2>&1 & add_cron echo "$(date -R) # UnblockNeteaseMusic Nodejs Version (http:5200, https:5201)" >>/tmp/unblockmusic.log elif [ "$APPTYPE" == "go" ]; then - UnblockNeteaseMusic -p 5200 -sp 5201 -c /usr/share/UnblockNeteaseMusicGo/server.crt -k /usr/share/UnblockNeteaseMusicGo/server.key -m 0 -e >>/tmp/unblockmusic.log 2>&1 & + UnblockNeteaseMusic -p 5200 -sp 5202 -m 0 -c /usr/share/UnblockNeteaseMusicGo/server.crt -k /usr/share/UnblockNeteaseMusicGo/server.key -m 0 >>/tmp/unblockmusic.log 2>&1 & echo "$(date -R) # UnblockNeteaseMusic Golang Version (http:5200, https:5201)" >>/tmp/unblockmusic.log + UnblockNeteaseMusic -p 5203 -sp 5201 -m 0 -c /usr/share/UnblockNeteaseMusicGo/server.crt -k /usr/share/UnblockNeteaseMusicGo/server.key -m 0 -e >>/tmp/unblockmusic.log 2>&1 & else kill -9 $(busybox ps -w | grep 'sleep 60m' | grep -v grep | awk '{print $1}') >/dev/null 2>&1 /usr/bin/UnblockNeteaseMusicCloud >/dev/null 2>&1 & From c252faf64e1905a9081f4bf00f361eff3526d47f Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Tue, 16 Jun 2020 11:58:20 +0800 Subject: [PATCH 38/39] Version bump to R20.6.18 --- package/lean/default-settings/Makefile | 2 +- package/lean/default-settings/files/zzz-default-settings | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index f9d01629fe..395d211df7 100644 --- a/package/lean/default-settings/Makefile +++ b/package/lean/default-settings/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=default-settings PKG_VERSION:=1.1 -PKG_RELEASE:=59 +PKG_RELEASE:=60 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings index a52a824f5f..a6904e9360 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -44,7 +44,7 @@ sed -i '/option disabled/d' /etc/config/wireless sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release -echo "DISTRIB_REVISION='R20.5.20'" >> /etc/openwrt_release +echo "DISTRIB_REVISION='R20.6.18'" >> /etc/openwrt_release sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release From acb822180e87ace5a971f3ff3c67b2125d69b20b Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Tue, 16 Jun 2020 12:08:11 +0800 Subject: [PATCH 39/39] luci-app-unblockmusic:change default Nodejs version value --- package/lean/luci-app-unblockmusic/Makefile | 2 +- .../luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index 9b7971cd52..6340fb4677 100644 --- a/package/lean/luci-app-unblockmusic/Makefile +++ b/package/lean/luci-app-unblockmusic/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockmusic PKG_VERSION:=2.3.5 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_CONFIG_DEPENDS := \ CONFIG_UnblockNeteaseMusic_Go \ diff --git a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua index ad0957b60a..28eba6abc3 100644 --- a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua +++ b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua @@ -47,20 +47,20 @@ cloudserver.rmempty = true cloudserver:depends("apptype", "cloud") flac = s:option(Flag, "flac_enabled", translate("启用无损音质")) -flac.default = 1 +flac.default = "1" flac.rmempty = false flac.description = translate("目前仅支持酷我、QQ、咪咕") flac:depends("apptype", "nodejs") force = s:option(Flag, "force_enabled", translate("强制替换为高音质歌曲")) -force.default = 1 +force.default = "1" force.rmempty = false force.description = translate("如果歌曲音质在 320Kbps 以内，则尝试强制替换为高音质版本") force:depends("apptype", "nodejs") o = s:option(Flag, "autoupdate") o.title = translate("自动检查更新主程序") -o.default = 0 +o.default = "1" o.rmempty = false o.description = translate("每天自动检测并更新到最新版本") o:depends("apptype", "nodejs")