From 14fed37a13008206fbac9bbd77d381e52e719fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 25 Oct 2023 01:12:10 +0200 Subject: [PATCH 1/8] Upgrade synapse to 1.95.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 2c57790..5430fcd 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.94.0/matrix-synapse_1.94.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=e9145698dd5f96a24bef267844821a446fef47a5f938ea9e3e09fb29d967dcb1 +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 # (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 006f18d..2b18ef8 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.94.0/matrix-synapse_1.94.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=7a91ceb6a2696ea646ed7959c51549caf4006bfa565010b875dbfbfc1794c010 +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 # (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 73802ec..5ac0771 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -6,9 +6,9 @@ bleach==6.1.0 canonicaljson==2.0.0 certifi==2023.7.22 cffi==1.16.0 -charset-normalizer==3.3.0 +charset-normalizer==3.3.1 constantly==15.1.0 -cryptography==41.0.4 +cryptography==41.0.5 hyperlink==21.0.0 idna==3.4 ijson==3.2.3 @@ -21,14 +21,14 @@ ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.94.0 -matrix-synapse-ldap3==0.2.2 +matrix-synapse==1.95.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.22 -Pillow==10.0.1 +phonenumbers==8.13.23 +Pillow==10.1.0 prometheus-client==0.17.1 psycopg2==2.9.9 pyasn1==0.5.0 @@ -42,7 +42,7 @@ pyOpenSSL==23.2.0 PyYAML==6.0.1 referencing==0.30.2 requests==2.31.0 -rpds-py==0.10.4 +rpds-py==0.10.6 semantic-version==2.10.0 service-identity==23.1.0 setuptools-rust==1.7.0 @@ -53,6 +53,6 @@ treq==22.2.0 Twisted==23.8.0 typing_extensions==4.8.0 unpaddedbase64==2.1.0 -urllib3==2.0.6 +urllib3==2.0.7 webencodings==0.5.1 zope.interface==6.1 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 06c6f04..1e5e2e5 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -6,9 +6,9 @@ bleach==6.1.0 canonicaljson==2.0.0 certifi==2023.7.22 cffi==1.16.0 -charset-normalizer==3.3.0 +charset-normalizer==3.3.1 constantly==15.1.0 -cryptography==41.0.4 +cryptography==41.0.5 hyperlink==21.0.0 idna==3.4 ijson==3.2.3 @@ -21,14 +21,14 @@ ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.94.0 -matrix-synapse-ldap3==0.2.2 +matrix-synapse==1.95.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.22 -Pillow==10.0.1 +phonenumbers==8.13.23 +Pillow==10.1.0 pkg_resources==0.0.0 prometheus-client==0.17.1 psycopg2==2.9.9 @@ -43,7 +43,7 @@ pyOpenSSL==23.2.0 PyYAML==6.0.1 referencing==0.30.2 requests==2.31.0 -rpds-py==0.10.4 +rpds-py==0.10.6 semantic-version==2.10.0 service-identity==23.1.0 setuptools-rust==1.7.0 @@ -55,6 +55,6 @@ treq==22.2.0 Twisted==23.8.0 typing_extensions==4.8.0 unpaddedbase64==2.1.0 -urllib3==2.0.6 +urllib3==2.0.7 webencodings==0.5.1 zope.interface==6.1 diff --git a/manifest.json b/manifest.json index 81ae9c7..d835889 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.94.0~ynh1", + "version": "1.95.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 71f9c1d55eb9ff0770119544d3036cc023da05cc Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 26 Oct 2023 08:12:55 +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 1a24149..d5f21bc 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.94.0~ynh1 +**Shipped version:** 1.95.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 157c1dd..9119a82 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.94.0~ynh1 +**Version incluse :** 1.95.0~ynh1 ## Avertissements / informations importantes ## Configuration 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 3/8] 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 4/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] 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$"