From e5e3250a76c60747f6d8a32acaa60eb774ca9730 Mon Sep 17 00:00:00 2001
From: ljf <ljf+git@grimaud.me>
Date: Mon, 7 Oct 2019 19:15:02 +0200
Subject: [PATCH 1/2] [enh] Upgrade to 1.1.10

---
 README.md                                   |  2 +-
 conf/app.src                                |  8 ++---
 manifest.json                               |  2 +-
 scripts/install                             |  3 ++
 sources/patches/app-0001-Use-sendmail.patch | 36 ++++++---------------
 5 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/README.md b/README.md
index 2ad8d20..c0344dc 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 
 Framadate is an online service for planning an appointment or making a decision quickly and easily. It's a community free/libre software alternative to Doodle.
 
-**Shipped version:** 1.0.3
+**Shipped version:** 1.1.10
 
 ## Screenshots
 
diff --git a/conf/app.src b/conf/app.src
index 788ffd4..bb83dc9 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,6 +1,6 @@
-SOURCE_URL=https://git.framasoft.org/framasoft/framadate/framadate/repository/1.0.3/archive.tar.bz2
-SOURCE_SUM=aa372ac8b7f0f7b0ad4ab973a5cfb7db5aa3b95a1ea584e3c57c8929d3766169
+SOURCE_URL=https://framagit.org/framasoft/framadate/framadate/-/archive/1.1.10/framadate-1.1.10.tar.gz
+SOURCE_SUM=ea9ab8bd713da17dc7e5d6ddd782ce704184a3189888ed837ba8e59ee7b6fa5f
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.bz2
+SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
+SOURCE_FILENAME=opensondage-1-1-10.tar.gz
diff --git a/manifest.json b/manifest.json
index 03170e4..1935bdb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -7,7 +7,7 @@
         "fr": "OpenSondage sert à faire des sondages sans authentification pour trouver une date de réunion qui convienne à toutes les personnes concernées.",
         "de": "OpenSondage ist ein Online-Dienst, der Ihnen bei der Absprache von Terminen oder der Entscheidungsfindung hilft."
     },
-    "version": "1.0.3~ynh1",
+    "version": "1.1.10~ynh1",
     "url": "https://git.framasoft.org/framasoft/framadate",
     "license": "CECILL-B",
     "maintainer": {
diff --git a/scripts/install b/scripts/install
index f3edb49..1c44152 100644
--- a/scripts/install
+++ b/scripts/install
@@ -12,6 +12,9 @@ source /usr/share/yunohost/helpers
 #=================================================
 # MANAGE SCRIPT FAILURE
 #=================================================
+ynh_clean_setup () {
+    read p	
+}
 
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
diff --git a/sources/patches/app-0001-Use-sendmail.patch b/sources/patches/app-0001-Use-sendmail.patch
index b10ef71..b560d09 100644
--- a/sources/patches/app-0001-Use-sendmail.patch
+++ b/sources/patches/app-0001-Use-sendmail.patch
@@ -1,31 +1,13 @@
-From 3ddf8c6c94d3e14566c50d57a457c8d7eaf7bb3c Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
-Date: Fri, 27 Oct 2017 13:21:44 +0200
-Subject: [PATCH] Use sendmail
-
----
- app/classes/Framadate/Services/MailService.php | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
 diff --git a/app/classes/Framadate/Services/MailService.php b/app/classes/Framadate/Services/MailService.php
-index b7c60dc..f292e7e 100644
+index f99b1fe..111863d 100644
 --- a/app/classes/Framadate/Services/MailService.php
 +++ b/app/classes/Framadate/Services/MailService.php
-@@ -25,7 +25,7 @@ class MailService {
-     function send($to, $subject, $body, $msgKey = null) {
-         if ($this->smtp_allowed == true && $this->canSendMsg($msgKey)) {
-             $mail = new PHPMailer(true);
--            $mail->isSMTP();
-+            $mail->IsSendmail();
+@@ -82,7 +82,7 @@ class MailService {
+      * @param PHPMailer $mailer
+      */
+     private function configureMailer(PHPMailer $mailer) {
+-        $mailer->isSMTP();
++        $mailer->isSendmail();
  
-             // From
-             $mail->FromName = NOMAPPLICATION;
-@@ -73,4 +73,3 @@ class MailService {
-     }
- 
- }
-- 
-\ No newline at end of file
--- 
-2.13.6
-
+         $available_options = [
+             'host' => 'Host',

From dad51c5e68f866cb4162464cf7fd88b9c8f6bb79 Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Mon, 7 Oct 2019 19:34:04 +0200
Subject: [PATCH 2/2] [fix] Missing to remove debug purpose

---
 scripts/install | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index 1c44152..b6dd141 100644
--- a/scripts/install
+++ b/scripts/install
@@ -12,10 +12,6 @@ source /usr/share/yunohost/helpers
 #=================================================
 # MANAGE SCRIPT FAILURE
 #=================================================
-ynh_clean_setup () {
-    read p	
-}
-
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors