From e53b469ff15c4a537b106a3074b97409b0345bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Magimel?= Date: Sat, 10 Sep 2022 15:39:56 +0200 Subject: [PATCH 01/28] fix(conf): start a new line for each domain to whitelist When generating the domain list for the option `sso/client_whitelist`, the line break is taken into account to create a real list of URLs. --- scripts/_common.sh | 4 ++-- scripts/change_url | 4 +++- scripts/config | 4 +++- scripts/install | 4 +++- scripts/upgrade | 4 +++- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index d3ca72f..5a41b3c 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -51,7 +51,7 @@ install_sources() { else pip3 install --upgrade setuptools wheel pip fi - + 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 @@ -71,6 +71,6 @@ install_sources() { get_domain_list() { yunohost --output-as plain domain list | grep -E "^#" -v | sort | uniq | while read domain; do - echo -n " - https://$domain\n" + echo -n " - https://$domain\n" done } diff --git a/scripts/change_url b/scripts/change_url index fa8668e..6012bb2 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -49,7 +49,8 @@ synapse_db_name="matrix_$app" synapse_db_user="matrix_$app" synapse_db_name="matrix_$app" upstream_version=$(ynh_app_upstream_version) -domain_whitelist_client=$(get_domain_list) +domain_whitelist_client_=$(get_domain_list) +domain_whitelist_client=${domain_whitelist_client_%"\n"} # Check if the new path stay /_matrix if not exit @@ -113,6 +114,7 @@ else sso_enabled=False fi +ynh_replace_string __DOMAIN_WHITELIST_CLIENT__ "$domain_whitelist_client" $YNH_APP_BASEDIR/conf/homeserver.yaml ynh_add_config --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml" ynh_add_config --template="log.yaml" --destination="/etc/matrix-$app/log.yaml" diff --git a/scripts/config b/scripts/config index ec3f646..46c3ca0 100644 --- a/scripts/config +++ b/scripts/config @@ -27,7 +27,8 @@ is_free_registration=$(ynh_app_setting_get --app $app --key is_free_registration jitsi_server=$(ynh_app_setting_get --app=$app --key=jitsi_server) e2e_enabled_by_default=$(ynh_app_setting_get --app=$app --key=e2e_enabled_by_default) synapse_user_app_pwd=$(ynh_app_setting_get --app=$app --key=synapse_user_app_pwd) -domain_whitelist_client=$(get_domain_list) +domain_whitelist_client_=$(get_domain_list) +domain_whitelist_client=${domain_whitelist_client_%"\n"} main_domain=$(yunohost domain list --output-as json | jq -r .main) #================================================= @@ -136,6 +137,7 @@ apply_config() { sso_enabled=False fi + ynh_replace_string __DOMAIN_WHITELIST_CLIENT__ "$domain_whitelist_client" $YNH_APP_BASEDIR/conf/homeserver.yaml ynh_add_config --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml" ynh_add_config --template="log.yaml" --destination="/etc/matrix-$app/log.yaml" diff --git a/scripts/install b/scripts/install index 29311e2..9f284fd 100644 --- a/scripts/install +++ b/scripts/install @@ -36,7 +36,8 @@ report_stats="false" allow_public_rooms="false" e2e_enabled_by_default="true" default_domain_value="Same than the domain" -domain_whitelist_client=$(get_domain_list) +domain_whitelist_client_=$(get_domain_list) +domain_whitelist_client=${domain_whitelist_client_%"\n"} #================================================= # RETRIEVE ARGUMENTS FROM THE MANIFEST @@ -277,6 +278,7 @@ else sso_enabled=False fi +ynh_replace_string __DOMAIN_WHITELIST_CLIENT__ "$domain_whitelist_client" $YNH_APP_BASEDIR/conf/homeserver.yaml ynh_add_config --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml" ynh_add_config --template="log.yaml" --destination="/etc/matrix-$app/log.yaml" diff --git a/scripts/upgrade b/scripts/upgrade index 536ca48..a51faf8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -41,7 +41,8 @@ registration_shared_secret=$(ynh_app_setting_get --app=$app --key=registration_s form_secret=$(ynh_app_setting_get --app=$app --key=form_secret) macaroon_secret_key=$(ynh_app_setting_get --app=$app --key=macaroon_secret_key) synapse_user_app_pwd=$(ynh_app_setting_get --app=$app --key=synapse_user_app_pwd) -domain_whitelist_client=$(get_domain_list) +domain_whitelist_client_=$(get_domain_list) +domain_whitelist_client=${domain_whitelist_client_%"\n"} main_domain=$(yunohost domain list --output-as json | jq -r .main) #================================================= @@ -249,6 +250,7 @@ else sso_enabled=False fi +ynh_replace_string __DOMAIN_WHITELIST_CLIENT__ "$domain_whitelist_client" "$YNH_APP_BASEDIR/conf/homeserver.yaml" ynh_add_config --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml" ynh_add_config --template="log.yaml" --destination="/etc/matrix-$app/log.yaml" From f58c330fe94aa8eeb9a169c17f279431bf1d673c Mon Sep 17 00:00:00 2001 From: gredin67 Date: Tue, 10 Jan 2023 16:49:36 +0100 Subject: [PATCH 02/28] e2e default --- scripts/config | 1 - scripts/install | 1 - scripts/upgrade | 1 - 3 files changed, 3 deletions(-) diff --git a/scripts/config b/scripts/config index 46c3ca0..7fcf350 100644 --- a/scripts/config +++ b/scripts/config @@ -137,7 +137,6 @@ apply_config() { sso_enabled=False fi - ynh_replace_string __DOMAIN_WHITELIST_CLIENT__ "$domain_whitelist_client" $YNH_APP_BASEDIR/conf/homeserver.yaml ynh_add_config --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml" ynh_add_config --template="log.yaml" --destination="/etc/matrix-$app/log.yaml" diff --git a/scripts/install b/scripts/install index 9f284fd..8a1de20 100644 --- a/scripts/install +++ b/scripts/install @@ -278,7 +278,6 @@ else sso_enabled=False fi -ynh_replace_string __DOMAIN_WHITELIST_CLIENT__ "$domain_whitelist_client" $YNH_APP_BASEDIR/conf/homeserver.yaml ynh_add_config --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml" ynh_add_config --template="log.yaml" --destination="/etc/matrix-$app/log.yaml" diff --git a/scripts/upgrade b/scripts/upgrade index a51faf8..fd169c1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -250,7 +250,6 @@ else sso_enabled=False fi -ynh_replace_string __DOMAIN_WHITELIST_CLIENT__ "$domain_whitelist_client" "$YNH_APP_BASEDIR/conf/homeserver.yaml" ynh_add_config --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml" ynh_add_config --template="log.yaml" --destination="/etc/matrix-$app/log.yaml" From e853d00dc23e909edd65ec90b8d36e35bf6b20ab Mon Sep 17 00:00:00 2001 From: gredin67 Date: Tue, 10 Jan 2023 17:57:44 +0100 Subject: [PATCH 03/28] fix coturn.conf external-ip --- scripts/install | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 8a1de20..8aaf236 100644 --- a/scripts/install +++ b/scripts/install @@ -297,12 +297,12 @@ public_ip6="$(curl -s ipv6.yunohost.org)" || true turn_external_ip="" if [ -n "$public_ip4" ] && ynh_validate_ip4 --ip_address="$public_ip4" then - turn_external_ip+="\nexternal-ip=$public_ip4" + turn_external_ip+="external-ip="$public_ip4%"\n" fi if [ -n "$public_ip6" ] && ynh_validate_ip6 --ip_address="$public_ip6" then - turn_external_ip+="\nexternal-ip=$public_ip6" + turn_external_ip+="external-ip="$public_ip6%"\n" fi ynh_add_config --template="turnserver.conf" --destination="/etc/matrix-$app/coturn.conf" diff --git a/scripts/restore b/scripts/restore index 347c02e..c12625e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -176,12 +176,12 @@ public_ip6="$(curl -s ipv6.yunohost.org)" || true turn_external_ip="" if [ -n "$public_ip4" ] && ynh_validate_ip4 --ip_address="$public_ip4" then - turn_external_ip+="\nexternal-ip=$public_ip4" + turn_external_ip+="external-ip="$public_ip4%"\n" fi if [ -n "$public_ip6" ] && ynh_validate_ip6 --ip_address="$public_ip6" then - turn_external_ip+="\nexternal-ip=$public_ip6" + turn_external_ip+="external-ip="$public_ip6%"\n" fi ynh_add_config --template="turnserver.conf" --destination="/etc/matrix-$app/coturn.conf" diff --git a/scripts/upgrade b/scripts/upgrade index fd169c1..714aeba 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -352,12 +352,12 @@ public_ip6="$(curl -s ipv6.yunohost.org)" || true turn_external_ip="" if [ -n "$public_ip4" ] && ynh_validate_ip4 --ip_address="$public_ip4" then - turn_external_ip+="\nexternal-ip=$public_ip4" + turn_external_ip+="external-ip="$public_ip4%"\n" fi if [ -n "$public_ip6" ] && ynh_validate_ip6 --ip_address="$public_ip6" then - turn_external_ip+="\nexternal-ip=$public_ip6" + turn_external_ip+="external-ip="$public_ip6%"\n" fi ynh_add_config --template="turnserver.conf" --destination="/etc/matrix-$app/coturn.conf" From 4da1cb0f1169776ca280260d45079c1823404b47 Mon Sep 17 00:00:00 2001 From: Gredin67 Date: Thu, 12 Jan 2023 18:47:17 +0100 Subject: [PATCH 04/28] remove unnecessary replace_string --- scripts/change_url | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/change_url b/scripts/change_url index 6012bb2..4735e7d 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -114,7 +114,6 @@ else sso_enabled=False fi -ynh_replace_string __DOMAIN_WHITELIST_CLIENT__ "$domain_whitelist_client" $YNH_APP_BASEDIR/conf/homeserver.yaml ynh_add_config --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml" ynh_add_config --template="log.yaml" --destination="/etc/matrix-$app/log.yaml" From 8b70acb2d27722905c0dd85df8c78e1269a05cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sun, 22 Jan 2023 14:06:57 +0100 Subject: [PATCH 05/28] Remove buster support and add bookworm support --- conf/{armv7_buster.src => armv7_bookworm.src} | 2 +- manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename conf/{armv7_buster.src => armv7_bookworm.src} (79%) diff --git a/conf/armv7_buster.src b/conf/armv7_bookworm.src similarity index 79% rename from conf/armv7_buster.src rename to conf/armv7_bookworm.src index 61c7134..d9d32e8 100644 --- a/conf/armv7_buster.src +++ b/conf/armv7_bookworm.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.74.0/matrix-synapse_1.74.0-buster-bin1_armv7l.tar.gz +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.74.0/matrix-synapse_1.74.0-bookworm-bin1_armv7l.tar.gz SOURCE_SUM=4c7412eab47e9ac4ccc6cde6cbe33dbee2badbbded475cef5bb2b2e3ee926d62 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 diff --git a/manifest.json b/manifest.json index 0813a51..32dfdea 100644 --- a/manifest.json +++ b/manifest.json @@ -19,7 +19,7 @@ "code": "https://github.com/matrix-org/synapse" }, "requirements": { - "yunohost": ">= 4.1.2" + "yunohost": ">= 11.0.11" }, "multi_instance": true, "services": [ From c76e28b81160756e3318bb942ea62cbba7db1882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sun, 22 Jan 2023 15:23:59 +0100 Subject: [PATCH 06/28] Upgrade synapse to 1.75.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- manifest.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index d9d32e8..e2a3b41 100644 --- a/conf/armv7_bookworm.src +++ b/conf/armv7_bookworm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.74.0/matrix-synapse_1.74.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=4c7412eab47e9ac4ccc6cde6cbe33dbee2badbbded475cef5bb2b2e3ee926d62 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.75.0/matrix-synapse_1.75.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=529c16227cf20d361d354363ac547483d6e062f0eb35c1f9e0d6d001a392d54a # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index 5955c8c..2807e19 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.74.0/matrix-synapse_1.74.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=27f0cfad22014cf1eb75492e04996156d7284d1f419d23e0e4970c5ff479ba7d +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.75.0/matrix-synapse_1.75.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=bff4e77b1534e074d474814c9e33da2381eb3751c53b314402057483e910257a # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index 32dfdea..00112b3 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Instant messaging server which uses Matrix", "fr": "Serveur de messagerie instantané basé sur Matrix" }, - "version": "1.74.0~ynh1", + "version": "1.75.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 485f8b340924e0619ba8a5dd2cb33676b4aed231 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 22 Jan 2023 15:00:36 +0000 Subject: [PATCH 07/28] Auto-update README --- README.md | 4 ++-- README_fr.md | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index ce5d1b8..32a4041 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Synapse for YunoHost -[![Integration level](https://dash.yunohost.org/integration/synapse.svg)](https://dash.yunohost.org/appci/app/synapse) ![Working status](https://ci-apps.yunohost.org/ci/badges/synapse.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/synapse.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/synapse.svg)](https://dash.yunohost.org/appci/app/synapse) ![Working status](https://ci-apps.yunohost.org/ci/badges/synapse.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/synapse.maintain.svg) [![Install Synapse with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=synapse) *[Lire ce readme en français.](./README_fr.md)* @@ -20,7 +20,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Shipped version:** 1.74.0~ynh1 +**Shipped version:** 1.75.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 461d8fc..430c51e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,22 +5,22 @@ It shall NOT be edited by hand. # Synapse pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/synapse.svg)](https://dash.yunohost.org/appci/app/synapse) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/synapse.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/synapse.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/synapse.svg)](https://dash.yunohost.org/appci/app/synapse) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/synapse.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/synapse.maintain.svg) [![Installer Synapse avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=synapse) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Synapse rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer Synapse rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Version incluse :** 1.74.0~ynh1 +**Version incluse :** 1.75.0~ynh1 ## Avertissements / informations importantes ## Configuration @@ -205,8 +205,8 @@ Before installing a second instance of the app it's really recommended to update ## Documentations et ressources -* Site officiel de l'app : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -222,4 +222,4 @@ ou sudo yunohost app upgrade synapse -u https://github.com/YunoHost-Apps/synapse_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 3a730c33bac683d2784210b2d2f97929fca070d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 1 Feb 2023 01:04:15 +0100 Subject: [PATCH 08/28] Upgrade synapse to 1.76.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- manifest.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index e2a3b41..52cddc1 100644 --- a/conf/armv7_bookworm.src +++ b/conf/armv7_bookworm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.75.0/matrix-synapse_1.75.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=529c16227cf20d361d354363ac547483d6e062f0eb35c1f9e0d6d001a392d54a +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.76.0/matrix-synapse_1.76.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=11b45507a34f16cae39eed899798f7078d54f32190ebc2c9b1450a1410eb639d # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index 2807e19..6da9c49 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.75.0/matrix-synapse_1.75.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=bff4e77b1534e074d474814c9e33da2381eb3751c53b314402057483e910257a +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.76.0/matrix-synapse_1.76.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=255fe98712d7482a68305e641e507048fb6c123e67912b788e6eeeb511b598cc # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index 00112b3..cad9c83 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Instant messaging server which uses Matrix", "fr": "Serveur de messagerie instantané basé sur Matrix" }, - "version": "1.75.0~ynh1", + "version": "1.76.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From a6dd5e1cbd1ca3b287494a6d61539883b166d95c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 1 Feb 2023 07:39:49 +0000 Subject: [PATCH 09/28] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 32a4041..e55c4b1 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Shipped version:** 1.75.0~ynh1 +**Shipped version:** 1.76.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 430c51e..0e61ecf 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Version incluse :** 1.75.0~ynh1 +**Version incluse :** 1.76.0~ynh1 ## Avertissements / informations importantes ## Configuration From b1eab1b4085c0bc870a3f078ee2cd15f5c188624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 9 Feb 2023 19:44:59 +0100 Subject: [PATCH 10/28] Cleanup install and use requirement from package build --- scripts/_common.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 990a3fc..ec166b7 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -47,16 +47,15 @@ install_sources() { source $final_path/bin/activate set -$u_arg; if [ $(lsb_release --codename --short) == "bullseye" ]; then + # Fix issue with setuptools https://github.com/pypa/setuptools/issues/3118 pip3 install --upgrade setuptools==60.8.2 wheel pip else pip3 install --upgrade setuptools wheel pip fi chown $synapse_user:root -R $final_path - sudo -u $synapse_user env PATH=$PATH pip3 install --upgrade 'cryptography>=3.4.7' 'pyOpenSSL>=22.1.0' 'attrs>=22.1.0' pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml jinja2 - # Fix issue https://github.com/YunoHost-Apps/synapse_ynh/issues/248 - pip3 install --upgrade 'Twisted>=21' 'treq>=21.1.0' matrix-synapse==$upstream_version matrix-synapse-ldap3 + sudo -u $synapse_user env PATH=$PATH pip3 install --upgrade -r ../conf/requirement_$(lsb_release --codename --short).txt # 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; From 75919e6c95456401cbd52ee7b2d635442f5fccab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 15 Feb 2023 01:51:48 +0100 Subject: [PATCH 11/28] Upgrade synapse to 1.77.0 --- conf/armv7_bookworm.src | 4 +-- conf/armv7_bullseye.src | 4 +-- conf/requirement_bookworm.txt | 55 ++++++++++++++++++++++++++++++++++ conf/requirement_bullseye.txt | 56 +++++++++++++++++++++++++++++++++++ manifest.json | 2 +- 5 files changed, 116 insertions(+), 5 deletions(-) create mode 100644 conf/requirement_bookworm.txt create mode 100644 conf/requirement_bullseye.txt diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 52cddc1..dac0f8d 100644 --- a/conf/armv7_bookworm.src +++ b/conf/armv7_bookworm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.76.0/matrix-synapse_1.76.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=11b45507a34f16cae39eed899798f7078d54f32190ebc2c9b1450a1410eb639d +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.77.0/matrix-synapse_1.77.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=60b117008ebd0339c397983f11d8b3538eb5cd086839fcb3c46b70dc4348afda # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index 6da9c49..5ecc6f7 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.76.0/matrix-synapse_1.76.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=255fe98712d7482a68305e641e507048fb6c123e67912b788e6eeeb511b598cc +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.77.0/matrix-synapse_1.77.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=ddefcfa9ba4b80ac4b49cbd4ab4172c27136ce0ab32d4ac3f1d517ecc6b43391 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt new file mode 100644 index 0000000..251f97d --- /dev/null +++ b/conf/requirement_bookworm.txt @@ -0,0 +1,55 @@ +attrs==22.2.0 +Automat==22.10.0 +bcrypt==4.0.1 +bleach==6.0.0 +canonicaljson==1.6.4 +certifi==2022.12.7 +cffi==1.15.1 +charset-normalizer==3.0.1 +constantly==15.1.0 +cryptography==39.0.1 +frozendict==2.3.4 +hyperlink==21.0.0 +idna==3.4 +ijson==3.2.0.post0 +incremental==22.10.0 +Jinja2==3.1.2 +jsonschema==4.17.3 +ldap3==2.9.1 +lxml==4.9.2 +MarkupSafe==2.1.2 +matrix-common==1.3.0 +matrix-synapse==1.77.0 +matrix-synapse-ldap3==0.2.2 +msgpack==1.0.4 +ndg-httpsclient==0.5.1 +netaddr==0.8.0 +packaging==23.0 +phonenumbers==8.13.6 +Pillow==9.4.0 +prometheus-client==0.16.0 +psycopg2==2.9.5 +pyasn1==0.4.8 +pyasn1-modules==0.2.8 +pycparser==2.21 +pydantic==1.10.4 +pymacaroons==0.13.0 +PyNaCl==1.5.0 +pyOpenSSL==23.0.0 +pyrsistent==0.19.3 +PyYAML==6.0 +requests==2.28.2 +semantic-version==2.10.0 +service-identity==21.1.0 +setuptools-rust==1.5.2 +signedjson==1.1.4 +simplejson==3.18.3 +six==1.16.0 +sortedcontainers==2.4.0 +treq==22.2.0 +Twisted==22.10.0 +typing_extensions==4.4.0 +unpaddedbase64==2.1.0 +urllib3==1.26.14 +webencodings==0.5.1 +zope.interface==5.5.2 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt new file mode 100644 index 0000000..75b5c31 --- /dev/null +++ b/conf/requirement_bullseye.txt @@ -0,0 +1,56 @@ +attrs==22.2.0 +Automat==22.10.0 +bcrypt==4.0.1 +bleach==6.0.0 +canonicaljson==1.6.4 +certifi==2022.12.7 +cffi==1.15.1 +charset-normalizer==3.0.1 +constantly==15.1.0 +cryptography==39.0.1 +frozendict==2.3.4 +hyperlink==21.0.0 +idna==3.4 +ijson==3.2.0.post0 +incremental==22.10.0 +Jinja2==3.1.2 +jsonschema==4.17.3 +ldap3==2.9.1 +lxml==4.9.2 +MarkupSafe==2.1.2 +matrix-common==1.3.0 +matrix-synapse==1.77.0 +matrix-synapse-ldap3==0.2.2 +msgpack==1.0.4 +ndg-httpsclient==0.5.1 +netaddr==0.8.0 +packaging==23.0 +phonenumbers==8.13.6 +Pillow==9.4.0 +pkg_resources==0.0.0 +prometheus-client==0.16.0 +psycopg2==2.9.5 +pyasn1==0.4.8 +pyasn1-modules==0.2.8 +pycparser==2.21 +pydantic==1.10.4 +pymacaroons==0.13.0 +PyNaCl==1.5.0 +pyOpenSSL==23.0.0 +pyrsistent==0.19.3 +PyYAML==6.0 +requests==2.28.2 +semantic-version==2.10.0 +service-identity==21.1.0 +setuptools-rust==1.5.2 +signedjson==1.1.4 +simplejson==3.18.3 +six==1.16.0 +sortedcontainers==2.4.0 +treq==22.2.0 +Twisted==22.10.0 +typing_extensions==4.4.0 +unpaddedbase64==2.1.0 +urllib3==1.26.14 +webencodings==0.5.1 +zope.interface==5.5.2 diff --git a/manifest.json b/manifest.json index cad9c83..07c6e6f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Instant messaging server which uses Matrix", "fr": "Serveur de messagerie instantané basé sur Matrix" }, - "version": "1.76.0~ynh1", + "version": "1.77.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From ea9adf080a021b3b5316c09ea933a9589cc783de Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 15 Feb 2023 06:56:32 +0000 Subject: [PATCH 12/28] Auto-update README --- README.md | 3 ++- README_fr.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e55c4b1..379b8dc 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Synapse for YunoHost [![Integration level](https://dash.yunohost.org/integration/synapse.svg)](https://dash.yunohost.org/appci/app/synapse) ![Working status](https://ci-apps.yunohost.org/ci/badges/synapse.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/synapse.maintain.svg) + [![Install Synapse with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=synapse) *[Lire ce readme en français.](./README_fr.md)* @@ -20,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Shipped version:** 1.76.0~ynh1 +**Shipped version:** 1.77.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 0e61ecf..70e87c3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Synapse pour YunoHost [![Niveau d’intégration](https://dash.yunohost.org/integration/synapse.svg)](https://dash.yunohost.org/appci/app/synapse) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/synapse.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/synapse.maintain.svg) + [![Installer Synapse avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=synapse) *[Read this readme in english.](./README.md)* @@ -20,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Version incluse :** 1.76.0~ynh1 +**Version incluse :** 1.77.0~ynh1 ## Avertissements / informations importantes ## Configuration From 634aea68e9e8d2a7e20aaa30db8df38ed27db6a8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 15 Feb 2023 19:12:59 +0000 Subject: [PATCH 13/28] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index e55c4b1..d160670 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Synapse for YunoHost [![Integration level](https://dash.yunohost.org/integration/synapse.svg)](https://dash.yunohost.org/appci/app/synapse) ![Working status](https://ci-apps.yunohost.org/ci/badges/synapse.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/synapse.maintain.svg) + [![Install Synapse with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=synapse) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 0e61ecf..d417bf1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Synapse pour YunoHost [![Niveau d’intégration](https://dash.yunohost.org/integration/synapse.svg)](https://dash.yunohost.org/appci/app/synapse) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/synapse.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/synapse.maintain.svg) + [![Installer Synapse avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=synapse) *[Read this readme in english.](./README.md)* From 24b07765e14cf737d44647e89e5ba27fc457bf5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 15 Feb 2023 20:16:42 +0100 Subject: [PATCH 14/28] Add missing chown --- scripts/_common.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index ec166b7..7fdc28f 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -54,6 +54,7 @@ install_sources() { fi chown $synapse_user:root -R $final_path + chown $synapse_user:root ../conf/requirement_$(lsb_release --codename --short).txt pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml jinja2 sudo -u $synapse_user env PATH=$PATH pip3 install --upgrade -r ../conf/requirement_$(lsb_release --codename --short).txt From 10d66805ef9af2be58fade72b7c69eb8100b7549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 15 Feb 2023 22:29:06 +0100 Subject: [PATCH 15/28] fix path issue --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 7fdc28f..240f81e 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -54,7 +54,7 @@ install_sources() { fi chown $synapse_user:root -R $final_path - chown $synapse_user:root ../conf/requirement_$(lsb_release --codename --short).txt + chown $synapse_user:root $YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml jinja2 sudo -u $synapse_user env PATH=$PATH pip3 install --upgrade -r ../conf/requirement_$(lsb_release --codename --short).txt From b6fdf2e9980d9b8f257ca3cc1f9186184fc1b97b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 16 Feb 2023 00:09:54 +0100 Subject: [PATCH 16/28] Fix typo --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 240f81e..0eb1695 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -56,7 +56,7 @@ install_sources() { chown $synapse_user:root -R $final_path chown $synapse_user:root $YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml jinja2 - sudo -u $synapse_user env PATH=$PATH pip3 install --upgrade -r ../conf/requirement_$(lsb_release --codename --short).txt + sudo -u $synapse_user env PATH=$PATH pip3 install --upgrade -r $YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt # 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; From 136d04abea3f2c5f2dbbf9f5417558773aad6a34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 16 Feb 2023 08:07:35 +0100 Subject: [PATCH 17/28] fix setup source --- scripts/_common.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 0eb1695..788440e 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -53,10 +53,14 @@ install_sources() { pip3 install --upgrade setuptools wheel pip fi + temp_requirement=$(mktemp) + cp $YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt $temp_requirement + chown $synapse_user:root $temp_requirement + chown $synapse_user:root -R $final_path - chown $synapse_user:root $YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml jinja2 - sudo -u $synapse_user env PATH=$PATH pip3 install --upgrade -r $YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt + sudo -u $synapse_user env PATH=$PATH pip3 install --upgrade -r $temp_requirement + ynh_secure_remove $temp_requirement # 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; From 4e7aadd0353f4245e2629c100caa93d4c3ae9cfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 1 Mar 2023 00:59:28 +0100 Subject: [PATCH 18/28] Upgrade synapse to 1.78.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 8 ++++---- conf/requirement_bullseye.txt | 8 ++++---- manifest.json | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index dac0f8d..ddc2c0a 100644 --- a/conf/armv7_bookworm.src +++ b/conf/armv7_bookworm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.77.0/matrix-synapse_1.77.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=60b117008ebd0339c397983f11d8b3538eb5cd086839fcb3c46b70dc4348afda +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.78.0/matrix-synapse_1.78.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=9ae1750d1158f0c84bc9030d10dd1b2aeb222c42db75ca46f4504d5b1be505cd # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index 5ecc6f7..93f65bf 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.77.0/matrix-synapse_1.77.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=ddefcfa9ba4b80ac4b49cbd4ab4172c27136ce0ab32d4ac3f1d517ecc6b43391 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.78.0/matrix-synapse_1.78.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=77af36a3101e2ac31f439834b1ad18ba9859cfd56494cb1a50d074abea1c64e6 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt index 251f97d..656c34b 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -2,7 +2,7 @@ attrs==22.2.0 Automat==22.10.0 bcrypt==4.0.1 bleach==6.0.0 -canonicaljson==1.6.4 +canonicaljson==1.6.5 certifi==2022.12.7 cffi==1.15.1 charset-normalizer==3.0.1 @@ -19,7 +19,7 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.77.0 +matrix-synapse==1.78.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.4 ndg-httpsclient==0.5.1 @@ -32,7 +32,7 @@ psycopg2==2.9.5 pyasn1==0.4.8 pyasn1-modules==0.2.8 pycparser==2.21 -pydantic==1.10.4 +pydantic==1.10.5 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.0.0 @@ -48,7 +48,7 @@ six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 Twisted==22.10.0 -typing_extensions==4.4.0 +typing_extensions==4.5.0 unpaddedbase64==2.1.0 urllib3==1.26.14 webencodings==0.5.1 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 75b5c31..99621a4 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -2,7 +2,7 @@ attrs==22.2.0 Automat==22.10.0 bcrypt==4.0.1 bleach==6.0.0 -canonicaljson==1.6.4 +canonicaljson==1.6.5 certifi==2022.12.7 cffi==1.15.1 charset-normalizer==3.0.1 @@ -19,7 +19,7 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.77.0 +matrix-synapse==1.78.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.4 ndg-httpsclient==0.5.1 @@ -33,7 +33,7 @@ psycopg2==2.9.5 pyasn1==0.4.8 pyasn1-modules==0.2.8 pycparser==2.21 -pydantic==1.10.4 +pydantic==1.10.5 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.0.0 @@ -49,7 +49,7 @@ six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 Twisted==22.10.0 -typing_extensions==4.4.0 +typing_extensions==4.5.0 unpaddedbase64==2.1.0 urllib3==1.26.14 webencodings==0.5.1 diff --git a/manifest.json b/manifest.json index 07c6e6f..a004f17 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Instant messaging server which uses Matrix", "fr": "Serveur de messagerie instantané basé sur Matrix" }, - "version": "1.77.0~ynh1", + "version": "1.78.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 48abc6a3c0f3b7cf3e14ab6bb22541f3f41b3c92 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 1 Mar 2023 07:13:23 +0000 Subject: [PATCH 19/28] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 379b8dc..8bf09dd 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Shipped version:** 1.77.0~ynh1 +**Shipped version:** 1.78.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 70e87c3..06c85ec 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Version incluse :** 1.77.0~ynh1 +**Version incluse :** 1.78.0~ynh1 ## Avertissements / informations importantes ## Configuration From eb3d09b6622617d4bf13dd61978da62dbd14d574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 6 Mar 2023 08:34:48 +0100 Subject: [PATCH 20/28] Cleanup install/upgrade source --- scripts/_common.sh | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 788440e..83fd3d9 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -53,23 +53,13 @@ install_sources() { pip3 install --upgrade setuptools wheel pip fi - temp_requirement=$(mktemp) - cp $YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt $temp_requirement - chown $synapse_user:root $temp_requirement - - chown $synapse_user:root -R $final_path pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml jinja2 - sudo -u $synapse_user env PATH=$PATH pip3 install --upgrade -r $temp_requirement - ynh_secure_remove $temp_requirement + pip3 install --upgrade -r $YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt # 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; deactivate set -$u_arg; - - # Remove Rust to reduce backup size - ynh_secure_remove --file=$final_path/.rustup - ynh_secure_remove --file=$final_path/.cargo fi } From e44e182062b00cb96b1e52d185d7d7c0a1264a9e Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 13 Mar 2023 18:44:57 +0100 Subject: [PATCH 21/28] Add tip about federationtester in the README/DISCLAIMER --- doc/DISCLAIMER.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 62381c9..364a074 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -34,6 +34,8 @@ If it is not automatically done, you need to open this in your ISP box. You also need a valid TLS certificate for the domain used by synapse. To do that you can refer to the documentation here : https://yunohost.org/#/certificate_en +https://federationtester.matrix.org/ can be used to easily debug federation issues + ### Turnserver For Voip and video conferencing a turnserver is also installed (and configured). The turnserver listens on two UDP and TCP ports. You can get them with these commands: From 4838af16cb9fed564ee730b9982a6c547267a9e5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 13 Mar 2023 17:45:19 +0000 Subject: [PATCH 22/28] Auto-update README --- README.md | 2 ++ README_fr.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index 379b8dc..ac75732 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,8 @@ If it is not automatically done, you need to open this in your ISP box. You also need a valid TLS certificate for the domain used by synapse. To do that you can refer to the documentation here : https://yunohost.org/#/certificate_en +https://federationtester.matrix.org/ can be used to easily debug federation issues + ### Turnserver For Voip and video conferencing a turnserver is also installed (and configured). The turnserver listens on two UDP and TCP ports. You can get them with these commands: diff --git a/README_fr.md b/README_fr.md index 70e87c3..2fd9cdd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -60,6 +60,8 @@ If it is not automatically done, you need to open this in your ISP box. You also need a valid TLS certificate for the domain used by synapse. To do that you can refer to the documentation here : https://yunohost.org/#/certificate_en +https://federationtester.matrix.org/ can be used to easily debug federation issues + ### Turnserver For Voip and video conferencing a turnserver is also installed (and configured). The turnserver listens on two UDP and TCP ports. You can get them with these commands: From a314eb0a05cf3322148403ceddfd69bc83f02a40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 15 Mar 2023 01:26:51 +0100 Subject: [PATCH 23/28] Upgrade synapse to 1.79.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 16 ++++++++-------- conf/requirement_bullseye.txt | 16 ++++++++-------- manifest.json | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index ddc2c0a..a9d854e 100644 --- a/conf/armv7_bookworm.src +++ b/conf/armv7_bookworm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.78.0/matrix-synapse_1.78.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=9ae1750d1158f0c84bc9030d10dd1b2aeb222c42db75ca46f4504d5b1be505cd +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.79.0/matrix-synapse_1.79.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=78ee92bd904143247adc410f0a7ab822a3bd63312cb6711473661db66e964aae # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index 93f65bf..741fe08 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.78.0/matrix-synapse_1.78.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=77af36a3101e2ac31f439834b1ad18ba9859cfd56494cb1a50d074abea1c64e6 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.79.0/matrix-synapse_1.79.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=bd792ded7d038b992fc5ceeb477307c566cdec0faa38cb796102ad7c9a85b808 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt index 656c34b..5de6ed8 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -5,9 +5,9 @@ bleach==6.0.0 canonicaljson==1.6.5 certifi==2022.12.7 cffi==1.15.1 -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 constantly==15.1.0 -cryptography==39.0.1 +cryptography==39.0.2 frozendict==2.3.4 hyperlink==21.0.0 idna==3.4 @@ -19,20 +19,20 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.78.0 +matrix-synapse==1.79.0 matrix-synapse-ldap3==0.2.2 -msgpack==1.0.4 +msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.0 -phonenumbers==8.13.6 +phonenumbers==8.13.7 Pillow==9.4.0 prometheus-client==0.16.0 psycopg2==2.9.5 pyasn1==0.4.8 pyasn1-modules==0.2.8 pycparser==2.21 -pydantic==1.10.5 +pydantic==1.10.6 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.0.0 @@ -43,13 +43,13 @@ semantic-version==2.10.0 service-identity==21.1.0 setuptools-rust==1.5.2 signedjson==1.1.4 -simplejson==3.18.3 +simplejson==3.18.4 six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 Twisted==22.10.0 typing_extensions==4.5.0 unpaddedbase64==2.1.0 -urllib3==1.26.14 +urllib3==1.26.15 webencodings==0.5.1 zope.interface==5.5.2 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 99621a4..3e255b6 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -5,9 +5,9 @@ bleach==6.0.0 canonicaljson==1.6.5 certifi==2022.12.7 cffi==1.15.1 -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 constantly==15.1.0 -cryptography==39.0.1 +cryptography==39.0.2 frozendict==2.3.4 hyperlink==21.0.0 idna==3.4 @@ -19,13 +19,13 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.78.0 +matrix-synapse==1.79.0 matrix-synapse-ldap3==0.2.2 -msgpack==1.0.4 +msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.0 -phonenumbers==8.13.6 +phonenumbers==8.13.7 Pillow==9.4.0 pkg_resources==0.0.0 prometheus-client==0.16.0 @@ -33,7 +33,7 @@ psycopg2==2.9.5 pyasn1==0.4.8 pyasn1-modules==0.2.8 pycparser==2.21 -pydantic==1.10.5 +pydantic==1.10.6 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.0.0 @@ -44,13 +44,13 @@ semantic-version==2.10.0 service-identity==21.1.0 setuptools-rust==1.5.2 signedjson==1.1.4 -simplejson==3.18.3 +simplejson==3.18.4 six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 Twisted==22.10.0 typing_extensions==4.5.0 unpaddedbase64==2.1.0 -urllib3==1.26.14 +urllib3==1.26.15 webencodings==0.5.1 zope.interface==5.5.2 diff --git a/manifest.json b/manifest.json index a004f17..aef1d41 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Instant messaging server which uses Matrix", "fr": "Serveur de messagerie instantané basé sur Matrix" }, - "version": "1.78.0~ynh1", + "version": "1.79.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 0c56f3fd0ab385c3b340553297cb3f20e4e7a2a3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 15 Mar 2023 07:07:07 +0000 Subject: [PATCH 24/28] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 040ab0f..a1a00db 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Shipped version:** 1.78.0~ynh1 +**Shipped version:** 1.79.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 20a9126..f55d969 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Version incluse :** 1.78.0~ynh1 +**Version incluse :** 1.79.0~ynh1 ## Avertissements / informations importantes ## Configuration From 29ca8c5266f8d801f10b3d2dec283f0d0bc0a847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 30 Mar 2023 01:09:06 +0200 Subject: [PATCH 25/28] Upgrade synapse to 1.80.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 12 ++++++------ conf/requirement_bullseye.txt | 12 ++++++------ manifest.json | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index a9d854e..45da720 100644 --- a/conf/armv7_bookworm.src +++ b/conf/armv7_bookworm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.79.0/matrix-synapse_1.79.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=78ee92bd904143247adc410f0a7ab822a3bd63312cb6711473661db66e964aae +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.80.0/matrix-synapse_1.80.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=66bd42d17a7367d9b3be0dbe90fad6cec097e598214d8d46a38122fae240c501 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index 741fe08..6622815 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.79.0/matrix-synapse_1.79.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=bd792ded7d038b992fc5ceeb477307c566cdec0faa38cb796102ad7c9a85b808 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.80.0/matrix-synapse_1.80.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=9455d932b37c558b84f53083a44ad7c0047f10f2bcef346974b69f3bf0e23f83 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt index 5de6ed8..0d02e4c 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -7,7 +7,7 @@ certifi==2022.12.7 cffi==1.15.1 charset-normalizer==3.1.0 constantly==15.1.0 -cryptography==39.0.2 +cryptography==40.0.1 frozendict==2.3.4 hyperlink==21.0.0 idna==3.4 @@ -19,23 +19,23 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.79.0 +matrix-synapse==1.80.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.0 -phonenumbers==8.13.7 +phonenumbers==8.13.8 Pillow==9.4.0 prometheus-client==0.16.0 psycopg2==2.9.5 pyasn1==0.4.8 pyasn1-modules==0.2.8 pycparser==2.21 -pydantic==1.10.6 +pydantic==1.10.7 pymacaroons==0.13.0 PyNaCl==1.5.0 -pyOpenSSL==23.0.0 +pyOpenSSL==23.1.1 pyrsistent==0.19.3 PyYAML==6.0 requests==2.28.2 @@ -52,4 +52,4 @@ typing_extensions==4.5.0 unpaddedbase64==2.1.0 urllib3==1.26.15 webencodings==0.5.1 -zope.interface==5.5.2 +zope.interface==6.0 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 3e255b6..5de7c73 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -7,7 +7,7 @@ certifi==2022.12.7 cffi==1.15.1 charset-normalizer==3.1.0 constantly==15.1.0 -cryptography==39.0.2 +cryptography==40.0.1 frozendict==2.3.4 hyperlink==21.0.0 idna==3.4 @@ -19,13 +19,13 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.79.0 +matrix-synapse==1.80.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.0 -phonenumbers==8.13.7 +phonenumbers==8.13.8 Pillow==9.4.0 pkg_resources==0.0.0 prometheus-client==0.16.0 @@ -33,10 +33,10 @@ psycopg2==2.9.5 pyasn1==0.4.8 pyasn1-modules==0.2.8 pycparser==2.21 -pydantic==1.10.6 +pydantic==1.10.7 pymacaroons==0.13.0 PyNaCl==1.5.0 -pyOpenSSL==23.0.0 +pyOpenSSL==23.1.1 pyrsistent==0.19.3 PyYAML==6.0 requests==2.28.2 @@ -53,4 +53,4 @@ typing_extensions==4.5.0 unpaddedbase64==2.1.0 urllib3==1.26.15 webencodings==0.5.1 -zope.interface==5.5.2 +zope.interface==6.0 diff --git a/manifest.json b/manifest.json index aef1d41..2d38869 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Instant messaging server which uses Matrix", "fr": "Serveur de messagerie instantané basé sur Matrix" }, - "version": "1.79.0~ynh1", + "version": "1.80.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 2b6d4924ea7bd72542add6315c82aa5688e48a31 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 30 Mar 2023 05:57:27 +0000 Subject: [PATCH 26/28] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a1a00db..5db89c6 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Shipped version:** 1.79.0~ynh1 +**Shipped version:** 1.80.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index f55d969..ef2bc0a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Version incluse :** 1.79.0~ynh1 +**Version incluse :** 1.80.0~ynh1 ## Avertissements / informations importantes ## Configuration From 058e08433427064c2faea37b79ec7c01e0604f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 12 Apr 2023 01:01:43 +0200 Subject: [PATCH 27/28] Upgrade synapse to 1.81.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 13 ++++++------- conf/requirement_bullseye.txt | 13 ++++++------- manifest.json | 2 +- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 45da720..837272f 100644 --- a/conf/armv7_bookworm.src +++ b/conf/armv7_bookworm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.80.0/matrix-synapse_1.80.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=66bd42d17a7367d9b3be0dbe90fad6cec097e598214d8d46a38122fae240c501 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.81.0/matrix-synapse_1.81.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=429e1d7570322b44da083f003adfda0e2ebfd1773d9991dd5b9ad6df5ff56804 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index 6622815..c8b5300 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.80.0/matrix-synapse_1.80.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=9455d932b37c558b84f53083a44ad7c0047f10f2bcef346974b69f3bf0e23f83 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.81.0/matrix-synapse_1.81.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=7469e9e303fa72f3c6bd2700a77fb5bfda8f8e2bbafdb6d4b4074d1fe6be4043 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt index 0d02e4c..450eb0f 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -2,16 +2,16 @@ attrs==22.2.0 Automat==22.10.0 bcrypt==4.0.1 bleach==6.0.0 -canonicaljson==1.6.5 +canonicaljson==2.0.0 certifi==2022.12.7 cffi==1.15.1 charset-normalizer==3.1.0 constantly==15.1.0 cryptography==40.0.1 -frozendict==2.3.4 hyperlink==21.0.0 idna==3.4 ijson==3.2.0.post0 +immutabledict==2.2.4 incremental==22.10.0 Jinja2==3.1.2 jsonschema==4.17.3 @@ -19,16 +19,16 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.80.0 +matrix-synapse==1.81.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.0 -phonenumbers==8.13.8 -Pillow==9.4.0 +phonenumbers==8.13.9 +Pillow==9.5.0 prometheus-client==0.16.0 -psycopg2==2.9.5 +psycopg2==2.9.6 pyasn1==0.4.8 pyasn1-modules==0.2.8 pycparser==2.21 @@ -43,7 +43,6 @@ semantic-version==2.10.0 service-identity==21.1.0 setuptools-rust==1.5.2 signedjson==1.1.4 -simplejson==3.18.4 six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 5de7c73..18fa347 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -2,16 +2,16 @@ attrs==22.2.0 Automat==22.10.0 bcrypt==4.0.1 bleach==6.0.0 -canonicaljson==1.6.5 +canonicaljson==2.0.0 certifi==2022.12.7 cffi==1.15.1 charset-normalizer==3.1.0 constantly==15.1.0 cryptography==40.0.1 -frozendict==2.3.4 hyperlink==21.0.0 idna==3.4 ijson==3.2.0.post0 +immutabledict==2.2.4 incremental==22.10.0 Jinja2==3.1.2 jsonschema==4.17.3 @@ -19,17 +19,17 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.80.0 +matrix-synapse==1.81.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.0 -phonenumbers==8.13.8 -Pillow==9.4.0 +phonenumbers==8.13.9 +Pillow==9.5.0 pkg_resources==0.0.0 prometheus-client==0.16.0 -psycopg2==2.9.5 +psycopg2==2.9.6 pyasn1==0.4.8 pyasn1-modules==0.2.8 pycparser==2.21 @@ -44,7 +44,6 @@ semantic-version==2.10.0 service-identity==21.1.0 setuptools-rust==1.5.2 signedjson==1.1.4 -simplejson==3.18.4 six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 diff --git a/manifest.json b/manifest.json index 2d38869..dcad619 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Instant messaging server which uses Matrix", "fr": "Serveur de messagerie instantané basé sur Matrix" }, - "version": "1.80.0~ynh1", + "version": "1.81.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From e5e91f1562561e94151e9646e36256e04cebf385 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 13 Apr 2023 05:46:01 +0000 Subject: [PATCH 28/28] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5db89c6..0c5852e 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Shipped version:** 1.80.0~ynh1 +**Shipped version:** 1.81.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index ef2bc0a..d1476b1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Version incluse :** 1.80.0~ynh1 +**Version incluse :** 1.81.0~ynh1 ## Avertissements / informations importantes ## Configuration