Release v6.24.1

.meta/dietpi-survey_report

@@ -395,6 +395,17 @@
 	aSOFTWARE_NAME6_23[174]='GIMP'
 	aSOFTWARE_NAME6_23[175]='XFCE Power Manager'
 
+	# - v6.24 + v6.25
+	aSOFTWARE_NAME6_24=()
+	aSOFTWARE_NAME6_25=()
+	for i in ${!aSOFTWARE_NAME6_23[@]}
+	do
+
+		aSOFTWARE_NAME6_24[$i]=${aSOFTWARE_NAME6_23[$i]}
+		aSOFTWARE_NAME6_25[$i]=${aSOFTWARE_NAME6_24[$i]}
+
+	done
+
 	Main(){
 
 		# Copy files to RAM to speed up grep

CHANGELOG.txt

@@ -1,17 +1,13 @@
 
-v6.24 (Hotfix)
-(15/05/19)
-
-Changes / Improvements / Optimisations:
-- DietPi-Software | Emby + Plex Server: Enabled access to DietPi network mounts and media files by default. Many thanks to @ilgrank for reporting this missing feature: https://github.com/MichaIng/DietPi/issues/2801
-- DietPi-Software | ownCloud + phpBB: Support had to be disabled on ARMv6 for now until we either find a way to install PHP7.2 (with all required modules) outside of sury.org (which does not support ARMv6) or those enable support for PHP7.3 (expected with ownCloud 10.3 and phpBB 3.3).
+v6.24.1
+(18/05/19 Hotfix)
 
 Bug Fixes:
-- DietPi-Software | PHP: Resolved a critical issue where PHP install/update broke ARMv6 devices since Debian armhf does not support ARMv6 like Raspbian does. Many thanks for the fast user reports: https://github.com/MichaIng/DietPi/issues/2794
-- DietPi-Software | PHP: Resolved an issue where APT upgrade can fail due to insufficient sury.org APT repo preferences. Many thanks to @sifyer for reporting this issue: https://github.com/MichaIng/DietPi/issues/2795
-- DietPi-WiFi-Monitor | Resolved a failure due to false concurrency check. Many thanks to @GulyFMG for reporting this issue: https://github.com/MichaIng/DietPi/issues/2802
+- DietPi-WiFi-Monitor | Resolved an issue where the service leads to a constant high CPU load. Many thanks for @GulyFMG for reporting this issue: https://github.com/MichaIng/DietPi/issues/2802
+- DietPi-Software | PHP: On ARMv6, fine tuned the required Buster branch priority pins to avoid certain ATP dependency errors. Many thanks to @maartenlangeveld for reporting this issue: https://github.com/MichaIng/DietPi/issues/2808, https://github.com/MichaIng/DietPi/issues/2811
+- DietPi-Software | Lighttpd: Resolved an issue where Lighttpd fails to start on ARMv6. Many thanks to @maartenlangeveld for reporting this issue: https://github.com/MichaIng/DietPi/issues/2808
 
-As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/2803
+As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/2819
 
 Known/Outstanding Issues:
 - DietPi-Config | Enabling WiFi + Ethernet adapters, both on different subnets, breaks WiFi connection in some cases: https://github.com/MichaIng/DietPi/issues/2103
@@ -25,6 +21,20 @@ Known/Outstanding Issues:
 
 For all additional issues that may appear after release, please see the following link for active tickets: https://github.com/MichaIng/DietPi/issues
 
+v6.24
+(15/05/19 Hotfix)
+
+Changes / Improvements / Optimisations:
+- DietPi-Software | Emby + Plex Server: Enabled access to DietPi network mounts and media files by default. Many thanks to @ilgrank for reporting this missing feature: https://github.com/MichaIng/DietPi/issues/2801
+- DietPi-Software | ownCloud + phpBB: Support had to be disabled on ARMv6 for now until we either find a way to install PHP7.2 (with all required modules) outside of sury.org (which does not support ARMv6) or those enable support for PHP7.3 (expected with ownCloud 10.3 and phpBB 3.3).
+
+Bug Fixes:
+- DietPi-Software | PHP: Resolved a critical issue where PHP install/update broke ARMv6 devices since Debian armhf does not support ARMv6 like Raspbian does. Many thanks for the fast user reports: https://github.com/MichaIng/DietPi/issues/2794
+- DietPi-Software | PHP: Resolved an issue where APT upgrade can fail due to insufficient sury.org APT repo preferences. Many thanks to @sifyer for reporting this issue: https://github.com/MichaIng/DietPi/issues/2795
+- DietPi-WiFi-Monitor | Resolved a failure due to false concurrency check. Many thanks to @GulyFMG for reporting this issue: https://github.com/MichaIng/DietPi/issues/2802
+
+As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/2803
+
 v6.23
 (12/05/19)
 

PREP_SYSTEM_FOR_DIETPI.sh

@@ -852,8 +852,16 @@ _EOF_
 		elif (( $G_HW_MODEL < 10 )); then
 
 			G_AGI libraspberrypi-bin libraspberrypi0 raspberrypi-bootloader raspberrypi-kernel raspberrypi-sys-mods
-			# Buster systemd-udevd doesn't support the current raspi-copies-and-fills: https://github.com/MichaIng/DietPi/issues/1286
-			(( $DISTRO_TARGET < 5 )) && G_AGI raspi-copies-and-fills
+			# Buster systemd doesn't support the current raspi-copies-and-fills: https://github.com/MichaIng/DietPi/issues/1286
+			if (( $DISTRO_TARGET < 5 )); then
+
+				G_AGI raspi-copies-and-fills
+
+			else
+
+				G_AGP raspi-copies-and-fills
+
+			fi
 
 		#	Odroid N2
 		elif (( $G_HW_MODEL == 15 )); then

dietpi/dietpi-config

@@ -1234,7 +1234,7 @@ More info here: https://www.raspberrypi.org/forums/viewtopic.php?p=105008#p10500
 				grep -q '^[[:blank:]]*enable_uart=0' /DietPi/config.txt && rpi_uart_state='[Off]'
 
 			fi
-			G_WHIP_MENU_ARRAY+=("$rpi_uart device" ': $rpi_uart_state')
+			G_WHIP_MENU_ARRAY+=("$rpi_uart device" ": $rpi_uart_state")
 
 		fi
 

dietpi/dietpi-software

@@ -1834,6 +1834,10 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		# - non-RPi Buster: https://packages.debian.org/phpmyadmin
 		(( $G_HW_MODEL > 9 )) && aSOFTWARE_AVAIL_G_DISTRO[$software_id,5]=0
 
+		# Since the APT package depends on PHP meta packages, PHP7.2 cannot be installed
+		# Since ownCloud + phpBB require PHP7.2 currently, phpMyAdmin is not compatible with those
+		[[ -f '/var/www/owncloud/occ' || -f '/var/www/phpBB3/config.php' ]] && aSOFTWARE_AVAIL_G_DISTRO[$software_id,$G_DISTRO]=0
+
 		#------------------
 		software_id=91
 
@@ -3269,11 +3273,11 @@ Package: *php7.3*\nPin: release *\nPin-Priority: -1' > /etc/apt/preferences.d/di
 			# - Remove previous disk cache dir or symlink
 			[[ -d '/var/cache/samba' || -L '/var/cache/samba' ]] && rm -R /var/cache/samba
 			# - Pre-create RAM cache dir
-			mkdir -p /var/run/samba-cache
+			mkdir -p /run/samba-cache
 			# - Link disk cache to RAM
-			ln -s /var/run/samba-cache /var/cache/samba
+			ln -s /run/samba-cache /var/cache/samba
 			# - Create RAM cache dir automatically on boot
-			echo 'd /var/run/samba-cache - - - - -' > /etc/tmpfiles.d/dietpi-samba_cache.conf
+			echo 'd /run/samba-cache - - - - -' > /etc/tmpfiles.d/dietpi-samba_cache.conf
 
 			G_AGI samba
 
@@ -3403,14 +3407,14 @@ Package: *php7.3*\nPin: release *\nPin-Priority: -1' > /etc/apt/preferences.d/di
 			G_AGI $package_list
 
 			# Fix wrong permissions from Jessie package: https://github.com/MichaIng/DietPi/issues/2736
-			# - /var/run/redis is created but on boot as well with wrong root:root permissions, so we need to fix that via ExecStartPre
+			# - /run/redis is created but on boot as well with wrong root:root permissions, so we need to fix that via ExecStartPre
 			if (( $G_DISTRO < 4 )); then
 
 				mkdir -p /etc/systemd/system/redis-server.service.d
 				echo "[Service]
 PermissionsStartOnly=true
-ExecStartPre=$(command -v mkdir) -p /var/run/redis /var/lib/redis
-ExecStartPre=$(command -v chown) -R redis:redis /var/run/redis /var/lib/redis" > /etc/systemd/system/redis-server.service.d/dietpi-fix_permissions.conf
+ExecStartPre=$(command -v mkdir) -p /run/redis /var/lib/redis
+ExecStartPre=$(command -v chown) -R redis:redis /run/redis /var/lib/redis" > /etc/systemd/system/redis-server.service.d/dietpi-fix_permissions.conf
 				systemctl daemon-reload
 
 			fi
@@ -3422,9 +3426,6 @@ ExecStartPre=$(command -v chown) -R redis:redis /var/run/redis /var/lib/redis" >
 
 			Banner_Installing
 
-			# Buster force flag
-			local force_buster=''
-
 			# Jessie + Stretch: Add Ondrejs PHP repository for latest PHP version (currently PHP7.3)
 			if (( $G_DISTRO < 5 )); then
 
@@ -3440,9 +3441,12 @@ ExecStartPre=$(command -v chown) -R redis:redis /var/run/redis /var/lib/redis" >
 					# - APT source
 					echo "deb $INSTALL_URL_ADDRESS buster main" > /etc/apt/sources.list.d/dietpi-php.list
 					# - Set priority for Buster: No auto install but auto upgrade
-					echo -e 'Package: *\nPin: release n=buster\nPin-Priority: 100' > /etc/apt/preferences.d/dietpi-php
-					# - Force Buster to allow APT install with above low priority
-					force_buster='-t buster'
+					echo -e '# Allow to install PHP7.3 dependencies and meta packages from Buster
+# - Lighttpd must be pulled as well from Buster since the Stretch version does not support Buster libssl1.1 (1.1.1)
+Package: php libapache2-mod-php php-* libssl* libc6* libc-* libgssapi-krb5-2 libpcre2-8-0 libk5crypto3 libkrb5-3 libkrb5support0 locales libzip4 curl lighttpd
+Pin: release n=buster\nPin-Priority: 501\n
+# Pin down all other Buster packages to only allow upgrades of already installed ones via: "apt upgrade"
+Package: *\nPin: release n=buster\nPin-Priority: 100' > /etc/apt/preferences.d/dietpi-php
 
 				else
 
@@ -3520,7 +3524,7 @@ Package: openssl libssl*\nPin: origin packages.sury.org\nPin-Priority: -1' > /et
 			# Redis PHP module
 			(( ${aSOFTWARE_INSTALL_STATE[91]} > 0 )) && package_list+=" $PHP_NAME-redis"
 
-			G_AGI $force_buster $package_list
+			G_AGI $package_list
 
 		fi
 
@@ -7239,6 +7243,10 @@ _EOF_
 			G_BACKUP_FP /etc/lighttpd/lighttpd.conf
 			sed -i '/^server.document-root/c\server.document-root        = "/var/www"' /etc/lighttpd/lighttpd.conf
 
+			# Fix in case Lighttpd got updated to Buster version (on ARMv6 due to PHP7.3 libssl1.1 depedency)
+			# - "create-mime.assign.pl" has been renamed to "create-mime.conf.pl"
+			[[ -f '/usr/share/lighttpd/create-mime.assign.pl' ]] || sed -i 's/create-mime\.assign\.pl/create-mime.conf.pl/g' /etc/lighttpd/lighttpd.conf
+
 			# Configure fastcgi for PHP-FPM
 			cat << _EOF_ > /etc/lighttpd/conf-available/15-fastcgi-php.conf
 # -*- depends: fastcgi -*-
@@ -7260,7 +7268,7 @@ _EOF_
 
 			# Move default page
 			mv /var/www/html/index.lighttpd.html /var/www/
-			[[ $(ls -A /var/www/html 2>&1) ]] || rm -R /var/www/html
+			rmdir --ignore-fail-on-non-empty /var/www/html
 
 		fi
 
@@ -7784,7 +7792,7 @@ _EOF_
 			local redis_conf="/etc/redis/redis*.conf"
 			# - Enable Redis socket and grant www-data access to it:
 			#	- NB: To allow wildcard expansion, do not use quotes around $redis_conf!
-			GCI_PRESERVE=1 G_CONFIG_INJECT 'unixsocket[[:blank:]]' 'unixsocket /var/run/redis/redis-server.sock' $redis_conf
+			GCI_PRESERVE=1 G_CONFIG_INJECT 'unixsocket[[:blank:]]' 'unixsocket /run/redis/redis-server.sock' $redis_conf
 			#	- Current Buster PHP7.3 Redis module cannot access Redis socket even with group + 770 permissions.
 			#	- Obviously group of spawned processes is overridden by only www-data while redis membership is lost.
 			#	- Requires secure solution, however for now we workaround with 777 socket permissions.
@@ -8078,7 +8086,7 @@ The install script will now exit. After applying one of the the above, rerun die
 			local redis_conf="/etc/redis/redis*.conf"
 			# - Enable Redis socket and grant www-data access to it:
 			#	- NB: To allow wildcard expansion, do not use quotes around $redis_conf!
-			GCI_PRESERVE=1 G_CONFIG_INJECT 'unixsocket[[:blank:]]' 'unixsocket /var/run/redis/redis-server.sock' $redis_conf
+			GCI_PRESERVE=1 G_CONFIG_INJECT 'unixsocket[[:blank:]]' 'unixsocket /run/redis/redis-server.sock' $redis_conf
 			#	- Current Buster PHP7.3 Redis module cannot access Redis socket even with group + 770 permissions.
 			#	- Obviously group of spawned processes is overridden by only www-data while redis membership is lost.
 			#	- Requires secure solution, however for now we workaround with 777 socket permissions.
@@ -8345,9 +8353,9 @@ After=network.target sound.target
 User=mpd
 #Group=dietpi # Do not change, use system assigned groups, requires both dietpi and audio groups
 PermissionsStartOnly=true
-RuntimeDirectory=/var/run/mpd
-ExecStartPre=$(command -v mkdir) -p /var/run/mpd
-ExecStartPre=$(command -v chown) -R mpd:dietpi /var/run/mpd
+RuntimeDirectory=/run/mpd
+ExecStartPre=$(command -v mkdir) -p /run/mpd
+ExecStartPre=$(command -v chown) -R mpd:dietpi /run/mpd
 ExecStart=$(command -v mpd) --no-daemon /etc/mpd.conf
 
 # allow MPD to use real-time priority 50
@@ -13305,8 +13313,8 @@ _EOF_
 
 			Banner_Uninstalling
 			G_AGP samba samba-common-bin
-			[[ -f /etc/tmpfiles.d/dietpi-samba_cache.conf ]] && rm /etc/tmpfiles.d/dietpi-samba_cache.conf
-			[[ -d /var/run/samba-cache ]] && rm -R /var/run/samba-cache
+			[[ -f '/etc/tmpfiles.d/dietpi-samba_cache.conf' ]] && rm /etc/tmpfiles.d/dietpi-samba_cache.conf
+			[[ -d '/run/samba-cache' ]] && rm -R /run/samba-cache
 
 		fi
 
@@ -15425,6 +15433,16 @@ Once DietPi has completed your software installations, and rebooted, please foll
 
 			fi
 
+			# phpMyAdmin is currently not compatible with ownCloud and phpBB: https://github.com/MichaIng/DietPi/issues/2808#issuecomment-493220292
+			if (( ${aSOFTWARE_INSTALL_STATE[90]} == 1 && ( ${aSOFTWARE_INSTALL_STATE[47]} > 0 || ${aSOFTWARE_INSTALL_STATE[54]} > 0 ) )); then
+
+				G_WHIP_MSG '[WARNING] Incompatible selection\n
+phpMyAdmin is currently not compatible with ownCloud and phpBB. This will be possible with ownCloud 10.3 and phpBB 3.3. Check out the changelogs of future DietPi updates to get informed.\n
+phpMyAdmin will be deselected!'
+				aSOFTWARE_INSTALL_STATE[90]=0
+
+			fi
+
 			# Boot Choices
 			if (( ${aSOFTWARE_INSTALL_STATE[23]} == 1 ||
 				${aSOFTWARE_INSTALL_STATE[24]} == 1 ||

dietpi/func/dietpi-globals

@@ -55,7 +55,7 @@
 	# DietPi Versions/Branch
 	G_DIETPI_VERSION_CORE=${G_DIETPI_VERSION_CORE:-6}
 	G_DIETPI_VERSION_SUB=${G_DIETPI_VERSION_SUB:-24}
-	G_DIETPI_VERSION_RC=${G_DIETPI_VERSION_RC:-0}
+	G_DIETPI_VERSION_RC=${G_DIETPI_VERSION_RC:-1}
 	G_GITBRANCH=${G_GITBRANCH:-master}
 	G_GITOWNER=${G_GITOWNER:-MichaIng}
 	[[ -f '/DietPi/dietpi/.version' && $(</DietPi/dietpi/.version) == '#!/bin/bash'* ]] && . /DietPi/dietpi/.version
@@ -502,7 +502,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i '[d]ietpi')"; then
 	#-----------------------------------------------------------------------------------
 	# DietPi scripts, moved from /etc/bash.bashrc
 	# - sudo command that ensures DietPi-Globals with G_* commands are loaded
-	G_SUDO(){ sudo -s . /DietPi/dietpi/func/dietpi-globals && "$@"; }
+	G_SUDO(){ local input=$@; sudo bash -c ". /DietPi/dietpi/func/dietpi-globals && $input"; }
 	# - sudo alias that allows running other aliases with "sudo"
 	alias sudo='sudo ' # https://github.com/MichaIng/DietPi/issues/424
 

dietpi/func/dietpi-set_software

@@ -130,6 +130,9 @@ $FP_SCRIPT	setpermissions		Applies required filesystem permissions to DietPi spe
 				echo "deb $INPUT_MODE_VALUE $G_DISTRO_NAME main contrib non-free rpi" > /etc/apt/sources.list
 				echo "deb https://archive.raspberrypi.org/debian/ $G_DISTRO_NAME main ui" > /etc/apt/sources.list.d/raspi.list
 
+				# - Buster branch exists but is not kept updated and misses some packages (e.g. Kodi 18). Lets add both...
+				(( $G_DISTRO > 4 )) && echo 'deb https://archive.raspberrypi.org/debian/ stretch main ui' >> /etc/apt/sources.list.d/raspi.list
+
 				# - Update dietpi.txt entry
 				G_CONFIG_INJECT 'CONFIG_APT_RASPBIAN_MIRROR=' "CONFIG_APT_RASPBIAN_MIRROR=$INPUT_MODE_VALUE" /DietPi/dietpi.txt
 

dietpi/patch_file

@@ -1980,6 +1980,16 @@ opcache.max_accelerated_files=10000\nopcache.memory_consumption=128\nopcache.sav
 			getent passwd emby &> /dev/null && usermod -a -G dietpi emby
 			getent passwd plex &> /dev/null && usermod -a -G dietpi plex
 			#-------------------------------------------------------------------------------
+			# Patch Lighttpd config file on ARMv6 (Buster version installed): https://github.com/MichaIng/DietPi/issues/2808
+			if [[ -f '/etc/lighttpd/lighttpd.conf' && ! -f '/usr/share/lighttpd/create-mime.assign.pl' && -f '/usr/share/lighttpd/create-mime.conf.pl' ]]; then
+
+				sed -i 's|/usr/share/lighttpd/create-mime\.assign\.pl|/usr/share/lighttpd/create-mime.conf.pl|g' /etc/lighttpd/lighttpd.conf
+
+			fi
+			#-------------------------------------------------------------------------------
+			# Restart DietPi-WiFi-Monitor to apply fixed script now: https://github.com/MichaIng/DietPi/issues/2802
+			systemctl -q is-active dietpi-wifi-monitor && systemctl restart dietpi-wifi-monitor
+			#-------------------------------------------------------------------------------
 
 		fi
 

dietpi/pre-patch_file

@@ -145,6 +145,19 @@ Package: openssl libssl*\nPin: origin packages.sury.org\nPin-Priority: -1' > /et
 
 		fi
 		#-------------------------------------------------------------------------------
+		# Pre-patch 9: https://github.com/MichaIng/DietPi/issues/2808
+		if (( $G_DIETPI_VERSION_SUB < 25 )) && [[ -f '/etc/apt/preferences.d/dietpi-php' ]]; then
+
+			echo -e '\e[90m[\e[0m INFO \e[90m]\e[0m Pre-patch 9 | Patching Buster APT repo preferences to prevent possible APT issues'
+			echo -e '# Allow to install PHP7.3 dependencies and meta packages from Buster
+# - Lighttpd must be pulled as well from Buster since the Stretch version does not support Buster libssl1.1 (1.1.1)
+Package: php libapache2-mod-php php-* libssl* libc6* libc-* libgssapi-krb5-2 libpcre2-8-0 libk5crypto3 libkrb5-3 libkrb5support0 locales libzip4 curl lighttpd
+Pin: release n=buster\nPin-Priority: 501\n
+# Pin down all other Buster packages to only allow upgrades of already installed ones via: "apt upgrade"
+Package: *\nPin: release n=buster\nPin-Priority: 100' > /etc/apt/preferences.d/dietpi-php || { EXIT_CODE=9; break; }
+
+		fi	
+		#-------------------------------------------------------------------------------
 		# Finished
 		echo -e '\e[90m[\e[0m  \e[32mOK\e[0m  \e[90m]\e[0m Successfully applied pre-patches\n'
 		break

dietpi/server_version-6

@@ -1,3 +1,3 @@
 6
 24
-0
+1

rootfs/var/lib/dietpi/services/dietpi-wifi-monitor.sh

@@ -12,7 +12,7 @@
 
 	URL_PING=''
 	ADAPTER="wlan$(sed -n 2p /DietPi/dietpi/.network)"
-	TICKRATE={TICKRATE:-10}
+	[[ $TICKRATE =~ ^[0-9]+$ ]] && (( $TICKRATE > 0 )) || TICKRATE=10
 
 	#-------------------------------------------------------------------------------------
 	# Main