From 2ec5b92aa0fa68005567b234ed27f2ff63a7f55c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Thu, 9 Jan 2020 21:52:45 +0000
Subject: [PATCH 01/11] Upgrade synapse to 1.8.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 ac4145c..6bfc41b 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,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.7.3
+**Shipped version:** 1.8.0
 
 ## Configuration
 
diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src
index f5bf623..92ad459 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.7.3/matrix-synapse_1.7.3-stretch-bin1_armv7l.tar.gz
-SOURCE_SUM=8f1674613ea0233a9c9f476751a82a39ec147d6d8b88d7397636a4b7cb91a231
+SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.8.0/matrix-synapse_1.8.0-stretch-bin1_armv7l.tar.gz
+SOURCE_SUM=ec3ad785e7d888b7f057e4bfa8a6d2f4b74b223ef2514d5e424e92e96226bbc8
 # (Optional) Program to check the integrity (sha256sum, md5sum...)
 # default: sha256
 SOURCE_SUM_PRG=sha256sum
diff --git a/manifest.json b/manifest.json
index ec84f86..2f8399a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Instant messaging server who use matrix",
 		"fr": "Un serveur de messagerie instantané basé sur matrix"
 	},
-	"version": "1.7.3~ynh1",
+	"version": "1.8.0~ynh1",
 	"url": "http://matrix.org",
 	"license": "Apache-2.0",
 	"maintainer": {

From e5d076326ceba83c526f58292190827d1378c5c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Thu, 23 Jan 2020 20:20:31 +0000
Subject: [PATCH 02/11] Upgrade synapse to 1.9.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 6bfc41b..762f78d 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,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.8.0
+**Shipped version:** 1.9.0
 
 ## Configuration
 
diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src
index 92ad459..33b4669 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.8.0/matrix-synapse_1.8.0-stretch-bin1_armv7l.tar.gz
-SOURCE_SUM=ec3ad785e7d888b7f057e4bfa8a6d2f4b74b223ef2514d5e424e92e96226bbc8
+SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.9.0/matrix-synapse_1.9.0-stretch-bin1_armv7l.tar.gz
+SOURCE_SUM=11151c20b470835ace71f364fd9c4cf325fb62d39f2848c109d8fe430fe5fdbc
 # (Optional) Program to check the integrity (sha256sum, md5sum...)
 # default: sha256
 SOURCE_SUM_PRG=sha256sum
diff --git a/manifest.json b/manifest.json
index 2f8399a..ccf8e05 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Instant messaging server who use matrix",
 		"fr": "Un serveur de messagerie instantané basé sur matrix"
 	},
-	"version": "1.8.0~ynh1",
+	"version": "1.9.0~ynh1",
 	"url": "http://matrix.org",
 	"license": "Apache-2.0",
 	"maintainer": {

From d7316c70934619f10ab8b31e664e429fed015b67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Sun, 26 Jan 2020 15:45:28 +0100
Subject: [PATCH 03/11] Remove old venv files

---
 scripts/upgrade | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 0552f01..7c10e7b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -136,6 +136,11 @@ then
 
 	if [ -n "$(uname -m | grep arm)" ]
 	then
+		# Clean old file, sometime it could make some big issues if we don't do this !!
+		ynh_secure_remove --file=$final_path/bin
+		ynh_secure_remove --file=$final_path/lib
+		ynh_secure_remove --file=$final_path/include
+		ynh_secure_remove --file=$final_path/share
 		ynh_setup_source --dest_dir=$final_path/ --source_id="armv7_$(lsb_release --codename --short)"
 	else
 		# Install virtualenv if it don't exist

From 3bf5a13ec59511649fea7a8a89f9615214c2cf1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Tue, 28 Jan 2020 21:54:26 +0000
Subject: [PATCH 04/11] Upgrade synapse to 1.9.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 762f78d..76f4e91 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,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.9.0
+**Shipped version:** 1.9.1
 
 ## Configuration
 
diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src
index 33b4669..1d73ae3 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.9.0/matrix-synapse_1.9.0-stretch-bin1_armv7l.tar.gz
-SOURCE_SUM=11151c20b470835ace71f364fd9c4cf325fb62d39f2848c109d8fe430fe5fdbc
+SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.9.1/matrix-synapse_1.9.1-stretch-bin1_armv7l.tar.gz
+SOURCE_SUM=1961f3bbbe3285daa511512ba566137101716ecb1dccbfb6aff37242b78520a6
 # (Optional) Program to check the integrity (sha256sum, md5sum...)
 # default: sha256
 SOURCE_SUM_PRG=sha256sum
diff --git a/manifest.json b/manifest.json
index ccf8e05..cdaa2c1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Instant messaging server who use matrix",
 		"fr": "Un serveur de messagerie instantané basé sur matrix"
 	},
-	"version": "1.9.0~ynh1",
+	"version": "1.9.1~ynh1",
 	"url": "http://matrix.org",
 	"license": "Apache-2.0",
 	"maintainer": {

From d86e4cb4d0f697064613982afddfd34a276b1cb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Wed, 12 Feb 2020 21:52:56 +0000
Subject: [PATCH 05/11] Upgrade synapse to 1.10.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 76f4e91..95f567e 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,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.9.1
+**Shipped version:** 1.10.0
 
 ## Configuration
 
diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src
index 1d73ae3..18d5d48 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.9.1/matrix-synapse_1.9.1-stretch-bin1_armv7l.tar.gz
-SOURCE_SUM=1961f3bbbe3285daa511512ba566137101716ecb1dccbfb6aff37242b78520a6
+SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.10.0/matrix-synapse_1.10.0-stretch-bin1_armv7l.tar.gz
+SOURCE_SUM=518f6ec59e7cc49e746b2037796df8dcb93e70eaad37a9db984a19ac1e3c8e3d
 # (Optional) Program to check the integrity (sha256sum, md5sum...)
 # default: sha256
 SOURCE_SUM_PRG=sha256sum
diff --git a/manifest.json b/manifest.json
index cdaa2c1..c243136 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Instant messaging server who use matrix",
 		"fr": "Un serveur de messagerie instantané basé sur matrix"
 	},
-	"version": "1.9.1~ynh1",
+	"version": "1.10.0~ynh1",
 	"url": "http://matrix.org",
 	"license": "Apache-2.0",
 	"maintainer": {

From 44cc4d66e9bf623a1abbc7c72afc4a015621190f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Mon, 17 Feb 2020 21:56:15 +0000
Subject: [PATCH 06/11] Upgrade synapse to 1.10.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 95f567e..1bf7cef 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,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.10.0
+**Shipped version:** 1.10.1
 
 ## Configuration
 
diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src
index 18d5d48..3ce2cb4 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.10.0/matrix-synapse_1.10.0-stretch-bin1_armv7l.tar.gz
-SOURCE_SUM=518f6ec59e7cc49e746b2037796df8dcb93e70eaad37a9db984a19ac1e3c8e3d
+SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.10.1/matrix-synapse_1.10.1-stretch-bin1_armv7l.tar.gz
+SOURCE_SUM=08e5273bfe2b74fb132379831959a03eb76d478c353970dba48ede48a3dce5d9
 # (Optional) Program to check the integrity (sha256sum, md5sum...)
 # default: sha256
 SOURCE_SUM_PRG=sha256sum
diff --git a/manifest.json b/manifest.json
index c243136..27266c6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Instant messaging server who use matrix",
 		"fr": "Un serveur de messagerie instantané basé sur matrix"
 	},
-	"version": "1.10.0~ynh1",
+	"version": "1.10.1~ynh1",
 	"url": "http://matrix.org",
 	"license": "Apache-2.0",
 	"maintainer": {

From 50c9463d96ffebb55d59b9772a4a0f9542923012 Mon Sep 17 00:00:00 2001
From: Josue-T <josue@tille.ch>
Date: Wed, 19 Feb 2020 22:15:20 +0100
Subject: [PATCH 07/11] Update scripts/upgrade

Co-Authored-By: JimboJoe <jimmy@monin.net>
---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 7c10e7b..34636b8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -136,7 +136,7 @@ then
 
 	if [ -n "$(uname -m | grep arm)" ]
 	then
-		# Clean old file, sometime it could make some big issues if we don't do this !!
+		# Clean old file, sometimes it could make some big issues if we don't do this!!
 		ynh_secure_remove --file=$final_path/bin
 		ynh_secure_remove --file=$final_path/lib
 		ynh_secure_remove --file=$final_path/include

From 47387772fdf15ccf87045647d313f2284ff45507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Fri, 21 Feb 2020 21:53:08 +0000
Subject: [PATCH 08/11] Upgrade synapse to 1.11.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 1bf7cef..2bdd207 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,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.10.1
+**Shipped version:** 1.11.0
 
 ## Configuration
 
diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src
index 3ce2cb4..667b8bf 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.10.1/matrix-synapse_1.10.1-stretch-bin1_armv7l.tar.gz
-SOURCE_SUM=08e5273bfe2b74fb132379831959a03eb76d478c353970dba48ede48a3dce5d9
+SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.11.0/matrix-synapse_1.11.0-stretch-bin1_armv7l.tar.gz
+SOURCE_SUM=8a4f13bdbe429c94df3aab07d289a61f5f2e372d45cda21ea9d297f1cc224ece
 # (Optional) Program to check the integrity (sha256sum, md5sum...)
 # default: sha256
 SOURCE_SUM_PRG=sha256sum
diff --git a/manifest.json b/manifest.json
index 27266c6..8d26690 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Instant messaging server who use matrix",
 		"fr": "Un serveur de messagerie instantané basé sur matrix"
 	},
-	"version": "1.10.1~ynh1",
+	"version": "1.11.0~ynh1",
 	"url": "http://matrix.org",
 	"license": "Apache-2.0",
 	"maintainer": {

From 26b84e6e511535bf99f7bb1de84cba4d11cad8be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Tue, 25 Feb 2020 23:03:02 +0100
Subject: [PATCH 09/11] Fix "if" condition"

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 34636b8..25f57ea 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -235,7 +235,7 @@ ynh_replace_special_string --match_string=__SYNAPSE_DB_PWD__ --replace_string=$s
 ynh_replace_special_string --match_string=__TURNPWD__ --replace_string=$turnserver_pwd --target_file="$homeserver_config_path"
 ynh_replace_special_string --match_string=__REGISTRATION_SECRET__ --replace_string="$registration_shared_secret" --target_file="$homeserver_config_path"
 ynh_replace_special_string --match_string=__FORM_SECRET__ --replace_string="$form_secret" --target_file="$homeserver_config_path"
-if [ -n $macaroon_secret_key ]; then
+if [ -z $macaroon_secret_key ]; then
     # Well, in this package this value was not managed because it was not needed, synapse is able to generate this with some other secret in the config file but after some vulnerability was found with this practice.
     # For more detail about this issue you can see : https://matrix.org/blog/2019/01/15/further-details-on-critical-security-update-in-synapse-affecting-all-versions-prior-to-0-34-1-cve-2019-5885/
     # The problem is that we can't just say generate a new value if the package has not already defined a value. The reason is that changing this value logout all user. And in case of a user has enabled the encryption, the user might lost all conversation !!

From a3050ffd238f39f482c79b53b6827fc9931ad426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Tue, 3 Mar 2020 21:54:16 +0000
Subject: [PATCH 10/11] Upgrade synapse to 1.11.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 2bdd207..69ca5a9 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,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.11.0
+**Shipped version:** 1.11.1
 
 ## Configuration
 
diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src
index 667b8bf..6bcd6d3 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.11.0/matrix-synapse_1.11.0-stretch-bin1_armv7l.tar.gz
-SOURCE_SUM=8a4f13bdbe429c94df3aab07d289a61f5f2e372d45cda21ea9d297f1cc224ece
+SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.11.1/matrix-synapse_1.11.1-stretch-bin1_armv7l.tar.gz
+SOURCE_SUM=d793d49c561898330ce62bc7c1620b71467d611c375c41b697d2fd3064ddbee4
 # (Optional) Program to check the integrity (sha256sum, md5sum...)
 # default: sha256
 SOURCE_SUM_PRG=sha256sum
diff --git a/manifest.json b/manifest.json
index 8d26690..cd6b819 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Instant messaging server who use matrix",
 		"fr": "Un serveur de messagerie instantané basé sur matrix"
 	},
-	"version": "1.11.0~ynh1",
+	"version": "1.11.1~ynh1",
 	"url": "http://matrix.org",
 	"license": "Apache-2.0",
 	"maintainer": {

From 874d68f6537a4efb3915600569d6da774fe3b6ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Fri, 6 Mar 2020 21:41:56 +0100
Subject: [PATCH 11/11] Fix "if" condition"

---
 scripts/change_url | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/change_url b/scripts/change_url
index 59a44c5..d8065af 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -114,7 +114,7 @@ ynh_replace_special_string --match_string=__SYNAPSE_DB_PWD__ --replace_string=$s
 ynh_replace_special_string --match_string=__TURNPWD__ --replace_string=$turnserver_pwd --target_file="$homeserver_config_path"
 ynh_replace_special_string --match_string=__REGISTRATION_SECRET__ --replace_string="$registration_shared_secret" --target_file="$homeserver_config_path"
 ynh_replace_special_string --match_string=__FORM_SECRET__ --replace_string="$form_secret" --target_file="$homeserver_config_path"
-if [ -n $macaroon_secret_key ]; then
+if [ -z $macaroon_secret_key ]; then
     # Well, in this package this value was not managed because it was not needed, synapse is able to generate this with some other secret in the config file but after some vulnerability was found with this practice.
     # For more detail about this issue you can see : https://matrix.org/blog/2019/01/15/further-details-on-critical-security-update-in-synapse-affecting-all-versions-prior-to-0-34-1-cve-2019-5885/
     # The problem is that we can't just say generate a new value if the package has not already defined a value. The reason is that changing this value logout all user. And in case of a user has enabled the encryption, the user might lost all conversation !!