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 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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