v6.34 (#3903)

+ DietPi-Software | Tonido: Drop support as this project has been obviously abandoned (no sign since 2017), no source code available (if it ever was) and the pre-compiled binaries depend on ancient libpng12 which is not available anymore since Debian Stretch (=libpng16) and now installing the package from Jessie fails with a strange error, most likely due to a change in apt or dpkg. + DietPi-Patch | Remove Tonido install flag and obsolete reinstalls + DietPi-Services | Remove Tonido from DietPi control + DietPi-Survey_report | Remove Tonido with v6.34 + DietPi-Patch | Tonido: Preserve DietPi-Services control if it has not been excluded as it has been removed from the static list
MichaIng · Nov 8, 2020 · a5407d1 · a5407d1
1 parent 8e122de
commit a5407d1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 113 deletions.
diff --git a/.meta/dietpi-survey_report b/.meta/dietpi-survey_report
@@ -488,6 +488,7 @@
 		aSOFTWARE_NAME6_34[$i]=${aSOFTWARE_NAME6_33[$i]}
 
 	done
+	aSOFTWARE_NAME6_34[134]='134' # Tonido
 	aSOFTWARE_NAME6_34[137]='137' # CloudPrint
 	# shellcheck disable=SC2034
 	aSOFTWARE_NAME6_34[181]='PaperMC'

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -7,6 +7,7 @@ Changes / Improvements / Optimisations:
 - DietPi-NordVPN | A function has been added update the NordVPN server list, e.g. when new servers are available that are closer to your location.
 - DietPi-Config | RPi: When applying less than 32 MiB GPU memory, the VCSM (VideoCore Shared Memory) device and kernel module are disabled now. The automatically loaded cut-down firmware files do not support it which leads to currently 5 expected kernel error messages. Disabling it in the first place might marginally speed up boot and reduce memory usage, but more importantly reduces confusion or worries induced by to the error messages.
 - DietPi-Software | PaperMC: Highly optimised Minecraft server, written in Java, extensible via plugins, now available for install. Many thanks to @ravenclaw900 for implementing this software option: https://github.com/MichaIng/DietPi/pull/3828
+- DietPi-Software | Tonido: This software option has been removed, since it is not developed anymore fore three years, no sources have been found and the latest binaries require ancient library versions which fail to be easily installed on currently supported Debian versions.
 - DietPi-Software | CloudPrint: This software option has been removed, since the Google Cloud Print service will be shut down at the end of 2020 and we don't want to offer software options which will work for at most two months. Please migrate to another printing solution in time. Already installed CloudPrint instances will remain installed and the system service remains functional until the end of the year. With the first DietPi release in 2021 we will remove service handling and offer the package removal during the update process. Further information can be found here: https://www.google.com/cloudprint/learn/ 
 - DietPi-Software | OpenBazaar: Build is now done with the currently latest Go v1.15.3 and the service runs as unprivileged user "openbazaar" instead of root.
 - DietPi-Software | XRDP: Remote desktop connections can now be done with the "Xorg" method and hence don't require an active VNC server anymore. New installes will not pull TigerVNC as dependency and if only RDP is required, TigerVNC can be uninstalled.

diff --git a/dietpi/dietpi-services b/dietpi/dietpi-services
@@ -141,7 +141,6 @@ Available services:
 			'minio'
 			'syncthing' 'syncthing-inotify'
 			'urbackupsrv'
-			'tonido'
 			'gogs'
 			'gitea'
 			'firefox-sync'

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
@@ -1022,18 +1022,6 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		aSOFTWARE_TYPE[$software_id]=0
 		aSOFTWARE_ONLINEDOC_URL[$software_id]='p=2363#p2363'
 		#------------------
-		software_id=134
-
-		aSOFTWARE_NAME[$software_id]='Tonido'
-		aSOFTWARE_DESC[$software_id]='lightweight cloud based backup system'
-		aSOFTWARE_CATEGORY_INDEX[$software_id]=4
-		aSOFTWARE_TYPE[$software_id]=0
-		aSOFTWARE_ONLINEDOC_URL[$software_id]='p=6476#p6476'
-		# - ARMv6
-		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
-		# - ARMv8
-		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,3]=0
-		#------------------
 		software_id=158
 
 		aSOFTWARE_NAME[$software_id]='Minio'
@@ -2365,7 +2353,6 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		# - Jackett (147)
 		software_id=126
 		if (( ( ${aSOFTWARE_INSTALL_STATE[60]} == 1 && $WIFIHOTSPOT_RTL8188C_DEVICE && ! $WIFIHOTSPOT_RTL8188C_PACKAGE && $G_HW_MODEL > 9 && $G_HW_ARCH < 4 ) ||
-			${aSOFTWARE_INSTALL_STATE[134]} == 1 ||
 			${aSOFTWARE_INSTALL_STATE[140]} == 1 ||
 			${aSOFTWARE_INSTALL_STATE[147]} == 1 )); then
 
@@ -5367,38 +5354,6 @@ Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=bullseye\nPin-
 
 		fi
 
-		software_id=134 # Tonido
-		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
-
-			Banner_Installing
-
-			### Pre-reqs
-			DEPS_LIST='libfontconfig1'
-			## libjpeg8, libpng12: https://github.com/MichaIng/DietPi/issues/1428#issuecomment-361099496
-			# - ARMv6/7
-			if (( $G_HW_ARCH == 1 || $G_HW_ARCH == 2 )); then
-
-				INSTALL_URL_ADDRESS1='https://dietpi.com/downloads/binaries/all/libjpeg8_8d1-2_armhf.deb'
-				INSTALL_URL_ADDRESS2='https://dietpi.com/downloads/binaries/all/libpng12-0_1.2.50-2+deb8u3_armhf.deb'
-				INSTALL_URL_ADDRESS3='http://patch.codelathe.com/tonido/live/installer/armv6l-rpi/tonido.tar.gz'
-
-			# - x86_64
-			elif (( $G_HW_ARCH == 10 )); then
-
-				INSTALL_URL_ADDRESS1='https://dietpi.com/downloads/binaries/all/libjpeg8_8d1-2_amd64.deb'
-				INSTALL_URL_ADDRESS2='https://dietpi.com/downloads/binaries/all/libpng12-0_1.2.50-2+deb8u3_amd64.deb'
-				INSTALL_URL_ADDRESS3='https://www.tonido.com/download.php?tonido64.tar.gz'
-
-			fi
-
-			Download_Install "$INSTALL_URL_ADDRESS1"
-			no_check_url=1 Download_Install "$INSTALL_URL_ADDRESS2"
-			no_check_url=1 Download_Install "$INSTALL_URL_ADDRESS3" /mnt/dietpi_userdata/tonido
-
-			unset -v INSTALL_URL_ADDRESS{1,2,3}
-
-		fi
-
 		software_id=113 # Chromium
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
@@ -11137,49 +11092,6 @@ _EOF_
 
 		fi
 
-		software_id=134 # Tonido
-		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
-
-			Banner_Configuration
-
-			# User
-			Create_User -g dietpi -d /home/tonido tonido
-
-			# Service
-			cat << '_EOF_' > /etc/systemd/system/tonido.service
-[Unit]
-Description=Tonido (DietPi)
-
-[Service]
-User=tonido
-WorkingDirectory=/mnt/dietpi_userdata/tonido
-ExecStart=/bin/dash -c 'export LD_LIBRARY_PATH=/mnt/dietpi_userdata/tonido; export TONIDODIR=/mnt/dietpi_userdata/tonido; ./tonidoconsole'
-
-[Install]
-WantedBy=multi-user.target
-_EOF_
-			# User dirs
-			G_EXEC mkdir -p /home/tonido /mnt/dietpi_userdata/tonido/sync{,data}
-			# - Symlink
-			[[ -d '/home/tonido/tonido' ]] && G_EXEC cp -a /home/tonido/tonido /mnt/dietpi_userdata/
-			rm -Rf /home/tonido/{tonido,TonidoSync{,Data}}
-			G_EXEC ln -s /mnt/dietpi_userdata/tonido /home/tonido/tonido
-			G_EXEC ln -s /mnt/dietpi_userdata/tonido/sync /home/tonido/TonidoSync
-			G_EXEC ln -s /mnt/dietpi_userdata/tonido/syncdata /home/tonido/TonidoSyncData
-
-			# Permissions
-			G_EXEC chown -R tonido:dietpi /mnt/dietpi_userdata/tonido /home/tonido
-
-			# ARMv7 switch
-			if (( $G_HW_ARCH == 2 )); then
-
-				G_EXEC sed -i 's/armv6l/armv7l/' /mnt/dietpi_userdata/tonido/manifest.xml
-				G_EXEC sed -i 's/armv6l/armv7l/' /mnt/dietpi_userdata/tonido/plugins/*/manifest.xml
-
-			fi
-
-		fi
-
 		software_id=113 # Chromium
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
@@ -13359,24 +13271,6 @@ _EOF_
 
 		fi
 
-		software_id=134 # Tonido
-		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
-
-			Banner_Uninstalling
-			if [[ -f '/etc/systemd/system/tonido.service' ]]; then
-
-				systemctl disable --now tonido
-				rm -R /etc/systemd/system/tonido.service*
-
-			fi
-			[[ -d '/etc/systemd/system/tonido.service.d' ]] && rm -R /etc/systemd/system/tonido.service.d
-			getent passwd tonido > /dev/null && userdel tonido
-			getent group tonido > /dev/null && groupdel tonido # Pre-v6.33
-			[[ -d '/mnt/dietpi_userdata/tonido' ]] && rm -R /mnt/dietpi_userdata/tonido
-			[[ -d '/home/tonido' ]] && rm -R /home/tonido
-
-		fi
-
 		software_id=135
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 

diff --git a/dietpi/patch_file b/dietpi/patch_file
@@ -272,8 +272,7 @@ _EOF_
 			# Reinstalls:
 			# 	Kodi: https://github.com/MichaIng/DietPi/issues/1428
 			#	Fail2Ban: https://github.com/MichaIng/DietPi/issues/1431
-			#	Tonido: https://github.com/MichaIng/DietPi/issues/1432
-			(( $G_DIETPI_INSTALL_STAGE == 2 )) && echo 31 73 134 >> /var/tmp/dietpi/dietpi-update_reinstalls
+			(( $G_DIETPI_INSTALL_STAGE == 2 )) && echo 31 73 >> /var/tmp/dietpi/dietpi-update_reinstalls
 			#-------------------------------------------------------------------------------
 
 		elif (( $G_DIETPI_VERSION_SUB == 1 )); then
@@ -665,7 +664,7 @@ _EOF_'
 
 			#-------------------------------------------------------------------------------
 			# Software removals:
-			#	JRiver: https://github.com/MichaIng/DietPi/issues/1080#issuecomment-403489246
+			#	jRiver: https://github.com/MichaIng/DietPi/issues/1080#issuecomment-403489246
 			(( $G_DIETPI_INSTALL_STAGE == 2 )) && sed -i '/^aSOFTWARE_INSTALL_STATE\[148\]=/c\aSOFTWARE_INSTALL_STATE\[148\]=0' /boot/dietpi/.installed
 			#-------------------------------------------------------------------------------
 			# ASUS TB WiFi: https://github.com/MichaIng/DietPi/issues/1760
@@ -675,11 +674,11 @@ _EOF_'
 			# - Items which run as own user:
 			#	ympd
 			# v6.17 MPD
-			#	minidlna
+			#	ReadyMedia (MiniDLNA)
 			#	Airsonic
 			# v6.18 Sonarr
 			# v6.18 Radarr
-			#	NZBget
+			#	NZBGet
 			# v6.18 RoonBridge
 			#	RoonServer
 			# v6.19 GMediaRender
@@ -689,7 +688,6 @@ _EOF_'
 			#  - NO REINSTALL: due to many changes, or, too much risk for existing user settings, fresh installs only
 			# v6.33	Cuberite
 			#	qBittorrent
-			#	Tonido
 			if (( $G_DIETPI_INSTALL_STAGE == 2 )); then
 
 				if [[ -d '/root/.config/NzbDrone' ]]; then
@@ -2628,6 +2626,14 @@ opcache.max_accelerated_files=10000\nopcache.memory_consumption=128\nopcache.sav
 
 		elif (( $G_DIETPI_VERSION_SUB == 33 )); then
 
+			#-------------------------------------------------------------------------------
+			# Remove Tonido install flag
+			if [[ -f '/boot/dietpi/.installed' ]] && grep -q '^aSOFTWARE_INSTALL_STATE\[134\]=2' /boot/dietpi/.installed
+			then
+				sed -i '/^aSOFTWARE_INSTALL_STATE\[134\]=2/d' /boot/dietpi/.installed
+				# Add service to custom includes if it has not been excluded, since it has been removed from the static DietPi-Services list
+				grep -q '^- tonido$' /boot/dietpi/.dietpi-services_include_exclude || G_CONFIG_INJECT '+ tonido' '+ tonido' /boot/dietpi/.dietpi-services_include_exclude
+			fi
 			#-------------------------------------------------------------------------------
 			# Remove CloudPrint install flag
 			[[ -f '/boot/dietpi/.installed' ]] && grep -q '^aSOFTWARE_INSTALL_STATE\[137\]=2' /boot/dietpi/.installed && sed -i '/^aSOFTWARE_INSTALL_STATE\[137\]=2/d' /boot/dietpi/.installed