diff --git a/README.md b/README.md index 14683b9..5f010a1 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://riot.im/app/#/room/#yunohost:matrix.org](https://riot.im/app/#/room/#yunohost:matrix.org) -**Shipped version:** 1.42.0 +**Shipped version:** 1.46.0 ## Configuration diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index b5910f8..4af47a1 100644 --- a/conf/armv7_bullseye.src +++ b/conf/armv7_bullseye.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.42.0/matrix-synapse_1.42.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=23069ded1a9a8032e8649732115c404d905cc3d74bed352c65b261484678fbc5 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.46.0/matrix-synapse_1.46.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=7489e88c57ce852955d4683e515107988ea3cc75c68b2f9ed986bcda90bec7bf # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_buster.src b/conf/armv7_buster.src index 3cf98da..a5e4076 100644 --- a/conf/armv7_buster.src +++ b/conf/armv7_buster.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.42.0/matrix-synapse_1.42.0-buster-bin1_armv7l.tar.gz -SOURCE_SUM=be6c97d736d929514702ffeee29e62cacda7d2ef01e96aef58ca700a349dabf7 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.46.0/matrix-synapse_1.46.0-buster-bin1_armv7l.tar.gz +SOURCE_SUM=a4979eaae2c10111209af430a38092da4f79b1141e71b5ee73d8a052c0a0b6a8 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index 25bf736..7833402 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Instant messaging server which uses Matrix", "fr": "Un serveur de messagerie instantané basé sur Matrix" }, - "version": "1.42.0~ynh1", + "version": "1.46.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 90c3b5d..2b53b3a 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -34,14 +34,6 @@ install_sources() { fi done else - # Install rustup is not already installed - # We need this to be able to install cryptgraphy - export PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin" - if [ -e $final_path/.rustup ]; then - sudo -u "$synapse_user" env PATH=$PATH rustup update - else - sudo -u "$synapse_user" bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=stable --profile=minimal' - fi # Install virtualenv if it don't exist test -e $final_path/bin/python3 || python3 -m venv $final_path @@ -50,10 +42,10 @@ install_sources() { # We set all necessary environement variable to create a python virtualenvironnement. u_arg='u' - set +$u_arg; + set +$u_arg; source $final_path/bin/activate - set -$u_arg; - pip3 install --upgrade setuptools wheel + set -$u_arg; + pip3 install --upgrade setuptools wheel pip chown $synapse_user:root -R $final_path sudo -u $synapse_user env PATH=$PATH pip3 install --upgrade 'cryptography>=3.4.7' pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml jinja2 @@ -61,9 +53,9 @@ install_sources() { pip3 install --upgrade 'Twisted>=21' 'treq>=21.1.0' matrix-synapse==$upstream_version matrix-synapse-ldap3 # This function was defined when we called "source $final_path/bin/activate". With this function we undo what "$final_path/bin/activate" does - set +$u_arg; + set +$u_arg; deactivate - set -$u_arg; + set -$u_arg; # Remove Rust to reduce backup size ynh_secure_remove --file=$final_path/.rustup