From 9ccb41083e8987adb6175ae952c873b7e8d0df2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 2 Aug 2023 01:17:51 +0200 Subject: [PATCH 1/8] Upgrade synapse to 1.89.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 16 ++++++++-------- conf/requirement_bullseye.txt | 14 +++++++------- manifest.json | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 231869d..e6b4c23 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.88.0/matrix-synapse_1.88.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=41656466893c339b9f34a0a46db7563363fcfe4c1443d7078aaba14051a1ef85 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.89.0/matrix-synapse_1.89.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=aaf0d8d5a24b7a98c9e41fd43faa2ebfc8baa00ce56a0f7180cfe560a60a8842 # (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 a47b02c..ab1a8b9 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.88.0/matrix-synapse_1.88.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=048a26443449fef69fab0fc7adadd6ffb3324f67526090bd0296c8320592ee37 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.89.0/matrix-synapse_1.89.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=098caf6bff5ad1433e99e1c4950b1a3c1e4b661ca17ae6e1ca2d5c199bea7934 # (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 19ea390..bc4f56d 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -3,15 +3,15 @@ Automat==22.10.0 bcrypt==4.0.1 bleach==6.0.0 canonicaljson==2.0.0 -certifi==2023.5.7 +certifi==2023.7.22 cffi==1.15.1 charset-normalizer==3.2.0 constantly==15.1.0 -cryptography==41.0.2 +cryptography==41.0.3 hyperlink==21.0.0 idna==3.4 -ijson==3.2.2 -immutabledict==2.2.5 +ijson==3.2.3 +immutabledict==3.0.0 incremental==22.10.0 Jinja2==3.1.2 jsonschema==4.18.4 @@ -20,20 +20,20 @@ ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.88.0 +matrix-synapse==1.89.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.16 +phonenumbers==8.13.17 Pillow==10.0.0 prometheus-client==0.17.1 psycopg2==2.9.6 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==1.10.11 +pydantic==1.10.12 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.2.0 @@ -51,6 +51,6 @@ treq==22.2.0 Twisted==22.10.0 typing_extensions==4.7.1 unpaddedbase64==2.1.0 -urllib3==2.0.3 +urllib3==2.0.4 webencodings==0.5.1 zope.interface==6.0 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index f741894..c57872d 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -3,15 +3,15 @@ Automat==22.10.0 bcrypt==4.0.1 bleach==6.0.0 canonicaljson==2.0.0 -certifi==2023.5.7 +certifi==2023.7.22 cffi==1.15.1 charset-normalizer==3.2.0 constantly==15.1.0 cryptography==41.0.2 hyperlink==21.0.0 idna==3.4 -ijson==3.2.2 -immutabledict==2.2.5 +ijson==3.2.3 +immutabledict==3.0.0 incremental==22.10.0 Jinja2==3.1.2 jsonschema==4.18.4 @@ -20,13 +20,13 @@ ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.88.0 +matrix-synapse==1.89.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.16 +phonenumbers==8.13.17 Pillow==10.0.0 pkg_resources==0.0.0 prometheus-client==0.17.1 @@ -34,7 +34,7 @@ psycopg2==2.9.6 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==1.10.11 +pydantic==1.10.12 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.2.0 @@ -52,6 +52,6 @@ treq==22.2.0 Twisted==22.10.0 typing_extensions==4.7.1 unpaddedbase64==2.1.0 -urllib3==2.0.3 +urllib3==2.0.4 webencodings==0.5.1 zope.interface==6.0 diff --git a/manifest.json b/manifest.json index 04dd94a..55e009c 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.88.0~ynh1", + "version": "1.89.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 42d08c8544daabe93e0fee7cc9ec7d12c023431d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 2 Aug 2023 20:54:09 +0000 Subject: [PATCH 2/8] 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 2222907..2cd90aa 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.88.0~ynh1 +**Shipped version:** 1.89.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 771e319..a22ecc4 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.88.0~ynh1 +**Version incluse :** 1.89.0~ynh1 ## Avertissements / informations importantes ## Configuration From 8f3ab46059f895b81429475c658de81e5761c4c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 16 Aug 2023 01:07:13 +0200 Subject: [PATCH 3/8] Upgrade synapse to 1.90.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 10 +++++----- conf/requirement_bullseye.txt | 12 ++++++------ manifest.json | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index e6b4c23..7a08df6 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.89.0/matrix-synapse_1.89.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=aaf0d8d5a24b7a98c9e41fd43faa2ebfc8baa00ce56a0f7180cfe560a60a8842 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.90.0/matrix-synapse_1.90.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=6e869b587e30e905fa6d3efc1567595cdac9a6eb342dba3e8c14591bfcbb7870 # (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 ab1a8b9..054a831 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.89.0/matrix-synapse_1.89.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=098caf6bff5ad1433e99e1c4950b1a3c1e4b661ca17ae6e1ca2d5c199bea7934 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.90.0/matrix-synapse_1.90.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=09f2f573868f9c73a7cb1a9cdb42ca7a00b65d911e1d7eda01b68fbde90a30df # (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 bc4f56d..85f2639 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -14,22 +14,22 @@ ijson==3.2.3 immutabledict==3.0.0 incremental==22.10.0 Jinja2==3.1.2 -jsonschema==4.18.4 +jsonschema==4.19.0 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.89.0 +matrix-synapse==1.90.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.17 +phonenumbers==8.13.18 Pillow==10.0.0 prometheus-client==0.17.1 -psycopg2==2.9.6 +psycopg2==2.9.7 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 @@ -38,7 +38,7 @@ pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.2.0 PyYAML==6.0.1 -referencing==0.30.0 +referencing==0.30.2 requests==2.31.0 rpds-py==0.9.2 semantic-version==2.10.0 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index c57872d..3a30145 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -7,30 +7,30 @@ certifi==2023.7.22 cffi==1.15.1 charset-normalizer==3.2.0 constantly==15.1.0 -cryptography==41.0.2 +cryptography==41.0.3 hyperlink==21.0.0 idna==3.4 ijson==3.2.3 immutabledict==3.0.0 incremental==22.10.0 Jinja2==3.1.2 -jsonschema==4.18.4 +jsonschema==4.19.0 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.89.0 +matrix-synapse==1.90.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.17 +phonenumbers==8.13.18 Pillow==10.0.0 pkg_resources==0.0.0 prometheus-client==0.17.1 -psycopg2==2.9.6 +psycopg2==2.9.7 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 @@ -39,7 +39,7 @@ pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.2.0 PyYAML==6.0.1 -referencing==0.30.0 +referencing==0.30.2 requests==2.31.0 rpds-py==0.9.2 semantic-version==2.10.0 diff --git a/manifest.json b/manifest.json index 55e009c..848ace3 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.89.0~ynh1", + "version": "1.90.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From bd61bd9d75d056b8091e352ae106f3d442ee1fe9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 16 Aug 2023 06:52:15 +0000 Subject: [PATCH 4/8] 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 2cd90aa..961eb1c 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.89.0~ynh1 +**Shipped version:** 1.90.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index a22ecc4..f428103 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.89.0~ynh1 +**Version incluse :** 1.90.0~ynh1 ## Avertissements / informations importantes ## Configuration From 19c7d017502d525f4199cf1c4b960144f0739010 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 26 Aug 2023 12:01:31 +0200 Subject: [PATCH 5/8] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 9c28469..ba82e45 100644 --- a/check_process +++ b/check_process @@ -15,7 +15,7 @@ upgrade=1 from_commit=0a485e0d6bcd14392b9203b3b27e7e1a7ba21d19 upgrade=1 from_commit=6af39e6e086e70e2063eb8f63c48a1e4a597300d backup_restore=1 - multi_instance=0 + multi_instance=1 incorrect_path=0 port_already_use=1 (8448) change_url=0 From 22cb3c0fce1995f13ba455f505026911a42228e4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 26 Aug 2023 17:35:23 +0200 Subject: [PATCH 6/8] fix --- check_process | 2 +- manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index ba82e45..9c28469 100644 --- a/check_process +++ b/check_process @@ -15,7 +15,7 @@ upgrade=1 from_commit=0a485e0d6bcd14392b9203b3b27e7e1a7ba21d19 upgrade=1 from_commit=6af39e6e086e70e2063eb8f63c48a1e4a597300d backup_restore=1 - multi_instance=1 + multi_instance=0 incorrect_path=0 port_already_use=1 (8448) change_url=0 diff --git a/manifest.json b/manifest.json index 848ace3..b82c846 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "requirements": { "yunohost": ">= 11.0.11" }, - "multi_instance": true, + "multi_instance": false, "services": [ "nginx" ], From 0fc887f03a8c03818156b4c1b4de7564cdf4ebbe Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 26 Aug 2023 18:32:55 +0200 Subject: [PATCH 7/8] multi install --- check_process | 2 +- manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index 9c28469..ba82e45 100644 --- a/check_process +++ b/check_process @@ -15,7 +15,7 @@ upgrade=1 from_commit=0a485e0d6bcd14392b9203b3b27e7e1a7ba21d19 upgrade=1 from_commit=6af39e6e086e70e2063eb8f63c48a1e4a597300d backup_restore=1 - multi_instance=0 + multi_instance=1 incorrect_path=0 port_already_use=1 (8448) change_url=0 diff --git a/manifest.json b/manifest.json index b82c846..848ace3 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "requirements": { "yunohost": ">= 11.0.11" }, - "multi_instance": false, + "multi_instance": true, "services": [ "nginx" ], From af8007277f4e94902053245c6adf415bd8ecfb89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 27 Aug 2023 23:07:26 +0200 Subject: [PATCH 8/8] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index ba82e45..9c28469 100644 --- a/check_process +++ b/check_process @@ -15,7 +15,7 @@ upgrade=1 from_commit=0a485e0d6bcd14392b9203b3b27e7e1a7ba21d19 upgrade=1 from_commit=6af39e6e086e70e2063eb8f63c48a1e4a597300d backup_restore=1 - multi_instance=1 + multi_instance=0 incorrect_path=0 port_already_use=1 (8448) change_url=0