From 9d6e982f6c4dbabb019fd5d9d4ccf9592111a9d7 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 26 Oct 2018 19:43:46 +0100
Subject: [PATCH] pynacl version was correct
---
src/freedombone-app-matrix | 6 +++---
src/freedombone-utils-search | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index 3bcb65df5..efb64cfb2 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -445,14 +445,14 @@ function upgrade_matrix {
export TMPDIR=/etc/matrix/tmp
pip install --upgrade --process-dependency-links .
- pip install --upgrade --force "pynacl==0.3.0"
+ pip install --upgrade --force "pynacl>=1.2.1"
sed -i 's/ssl.PROTOCOL_SSLv23/ssl.PROTOCOL_TLSv1/g' /usr/local/bin/register_new_matrix_user
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 "canonicaljson>=1.1.3"
pip install --upgrade --force "phonenumbers>=8.2.0"
pip install --upgrade --force "sortedcontainers>=2.0.4"
@@ -781,7 +781,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"
pip install --upgrade --force "canonicaljson>=1.1.3"
if [[ $(add_user_matrix "${MY_USERNAME}" "${MATRIX_PASSWORD}" | tail -n 1) != "0" ]]; then
diff --git a/src/freedombone-utils-search b/src/freedombone-utils-search
index ac5628e7e..c67701c18 100755
--- a/src/freedombone-utils-search
+++ b/src/freedombone-utils-search
@@ -721,7 +721,7 @@ if ! pip2 install pygments --upgrade; then
exit 357282
fi
-pip2 install --upgrade --force "pynacl==0.3.0"
+pip install --upgrade --force "pynacl>=1.2.1"
if [ -d "${SEARX_PATH}/searx" ]; then
rm -rf "${SEARX_PATH}/searx"
--
GitLab