From b8a205aeef1be7f02abba5bb891cdc3d1591bce2 Mon Sep 17 00:00:00 2001
From: Josue-T <josue@tille.ch>
Date: Tue, 26 Jun 2018 08:36:31 +0200
Subject: [PATCH 1/3] Upgrade synapse to 0.31.2 (#56)

---
 README.md              | 2 +-
 conf/armv7_jessie.src  | 4 ++--
 conf/armv7_stretch.src | 4 ++--
 conf/python_source.src | 4 ++--
 manifest.json          | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 9850454..79edde9 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.31.1
+**Shipped version:** 0.31.2
 
 Configuration
 -------------
diff --git a/conf/armv7_jessie.src b/conf/armv7_jessie.src
index 5a356da..40f5e93 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.31.1/matrix-synapse_0.31.1-jessie-bin1_armv7l.tar.gz
-SOURCE_SUM=77b12b4135e99da518e0c7910e3f929daf9200cea83ed5853f7712c77435a5bc
+SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.31.2/matrix-synapse_0.31.2-jessie-bin1_armv7l.tar.gz
+SOURCE_SUM=a82f65005f653530b1321fec70d8d59ce721685d5ea352c690bf96df8df743f2
 # (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 6c6f503..afbcf8c 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.31.1/matrix-synapse_0.31.1-stretch-bin1_armv7l.tar.gz
-SOURCE_SUM=bed38a43b7e770234f5c3278066316fa261486a885913248c0750088309d87fd
+SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.31.2/matrix-synapse_0.31.2-stretch-bin1_armv7l.tar.gz
+SOURCE_SUM=0374b08a3cf902fdc59f050ba9d7d80e6d5a267fa0e4240e89f17481f4afe25d
 # (Optional) Program to check the integrity (sha256sum, md5sum...)
 # default: sha256
 SOURCE_SUM_PRG=sha256sum
diff --git a/conf/python_source.src b/conf/python_source.src
index 040c3a8..8c3ccef 100644
--- a/conf/python_source.src
+++ b/conf/python_source.src
@@ -1,2 +1,2 @@
-SOURCE_URL=https://github.com/matrix-org/synapse/archive/v0.31.1.tar.gz
-SOURCE_SUM=0408b9f4fc91a90e138c19f0bf9851dcd30c970bd7d6c0bc7a0f498f39b12ac9
\ No newline at end of file
+SOURCE_URL=https://github.com/matrix-org/synapse/archive/v0.31.2.tar.gz
+SOURCE_SUM=dfe4dc9a048adefe324429a4882fde81708b7418130fdf693c9b63ef2f613d59
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 194228a..4ca38cd 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.31.1~ynh1",
+	"version": "0.31.2~ynh1",
 	"url": "http://matrix.org",
 	"license": "Apache-2.0",
 	"maintainer": {

From 1618deaffb725b20fbf0e9a5b68a7087ef392eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Thu, 28 Jun 2018 16:21:58 +0200
Subject: [PATCH 2/3] Change commit for upgrade in CI

---
 check_process | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/check_process b/check_process
index 20bd87c..163cd2e 100644
--- a/check_process
+++ b/check_process
@@ -11,7 +11,7 @@
         setup_private=0
         setup_public=1
         upgrade=1
-        upgrade=1   from_commit=a907e39c738997b0e30e9637a5b150bfecf06b18
+        upgrade=1   from_commit=db374d2bff981d2660ebdac52ee77c684383c00d
         backup_restore=1
         multi_instance=1
         incorrect_path=0
@@ -30,5 +30,5 @@
     Level 9=0
     Level 10=0
 ;;; Upgrade options
-	; commit=a907e39c738997b0e30e9637a5b150bfecf06b18
+	; commit=db374d2bff981d2660ebdac52ee77c684383c00d
 		name=Before multi_instance

From a12a4a72376f334c6bff7d997bad8196b192c4fb Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Wed, 4 Jul 2018 16:31:27 +0200
Subject: [PATCH 3/3] Change commit name

---
 check_process | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/check_process b/check_process
index 163cd2e..f0a8272 100644
--- a/check_process
+++ b/check_process
@@ -31,4 +31,4 @@
     Level 10=0
 ;;; Upgrade options
 	; commit=db374d2bff981d2660ebdac52ee77c684383c00d
-		name=Before multi_instance
+		name=Fix postgresql helper from old_version_for_CI_2 branch