From 5839c91bd54b09d8fcea0c87c6ac59d4a3793fb5 Mon Sep 17 00:00:00 2001
From: Joulinar <47155374+Joulinar@users.noreply.github.com>
Date: Mon, 6 Feb 2023 20:48:14 +0100
Subject: [PATCH 1/2] v8.14

DietPi-Software | Matrix-Synapse - add Rust and GCC as requirement for 32bit systems
---
 dietpi/dietpi-software | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index e98ed92649..abcb7c9f97 100755
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -3820,11 +3820,18 @@ _EOF_
 
 		if To_Install 125 # Synapse
 		then
-			# APT deps for Synapse with PostgreSQL
-			case $G_HW_ARCH in
-				[12]) G_AGI libopenjp2-7 libtiff5 libxcb1;; # ARMv6/7: Runtime libs for Pillow from piwheels (needs verification)
-				*) G_AGI gcc libpq-dev;; # ARMv8/x86_64: psycopg2 needs to be compiled
-			esac
+			if [[ $G_HW_ARCH == [12] ]]
+			then
+				G_AGI gcc libopenjp2-7 libtiff5 libxcb1 libssl-dev # ARMv6/7: Runtime libs for Pillow from piwheels (needs verification)
+				# Rust
+				G_EXEC curl -sSfL 'https://sh.rustup.rs' -o rustup-init.sh
+				G_EXEC chmod +x rustup-init.sh
+				G_EXEC_OUTPUT=1 G_EXEC ./rustup-init.sh -y --profile minimal
+				G_EXEC_NOHALT=1 G_EXEC rm rustup-init.sh
+				G_EXEC_NOHALT=1 G_EXEC source "$HOME/.cargo/env"
+			else
+				G_AGI gcc libpq-dev
+			fi
 
 			# Install
 			G_EXEC_OUTPUT=1 G_EXEC pip3 install --no-cache-dir -U matrix-synapse psycopg2

From a31940f54ae29c8855d045599836c84239f8d9c2 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Thu, 9 Feb 2023 23:00:01 +0100
Subject: [PATCH 2/2] v8.14

- DietPi-Software | Synapse: Resolved an issue where the installation failed on 32-bit ARM systems. Many thanks to @Dark77 for reporting this issue: https://dietpi.com/forum/t/matrix-synapse-fails-to-install/15831
---
 CHANGELOG.txt          |  1 +
 dietpi/dietpi-software | 27 ++++++++++++++-------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index dc5887d8b0..8235cf4b31 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -28,6 +28,7 @@ Bug fixes:
 - DietPi-Software | myMPD: Resolved an issue where intended initial configs were not applied correctly and web UI changes did not survive a service restart.
 - DietPi-Software | X.Org X Server: Resolved an issue where the install failed on ARM VMs with KMS support, where the xserver-xorg-video-vmware package was tried to be installed. Many thanks to @mews-se for reporting this issue: https://github.com/MichaIng/DietPi/issues/6085
 - DietPi-Software | Amiberry: Resolved an issue where using keyboard LEDs as power/activity indicators did not work, and stopping the service could hang. You can apply the fix by reinstalling Amiberry via "dietpi-software reinstall 108". Many thanks to @DJP75 for reporting this issue: https://github.com/MichaIng/DietPi/issues/5536
+- DietPi-Software | Synapse: Resolved an issue where the installation failed on 32-bit ARM systems. Many thanks to @Dark77 for reporting this issue: https://dietpi.com/forum/t/matrix-synapse-fails-to-install/15831
 
 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/6139
 
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index abcb7c9f97..67729c2e45 100755
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -3820,18 +3820,19 @@ _EOF_
 
 		if To_Install 125 # Synapse
 		then
-			if [[ $G_HW_ARCH == [12] ]]
-			then
-				G_AGI gcc libopenjp2-7 libtiff5 libxcb1 libssl-dev # ARMv6/7: Runtime libs for Pillow from piwheels (needs verification)
-				# Rust
-				G_EXEC curl -sSfL 'https://sh.rustup.rs' -o rustup-init.sh
-				G_EXEC chmod +x rustup-init.sh
-				G_EXEC_OUTPUT=1 G_EXEC ./rustup-init.sh -y --profile minimal
-				G_EXEC_NOHALT=1 G_EXEC rm rustup-init.sh
-				G_EXEC_NOHALT=1 G_EXEC source "$HOME/.cargo/env"
-			else
-				G_AGI gcc libpq-dev
-			fi
+			# APT deps for Synapse with PostgreSQL
+			case $G_HW_ARCH in
+				[12])
+					G_AGI libopenjp2-7 libtiff5 libxcb1 libssl-dev # ARMv6/7: Runtime libs for Pillow from piwheels (needs verification and libssl-dev for cryptography
+					# Rust until all modules are available on piwheels: https://github.com/piwheels/piwheels/pull/328
+					G_EXEC curl -sSf 'https://sh.rustup.rs/' -o rustup-init.sh
+					G_EXEC chmod +x rustup-init.sh
+					G_EXEC_OUTPUT=1 G_EXEC ./rustup-init.sh -y --profile minimal
+					G_EXEC rm rustup-init.sh
+					export PATH="/root/.cargo/.bin:$PATH"
+				;;
+				*) G_AGI gcc libpq-dev;; # ARMv8/x86_64: psycopg2 needs to be compiled
+			esac
 
 			# Install
 			G_EXEC_OUTPUT=1 G_EXEC pip3 install --no-cache-dir -U matrix-synapse psycopg2
@@ -11074,7 +11075,7 @@ _EOF_
 				# libjpeg-dev for Pillow, libatlas-base-dev for numpy
 				aDEPS+=('libjpeg-dev' 'libatlas-base-dev')
 				# Rust for cryptography
-				G_EXEC curl -sSfL 'https://sh.rustup.rs' -o rustup-init.sh
+				G_EXEC curl -sSf 'https://sh.rustup.rs/' -o rustup-init.sh
 				G_EXEC chmod +x rustup-init.sh
 				G_EXEC_OUTPUT=1 G_EXEC sudo -u "$ha_user" ./rustup-init.sh -y --profile minimal
 				G_EXEC rm rustup-init.sh