sync from upstream, version bump

amefs · Dec 10, 2023 · 6b5608d · 6b5608d
1 parent b065a7d
commit 6b5608d
Show file tree

Hide file tree

Showing 99 changed files with 155 additions and 163 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,26 @@
+## CHANGELOG v1.5.9
+
+*Changelog update Sunday, Dec 10, 2023*
+
+### General additions
+
+- facilitating the selection of the Transmission version during installation(`--transmission-version`)
+
+### Function improved
+
+- resolving dependency issues by installing DenyHosts using venv
+- only use released tag on acme.sh
+- apply new node.js repo
+
+### Function updated
+
+- add writable flag to [newer ttyd](https://github.com/tsl0922/ttyd/commit/f8efcddb0b615de7086fdb3c5f452d1ee42f32a3)
+- disable webUI UPNP on qBittorrent by default
+
+### Bug fixed
+
+---
+
 ## CHANGELOG v1.5.8
 
 *Changelog update Thursday, Jul 27, 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.8-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.9-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.
 

diff --git a/README_zh.md b/README_zh.md
@@ -24,7 +24,7 @@
 
 ## 当前版本
 
-![Version](https://img.shields.io/badge/version-1.5.8-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.9-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 也需要执行两次。
 

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.8
+# Current version:  v1.5.9
 #
 # 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.8
+# Current version:  v1.5.9
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io
@@ -602,6 +602,8 @@ function _installDeluge() {
 			_execute "pip2 install --upgrade wheel"
 			_info "Installing python2-twisted[tls]... "
 			_execute "pip2 install --upgrade twisted[tls]"
+			_info "Installing pyOpenSSL... "
+			_execute "pip2 install --upgrade --force-reinstall pyOpenSSL"
 			_info "Installing python2-future... "
 			_execute "pip2 install --upgrade future"
 			_success "${APP_TITLE} dependencies installed."

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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 #
 # 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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 #
 # 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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 # Author:           Mischief
 # Credits to:       QuickBox.io
 #

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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 # 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.8
+# Current version:  v1.5.9
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io

diff --git a/packages/package/install/installpackage-qbittorrent b/packages/package/install/installpackage-qbittorrent
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.8
+# Current version:  v1.5.9
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io
@@ -752,7 +752,7 @@ WebUI\LocalHostAuth=false
 WebUI\Password_ha1=@ByteArray(${ha1pass})
 WebUI\Port=${PORT}
 WebUI\ServerDomains=*
-WebUI\UseUPnP=true
+WebUI\UseUPnP=false
 WebUI\Username=${username}
 
 [BitTorrent]

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

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

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

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

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

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

diff --git a/packages/package/install/installpackage-transmission b/packages/package/install/installpackage-transmission
@@ -4,7 +4,7 @@
 #
 # GitHub:   https://github.com/amefs/quickbox-lite
 # Author:   Amefs
-# Current version:  v1.5.8
+# Current version:  v1.5.9
 # URL:
 # Original Repo:    https://github.com/QuickBox/QB
 # Credits to:       QuickBox.io
@@ -316,7 +316,7 @@ function _configureApp() {
 	_execute "systemctl stop transmission-daemon"
 	sleep 2
 	# install enhancement WebUI
-	echo 1 | bash -c "$(wget -qO- https://github.com/ronggang/transmission-web-control/raw/master/release/install-tr-control.sh)" >>"${OUTTO}" 2>&1
+	echo 1 | bash -c "$(wget -qO- https://github.com/transmission-web-control/transmission-web-control/raw/master/release/install-tr-control.sh)" >>"${OUTTO}" 2>&1
 
 	# get userlist
 	userlist=$(cat $(find /root/.qbuser/ -type f) | cut -d: -f1)

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