From 9eaddbe4123ebc2a6774f664dc525adeacb3de57 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 31 Oct 2023 14:37:16 +0000 Subject: [PATCH 01/19] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 1a24149..8ec7334 100644 --- a/README.md +++ b/README.md @@ -210,6 +210,7 @@ Before installing a second instance of the app it's really recommended to update * Official app website: * Upstream app code repository: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 157c1dd..771865c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -210,6 +210,7 @@ Before installing a second instance of the app it's really recommended to update * Site officiel de l’app : * Dépôt de code officiel de l’app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 3f78f68ea6db12e85a63e2424c6363a244cbeddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 22 Nov 2023 09:57:32 +0100 Subject: [PATCH 02/19] Fix sso --- conf/nginx.conf | 2 +- scripts/install | 3 +++ scripts/upgrade | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 8957d4a..a968119 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,7 +10,7 @@ location __PATH__/ { location __PATH__/cas_server.php { alias /var/www/__APP__/; fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/run/php__PHPVERSION__-fpm-__NAME__.sock; + fastcgi_pass unix:/run/php/php__PHPVERSION__-fpm-__NAME__.sock; include fastcgi_params; fastcgi_param REMOTE_USER $remote_user; fastcgi_param PATH_INFO $fastcgi_path_info; diff --git a/scripts/install b/scripts/install index 28e8871..2107a4c 100644 --- a/scripts/install +++ b/scripts/install @@ -330,6 +330,9 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 ynh_script_progression --message="Configuring application..." ynh_add_fpm_config --usage=low --footprint=low +sed -i "s|user\s*=\s*$app|user = matrix-$app|g" /etc/php/7.*/fpm/pool.d/synapse.conf +sed -i "s|group\s*=\s*$app|group = matrix-$app|g" /etc/php/7.*/fpm/pool.d/synapse.conf +sed -i "s|chdir\s*=\s*/opt/yunohost/matrix-synapse.*|chdir = $final_www_path|g" /etc/php/7.*/fpm/pool.d/synapse.conf # Create .well-known redirection for access by federation if yunohost --output-as plain domain list | grep -q "^$server_name$" diff --git a/scripts/upgrade b/scripts/upgrade index 09810f0..63c0aa9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -520,6 +520,9 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - ynh_script_progression --message="Configuring application..." ynh_add_fpm_config --usage=low --footprint=low +sed -i "s|user\s*=\s*$app|user = matrix-$app|g" /etc/php/7.*/fpm/pool.d/synapse.conf +sed -i "s|group\s*=\s*$app|group = matrix-$app|g" /etc/php/7.*/fpm/pool.d/synapse.conf +sed -i "s|chdir\s*=\s*/opt/yunohost/matrix-synapse.*|chdir = $final_www_path|g" /etc/php/7.*/fpm/pool.d/synapse.conf # Create .well-known redirection for access by federation if yunohost --output-as plain domain list | grep -q "^$server_name$" From 63e7214aa90c1173290ac7ad24bae4b095f03636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 1 Nov 2023 01:12:30 +0100 Subject: [PATCH 03/19] Upgrade synapse to 1.95.1 --- 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 5430fcd..5a72e7a 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.95.0/matrix-synapse_1.95.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=1a1d9248b139f67d23a89a20745d14d88c5b8627f76872d7f94f66952b5f1253 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.95.1/matrix-synapse_1.95.1-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=4e4693747b5c3c996b61a61707d6cf1d485dcb09db1bbc4075bd3bdb60702507 # (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 2b18ef8..163e32b 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.95.0/matrix-synapse_1.95.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=97e9942bea9bcecc2a75228255a1824298300302559a9332e50816fa54193738 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.95.1/matrix-synapse_1.95.1-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=6a2d4d7b67ca0bc0423c23dc75a6327d86687cd05782d5d686ae75ab41ebcc96 # (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 5ac0771..deccdcd 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -7,7 +7,7 @@ canonicaljson==2.0.0 certifi==2023.7.22 cffi==1.16.0 charset-normalizer==3.3.1 -constantly==15.1.0 +constantly==23.10.4 cryptography==41.0.5 hyperlink==21.0.0 idna==3.4 @@ -15,21 +15,21 @@ ijson==3.2.3 immutabledict==3.0.0 incremental==22.10.0 Jinja2==3.1.2 -jsonschema==4.19.1 +jsonschema==4.19.2 jsonschema-specifications==2023.7.1 ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.95.0 +matrix-synapse==1.95.1 matrix-synapse-ldap3==0.3.0 msgpack==1.0.7 ndg-httpsclient==0.5.1 netaddr==0.9.0 packaging==23.2 -phonenumbers==8.13.23 +phonenumbers==8.13.24 Pillow==10.1.0 -prometheus-client==0.17.1 +prometheus-client==0.18.0 psycopg2==2.9.9 pyasn1==0.5.0 pyasn1-modules==0.3.0 @@ -38,19 +38,19 @@ pydantic==2.4.2 pydantic_core==2.10.1 pymacaroons==0.13.0 PyNaCl==1.5.0 -pyOpenSSL==23.2.0 +pyOpenSSL==23.3.0 PyYAML==6.0.1 referencing==0.30.2 requests==2.31.0 rpds-py==0.10.6 semantic-version==2.10.0 service-identity==23.1.0 -setuptools-rust==1.7.0 +setuptools-rust==1.8.1 signedjson==1.1.4 six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 -Twisted==23.8.0 +Twisted==23.10.0 typing_extensions==4.8.0 unpaddedbase64==2.1.0 urllib3==2.0.7 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 1e5e2e5..a08a7ff 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -7,7 +7,7 @@ canonicaljson==2.0.0 certifi==2023.7.22 cffi==1.16.0 charset-normalizer==3.3.1 -constantly==15.1.0 +constantly==23.10.4 cryptography==41.0.5 hyperlink==21.0.0 idna==3.4 @@ -15,22 +15,22 @@ ijson==3.2.3 immutabledict==3.0.0 incremental==22.10.0 Jinja2==3.1.2 -jsonschema==4.19.1 +jsonschema==4.19.2 jsonschema-specifications==2023.7.1 ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.95.0 +matrix-synapse==1.95.1 matrix-synapse-ldap3==0.3.0 msgpack==1.0.7 ndg-httpsclient==0.5.1 netaddr==0.9.0 packaging==23.2 -phonenumbers==8.13.23 +phonenumbers==8.13.24 Pillow==10.1.0 pkg_resources==0.0.0 -prometheus-client==0.17.1 +prometheus-client==0.18.0 psycopg2==2.9.9 pyasn1==0.5.0 pyasn1-modules==0.3.0 @@ -39,20 +39,20 @@ pydantic==2.4.2 pydantic_core==2.10.1 pymacaroons==0.13.0 PyNaCl==1.5.0 -pyOpenSSL==23.2.0 +pyOpenSSL==23.3.0 PyYAML==6.0.1 referencing==0.30.2 requests==2.31.0 rpds-py==0.10.6 semantic-version==2.10.0 service-identity==23.1.0 -setuptools-rust==1.7.0 +setuptools-rust==1.8.1 signedjson==1.1.4 six==1.16.0 sortedcontainers==2.4.0 tomli==2.0.1 treq==22.2.0 -Twisted==23.8.0 +Twisted==23.10.0 typing_extensions==4.8.0 unpaddedbase64==2.1.0 urllib3==2.0.7 diff --git a/manifest.json b/manifest.json index d835889..5cf2e99 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.95.0~ynh1", + "version": "1.95.1~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From ece3f6f524a42a0c7017ffeed6e02bf3bdd42573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sat, 18 Nov 2023 01:02:45 +0100 Subject: [PATCH 04/19] Upgrade synapse to 1.96.1 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 22 +++++++++++----------- conf/requirement_bullseye.txt | 22 +++++++++++----------- manifest.json | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 5a72e7a..b183336 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.95.1/matrix-synapse_1.95.1-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=4e4693747b5c3c996b61a61707d6cf1d485dcb09db1bbc4075bd3bdb60702507 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.96.1/matrix-synapse_1.96.1-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=4c084d839a3aa058f950c5abda85554b1635b8effcd77bd7a471a21f0a22a9a2 # (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 163e32b..1f2142a 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.95.1/matrix-synapse_1.95.1-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=6a2d4d7b67ca0bc0423c23dc75a6327d86687cd05782d5d686ae75ab41ebcc96 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.96.1/matrix-synapse_1.96.1-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=09fe388a344ecb71acb63c15ea4451ddcc5df6fbef1644f030e49ec35c311068 # (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 deccdcd..222483e 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -6,7 +6,7 @@ bleach==6.1.0 canonicaljson==2.0.0 certifi==2023.7.22 cffi==1.16.0 -charset-normalizer==3.3.1 +charset-normalizer==3.3.2 constantly==23.10.4 cryptography==41.0.5 hyperlink==21.0.0 @@ -15,44 +15,44 @@ ijson==3.2.3 immutabledict==3.0.0 incremental==22.10.0 Jinja2==3.1.2 -jsonschema==4.19.2 -jsonschema-specifications==2023.7.1 +jsonschema==4.20.0 +jsonschema-specifications==2023.11.1 ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.95.1 +matrix-synapse==1.96.1 matrix-synapse-ldap3==0.3.0 msgpack==1.0.7 ndg-httpsclient==0.5.1 netaddr==0.9.0 packaging==23.2 -phonenumbers==8.13.24 +phonenumbers==8.13.25 Pillow==10.1.0 prometheus-client==0.18.0 psycopg2==2.9.9 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==2.4.2 -pydantic_core==2.10.1 +pydantic==2.5.1 +pydantic_core==2.14.3 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.3.0 PyYAML==6.0.1 -referencing==0.30.2 +referencing==0.31.0 requests==2.31.0 -rpds-py==0.10.6 +rpds-py==0.13.0 semantic-version==2.10.0 service-identity==23.1.0 setuptools-rust==1.8.1 signedjson==1.1.4 six==1.16.0 sortedcontainers==2.4.0 -treq==22.2.0 +treq==23.11.0 Twisted==23.10.0 typing_extensions==4.8.0 unpaddedbase64==2.1.0 -urllib3==2.0.7 +urllib3==2.1.0 webencodings==0.5.1 zope.interface==6.1 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index a08a7ff..b559ce2 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -6,7 +6,7 @@ bleach==6.1.0 canonicaljson==2.0.0 certifi==2023.7.22 cffi==1.16.0 -charset-normalizer==3.3.1 +charset-normalizer==3.3.2 constantly==23.10.4 cryptography==41.0.5 hyperlink==21.0.0 @@ -15,19 +15,19 @@ ijson==3.2.3 immutabledict==3.0.0 incremental==22.10.0 Jinja2==3.1.2 -jsonschema==4.19.2 -jsonschema-specifications==2023.7.1 +jsonschema==4.20.0 +jsonschema-specifications==2023.11.1 ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.95.1 +matrix-synapse==1.96.1 matrix-synapse-ldap3==0.3.0 msgpack==1.0.7 ndg-httpsclient==0.5.1 netaddr==0.9.0 packaging==23.2 -phonenumbers==8.13.24 +phonenumbers==8.13.25 Pillow==10.1.0 pkg_resources==0.0.0 prometheus-client==0.18.0 @@ -35,15 +35,15 @@ psycopg2==2.9.9 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==2.4.2 -pydantic_core==2.10.1 +pydantic==2.5.1 +pydantic_core==2.14.3 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.3.0 PyYAML==6.0.1 -referencing==0.30.2 +referencing==0.31.0 requests==2.31.0 -rpds-py==0.10.6 +rpds-py==0.13.0 semantic-version==2.10.0 service-identity==23.1.0 setuptools-rust==1.8.1 @@ -51,10 +51,10 @@ signedjson==1.1.4 six==1.16.0 sortedcontainers==2.4.0 tomli==2.0.1 -treq==22.2.0 +treq==23.11.0 Twisted==23.10.0 typing_extensions==4.8.0 unpaddedbase64==2.1.0 -urllib3==2.0.7 +urllib3==2.1.0 webencodings==0.5.1 zope.interface==6.1 diff --git a/manifest.json b/manifest.json index 5cf2e99..7fa1022 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.95.1~ynh1", + "version": "1.96.1~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From e7408e40acf84c904d28b828b463dde4441d2c11 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 22 Nov 2023 14:38:22 +0000 Subject: [PATCH 05/19] 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 d5f21bc..46f63d1 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.95.0~ynh1 +**Shipped version:** 1.96.1~ynh1 ## Disclaimers / important information ## Configuration @@ -210,6 +210,7 @@ Before installing a second instance of the app it's really recommended to update * Official app website: * Upstream app code repository: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 9119a82..208f547 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.95.0~ynh1 +**Version incluse :** 1.96.1~ynh1 ## Avertissements / informations importantes ## Configuration @@ -210,6 +210,7 @@ Before installing a second instance of the app it's really recommended to update * Site officiel de l’app : * Dépôt de code officiel de l’app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 4b4ce678f57598a835bd984d148ab9fcd95ec648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 22 Nov 2023 17:18:40 +0100 Subject: [PATCH 06/19] Fix warnings --- scripts/install | 7 ++++--- scripts/upgrade | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 2107a4c..668f376 100644 --- a/scripts/install +++ b/scripts/install @@ -330,9 +330,10 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 ynh_script_progression --message="Configuring application..." ynh_add_fpm_config --usage=low --footprint=low -sed -i "s|user\s*=\s*$app|user = matrix-$app|g" /etc/php/7.*/fpm/pool.d/synapse.conf -sed -i "s|group\s*=\s*$app|group = matrix-$app|g" /etc/php/7.*/fpm/pool.d/synapse.conf -sed -i "s|chdir\s*=\s*/opt/yunohost/matrix-synapse.*|chdir = $final_www_path|g" /etc/php/7.*/fpm/pool.d/synapse.conf +sed -i "s|user\s*=\s*$app|user = matrix-$app|g" /etc/php/7.*/fpm/pool.d/$app.conf +sed -i "s|group\s*=\s*$app|group = matrix-$app|g" /etc/php/7.*/fpm/pool.d/$app.conf +sed -i "s|chdir\s*=\s*/opt/yunohost/matrix-synapse.*|chdir = $final_www_path|g" /etc/php/7.*/fpm/pool.d/$app.conf +ynh_store_file_checksum --file=/etc/php/7.*/fpm/pool.d/$app.conf # Create .well-known redirection for access by federation if yunohost --output-as plain domain list | grep -q "^$server_name$" diff --git a/scripts/upgrade b/scripts/upgrade index 63c0aa9..5df26b2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -520,9 +520,10 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - ynh_script_progression --message="Configuring application..." ynh_add_fpm_config --usage=low --footprint=low -sed -i "s|user\s*=\s*$app|user = matrix-$app|g" /etc/php/7.*/fpm/pool.d/synapse.conf -sed -i "s|group\s*=\s*$app|group = matrix-$app|g" /etc/php/7.*/fpm/pool.d/synapse.conf -sed -i "s|chdir\s*=\s*/opt/yunohost/matrix-synapse.*|chdir = $final_www_path|g" /etc/php/7.*/fpm/pool.d/synapse.conf +sed -i "s|user\s*=\s*$app|user = matrix-$app|g" /etc/php/7.*/fpm/pool.d/$app.conf +sed -i "s|group\s*=\s*$app|group = matrix-$app|g" /etc/php/7.*/fpm/pool.d/$app.conf +sed -i "s|chdir\s*=\s*/opt/yunohost/matrix-synapse.*|chdir = $final_www_path|g" /etc/php/7.*/fpm/pool.d/$app.conf +ynh_store_file_checksum --file=/etc/php/7.*/fpm/pool.d/$app.conf # Create .well-known redirection for access by federation if yunohost --output-as plain domain list | grep -q "^$server_name$" From b4fa0b6d8d07bccf2b31272811f40a6606be73c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 22 Nov 2023 19:03:17 +0100 Subject: [PATCH 07/19] Fix checksum issue --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 668f376..8271121 100644 --- a/scripts/install +++ b/scripts/install @@ -333,7 +333,7 @@ ynh_add_fpm_config --usage=low --footprint=low sed -i "s|user\s*=\s*$app|user = matrix-$app|g" /etc/php/7.*/fpm/pool.d/$app.conf sed -i "s|group\s*=\s*$app|group = matrix-$app|g" /etc/php/7.*/fpm/pool.d/$app.conf sed -i "s|chdir\s*=\s*/opt/yunohost/matrix-synapse.*|chdir = $final_www_path|g" /etc/php/7.*/fpm/pool.d/$app.conf -ynh_store_file_checksum --file=/etc/php/7.*/fpm/pool.d/$app.conf +ynh_store_file_checksum --file=$(ls /etc/php/7.*/fpm/pool.d/$app.conf) # Create .well-known redirection for access by federation if yunohost --output-as plain domain list | grep -q "^$server_name$" diff --git a/scripts/upgrade b/scripts/upgrade index 5df26b2..0dee176 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -523,7 +523,7 @@ ynh_add_fpm_config --usage=low --footprint=low sed -i "s|user\s*=\s*$app|user = matrix-$app|g" /etc/php/7.*/fpm/pool.d/$app.conf sed -i "s|group\s*=\s*$app|group = matrix-$app|g" /etc/php/7.*/fpm/pool.d/$app.conf sed -i "s|chdir\s*=\s*/opt/yunohost/matrix-synapse.*|chdir = $final_www_path|g" /etc/php/7.*/fpm/pool.d/$app.conf -ynh_store_file_checksum --file=/etc/php/7.*/fpm/pool.d/$app.conf +ynh_store_file_checksum --file=$(ls /etc/php/7.*/fpm/pool.d/$app.conf) # Create .well-known redirection for access by federation if yunohost --output-as plain domain list | grep -q "^$server_name$" From cdaa3519ddef332269e509e36202e0c4110a1fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 29 Nov 2023 01:10:13 +0100 Subject: [PATCH 08/19] Upgrade synapse to 1.97.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 24 ++++++++++++------------ conf/requirement_bullseye.txt | 24 ++++++++++++------------ manifest.json | 2 +- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index b183336..b37ef1d 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.96.1/matrix-synapse_1.96.1-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=4c084d839a3aa058f950c5abda85554b1635b8effcd77bd7a471a21f0a22a9a2 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.97.0/matrix-synapse_1.97.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=9f9df39fd55a1d5ba11d717569016261353f7a42316cf40a8e40ce5441377800 # (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 1f2142a..dc6d29f 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.96.1/matrix-synapse_1.96.1-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=09fe388a344ecb71acb63c15ea4451ddcc5df6fbef1644f030e49ec35c311068 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.97.0/matrix-synapse_1.97.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=348d491c8007c569393943a185684a0210ef2c06350d59e04c0a9a05d3716823 # (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 222483e..d469e7c 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -1,18 +1,18 @@ annotated-types==0.6.0 attrs==23.1.0 Automat==22.10.0 -bcrypt==4.0.1 +bcrypt==4.1.1 bleach==6.1.0 canonicaljson==2.0.0 -certifi==2023.7.22 +certifi==2023.11.17 cffi==1.16.0 charset-normalizer==3.3.2 constantly==23.10.4 -cryptography==41.0.5 +cryptography==41.0.7 hyperlink==21.0.0 -idna==3.4 +idna==3.6 ijson==3.2.3 -immutabledict==3.0.0 +immutabledict==4.0.0 incremental==22.10.0 Jinja2==3.1.2 jsonschema==4.20.0 @@ -21,28 +21,28 @@ ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.96.1 +matrix-synapse==1.97.0 matrix-synapse-ldap3==0.3.0 msgpack==1.0.7 ndg-httpsclient==0.5.1 netaddr==0.9.0 packaging==23.2 -phonenumbers==8.13.25 +phonenumbers==8.13.26 Pillow==10.1.0 -prometheus-client==0.18.0 +prometheus-client==0.19.0 psycopg2==2.9.9 -pyasn1==0.5.0 +pyasn1==0.5.1 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==2.5.1 -pydantic_core==2.14.3 +pydantic==2.5.2 +pydantic_core==2.14.5 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.3.0 PyYAML==6.0.1 referencing==0.31.0 requests==2.31.0 -rpds-py==0.13.0 +rpds-py==0.13.1 semantic-version==2.10.0 service-identity==23.1.0 setuptools-rust==1.8.1 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index b559ce2..4b9caa9 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -1,18 +1,18 @@ annotated-types==0.6.0 attrs==23.1.0 Automat==22.10.0 -bcrypt==4.0.1 +bcrypt==4.1.1 bleach==6.1.0 canonicaljson==2.0.0 -certifi==2023.7.22 +certifi==2023.11.17 cffi==1.16.0 charset-normalizer==3.3.2 constantly==23.10.4 -cryptography==41.0.5 +cryptography==41.0.7 hyperlink==21.0.0 -idna==3.4 +idna==3.6 ijson==3.2.3 -immutabledict==3.0.0 +immutabledict==4.0.0 incremental==22.10.0 Jinja2==3.1.2 jsonschema==4.20.0 @@ -21,29 +21,29 @@ ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.96.1 +matrix-synapse==1.97.0 matrix-synapse-ldap3==0.3.0 msgpack==1.0.7 ndg-httpsclient==0.5.1 netaddr==0.9.0 packaging==23.2 -phonenumbers==8.13.25 +phonenumbers==8.13.26 Pillow==10.1.0 pkg_resources==0.0.0 -prometheus-client==0.18.0 +prometheus-client==0.19.0 psycopg2==2.9.9 -pyasn1==0.5.0 +pyasn1==0.5.1 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==2.5.1 -pydantic_core==2.14.3 +pydantic==2.5.2 +pydantic_core==2.14.5 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.3.0 PyYAML==6.0.1 referencing==0.31.0 requests==2.31.0 -rpds-py==0.13.0 +rpds-py==0.13.1 semantic-version==2.10.0 service-identity==23.1.0 setuptools-rust==1.8.1 diff --git a/manifest.json b/manifest.json index 7fa1022..3e7bdf4 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.96.1~ynh1", + "version": "1.97.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 56a0d0e938f0a276b66a47be31b4fc7b6ca0fa9d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 29 Nov 2023 08:10:20 +0000 Subject: [PATCH 09/19] 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 46f63d1..6342b03 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.96.1~ynh1 +**Shipped version:** 1.97.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 208f547..2c3ff67 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.96.1~ynh1 +**Version incluse :** 1.97.0~ynh1 ## Avertissements / informations importantes ## Configuration From 16a1dda2898769cba70a52648191c842627ddf5c Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Sun, 10 Dec 2023 23:39:47 +0100 Subject: [PATCH 10/19] Update check_process --- check_process | 2 -- 1 file changed, 2 deletions(-) diff --git a/check_process b/check_process index 9c28469..cc3a5bd 100644 --- a/check_process +++ b/check_process @@ -12,8 +12,6 @@ setup_private=0 setup_public=1 upgrade=1 - upgrade=1 from_commit=0a485e0d6bcd14392b9203b3b27e7e1a7ba21d19 - upgrade=1 from_commit=6af39e6e086e70e2063eb8f63c48a1e4a597300d backup_restore=1 multi_instance=0 incorrect_path=0 From c92f24e2105925229b959701d2f3fd002919e65b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 13 Dec 2023 10:03:41 +0100 Subject: [PATCH 11/19] Revert "Update check_process" This reverts commit 16a1dda2898769cba70a52648191c842627ddf5c. --- check_process | 2 ++ 1 file changed, 2 insertions(+) diff --git a/check_process b/check_process index cc3a5bd..9c28469 100644 --- a/check_process +++ b/check_process @@ -12,6 +12,8 @@ setup_private=0 setup_public=1 upgrade=1 + upgrade=1 from_commit=0a485e0d6bcd14392b9203b3b27e7e1a7ba21d19 + upgrade=1 from_commit=6af39e6e086e70e2063eb8f63c48a1e4a597300d backup_restore=1 multi_instance=0 incorrect_path=0 From d6fe1e9e58641232b42e30abb3fee2c38849a4bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 13 Dec 2023 02:01:58 +0100 Subject: [PATCH 12/19] Upgrade synapse to 1.98.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 10 +++++----- conf/requirement_bullseye.txt | 10 +++++----- manifest.json | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index b37ef1d..ff7cb9f 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.97.0/matrix-synapse_1.97.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=9f9df39fd55a1d5ba11d717569016261353f7a42316cf40a8e40ce5441377800 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.98.0/matrix-synapse_1.98.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=d65552797237b1ce85f7a3a4c627f9da3c9b46fc72132ce8bb1a3022f78fd454 # (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 dc6d29f..a66ba44 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.97.0/matrix-synapse_1.97.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=348d491c8007c569393943a185684a0210ef2c06350d59e04c0a9a05d3716823 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.98.0/matrix-synapse_1.98.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=ff48049e5f4a4b8ff1e84af999b694a4aece3d647e23c3b3fe013ea86a17c820 # (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 d469e7c..c80a1c8 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -16,12 +16,12 @@ immutabledict==4.0.0 incremental==22.10.0 Jinja2==3.1.2 jsonschema==4.20.0 -jsonschema-specifications==2023.11.1 +jsonschema-specifications==2023.11.2 ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.97.0 +matrix-synapse==1.98.0 matrix-synapse-ldap3==0.3.0 msgpack==1.0.7 ndg-httpsclient==0.5.1 @@ -40,9 +40,9 @@ pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.3.0 PyYAML==6.0.1 -referencing==0.31.0 +referencing==0.32.0 requests==2.31.0 -rpds-py==0.13.1 +rpds-py==0.13.2 semantic-version==2.10.0 service-identity==23.1.0 setuptools-rust==1.8.1 @@ -51,7 +51,7 @@ six==1.16.0 sortedcontainers==2.4.0 treq==23.11.0 Twisted==23.10.0 -typing_extensions==4.8.0 +typing_extensions==4.9.0 unpaddedbase64==2.1.0 urllib3==2.1.0 webencodings==0.5.1 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 4b9caa9..0d4747f 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -16,12 +16,12 @@ immutabledict==4.0.0 incremental==22.10.0 Jinja2==3.1.2 jsonschema==4.20.0 -jsonschema-specifications==2023.11.1 +jsonschema-specifications==2023.11.2 ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.97.0 +matrix-synapse==1.98.0 matrix-synapse-ldap3==0.3.0 msgpack==1.0.7 ndg-httpsclient==0.5.1 @@ -41,9 +41,9 @@ pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.3.0 PyYAML==6.0.1 -referencing==0.31.0 +referencing==0.32.0 requests==2.31.0 -rpds-py==0.13.1 +rpds-py==0.13.2 semantic-version==2.10.0 service-identity==23.1.0 setuptools-rust==1.8.1 @@ -53,7 +53,7 @@ sortedcontainers==2.4.0 tomli==2.0.1 treq==23.11.0 Twisted==23.10.0 -typing_extensions==4.8.0 +typing_extensions==4.9.0 unpaddedbase64==2.1.0 urllib3==2.1.0 webencodings==0.5.1 diff --git a/manifest.json b/manifest.json index 3e7bdf4..93d9a9d 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.97.0~ynh1", + "version": "1.98.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 37dbe6c883060c94dfbe1b6fd7ddd7f1bb8c74a2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 13 Dec 2023 09:26:26 +0000 Subject: [PATCH 13/19] 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 6342b03..65746a0 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.97.0~ynh1 +**Shipped version:** 1.98.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 2c3ff67..e922e25 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.97.0~ynh1 +**Version incluse :** 1.98.0~ynh1 ## Avertissements / informations importantes ## Configuration From 5d66862eca621ddf974c9995f37c7c8afc261760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 13 Dec 2023 13:17:12 +0100 Subject: [PATCH 14/19] Fix checkprocess --- check_process | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/check_process b/check_process index 9c28469..c41f8ac 100644 --- a/check_process +++ b/check_process @@ -12,8 +12,8 @@ setup_private=0 setup_public=1 upgrade=1 - upgrade=1 from_commit=0a485e0d6bcd14392b9203b3b27e7e1a7ba21d19 - upgrade=1 from_commit=6af39e6e086e70e2063eb8f63c48a1e4a597300d + upgrade=1 from_commit=45603af210df356214dc32786c577d5c76cf84e3 + upgrade=1 from_commit=ed9d550d69c168182aa9e070f265a141d8bd9fd2 backup_restore=1 multi_instance=0 incorrect_path=0 @@ -22,7 +22,7 @@ ;;; Levels Level 5=auto ;;; Upgrade options - ; commit=0a485e0d6bcd14392b9203b3b27e7e1a7ba21d19 + ; commit=45603af210df356214dc32786c577d5c76cf84e3 name=Before permission implementation (branch old_version_for_CI_4) - ; commit=6af39e6e086e70e2063eb8f63c48a1e4a597300d - name=Before app user creation + ; commit=ed9d550d69c168182aa9e070f265a141d8bd9fd2 + name=Before app user creation (branch old_version_for_CI_5) From ab2bc432b8060491e2288c19b197806e32d1e47a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 13 Dec 2023 14:06:11 +0100 Subject: [PATCH 15/19] Remove support of test from old version because of some core incompatibility changes --- check_process | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/check_process b/check_process index c41f8ac..2508f0c 100644 --- a/check_process +++ b/check_process @@ -12,8 +12,7 @@ setup_private=0 setup_public=1 upgrade=1 - upgrade=1 from_commit=45603af210df356214dc32786c577d5c76cf84e3 - upgrade=1 from_commit=ed9d550d69c168182aa9e070f265a141d8bd9fd2 + upgrade=1 from_commit=b3bacec606f25c7f69de44da9e9e7eac405810c7 backup_restore=1 multi_instance=0 incorrect_path=0 @@ -22,7 +21,5 @@ ;;; Levels Level 5=auto ;;; Upgrade options - ; commit=45603af210df356214dc32786c577d5c76cf84e3 - name=Before permission implementation (branch old_version_for_CI_4) ; commit=ed9d550d69c168182aa9e070f265a141d8bd9fd2 - name=Before app user creation (branch old_version_for_CI_5) + name=Post app user creation From 69f6f63f747f57efdb461ac7508da3954aa45f39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 25 Jan 2024 02:14:48 +0100 Subject: [PATCH 16/19] Upgrade synapse to 1.99.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 38 +++++++++++++++++------------------ conf/requirement_bullseye.txt | 38 +++++++++++++++++------------------ manifest.json | 2 +- 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index ff7cb9f..68ffb79 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.98.0/matrix-synapse_1.98.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=d65552797237b1ce85f7a3a4c627f9da3c9b46fc72132ce8bb1a3022f78fd454 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.99.0/matrix-synapse_1.99.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=e318acc43b448cd616fa02d792e7d76cdf31af0eb7da963ea1665d47cc3bca61 # (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 a66ba44..b12bfd7 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.98.0/matrix-synapse_1.98.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=ff48049e5f4a4b8ff1e84af999b694a4aece3d647e23c3b3fe013ea86a17c820 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.99.0/matrix-synapse_1.99.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=fb4ce3e81646cfa9de7619cb4fc6b85274897eab0b81e2e5fc354c743c97f734 # (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 c80a1c8..2d08da7 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -1,50 +1,50 @@ annotated-types==0.6.0 -attrs==23.1.0 +attrs==23.2.0 Automat==22.10.0 -bcrypt==4.1.1 +bcrypt==4.1.2 bleach==6.1.0 canonicaljson==2.0.0 certifi==2023.11.17 cffi==1.16.0 charset-normalizer==3.3.2 constantly==23.10.4 -cryptography==41.0.7 +cryptography==42.0.0 hyperlink==21.0.0 idna==3.6 ijson==3.2.3 -immutabledict==4.0.0 +immutabledict==4.1.0 incremental==22.10.0 -Jinja2==3.1.2 -jsonschema==4.20.0 -jsonschema-specifications==2023.11.2 +Jinja2==3.1.3 +jsonschema==4.21.1 +jsonschema-specifications==2023.12.1 ldap3==2.9.1 -lxml==4.9.3 -MarkupSafe==2.1.3 +lxml==5.1.0 +MarkupSafe==2.1.4 matrix-common==1.3.0 -matrix-synapse==1.98.0 +matrix-synapse==1.99.0 matrix-synapse-ldap3==0.3.0 msgpack==1.0.7 ndg-httpsclient==0.5.1 -netaddr==0.9.0 +netaddr==0.10.1 packaging==23.2 -phonenumbers==8.13.26 -Pillow==10.1.0 +phonenumbers==8.13.28 +pillow==10.2.0 prometheus-client==0.19.0 psycopg2==2.9.9 pyasn1==0.5.1 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==2.5.2 -pydantic_core==2.14.5 +pydantic==2.5.3 +pydantic_core==2.14.6 pymacaroons==0.13.0 PyNaCl==1.5.0 -pyOpenSSL==23.3.0 +pyOpenSSL==24.0.0 PyYAML==6.0.1 -referencing==0.32.0 +referencing==0.32.1 requests==2.31.0 -rpds-py==0.13.2 +rpds-py==0.17.1 semantic-version==2.10.0 -service-identity==23.1.0 +service-identity==24.1.0 setuptools-rust==1.8.1 signedjson==1.1.4 six==1.16.0 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 0d4747f..8d79f0d 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -1,51 +1,51 @@ annotated-types==0.6.0 -attrs==23.1.0 +attrs==23.2.0 Automat==22.10.0 -bcrypt==4.1.1 +bcrypt==4.1.2 bleach==6.1.0 canonicaljson==2.0.0 certifi==2023.11.17 cffi==1.16.0 charset-normalizer==3.3.2 constantly==23.10.4 -cryptography==41.0.7 +cryptography==42.0.0 hyperlink==21.0.0 idna==3.6 ijson==3.2.3 -immutabledict==4.0.0 +immutabledict==4.1.0 incremental==22.10.0 -Jinja2==3.1.2 -jsonschema==4.20.0 -jsonschema-specifications==2023.11.2 +Jinja2==3.1.3 +jsonschema==4.21.1 +jsonschema-specifications==2023.12.1 ldap3==2.9.1 -lxml==4.9.3 -MarkupSafe==2.1.3 +lxml==5.1.0 +MarkupSafe==2.1.4 matrix-common==1.3.0 -matrix-synapse==1.98.0 +matrix-synapse==1.99.0 matrix-synapse-ldap3==0.3.0 msgpack==1.0.7 ndg-httpsclient==0.5.1 -netaddr==0.9.0 +netaddr==0.10.1 packaging==23.2 -phonenumbers==8.13.26 -Pillow==10.1.0 +phonenumbers==8.13.28 +pillow==10.2.0 pkg_resources==0.0.0 prometheus-client==0.19.0 psycopg2==2.9.9 pyasn1==0.5.1 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==2.5.2 -pydantic_core==2.14.5 +pydantic==2.5.3 +pydantic_core==2.14.6 pymacaroons==0.13.0 PyNaCl==1.5.0 -pyOpenSSL==23.3.0 +pyOpenSSL==24.0.0 PyYAML==6.0.1 -referencing==0.32.0 +referencing==0.32.1 requests==2.31.0 -rpds-py==0.13.2 +rpds-py==0.17.1 semantic-version==2.10.0 -service-identity==23.1.0 +service-identity==24.1.0 setuptools-rust==1.8.1 signedjson==1.1.4 six==1.16.0 diff --git a/manifest.json b/manifest.json index 93d9a9d..53d0359 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.98.0~ynh1", + "version": "1.99.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 532778b3c6f75466e0441324f466caaf659b2d6b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 25 Jan 2024 16:23:16 +0000 Subject: [PATCH 17/19] 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 65746a0..83852d3 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.98.0~ynh1 +**Shipped version:** 1.99.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index e922e25..9d641a0 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.98.0~ynh1 +**Version incluse :** 1.99.0~ynh1 ## Avertissements / informations importantes ## Configuration From 6a6f323c2700c21ce3d4727156eca3ed904fbd4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 1 Feb 2024 02:08:10 +0100 Subject: [PATCH 18/19] Upgrade synapse to 1.100.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 14 +++++++------- conf/requirement_bullseye.txt | 14 +++++++------- manifest.json | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 68ffb79..3ad69c1 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.99.0/matrix-synapse_1.99.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=e318acc43b448cd616fa02d792e7d76cdf31af0eb7da963ea1665d47cc3bca61 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.100.0/matrix-synapse_1.100.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=8a3b27f951761430949c845e3f7c01c66d472c893f87e6f3246937dd815f10ec # (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 b12bfd7..e5b5c25 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.99.0/matrix-synapse_1.99.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=fb4ce3e81646cfa9de7619cb4fc6b85274897eab0b81e2e5fc354c743c97f734 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.100.0/matrix-synapse_1.100.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=968d71330eb0ed4aed50d6e467045a9710242e14092670e5b463cf10a392047b # (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 2d08da7..e7d3a77 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -8,7 +8,7 @@ certifi==2023.11.17 cffi==1.16.0 charset-normalizer==3.3.2 constantly==23.10.4 -cryptography==42.0.0 +cryptography==42.0.2 hyperlink==21.0.0 idna==3.6 ijson==3.2.3 @@ -21,26 +21,26 @@ ldap3==2.9.1 lxml==5.1.0 MarkupSafe==2.1.4 matrix-common==1.3.0 -matrix-synapse==1.99.0 +matrix-synapse==1.100.0 matrix-synapse-ldap3==0.3.0 msgpack==1.0.7 ndg-httpsclient==0.5.1 netaddr==0.10.1 packaging==23.2 -phonenumbers==8.13.28 +phonenumbers==8.13.29 pillow==10.2.0 prometheus-client==0.19.0 psycopg2==2.9.9 pyasn1==0.5.1 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==2.5.3 -pydantic_core==2.14.6 +pydantic==2.6.0 +pydantic_core==2.16.1 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==24.0.0 PyYAML==6.0.1 -referencing==0.32.1 +referencing==0.33.0 requests==2.31.0 rpds-py==0.17.1 semantic-version==2.10.0 @@ -53,6 +53,6 @@ treq==23.11.0 Twisted==23.10.0 typing_extensions==4.9.0 unpaddedbase64==2.1.0 -urllib3==2.1.0 +urllib3==2.2.0 webencodings==0.5.1 zope.interface==6.1 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 8d79f0d..c049b21 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -8,7 +8,7 @@ certifi==2023.11.17 cffi==1.16.0 charset-normalizer==3.3.2 constantly==23.10.4 -cryptography==42.0.0 +cryptography==42.0.2 hyperlink==21.0.0 idna==3.6 ijson==3.2.3 @@ -21,13 +21,13 @@ ldap3==2.9.1 lxml==5.1.0 MarkupSafe==2.1.4 matrix-common==1.3.0 -matrix-synapse==1.99.0 +matrix-synapse==1.100.0 matrix-synapse-ldap3==0.3.0 msgpack==1.0.7 ndg-httpsclient==0.5.1 netaddr==0.10.1 packaging==23.2 -phonenumbers==8.13.28 +phonenumbers==8.13.29 pillow==10.2.0 pkg_resources==0.0.0 prometheus-client==0.19.0 @@ -35,13 +35,13 @@ psycopg2==2.9.9 pyasn1==0.5.1 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==2.5.3 -pydantic_core==2.14.6 +pydantic==2.6.0 +pydantic_core==2.16.1 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==24.0.0 PyYAML==6.0.1 -referencing==0.32.1 +referencing==0.33.0 requests==2.31.0 rpds-py==0.17.1 semantic-version==2.10.0 @@ -55,6 +55,6 @@ treq==23.11.0 Twisted==23.10.0 typing_extensions==4.9.0 unpaddedbase64==2.1.0 -urllib3==2.1.0 +urllib3==2.2.0 webencodings==0.5.1 zope.interface==6.1 diff --git a/manifest.json b/manifest.json index 53d0359..e4a541b 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.99.0~ynh1", + "version": "1.100.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 10bff828970ee034812a1114bedb3e7740517ad2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 5 Feb 2024 17:34:22 +0000 Subject: [PATCH 19/19] 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 83852d3..544a7df 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.99.0~ynh1 +**Shipped version:** 1.100.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 9d641a0..adbc308 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.99.0~ynh1 +**Version incluse :** 1.100.0~ynh1 ## Avertissements / informations importantes ## Configuration