Release v9.3

.build/images/dietpi-installer

@@ -816,7 +816,7 @@ setenv rootuuid "true"' /boot/boot.cmd
 		G_DIETPI-NOTIFY 2 "Setting APT sources.list: $DISTRO_TARGET_NAME $DISTRO_TARGET"
 
 		# We need to forward $DISTRO_TARGET* to dietpi-set_software, as well as $G_HW_MODEL + $G_RASPBIAN for Debian vs Raspbian decision.
-		G_DISTRO=$DISTRO_TARGET G_DISTRO_NAME=$DISTRO_TARGET_NAME G_HW_ARCH=$G_HW_ARCH G_HW_MODEL=$G_HW_MODEL G_RASPBIAN=$G_RASPBIAN G_EXEC /boot/dietpi/func/dietpi-set_software apt-mirror default
+		G_DISTRO=$DISTRO_TARGET G_DISTRO_NAME=$DISTRO_TARGET_NAME G_HW_ARCH=$G_HW_ARCH G_HW_MODEL=$G_HW_MODEL G_RASPBIAN=$G_RASPBIAN HW_VARIANT=$HW_VARIANT G_EXEC /boot/dietpi/func/dietpi-set_software apt-mirror default
 
 		# (Re)create DietPi runtime and logs dir, used by G_AGx
 		G_EXEC mkdir -p /run/dietpi /var/tmp/dietpi/logs
@@ -964,7 +964,7 @@ setenv rootuuid "true"' /boot/boot.cmd
 		fi
 
 		# Assure that dir for additional sources is present
-		[[ -d '/etc/apt/sources.list.d' ]] || G_EXEC mkdir /etc/apt/sources.list.d
+		G_EXEC mkdir -p /etc/apt/sources.list.d
 
 		### Kernel/bootloader/initramfs packages: We need to install those directly to allow G_AGA() autoremove possible older packages later: https://github.com/MichaIng/DietPi/issues/1285#issuecomment-354602594
 
@@ -1037,7 +1037,7 @@ _EOF_
 			# Remove obsolete lists
 			G_EXEC rm -Rf /etc/apt/sources.list.d/*
 			# Add Armbian repository
-			G_EXEC eval "echo 'deb https://apt.armbian.com/ $DISTRO_TARGET_NAME main' > /etc/apt/sources.list.d/dietpi-armbian.list"
+			G_EXEC eval "echo 'deb https://apt.armbian.com ${DISTRO_TARGET_NAME/bullseye/bookworm} main' > /etc/apt/sources.list.d/dietpi-armbian.list"
 			# Update APT lists
 			G_AGUP
 			# Install kernel, device tree, U-Boot, firmware and initramfs packages
@@ -1151,14 +1151,13 @@ _EOF_
 			G_AGI initramfs-tools u-boot-tools armbian-firmware "${zstd[@]}"
 			[[ ${zstd[0]} ]] && G_CONFIG_INJECT 'COMPRESS=' 'COMPRESS=zstd' /etc/initramfs-tools/initramfs.conf
 			# Download and pre-install kernel hosted on dietpi.com where the Armbian APT repo provides a too old version
-			# - NanoPi R4S: Solve Ethernet adapter disappearing on soft reboot: https://github.com/MichaIng/DietPi/issues/6342
-			if [[ ( $G_HW_MODEL == 72 && $HW_VARIANT == 2 ) || $G_HW_MODEL =~ ^(47|76|83)$ ]]
+			if (( $G_HW_MODEL == 83 ))
 			then
 				G_EXEC_OUTPUT=1 G_EXEC curl -fo package1.deb "https://dietpi.com/downloads/binaries/linux-image-$branch-$kernel.deb"
 				G_EXEC_OUTPUT=1 G_EXEC curl -fo package2.deb "https://dietpi.com/downloads/binaries/linux-dtb-$branch-$kernel.deb"
 				G_EXEC_OUTPUT=1 G_EXEC curl -fo package3.deb 'https://dietpi.com/downloads/binaries/armbian-firmware.deb'
 				local uboot=()
-				[[ $G_HW_MODEL == 76 || ( $G_HW_MODEL == 83 && $HW_VARIANT == 1 ) ]] && { G_EXEC_OUTPUT=1 G_EXEC curl -fo package4.deb "https://dietpi.com/downloads/binaries/linux-u-boot-$model-$branch.deb"; uboot=('package4.deb'); }
+				#(( $G_HW_MODEL == 83 )) && (( $HW_VARIANT == 1 )) && { G_EXEC_OUTPUT=1 G_EXEC curl -fo package4.deb "https://dietpi.com/downloads/binaries/linux-u-boot-$model-$branch.deb"; uboot=('package4.deb'); }
 				G_EXEC_OUTPUT=1 G_EXEC dpkg -i package1.deb package2.deb package3.deb "${uboot[@]}"
 				G_EXEC rm package1.deb package2.deb package3.deb "${uboot[@]}"
 			fi
@@ -1195,7 +1194,7 @@ _EOF_
 			elif (( $G_HW_MODEL == 74 ))
 			then
 				G_AGI device-tree-compiler
-				[[ -d '/boot/overlay-user' ]] || G_EXEC mkdir /boot/overlay-user
+				G_EXEC mkdir -p /boot/overlay-user
 				cat << '_EOF_' > /boot/overlay-user/dietpi-usb-otg.dts
 /dts-v1/;
 /plugin/;
@@ -1286,6 +1285,14 @@ _EOF_
 			[[ -f '/etc/apt/trusted.gpg' ]] && G_EXEC rm /etc/apt/trusted.gpg
 			[[ -f '/etc/apt/trusted.gpg~' ]] && G_EXEC rm '/etc/apt/trusted.gpg~'
 
+			# Skip creating kernel symlinks and remove existing ones
+			if [[ -L '/vmlinuz' ]]
+			then
+				G_DIETPI-NOTIFY 2 'Preventing obsolete kernel and initramfs symlink generation'
+				G_EXEC eval 'echo '\''do_symlinks=0'\'' > /etc/kernel-img.conf'
+				G_EXEC rm -f /{initrd.img,vmlinuz}{,.old}
+			fi
+
 		# Quartz64
 		elif [[ $G_HW_MODEL == 49 && $(findmnt -Ufnro TARGET -T /boot) == '/' ]]
 		then
@@ -1441,7 +1448,7 @@ _EOF_
 
 			# Remove obsolete components from Armbian list and connect via HTTPS
 			G_EXEC rm -Rf /etc/apt/sources.list.d/{,.??,.[^.]}*
-			G_EXEC eval "echo 'deb https://apt.armbian.com/ $DISTRO_TARGET_NAME main' > /etc/apt/sources.list.d/dietpi-armbian.list"
+			G_EXEC eval "echo 'deb https://apt.armbian.com $DISTRO_TARGET_NAME main' > /etc/apt/sources.list.d/dietpi-armbian.list"
 
 			# Skip creating kernel symlinks and remove existing ones
 			if [[ -L '/vmlinuz' ]]
@@ -1477,10 +1484,6 @@ _EOF_
 			if dpkg-query -s 'armbian-firmware' &> /dev/null
 			then
 				aPACKAGES_REQUIRED_INSTALL+=('armbian-firmware')
-
-			elif dpkg-query -s 'orangepi-firmware' &> /dev/null
-			then
-				aPACKAGES_REQUIRED_INSTALL+=('orangepi-firmware')
 			else
 				aPACKAGES_REQUIRED_INSTALL+=('firmware-linux-free')	# Free misc
 				aPACKAGES_REQUIRED_INSTALL+=('firmware-misc-nonfree')	# Non-free misc incl. Ralink and MediaTek WiFi/BT

.build/software/Amiberry/build.bash

@@ -207,15 +207,12 @@ Package: amiberry
 Version: $v_ami
 Architecture: $(dpkg --print-architecture)
 Maintainer: MichaIng <[email protected]>
-Date: $(date -u '+%a, %d %b %Y %T %z')
-Standards-Version: 4.6.2.0
+Date: $(date -uR)
 Installed-Size: $(du -sk "$DIR" | mawk '{print $1}')
 Depends:$DEPS_APT_VERSIONED
 Section: games
 Priority: optional
 Homepage: https://amiberry.com/
-Vcs-Git: https://github.com/BlitterStudio/amiberry.git
-Vcs-Browser: https://github.com/BlitterStudio/amiberry
 Description: Optimized Amiga emulator for the Raspberry Pi and other ARM boards
  This package ships with optimized libSDL2 and capsimg builds.
 _EOF_

.build/software/gmediarender/build.bash

@@ -9,7 +9,8 @@ adeps=('libc6' 'gstreamer1.0-alsa' 'gstreamer1.0-libav' 'gstreamer1.0-plugins-go
 (( $G_DISTRO > 7 )) && adeps+=('libupnp17') || adeps+=('libupnp13')
 for i in "${adeps[@]}"
 do
-	dpkg-query -s "$i" &> /dev/null && continue
+	# Temporarily allow lib*t64 packages, while the 64-bit time_t transition is ongoing on Sid: https://bugs.debian.org/1065394
+	dpkg-query -s "$i" &> /dev/null || dpkg-query -s "${i}t64" &> /dev/null && continue
 	G_DIETPI-NOTIFY 1 "Expected dependency package was not installed: $i"
 	exit 1
 done
@@ -163,6 +164,8 @@ find "$DIR" ! \( -path "$DIR/DEBIAN" -prune \) -type f -exec md5sum {} + | sed "
 DEPS_APT_VERSIONED=
 for i in "${adeps[@]}"
 do
+	# Temporarily allow lib*t64 packages, while the 64-bit time_t transition is ongoing on Sid: https://bugs.debian.org/1065394
+	dpkg-query -s "$i" &> /dev/null || i+='t64'
 	DEPS_APT_VERSIONED+=" $i (>= $(dpkg-query -Wf '${VERSION}' "$i")),"
 done
 DEPS_APT_VERSIONED=${DEPS_APT_VERSIONED%,}
@@ -182,15 +185,12 @@ Package: $name
 Version: $version-$suffix
 Architecture: $(dpkg --print-architecture)
 Maintainer: MichaIng <[email protected]>
-Date: $(date -u '+%a, %d %b %Y %T %z')
-Standards-Version: 4.6.2.0
+Date: $(date -uR)
 Installed-Size: $(du -sk "$DIR" | mawk '{print $1}')
 Depends:$DEPS_APT_VERSIONED
 Section: sound
 Priority: optional
 Homepage: $repo
-Vcs-Git: $repo.git
-Vcs-Browser: $repo
 Description: Minimalist UPNP AV renderer
  gmrender-resurrect is a minimalist UPNP AV renderer that can be used to
  play music controlled by a UPNP AV control point.  This package contains

.build/software/raspberrypi-sys-mods/build.bash

@@ -54,14 +54,11 @@ Package: raspberrypi-sys-mods
 Version: 2:20230510-dietpi2
 Architecture: all
 Maintainer: MichaIng <[email protected]>
-Date: $(date -u '+%a, %d %b %Y %T %z')
-Standards-Version: 4.6.2.0
+Date: $(date -uR)
 Installed-Size: $(du -sk raspberrypi-sys-mods | mawk '{print $1}')
 Section: admin
 Priority: optional
 Homepage: https://github.com/RPi-Distro/raspberrypi-sys-mods
-Vcs-Git: https://github.com/RPi-Distro/raspberrypi-sys-mods.git
-Vcs-Browser: https://github.com/RPi-Distro/raspberrypi-sys-mods
 Description: System tweaks for the Raspberry Pi, DietPi edition
 _EOF_
 G_CONFIG_INJECT 'Installed-Size: ' "Installed-Size: $(du -sk raspberrypi-sys-mods | mawk '{print $1}')" raspberrypi-sys-mods/DEBIAN/control

.build/software/shairport-sync/build.bash

@@ -22,7 +22,8 @@ case $G_DISTRO in
 esac
 for i in "${adeps[@]}" "${adeps2[@]}"
 do
-	dpkg-query -s "$i" &> /dev/null && continue
+	# Temporarily allow lib*t64 packages, while the 64-bit time_t transition is ongoing on Sid: https://bugs.debian.org/1065394
+	dpkg-query -s "$i" &> /dev/null || dpkg-query -s "${i}t64" &> /dev/null && continue
 	G_DIETPI-NOTIFY 1 "Expected dependency package was not installed: $i"
 	exit 1
 done
@@ -348,6 +349,8 @@ find "$DIR" ! \( -path "$DIR/DEBIAN" -prune \) -type f -exec md5sum {} + | sed "
 DEPS_APT_VERSIONED=
 for i in "${adeps[@]}"
 do
+	# Temporarily allow lib*t64 packages, while the 64-bit time_t transition is ongoing on Sid: https://bugs.debian.org/1065394
+	dpkg-query -s "$i" &> /dev/null || i+='t64'
 	DEPS_APT_VERSIONED+=" $i (>= $(dpkg-query -Wf '${VERSION}' "$i")),"
 done
 DEPS_APT_VERSIONED=${DEPS_APT_VERSIONED%,}
@@ -528,6 +531,8 @@ find "$DIR" ! \( -path "$DIR/DEBIAN" -prune \) -type f -exec md5sum {} + | sed "
 # - Obtain DEB dependency versions
 for i in "${adeps2[@]}"
 do
+	# Temporarily allow lib*t64 packages, while the 64-bit time_t transition is ongoing on Sid: https://bugs.debian.org/1065394
+	dpkg-query -s "$i" &> /dev/null || i+='t64'
 	DEPS_APT_VERSIONED+=", $i (>= $(dpkg-query -Wf '${VERSION}' "$i"))"
 done
 # shellcheck disable=SC2001
@@ -539,16 +544,13 @@ Package: $name-airplay2
 Version: $version-$suffix
 Architecture: $(dpkg --print-architecture)
 Maintainer: MichaIng <[email protected]>
-Date: $(date -u '+%a, %d %b %Y %T %z')
-Standards-Version: 4.6.2.0
+Date: $(date -uR)
 Installed-Size: $(du -sk "$DIR" | mawk '{print $1}')
 Depends:$DEPS_APT_VERSIONED
 Conflicts: $name
 Section: sound
 Priority: optional
 Homepage: $repo
-Vcs-Git: $repo.git
-Vcs-Browser: $repo
 Description: AirPlay audio player
  Plays audio streamed from iTunes, iOS devices and third-party AirPlay
  sources such as ForkedDaapd and others. Audio played by a Shairport

.build/software/squeezelite/build.bash

@@ -164,16 +164,13 @@ Package: squeezelite
 Version: $version-$suffix
 Architecture: $(dpkg --print-architecture)
 Maintainer: MichaIng <[email protected]>
-Date: $(date -u '+%a, %d %b %Y %T %z')
-Standards-Version: 4.6.2.0
+Date: $(date -uR)
 Installed-Size: $(du -sk "$DIR" | mawk '{print $1}')
 Depends:$DEPS_APT_VERSIONED
 Conflicts: squeezelite-pa, squeezelite-pulseaudio
 Section: sound
 Priority: optional
 Homepage: https://github.com/ralph-irving/squeezelite
-Vcs-Git: https://github.com/ralph-irving/squeezelite.git
-Vcs-Browser: https://github.com/ralph-irving/squeezelite
 Description: lightweight headless Squeezebox emulator - ALSA version
  Squeezelite is a small headless Squeezebox emulator. It is aimed at
  supporting high quality audio including USB DAC based output at multiple

.build/software/vaultwarden/build.bash

@@ -227,15 +227,12 @@ Package: vaultwarden
 Version: $version
 Architecture: $(dpkg --print-architecture)
 Maintainer: MichaIng <[email protected]>
-Date: $(date -u '+%a, %d %b %Y %T %z')
-Standards-Version: 4.6.2.0
+Date: $(date -uR)
 Installed-Size: $(du -sk "$DIR" | mawk '{print $1}')
 Depends:$DEPS_APT_VERSIONED
 Section: misc
 Priority: optional
 Homepage: https://github.com/dani-garcia/vaultwarden
-Vcs-Git: https://github.com/dani-garcia/vaultwarden.git
-Vcs-Browser: https://github.com/dani-garcia/vaultwarden
 Description: Alternative implementation of the Bitwarden server API written in
  Rust and compatible with upstream Bitwarden clients, perfect for self-hosted
  deployment where running the official resource-heavy service might not be ideal.

.build/software/ympd/build.bash

@@ -15,7 +15,8 @@ case $G_DISTRO in
 esac
 for i in "${adeps[@]}"
 do
-	dpkg-query -s "$i" &> /dev/null && continue
+	# Temporarily allow lib*t64 packages, while the 64-bit time_t transition is ongoing on Sid: https://bugs.debian.org/1065394
+	dpkg-query -s "$i" &> /dev/null || dpkg-query -s "${i}t64" &> /dev/null && continue
 	G_DIETPI-NOTIFY 1 "Expected dependency package was not installed: $i"
 	exit 1
 done
@@ -137,6 +138,8 @@ find "$DIR" ! \( -path "$DIR/DEBIAN" -prune \) -type f -exec md5sum {} + | sed "
 DEPS_APT_VERSIONED=
 for i in "${adeps[@]}"
 do
+	# Temporarily allow lib*t64 packages, while the 64-bit time_t transition is ongoing on Sid: https://bugs.debian.org/1065394
+	dpkg-query -s "$i" &> /dev/null || i+='t64'
 	DEPS_APT_VERSIONED+=" $i (>= $(dpkg-query -Wf '${VERSION}' "$i")),"
 done
 DEPS_APT_VERSIONED=${DEPS_APT_VERSIONED%,}
@@ -157,15 +160,12 @@ Package: ympd
 Version: $version-$suffix
 Architecture: $(dpkg --print-architecture)
 Maintainer: MichaIng <[email protected]>
-Date: $(date -u '+%a, %d %b %Y %T %z')
-Standards-Version: 4.6.2.0
+Date: $(date -uR)
 Installed-Size: $(du -sk "$DIR" | mawk '{print $1}')
 Depends:$DEPS_APT_VERSIONED
 Section: sound
 Priority: optional
 Homepage: https://github.com/SuperBFG7/ympd
-Vcs-Git: https://github.com/SuperBFG7/ympd.git
-Vcs-Browser: https://github.com/SuperBFG7/ympd
 Description: Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS
 _EOF_
 G_CONFIG_INJECT 'Installed-Size: ' "Installed-Size: $(du -sk "$DIR" | mawk '{print $1}')" "$DIR/DEBIAN/control"

.meta/dietpi-survey_report

@@ -712,10 +712,11 @@ shopt -s extglob
 		aSOFTWARE_NAME9_0[i]=${aSOFTWARE_NAME8_25[i]}
 		aSOFTWARE_NAME9_1[i]=${aSOFTWARE_NAME9_0[i]}
 		aSOFTWARE_NAME9_2[i]=${aSOFTWARE_NAME9_1[i]}
+		aSOFTWARE_NAME9_3[i]=${aSOFTWARE_NAME9_2[i]}
 	done
 
 	# Pre-create software counter array so that we can see also software (available in newest version) with 0 installs
-	for i in "${aSOFTWARE_NAME9_2[@]}"
+	for i in "${aSOFTWARE_NAME9_3[@]}"
 	do
 		aSOFTWARE[$i]=0
 	done