From 4e7aadd0353f4245e2629c100caa93d4c3ae9cfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 1 Mar 2023 00:59:28 +0100 Subject: [PATCH 1/5] Upgrade synapse to 1.78.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 8 ++++---- conf/requirement_bullseye.txt | 8 ++++---- manifest.json | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index dac0f8d..ddc2c0a 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.77.0/matrix-synapse_1.77.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=60b117008ebd0339c397983f11d8b3538eb5cd086839fcb3c46b70dc4348afda +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.78.0/matrix-synapse_1.78.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=9ae1750d1158f0c84bc9030d10dd1b2aeb222c42db75ca46f4504d5b1be505cd # (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 5ecc6f7..93f65bf 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.77.0/matrix-synapse_1.77.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=ddefcfa9ba4b80ac4b49cbd4ab4172c27136ce0ab32d4ac3f1d517ecc6b43391 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.78.0/matrix-synapse_1.78.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=77af36a3101e2ac31f439834b1ad18ba9859cfd56494cb1a50d074abea1c64e6 # (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 251f97d..656c34b 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -2,7 +2,7 @@ attrs==22.2.0 Automat==22.10.0 bcrypt==4.0.1 bleach==6.0.0 -canonicaljson==1.6.4 +canonicaljson==1.6.5 certifi==2022.12.7 cffi==1.15.1 charset-normalizer==3.0.1 @@ -19,7 +19,7 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.77.0 +matrix-synapse==1.78.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.4 ndg-httpsclient==0.5.1 @@ -32,7 +32,7 @@ psycopg2==2.9.5 pyasn1==0.4.8 pyasn1-modules==0.2.8 pycparser==2.21 -pydantic==1.10.4 +pydantic==1.10.5 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.0.0 @@ -48,7 +48,7 @@ six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 Twisted==22.10.0 -typing_extensions==4.4.0 +typing_extensions==4.5.0 unpaddedbase64==2.1.0 urllib3==1.26.14 webencodings==0.5.1 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 75b5c31..99621a4 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -2,7 +2,7 @@ attrs==22.2.0 Automat==22.10.0 bcrypt==4.0.1 bleach==6.0.0 -canonicaljson==1.6.4 +canonicaljson==1.6.5 certifi==2022.12.7 cffi==1.15.1 charset-normalizer==3.0.1 @@ -19,7 +19,7 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.77.0 +matrix-synapse==1.78.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.4 ndg-httpsclient==0.5.1 @@ -33,7 +33,7 @@ psycopg2==2.9.5 pyasn1==0.4.8 pyasn1-modules==0.2.8 pycparser==2.21 -pydantic==1.10.4 +pydantic==1.10.5 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.0.0 @@ -49,7 +49,7 @@ six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 Twisted==22.10.0 -typing_extensions==4.4.0 +typing_extensions==4.5.0 unpaddedbase64==2.1.0 urllib3==1.26.14 webencodings==0.5.1 diff --git a/manifest.json b/manifest.json index 07c6e6f..a004f17 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.77.0~ynh1", + "version": "1.78.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 48abc6a3c0f3b7cf3e14ab6bb22541f3f41b3c92 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 1 Mar 2023 07:13:23 +0000 Subject: [PATCH 2/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 379b8dc..8bf09dd 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.77.0~ynh1 +**Shipped version:** 1.78.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 70e87c3..06c85ec 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.77.0~ynh1 +**Version incluse :** 1.78.0~ynh1 ## Avertissements / informations importantes ## Configuration From eb3d09b6622617d4bf13dd61978da62dbd14d574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 6 Mar 2023 08:34:48 +0100 Subject: [PATCH 3/5] Cleanup install/upgrade source --- scripts/_common.sh | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 788440e..83fd3d9 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -53,23 +53,13 @@ install_sources() { pip3 install --upgrade setuptools wheel pip fi - temp_requirement=$(mktemp) - cp $YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt $temp_requirement - chown $synapse_user:root $temp_requirement - - chown $synapse_user:root -R $final_path pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml jinja2 - sudo -u $synapse_user env PATH=$PATH pip3 install --upgrade -r $temp_requirement - ynh_secure_remove $temp_requirement + pip3 install --upgrade -r $YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt # This function was defined when we called "source $final_path/bin/activate". With this function we undo what "$final_path/bin/activate" does set +$u_arg; deactivate set -$u_arg; - - # Remove Rust to reduce backup size - ynh_secure_remove --file=$final_path/.rustup - ynh_secure_remove --file=$final_path/.cargo fi } From a314eb0a05cf3322148403ceddfd69bc83f02a40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 15 Mar 2023 01:26:51 +0100 Subject: [PATCH 4/5] Upgrade synapse to 1.79.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 ddc2c0a..a9d854e 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.78.0/matrix-synapse_1.78.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=9ae1750d1158f0c84bc9030d10dd1b2aeb222c42db75ca46f4504d5b1be505cd +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.79.0/matrix-synapse_1.79.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=78ee92bd904143247adc410f0a7ab822a3bd63312cb6711473661db66e964aae # (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 93f65bf..741fe08 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.78.0/matrix-synapse_1.78.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=77af36a3101e2ac31f439834b1ad18ba9859cfd56494cb1a50d074abea1c64e6 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.79.0/matrix-synapse_1.79.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=bd792ded7d038b992fc5ceeb477307c566cdec0faa38cb796102ad7c9a85b808 # (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 656c34b..5de6ed8 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -5,9 +5,9 @@ bleach==6.0.0 canonicaljson==1.6.5 certifi==2022.12.7 cffi==1.15.1 -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 constantly==15.1.0 -cryptography==39.0.1 +cryptography==39.0.2 frozendict==2.3.4 hyperlink==21.0.0 idna==3.4 @@ -19,20 +19,20 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.78.0 +matrix-synapse==1.79.0 matrix-synapse-ldap3==0.2.2 -msgpack==1.0.4 +msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.0 -phonenumbers==8.13.6 +phonenumbers==8.13.7 Pillow==9.4.0 prometheus-client==0.16.0 psycopg2==2.9.5 pyasn1==0.4.8 pyasn1-modules==0.2.8 pycparser==2.21 -pydantic==1.10.5 +pydantic==1.10.6 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.0.0 @@ -43,13 +43,13 @@ semantic-version==2.10.0 service-identity==21.1.0 setuptools-rust==1.5.2 signedjson==1.1.4 -simplejson==3.18.3 +simplejson==3.18.4 six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 Twisted==22.10.0 typing_extensions==4.5.0 unpaddedbase64==2.1.0 -urllib3==1.26.14 +urllib3==1.26.15 webencodings==0.5.1 zope.interface==5.5.2 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 99621a4..3e255b6 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -5,9 +5,9 @@ bleach==6.0.0 canonicaljson==1.6.5 certifi==2022.12.7 cffi==1.15.1 -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 constantly==15.1.0 -cryptography==39.0.1 +cryptography==39.0.2 frozendict==2.3.4 hyperlink==21.0.0 idna==3.4 @@ -19,13 +19,13 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.78.0 +matrix-synapse==1.79.0 matrix-synapse-ldap3==0.2.2 -msgpack==1.0.4 +msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.0 -phonenumbers==8.13.6 +phonenumbers==8.13.7 Pillow==9.4.0 pkg_resources==0.0.0 prometheus-client==0.16.0 @@ -33,7 +33,7 @@ psycopg2==2.9.5 pyasn1==0.4.8 pyasn1-modules==0.2.8 pycparser==2.21 -pydantic==1.10.5 +pydantic==1.10.6 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.0.0 @@ -44,13 +44,13 @@ semantic-version==2.10.0 service-identity==21.1.0 setuptools-rust==1.5.2 signedjson==1.1.4 -simplejson==3.18.3 +simplejson==3.18.4 six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 Twisted==22.10.0 typing_extensions==4.5.0 unpaddedbase64==2.1.0 -urllib3==1.26.14 +urllib3==1.26.15 webencodings==0.5.1 zope.interface==5.5.2 diff --git a/manifest.json b/manifest.json index a004f17..aef1d41 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.78.0~ynh1", + "version": "1.79.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 0c56f3fd0ab385c3b340553297cb3f20e4e7a2a3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 15 Mar 2023 07:07:07 +0000 Subject: [PATCH 5/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 040ab0f..a1a00db 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.78.0~ynh1 +**Shipped version:** 1.79.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 20a9126..f55d969 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.78.0~ynh1 +**Version incluse :** 1.79.0~ynh1 ## Avertissements / informations importantes ## Configuration