From e3d2e12256bdaa2c090520b0880b39e4f6c73b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Tue, 7 May 2024 13:09:25 +0200 Subject: [PATCH 1/2] fix shell check --- scripts/_common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index e3bdca4..6c0f7db 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -29,9 +29,9 @@ install_sources() { ynh_setup_source --dest_dir="$code_dir"/ --source_id="synapse_prebuilt_armv7_$(lsb_release --codename --short)" # Fix multi-instance support - for f in $(ls "$code_dir"/bin); do + for f in "$code_dir"/bin/*; do if ! [[ $f =~ "__" ]]; then - ynh_replace_special_string --match_string='#!/opt/yunohost/matrix-synapse' --replace_string='#!'$code_dir --target_file="$code_dir"/bin/"$f" + ynh_replace_special_string --match_string='#!/opt/yunohost/matrix-synapse' --replace_string='#!'"$code_dir" --target_file="$f" fi done else From 4acfef63e5cb495221a7f8266ba64baf6a7f09b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 15 May 2024 02:07:39 +0200 Subject: [PATCH 2/2] Upgrade synapse to 1.107.0 --- conf/requirement_bookworm.txt | 16 ++++++++-------- conf/requirement_bullseye.txt | 16 ++++++++-------- manifest.toml | 10 +++++----- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt index 7e3123f..0063686 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -1,33 +1,33 @@ annotated-types==0.6.0 attrs==23.2.0 Automat==22.10.0 -bcrypt==4.1.2 +bcrypt==4.1.3 bleach==6.1.0 canonicaljson==2.0.0 certifi==2024.2.2 cffi==1.16.0 charset-normalizer==3.3.2 constantly==23.10.4 -cryptography==42.0.5 +cryptography==42.0.7 hyperlink==21.0.0 idna==3.7 ijson==3.2.3 immutabledict==4.2.0 incremental==22.10.0 -Jinja2==3.1.3 +Jinja2==3.1.4 jsonschema==4.22.0 jsonschema-specifications==2023.12.1 ldap3==2.9.1 -lxml==5.2.1 +lxml==5.2.2 MarkupSafe==2.1.5 matrix-common==1.3.0 -matrix-synapse==1.106.0 +matrix-synapse==1.107.0 matrix-synapse-ldap3==0.3.0 msgpack==1.0.8 ndg-httpsclient==0.5.1 netaddr==1.2.1 packaging==24.0 -phonenumbers==8.13.35 +phonenumbers==8.13.36 pillow==10.3.0 prometheus_client==0.20.0 psycopg2==2.9.9 @@ -40,9 +40,9 @@ pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==24.1.0 PyYAML==6.0.1 -referencing==0.35.0 +referencing==0.35.1 requests==2.31.0 -rpds-py==0.18.0 +rpds-py==0.18.1 semantic-version==2.10.0 service-identity==24.1.0 setuptools-rust==1.9.0 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 21d5f61..cc777b5 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -1,33 +1,33 @@ annotated-types==0.6.0 attrs==23.2.0 Automat==22.10.0 -bcrypt==4.1.2 +bcrypt==4.1.3 bleach==6.1.0 canonicaljson==2.0.0 certifi==2024.2.2 cffi==1.16.0 charset-normalizer==3.3.2 constantly==23.10.4 -cryptography==42.0.5 +cryptography==42.0.7 hyperlink==21.0.0 idna==3.7 ijson==3.2.3 immutabledict==4.2.0 incremental==22.10.0 -Jinja2==3.1.3 +Jinja2==3.1.4 jsonschema==4.22.0 jsonschema-specifications==2023.12.1 ldap3==2.9.1 -lxml==5.2.1 +lxml==5.2.2 MarkupSafe==2.1.5 matrix-common==1.3.0 -matrix-synapse==1.106.0 +matrix-synapse==1.107.0 matrix-synapse-ldap3==0.3.0 msgpack==1.0.8 ndg-httpsclient==0.5.1 netaddr==1.2.1 packaging==24.0 -phonenumbers==8.13.35 +phonenumbers==8.13.36 pillow==10.3.0 prometheus_client==0.20.0 psycopg2==2.9.9 @@ -40,9 +40,9 @@ pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==24.1.0 PyYAML==6.0.1 -referencing==0.35.0 +referencing==0.35.1 requests==2.31.0 -rpds-py==0.18.0 +rpds-py==0.18.1 semantic-version==2.10.0 service-identity==24.1.0 setuptools-rust==1.9.0 diff --git a/manifest.toml b/manifest.toml index cd8c975..b88a7e2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Synapse" description.en = "Instant messaging server which uses Matrix" description.fr = "Serveur de messagerie instantané basé sur Matrix" -version = "1.106.0~ynh1" +version = "1.107.0~ynh1" maintainers = ["Josué Tille"] @@ -63,13 +63,13 @@ ram.runtime = "1G" [resources] [resources.sources.synapse_prebuilt_armv7_bookworm] prefetch = false - armhf.url = "https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.106.0/matrix-synapse_1.106.0-bookworm-bin1_armv7l.tar.gz" - armhf.sha256 = "a33070c47f3b0175d304ff9e13bd77b87743b4c457ee58c498fe1985e9fea336" + armhf.url = "https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.107.0/matrix-synapse_1.107.0-bookworm-bin1_armv7l.tar.gz" + armhf.sha256 = "568ed915a0ea9984e9163c74457c3c5263af08b93dbef74dd177f53aabf60538" [resources.sources.synapse_prebuilt_armv7_bullseye] prefetch = false - armhf.url = "https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.106.0/matrix-synapse_1.106.0-bullseye-bin1_armv7l.tar.gz" - armhf.sha256 = "8e4ae0f16474458e4a4c1759d75e73f5ef15e4323a7b2ce6dbeb8fa56f4f44c2" + armhf.url = "https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.107.0/matrix-synapse_1.107.0-bullseye-bin1_armv7l.tar.gz" + armhf.sha256 = "587118c7040ab64e4f4a85a014da89cd6b6b7258c3062a9abbd900b1a48e82d9" [resources.system_user] allow_email = true