From de592e6041f10279fc91b391b8d8b8227ac992d2 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Tue, 25 Jun 2019 21:29:45 +0200
Subject: [PATCH 1/3] Dummy help field :s

---
 manifest.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index dc9ed69..4169c87 100644
--- a/manifest.json
+++ b/manifest.json
@@ -58,10 +58,6 @@
 					"en": "Set the administrator password",
 					"fr": "Définissez le mot de passe administrateur"
 				},
-				"help": {
-					"en": "Use the help field to add an information for the admin about this question.",
-					"fr": "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question."
-				},
 				"example": "Choose a password"
 			},
 			{

From 2b25cb20d43e3214d86434fad30c3cc331afd1fc Mon Sep 17 00:00:00 2001
From: maniack <maniack@maniack-fixe>
Date: Tue, 9 Jul 2019 20:13:51 +0200
Subject: [PATCH 2/3] Temporary fix for getopts

---
 scripts/install | 6 ++++--
 scripts/upgrade | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index 47c9ff7..1845838 100644
--- a/scripts/install
+++ b/scripts/install
@@ -136,8 +136,10 @@ ynh_replace_string --match_string="__MYSQLUSER__" --replace_string=$db_name --ta
 ynh_replace_string --match_string="__MYSQLPASSWORD__" --replace_string="$db_pwd" --target_file="$application_file"
 ynh_replace_string --match_string="__LANGTOCHANGE__" --replace_string=$lang --target_file="$application_file"
 ynh_replace_string --match_string="__PLUGINSTOENABLE__" --replace_string="$plugins" --target_file="$application_file"
-ynh_replace_string --match_string="__TIME_ZONE__" --replace_string="$(date +%:::z)" --target_file="$application_file"
-
+# FIXME Temporary fix for rainloop, waiting for https://github.com/YunoHost/yunohost/pull/752 to be released.
+# ynh_replace_string --match_string="__TIME_ZONE__" --replace_string="$(date +%:::z)" --target_file="$application_file"
+timezone="$(date +%:::z)"
+ynh_replace_string --match_string="__TIME_ZONE__" --replace_string="${timezone//-/\\-}" --target_file="$application_file"
 
 # Set admin password
 php ../conf/config.php --index="$final_path/app/index.php" --password="$password"
diff --git a/scripts/upgrade b/scripts/upgrade
index db1f6cf..5e9cee0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -122,7 +122,10 @@ ynh_add_fpm_config
 ynh_script_progression --message="Upgrading rainloop configuration..."
 
 # Upgrade time_offset value for fail2ban
-ynh_replace_string --match_string="^time_offset = .*" --replace_string="time_offset = $(date +%:::z)" --target_file="$final_path/app/data/_data_/_default_/configs/application.ini"
+# FIXME Temporary fix for rainloop, waiting for https://github.com/YunoHost/yunohost/pull/752 to be released.
+# ynh_replace_string --match_string="^time_offset = .*" --replace_string="time_offset = $(date +%:::z)" --target_file="$final_path/app/data/_data_/_default_/configs/application.ini"
+timezone="$(date +%:::z)"
+ynh_replace_string --match_string="^time_offset = .*" --replace_string="time_offset = ${timezone//-/\\-}" --target_file="$final_path/app/data/_data_/_default_/configs/application.ini"
 
 # update SSO
 cp ../sources/sso/sso.php "$final_path/index.php"

From a791a1e6d550ef6447c2d5a8c5b14adde7306e79 Mon Sep 17 00:00:00 2001
From: Kayou <pierre.moltess@gmail.com>
Date: Thu, 18 Jul 2019 08:52:04 +0200
Subject: [PATCH 3/3] Bump package version

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 4169c87..3998dd4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Lightweight multi-account webmail",
 		"fr": "Webmail léger multi-comptes"
 	},
-	"version": "1.12.1~ynh2",
+	"version": "1.12.1~ynh3",
 	"url": "https://www.rainloop.net/",
 	"license": "AGPL-3.0-or-later",
 	"maintainer": {