From 3dbac39293b90ad2aceb1790f7744017ebbb3b67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 30 May 2019 17:49:06 +0000 Subject: [PATCH 01/14] Upgrade synapse to 0.99.5.2 --- README.md | 2 +- conf/armv7_jessie.src | 4 ++-- conf/armv7_stretch.src | 4 ++-- manifest.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b691140..6c43f81 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://riot.im/app/#/room/#yunohost:matrix.org](https://riot.im/app/#/room/#yunohost:matrix.org) -**Shipped version:** 0.99.5.1 +**Shipped version:** 0.99.5.2 Configuration ------------- diff --git a/conf/armv7_jessie.src b/conf/armv7_jessie.src index 24d49c6..261cd98 100644 --- a/conf/armv7_jessie.src +++ b/conf/armv7_jessie.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.99.5.1/matrix-synapse_0.99.5.1-jessie-bin1_armv7l.tar.gz -SOURCE_SUM=da24c88adb88e31179aab03aeec6f73394ebf8078166e141340a243b3b81bc8e +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.99.5.2/matrix-synapse_0.99.5.2-jessie-bin1_armv7l.tar.gz +SOURCE_SUM=c970664f11220e6aed8cc1fbe93c09c95f09408ba1c44e5c520fdb95be80469d # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src index cc53495..855535f 100644 --- a/conf/armv7_stretch.src +++ b/conf/armv7_stretch.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.99.5.1/matrix-synapse_0.99.5.1-stretch-bin1_armv7l.tar.gz -SOURCE_SUM=55c060870593c140d05c60e5993a7fcf564d56c9e194d1a203c43de0b71b9591 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.99.5.2/matrix-synapse_0.99.5.2-stretch-bin1_armv7l.tar.gz +SOURCE_SUM=04c349c0cd44c07e59f15830ad003417493460f0fa06f28f64468ff1f65176ac # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index bb6d2f5..2d3795d 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,7 @@ "en": "Instant messaging server who use matrix", "fr": "Un serveur de messagerie instantané basé sur matrix" }, - "version": "0.99.5.1~ynh1", + "version": "0.99.5.2~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 8c58abd4fbaca451b68902d385da8550b0071a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 13 Jun 2019 06:56:19 +0000 Subject: [PATCH 02/14] Upgrade synapse to 1.0.0 --- README.md | 2 +- conf/armv7_jessie.src | 4 ++-- conf/armv7_stretch.src | 4 ++-- manifest.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6c43f81..15594a4 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://riot.im/app/#/room/#yunohost:matrix.org](https://riot.im/app/#/room/#yunohost:matrix.org) -**Shipped version:** 0.99.5.2 +**Shipped version:** 1.0.0 Configuration ------------- diff --git a/conf/armv7_jessie.src b/conf/armv7_jessie.src index 261cd98..b5085ab 100644 --- a/conf/armv7_jessie.src +++ b/conf/armv7_jessie.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.99.5.2/matrix-synapse_0.99.5.2-jessie-bin1_armv7l.tar.gz -SOURCE_SUM=c970664f11220e6aed8cc1fbe93c09c95f09408ba1c44e5c520fdb95be80469d +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.0.0/matrix-synapse_1.0.0-jessie-bin1_armv7l.tar.gz +SOURCE_SUM= # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src index 855535f..c3e6210 100644 --- a/conf/armv7_stretch.src +++ b/conf/armv7_stretch.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.99.5.2/matrix-synapse_0.99.5.2-stretch-bin1_armv7l.tar.gz -SOURCE_SUM=04c349c0cd44c07e59f15830ad003417493460f0fa06f28f64468ff1f65176ac +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.0.0/matrix-synapse_1.0.0-stretch-bin1_armv7l.tar.gz +SOURCE_SUM=610b3a8591c33a93f82a9f6d5c250774d78262175b9faf0b805e5ad0b7d5a194 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index 2d3795d..d7cc774 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,7 @@ "en": "Instant messaging server who use matrix", "fr": "Un serveur de messagerie instantané basé sur matrix" }, - "version": "0.99.5.2~ynh1", + "version": "1.0.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 2be94ede44ba4d3d8b3771b29747b66594754664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 5 Jul 2019 08:25:18 +0200 Subject: [PATCH 03/14] Install Jinja2 manually --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 0ce0279..d231a5c 100644 --- a/scripts/install +++ b/scripts/install @@ -162,7 +162,7 @@ else source $final_path/bin/activate pip3 install --upgrade pip pip3 install --upgrade setuptools wheel - pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml + pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml jinja2 pip3 install --upgrade matrix-synapse==$upstream_version matrix-synapse-ldap3 # This function was defined when we called "source $final_path/bin/activate". With this function we undo what "$final_path/bin/activate" does diff --git a/scripts/upgrade b/scripts/upgrade index fd9e4f4..2cba4c9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -108,7 +108,7 @@ else # We set all necessary environement variable to create a python virtualenvironnement. source $final_path/bin/activate pip3 install --upgrade setuptools wheel - pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml + pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml jinja2 pip3 install --upgrade matrix-synapse==$upstream_version matrix-synapse-ldap3 # This function was defined when we called "source $final_path/bin/activate". With this function we undo what "$final_path/bin/activate" does From 81faa5b2fa0d24e4d17bdc6953b09e8aa9a61e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 5 Jul 2019 08:56:36 +0000 Subject: [PATCH 04/14] Upgrade synapse to 1.1.0 --- README.md | 2 +- conf/armv7_stretch.src | 4 ++-- manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 15594a4..fb5106b 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://riot.im/app/#/room/#yunohost:matrix.org](https://riot.im/app/#/room/#yunohost:matrix.org) -**Shipped version:** 1.0.0 +**Shipped version:** 1.1.0 Configuration ------------- diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src index c3e6210..291d4e3 100644 --- a/conf/armv7_stretch.src +++ b/conf/armv7_stretch.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.0.0/matrix-synapse_1.0.0-stretch-bin1_armv7l.tar.gz -SOURCE_SUM=610b3a8591c33a93f82a9f6d5c250774d78262175b9faf0b805e5ad0b7d5a194 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.1.0/matrix-synapse_1.1.0-stretch-bin1_armv7l.tar.gz +SOURCE_SUM=5344443a78a4b4a540c210380e9c73aab08181f44f60e32e5447a9b78a1c21ce # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index d7cc774..fdbbd20 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,7 @@ "en": "Instant messaging server who use matrix", "fr": "Un serveur de messagerie instantané basé sur matrix" }, - "version": "1.0.0~ynh1", + "version": "1.1.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 5c7ac659ba23ff838cc3f232cd5ed76b169b78c2 Mon Sep 17 00:00:00 2001 From: Nicolas Frandeboeuf Date: Tue, 23 Jul 2019 10:22:14 +0200 Subject: [PATCH 05/14] Fix typo in IP6 validation --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index de7c3ca..28b1a5b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -122,7 +122,7 @@ else ynh_replace_string '__IPV4__,' "" "$coturn_config_path" fi -if [[ -n "$public_ip6" ]] && ynh_valide_ip6 "$public_ip6" +if [[ -n "$public_ip6" ]] && ynh_validate_ip6 "$public_ip6" then ynh_replace_string '__IPV6__' "$public_ip6" "$coturn_config_path" else From a2c9bc0700501baae24040c872114cb35a99b515 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 23 Jul 2019 18:29:50 +0200 Subject: [PATCH 06/14] Explain is_public --- manifest.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.json b/manifest.json index fdbbd20..0d1e432 100644 --- a/manifest.json +++ b/manifest.json @@ -38,6 +38,9 @@ "en": "Is it a public server ?", "fr": "Est-ce un serveur public ?" }, + "help": { + "en": "A public server means that anybody will be able to register on this server." + } "default": 0 } ] From b73c81634e34eebb0217a8d40978d5a9e6d99918 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 23 Jul 2019 18:31:45 +0200 Subject: [PATCH 07/14] Typo :/ --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 0d1e432..a751ed2 100644 --- a/manifest.json +++ b/manifest.json @@ -40,7 +40,7 @@ }, "help": { "en": "A public server means that anybody will be able to register on this server." - } + }, "default": 0 } ] From 0057c0b3d53838c68705d5625e5f788b30d13a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 26 Jul 2019 08:55:58 +0000 Subject: [PATCH 08/14] Upgrade synapse to 1.2.0 --- README.md | 2 +- conf/armv7_stretch.src | 4 ++-- manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fb5106b..f0046fd 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://riot.im/app/#/room/#yunohost:matrix.org](https://riot.im/app/#/room/#yunohost:matrix.org) -**Shipped version:** 1.1.0 +**Shipped version:** 1.2.0 Configuration ------------- diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src index 291d4e3..9007b82 100644 --- a/conf/armv7_stretch.src +++ b/conf/armv7_stretch.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.1.0/matrix-synapse_1.1.0-stretch-bin1_armv7l.tar.gz -SOURCE_SUM=5344443a78a4b4a540c210380e9c73aab08181f44f60e32e5447a9b78a1c21ce +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.2.0/matrix-synapse_1.2.0-stretch-bin1_armv7l.tar.gz +SOURCE_SUM=719c8e6676d5e68011f00ce0b3e8fdbe3e4b2f53f6c482dfbb8d4b4e9746ce42 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index fdbbd20..1ac9d9d 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,7 @@ "en": "Instant messaging server who use matrix", "fr": "Un serveur de messagerie instantané basé sur matrix" }, - "version": "1.1.0~ynh1", + "version": "1.2.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 9fd7769a417f53a008a8b6b95c1d53b23846f005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 26 Jul 2019 12:48:45 +0000 Subject: [PATCH 09/14] Upgrade synapse to 1.2.1 --- README.md | 2 +- conf/armv7_stretch.src | 4 ++-- manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f0046fd..6543893 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://riot.im/app/#/room/#yunohost:matrix.org](https://riot.im/app/#/room/#yunohost:matrix.org) -**Shipped version:** 1.2.0 +**Shipped version:** 1.2.1 Configuration ------------- diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src index 9007b82..d7a23a6 100644 --- a/conf/armv7_stretch.src +++ b/conf/armv7_stretch.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.2.0/matrix-synapse_1.2.0-stretch-bin1_armv7l.tar.gz -SOURCE_SUM=719c8e6676d5e68011f00ce0b3e8fdbe3e4b2f53f6c482dfbb8d4b4e9746ce42 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.2.1/matrix-synapse_1.2.1-stretch-bin1_armv7l.tar.gz +SOURCE_SUM=b716ac0ea009ca5882fd938a6a32d316e4c5d95a4985afcf142f86809eadc853 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index 1ac9d9d..615ce25 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,7 @@ "en": "Instant messaging server who use matrix", "fr": "Un serveur de messagerie instantané basé sur matrix" }, - "version": "1.2.0~ynh1", + "version": "1.2.1~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 9918f7bef209235453ddfcd49bb032d0747bbb8d Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 26 Jul 2019 20:24:41 +0200 Subject: [PATCH 10/14] Update manifest.json Co-Authored-By: Mayeul Cantan --- manifest.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index a751ed2..7362d3e 100644 --- a/manifest.json +++ b/manifest.json @@ -39,7 +39,8 @@ "fr": "Est-ce un serveur public ?" }, "help": { - "en": "A public server means that anybody will be able to register on this server." + "en": "A public server means that anybody will be able to register on this server.", + "fr": "Un serveur public signifie que n'importe qui poura s'enregistrer sur ce serveur" }, "default": 0 } From a771acc979ac35064a03ee8253c8af16ff6066db Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 30 Jul 2019 16:18:50 +0200 Subject: [PATCH 11/14] Typo --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 7362d3e..49af867 100644 --- a/manifest.json +++ b/manifest.json @@ -40,7 +40,7 @@ }, "help": { "en": "A public server means that anybody will be able to register on this server.", - "fr": "Un serveur public signifie que n'importe qui poura s'enregistrer sur ce serveur" + "fr": "Un serveur public signifie que n'importe qui pourra s'enregistrer sur ce serveur." }, "default": 0 } From 4bba2a6fcf4a8e89b1e70355912c18c622ee70bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Tue, 20 Aug 2019 00:10:06 +0200 Subject: [PATCH 12/14] Upgrade to synapse v1.3.1 --- README.md | 2 +- conf/armv7_stretch.src | 4 ++-- manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6543893..c490814 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://riot.im/app/#/room/#yunohost:matrix.org](https://riot.im/app/#/room/#yunohost:matrix.org) -**Shipped version:** 1.2.1 +**Shipped version:** 1.3.1 Configuration ------------- diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src index d7a23a6..4eaf73e 100644 --- a/conf/armv7_stretch.src +++ b/conf/armv7_stretch.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.2.1/matrix-synapse_1.2.1-stretch-bin1_armv7l.tar.gz -SOURCE_SUM=b716ac0ea009ca5882fd938a6a32d316e4c5d95a4985afcf142f86809eadc853 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.3.1/matrix-synapse_1.3.1-stretch-bin1_armv7l.tar.gz +SOURCE_SUM=5d5bc39c6e868815daf211ac85ab03b9ae857dce60a3e3bdcaae0f835b295702 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index d7c9d22..fd16b83 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,7 @@ "en": "Instant messaging server who use matrix", "fr": "Un serveur de messagerie instantané basé sur matrix" }, - "version": "1.2.1~ynh1", + "version": "1.3.1~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 38d3018a389038a61a55e2a941a381d8f1f029eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Tue, 3 Sep 2019 15:38:09 +0200 Subject: [PATCH 13/14] Fix commit for CI --- check_process | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index 455b786..7e350c5 100644 --- a/check_process +++ b/check_process @@ -12,7 +12,7 @@ setup_public=1 upgrade=1 upgrade=1 from_commit=db374d2bff981d2660ebdac52ee77c684383c00d - upgrade=1 from_commit=ca5bc8dba9f7594bf985c69543f0c10a093fc097 + upgrade=1 from_commit=39b2e75dc51ac1a3f1ef937b6009e6fe786b037f backup_restore=1 multi_instance=1 incorrect_path=0 @@ -33,5 +33,5 @@ ;;; Upgrade options ; commit=db374d2bff981d2660ebdac52ee77c684383c00d name=Fix postgresql helper from old_version_for_CI_2 branch - ; commit=ca5bc8dba9f7594bf985c69543f0c10a093fc097 + ; commit=39b2e75dc51ac1a3f1ef937b6009e6fe786b037f name=Migrate from self signed certificate to cert managed by Yunohost From eca523222e6b86e87f118035d5ac784a9482f5a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Tue, 3 Sep 2019 20:43:34 +0200 Subject: [PATCH 14/14] Use specific commit for CI --- check_process | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index 7e350c5..953da6e 100644 --- a/check_process +++ b/check_process @@ -12,7 +12,7 @@ setup_public=1 upgrade=1 upgrade=1 from_commit=db374d2bff981d2660ebdac52ee77c684383c00d - upgrade=1 from_commit=39b2e75dc51ac1a3f1ef937b6009e6fe786b037f + upgrade=1 from_commit=0b830d9e4eadefb907f1f30a02ffbb84778f91fc backup_restore=1 multi_instance=1 incorrect_path=0 @@ -33,5 +33,5 @@ ;;; Upgrade options ; commit=db374d2bff981d2660ebdac52ee77c684383c00d name=Fix postgresql helper from old_version_for_CI_2 branch - ; commit=39b2e75dc51ac1a3f1ef937b6009e6fe786b037f + ; commit=0b830d9e4eadefb907f1f30a02ffbb84778f91fc name=Migrate from self signed certificate to cert managed by Yunohost