sync from upstream, version bump

amefs · Apr 3, 2024 · bb25880 · bb25880
1 parent 73e6668
commit bb25880
Show file tree

Hide file tree

Showing 111 changed files with 936 additions and 156 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,32 @@
+## CHANGELOG v1.5.10
+
+*Changelog update Wednesday, Apr 3, 2024*
+
+### General additions
+
+- Support qBittorrent-Clientblocker
+
+### Important changes
+
+- Discarding the Ubuntu 18.04 installation ([Release EOL](https://wiki.ubuntu.com/Releases))
+
+### Function improved
+
+- Migrating Panel State Refresh to React (by Tautcony)
+
+### Function updated
+
+- qBittorrent default version upgraded to v4.5.5
+- Transmission default version upgrade to v3.0
+- Python dependency default version upgraded to v3.11.x
+
+### Bug fixed
+
+- Fix broken Netdata installer
+- Fix broken ZNC installer
+
+---
+
 ## CHANGELOG v1.5.9
 
 *Changelog update Sunday, Dec 10, 2023*

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ This project is a modified version of the QuickBox community edition. This proje
 
 ## Script status
 
-![Version](https://img.shields.io/badge/version-1.5.9-orange?style=flat-square)![GNU v3.0 License](https://img.shields.io/badge/license-GNU%20v3.0%20License-blue.svg?style=flat-square)
+![Version](https://img.shields.io/badge/version-1.5.10-orange?style=flat-square)![GNU v3.0 License](https://img.shields.io/badge/license-GNU%20v3.0%20License-blue.svg?style=flat-square)
 
 When upgrade from 1.3.2 to 1.3.3, very recommend to use SSH with `box update quickbox`. You also need to run the command twice to finish the service upgrade. If you are using WebUI to finish the upgrade, please also upgrade twice.
 
@@ -44,9 +44,9 @@ Hardware requirement:
 
 OS Support (amd64 only):
 
-![Ubuntu22.04](https://img.shields.io/badge/Ubuntu%2022.04-passing-brightgreen.svg?style=flat-square)![Ubuntu20.04](https://img.shields.io/badge/Ubuntu%2020.04-passing-brightgreen.svg?style=flat-square)![Ubuntu18.04](https://img.shields.io/badge/Ubuntu%2018.04-passing-brightgreen.svg?style=flat-square)![Ubuntu16.04](https://img.shields.io/badge/Ubuntu%2016.04-EOL-red.svg?style=flat-square)
+![Ubuntu22.04](https://img.shields.io/badge/Ubuntu%2022.04-passing-brightgreen.svg?style=flat-square)![Ubuntu20.04](https://img.shields.io/badge/Ubuntu%2020.04-passing-brightgreen.svg?style=flat-square)![Ubuntu18.04](https://img.shields.io/badge/Ubuntu%2018.04-EOL-red.svg?style=flat-square)![Ubuntu16.04](https://img.shields.io/badge/Ubuntu%2016.04-EOL-red.svg?style=flat-square)
 
-![Debian12](https://img.shields.io/badge/Debian%2012-passing-brightgreen.svg?style=flat-square)![Debian11](https://img.shields.io/badge/Debian%2011-passing-brightgreen.svg?style=flat-square)![Debian10](https://img.shields.io/badge/Debian%2010-passing-brightgreen.svg?style=flat-square)![Debian9](https://img.shields.io/badge/Debian%209-discontinue-orange.svg?style=flat-square)
+![Debian12](https://img.shields.io/badge/Debian%2012-passing-brightgreen.svg?style=flat-square)![Debian11](https://img.shields.io/badge/Debian%2011-passing-brightgreen.svg?style=flat-square)![Debian10](https://img.shields.io/badge/Debian%2010-passing-brightgreen.svg?style=flat-square)![Debian9](https://img.shields.io/badge/Debian%209-EOL-red.svg?style=flat-square)
 
 Server Support:
 

diff --git a/README_zh.md b/README_zh.md
@@ -24,7 +24,7 @@
 
 ## 当前版本
 
-![Version](https://img.shields.io/badge/version-1.5.9-orange?style=flat-square)![GNU v3.0 License](https://img.shields.io/badge/license-GNU%20v3.0%20License-blue.svg?style=flat-square)
+![Version](https://img.shields.io/badge/version-1.5.10-orange?style=flat-square)![GNU v3.0 License](https://img.shields.io/badge/license-GNU%20v3.0%20License-blue.svg?style=flat-square)
 
 在执行 1.3.2 -> 1.3.3 的升级时，建议使用 SSH 运行  `box update quickbox` 进行升级操作，且需要执行两次以完成后台服务升级。若使用 WebUI 也需要执行两次。
 
@@ -44,9 +44,9 @@
 
 系统支持 (仅支持 amd64):
 
-![Ubuntu22.04](https://img.shields.io/badge/Ubuntu%2022.04-passing-brightgreen.svg?style=flat-square)![Ubuntu20.04](https://img.shields.io/badge/Ubuntu%2020.04-passing-brightgreen.svg?style=flat-square)![Ubuntu18.04](https://img.shields.io/badge/Ubuntu%2018.04-passing-brightgreen.svg?style=flat-square)![Ubuntu16.04](https://img.shields.io/badge/Ubuntu%2016.04-EOL-red.svg?style=flat-square)
+![Ubuntu22.04](https://img.shields.io/badge/Ubuntu%2022.04-passing-brightgreen.svg?style=flat-square)![Ubuntu20.04](https://img.shields.io/badge/Ubuntu%2020.04-passing-brightgreen.svg?style=flat-square)![Ubuntu18.04](https://img.shields.io/badge/Ubuntu%2018.04-EOL-red.svg?style=flat-square)![Ubuntu16.04](https://img.shields.io/badge/Ubuntu%2016.04-EOL-red.svg?style=flat-square)
 
-![Debian12](https://img.shields.io/badge/Debian%2012-passing-brightgreen.svg?style=flat-square)![Debian11](https://img.shields.io/badge/Debian%2011-passing-brightgreen.svg?style=flat-square)![Debian10](https://img.shields.io/badge/Debian%2010-passing-brightgreen.svg?style=flat-square)![Debian9](https://img.shields.io/badge/Debian%209-discontinue-orange.svg?style=flat-square)
+![Debian12](https://img.shields.io/badge/Debian%2012-passing-brightgreen.svg?style=flat-square)![Debian11](https://img.shields.io/badge/Debian%2011-passing-brightgreen.svg?style=flat-square)![Debian10](https://img.shields.io/badge/Debian%2010-passing-brightgreen.svg?style=flat-square)![Debian9](https://img.shields.io/badge/Debian%209-EOL-red.svg?style=flat-square)
 
 服务器支持:
 

diff --git a/bump-version.sh b/bump-version.sh
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   TautCony
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #

diff --git a/packages/package/install/installpackage-art b/packages/package/install/installpackage-art
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io
@@ -222,8 +222,8 @@ function _installApp() {
 	_info "Building ${APP_TITLE}..."
 
 	# Install for single user
-	_installPy 3.9.13
-	_initPyVenv 3.9.13 /home/${username}/.local/autoremovetorrents ${username}
+	_installPy 3.11.8
+	_initPyVenv 3.11.8 /home/${username}/.local/autoremovetorrents ${username}
 	chown -R ${username}:${username} /home/${username}/.local
 	cd /home/${username}/.local/autoremovetorrents
 	_info "Installing requirements... "

diff --git a/packages/package/install/installpackage-autodlirssi b/packages/package/install/installpackage-autodlirssi
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

diff --git a/packages/package/install/installpackage-btsync b/packages/package/install/installpackage-btsync
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

diff --git a/packages/package/install/installpackage-cifs b/packages/package/install/installpackage-cifs
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

diff --git a/packages/package/install/installpackage-deluge b/packages/package/install/installpackage-deluge
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

diff --git a/packages/package/install/installpackage-denyhosts b/packages/package/install/installpackage-denyhosts
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

diff --git a/packages/package/install/installpackage-docker b/packages/package/install/installpackage-docker
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

diff --git a/packages/package/install/installpackage-emby b/packages/package/install/installpackage-emby
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #

diff --git a/packages/package/install/installpackage-fail2ban b/packages/package/install/installpackage-fail2ban
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Maintainer:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # Author:           Mischief
 # Credits to:       QuickBox.io
 #

diff --git a/packages/package/install/installpackage-ffmpeg b/packages/package/install/installpackage-ffmpeg
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

diff --git a/packages/package/install/installpackage-filebrowser b/packages/package/install/installpackage-filebrowser
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

diff --git a/packages/package/install/installpackage-filebrowser-ee b/packages/package/install/installpackage-filebrowser-ee
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

diff --git a/packages/package/install/installpackage-flexget b/packages/package/install/installpackage-flexget
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io
@@ -229,8 +229,8 @@ function _installApp() {
 	_info "Building ${APP_TITLE}..."
 
 	# Install for single user
-	_installPy 3.9.13
-	_initPyVenv 3.9.13 /home/${username}/.local/flexget3 ${username}
+	_installPy 3.11.8
+	_initPyVenv 3.11.8 /home/${username}/.local/flexget3 ${username}
 	chown -R ${username}:${username} /home/${username}/.local
 	cd /home/${username}/.local/flexget3
 	_info "Installing requirements... "
@@ -302,15 +302,15 @@ diff -Nur '--exclude=.git' '--exclude=.vs' flexget/webserver.py flexget-patched/
      session.commit()
 EOF
 	sed -i "s/username='replace'/username='${username}'/g" /tmp/flexget-user-passwd.patch
-	patch -p1 -d ${pylib}/python3.9/site-packages/flexget/ </tmp/flexget-user-passwd.patch >>"${OUTTO}" 2>&1
-	sudo -u ${username} -H bash -c "${pybin}/python -m compileall ${pylib}/python3.9/site-packages/flexget/webserver.py" >>"${OUTTO}" 2>&1
+	patch -p1 -d ${pylib}/python3.11/site-packages/flexget/ </tmp/flexget-user-passwd.patch >>"${OUTTO}" 2>&1
+	sudo -u ${username} -H bash -c "${pybin}/python -m compileall ${pylib}/python3.11/site-packages/flexget/webserver.py" >>"${OUTTO}" 2>&1
 	rm -rf /tmp/flexget-user-passwd.patch
 
 	# remove hard encode username
 	if [[ ${old} == 1 ]]; then
-		sed -i "s/\\\'flexget\\\'/\\\'\\\'/g" ${pylib}/python3.9/site-packages/flexget/ui/v1/app/scripts/app.js
+		sed -i "s/\\\'flexget\\\'/\\\'\\\'/g" ${pylib}/python3.11/site-packages/flexget/ui/v1/app/scripts/app.js
 	else
-		jspath=$(grep -rnw "${pylib}/python3.9/site-packages/flexget/ui/v2/dist/assets/" -e '"flexget"' | cut -d: -f1)
+		jspath=$(grep -rnw "${pylib}/python3.11/site-packages/flexget/ui/v2/dist/assets/" -e '"flexget"' | cut -d: -f1)
 		sed -i "s/initialValues:{username:\"flexget\"/initialValues:{username:\"\"/g" ${jspath}
 	fi
 

diff --git a/packages/package/install/installpackage-flood b/packages/package/install/installpackage-flood
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Maintainer:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # Author:           Mischief
 # Credits to:       QuickBox.io
 #

diff --git a/packages/package/install/installpackage-h5ai b/packages/package/install/installpackage-h5ai
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

diff --git a/packages/package/install/installpackage-jellyfin b/packages/package/install/installpackage-jellyfin
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #

diff --git a/packages/package/install/installpackage-lecert b/packages/package/install/installpackage-lecert
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   JMSolo, Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

diff --git a/packages/package/install/installpackage-linuxrar b/packages/package/install/installpackage-linuxrar
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

diff --git a/packages/package/install/installpackage-mktorrent b/packages/package/install/installpackage-mktorrent
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io
@@ -221,7 +221,7 @@ EOF
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/Aniverse/inexistence
 # Credits to:       Aniverse

diff --git a/packages/package/install/installpackage-netdata b/packages/package/install/installpackage-netdata
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Maintainer:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # Author:           Mischief
 # Credits to:       QuickBox.io
 #
@@ -66,7 +66,7 @@ function _error() {
 APP_TITLE="Netdata"
 APP_NAME="netdata"
 APP_SERVICE="netdata"
-APP_BASEDEPS="autoconf autoconf-archive autogen automake cmake gcc libjson-c-dev libjudy-dev liblz4-dev libmnl-dev libssl-dev libuv1-dev make pkg-config python3-pymongo uuid-dev zlib1g-dev git"
+APP_BASEDEPS="zlib1g-dev uuid-dev libuv1-dev liblz4-dev libssl-dev libelf-dev libmnl-dev libprotobuf-dev protobuf-compiler gcc g++ make git autoconf autoconf-archive autogen automake pkg-config curl python3 cmake"
 
 APP_LOCK=.$APP_NAME.lock
 OUTTO=/srv/dashboard/db/output.log
@@ -158,17 +158,7 @@ function _installSystemUpdates() {
 
 function _installDepends() {
 	_info "Installing ${APP_TITLE} dependencies..."
-	local DEPLIST="${APP_BASEDEPS}"
-	for depend in $DEPLIST; do
-		_info "Installing ${depend}... "
-		_execute "apt-get -y --allow-unauthenticated -f install ${depend}" || { _error "Could not install ${depend}." && dependError=1; }
-	done
-	if [[ $dependError != "1" ]]; then
-		_success "${APP_TITLE} dependencies installed."
-	else
-		_error "${APP_TITLE} dependencies failed to install."
-		exit 1
-	fi
+	bash <(curl -sSL https://raw.githubusercontent.com/netdata/netdata/master/packaging/installer/install-required-packages.sh) --non-interactive >>"${OUTTO}" 2>&1
 }
 
 function _installApp() {

diff --git a/packages/package/install/installpackage-nfs b/packages/package/install/installpackage-nfs
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

diff --git a/packages/package/install/installpackage-novnc b/packages/package/install/installpackage-novnc
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Maintainer:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # Author:           Mischief
 # Credits to:       QuickBox.io
 #

diff --git a/packages/package/install/installpackage-openvpn b/packages/package/install/installpackage-openvpn
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

diff --git a/packages/package/install/installpackage-plex b/packages/package/install/installpackage-plex
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

diff --git a/packages/package/install/installpackage-pyenv b/packages/package/install/installpackage-pyenv
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.9
+# Current version:  v1.5.10
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io