Upgrade pip during python3 upgrade

src/freedombone-app-matrix

@@ -521,10 +521,15 @@ function upgrade_matrix {
     export TMPDIR=/etc/matrix/tmp
 
     # install python3 packages
-    if [[ "$MATRIX_PYTHON" != '/usr/binpython' ]]; then
+    if [[ "$MATRIX_PYTHON" != '/usr/bin/python' ]]; then
         $INSTALL_PACKAGES python3 python3-dev \
                           python3-pip python3-psycopg2 python3-venv \
                           python3-setuptools libpq-dev
+
+        # shellcheck disable=SC2230
+        MATRIX_PIP=$(which pip3)
+
+        $MATRIX_PIP install --upgrade pip==9.0.3
     fi
 
     # recreate the daemon if needed
@@ -538,7 +543,10 @@ function upgrade_matrix {
     chown -R matrix:matrix /etc/matrix
     chown -R matrix:matrix $MATRIX_DATA_DIR
 
+    # upgrade option causes breakage on ARM
+    $MATRIX_PIP install --force lxml
     $MATRIX_PIP install --upgrade --force "psycopg2"
+    $MATRIX_PIP install --upgrade --force "python-ldap"
     $MATRIX_PIP install --upgrade --force "pynacl>=1.2.1"
     $MATRIX_PIP install --upgrade --force "canonicaljson>=1.1.3"
     $MATRIX_PIP install --upgrade --force "phonenumbers>=8.2.0"