From 7a6c52b487f2b38d393c833ad7e5f5f6f1813b47 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 23 May 2018 12:43:25 +0100
Subject: [PATCH 1/4] Set temp directory for matrix upgrades

---
 src/freedombone-app-matrix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index de34a5f1..034e07c9 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -418,6 +418,11 @@ function upgrade_matrix {
     function_check set_repo_commit
     set_repo_commit /etc/matrix "matrix commit" "$MATRIX_COMMIT" $MATRIX_REPO
     cd /etc/matrix || exit 62476724
+    if [ ! -d /etc/matrix/tmp ]; then
+        mkdir /etc/matrix/tmp
+    fi
+    export TMPDIR=/etc/matrix/tmp
+
     pip install --upgrade --process-dependency-links .
     pip install --upgrade --force "pynacl>=1.2.1"
 
@@ -434,6 +439,11 @@ function upgrade_matrix {
     fi
     systemctl start turn
     systemctl start matrix
+
+    export TMPDIR=/tmp
+    if [ -d /etc/matrix/tmp ]; then
+        rm -rf /etc/matrix/tmp/*
+    fi
 }
 
 function backup_local_matrix {

From 7c192ca04609dea4711bcd3ca2f46c68be5ba560 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 23 May 2018 12:50:58 +0100
Subject: [PATCH 2/4] pynacl version

---
 src/freedombone-app-matrix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index 034e07c9..fa2ba9d4 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -431,7 +431,7 @@ function upgrade_matrix {
     chown -R matrix:matrix /etc/matrix
     chown -R matrix:matrix $MATRIX_DATA_DIR
 
-    pip install --upgrade --force "pynacl==0.3.0"
+    pip install --upgrade --force "pynacl>=1.2.1"
     pip install --upgrade --force "phonenumbers>=8.2.0"
 
     if [ -f /etc/ssl/certs/${MATRIX_DOMAIN_NAME}.dhparam ]; then
@@ -804,7 +804,7 @@ function install_matrix {
     # wait for nginx to start otherwise user add fails later
     sleep 5
 
-    pip install --upgrade --force "pynacl==0.3.0"
+    pip install --upgrade --force "pynacl>=1.2.1"
 
     if [[ $(add_user_matrix "${MY_USERNAME}" "${MATRIX_PASSWORD}" | tail -n 1) != "0" ]]; then
         echo $'Failed to add matrix admin user';

From 159ee9002ce8ee8c68d561c6f21842c8493e2425 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 23 May 2018 12:53:45 +0100
Subject: [PATCH 3/4] Additional package needed for matrix

---
 src/freedombone-app-matrix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index fa2ba9d4..e79ccc73 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -432,6 +432,7 @@ function upgrade_matrix {
     chown -R matrix:matrix $MATRIX_DATA_DIR
 
     pip install --upgrade --force "pynacl>=1.2.1"
+    pip install --upgrade --force "canonicaljson>=1.1.3"
     pip install --upgrade --force "phonenumbers>=8.2.0"
 
     if [ -f /etc/ssl/certs/${MATRIX_DOMAIN_NAME}.dhparam ]; then
@@ -805,6 +806,7 @@ function install_matrix {
     sleep 5
 
     pip install --upgrade --force "pynacl>=1.2.1"
+    pip install --upgrade --force "canonicaljson>=1.1.3"
 
     if [[ $(add_user_matrix "${MY_USERNAME}" "${MATRIX_PASSWORD}" | tail -n 1) != "0" ]]; then
         echo $'Failed to add matrix admin user';

From 6ba9c72af497033274991fecdaac40a582c3d822 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 23 May 2018 12:57:10 +0100
Subject: [PATCH 4/4] Upgrade matrix to 0.30.0

---
 src/freedombone-app-matrix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index e79ccc73..de6bd581 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -48,7 +48,7 @@ MATRIX_PORT=8009
 MATRIX_FEDERATION_ONION_PORT=8111
 MATRIX_ONION_PORT=8109
 MATRIX_REPO="https://github.com/matrix-org/synapse"
-MATRIX_COMMIT='ab5e888927e6a38190a65e10af7acf67873124e3'
+MATRIX_COMMIT='9e8ab0a4f44a3ec9e4b049f5571c14e333e8f0fa'
 REPORT_STATS="no"
 MATRIX_SECRET=
 MATRIX_EXPIRE_MONTHS=1