From 85f59d119eb36d59db90c2d88aba8c5935eea117 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jean-baptiste@holcroft.fr>
Date: Tue, 10 Jul 2018 23:51:00 +0200
Subject: [PATCH 1/4] upgrade ynh_send_readme_to_admin helper

if mail binary isn't properly selected, it may create an infinite loop at install
---
 scripts/_common.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 2ec6a78..52f91d6 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -287,14 +287,26 @@ ynh_send_readme_to_admin() {
 	local mail_subject="☁️🆈🅽🅷☁️: \`$app\` was just installed!"
 
 	local mail_message="This is an automated message from your beloved YunoHost server.
+
 Specific information for the application $app.
+
 $app_message
+
 ---
 Automatic diagnosis data from YunoHost
+
 $(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')"
 
+	# Define binary to use for mail command
+	if [ -e /usr/bin/bsd-mailx ]
+	then
+		local mail_bin=/usr/bin/bsd-mailx
+	else
+		local mail_bin=/usr/bin/mail.mailutils
+	fi
+
 	# Send the email to the recipients
-	echo "$mail_message" | mail -a "Content-Type: text/plain; charset=UTF-8" -s "$mail_subject" "$recipients"
+	echo "$mail_message" | $mail_bin -a "Content-Type: text/plain; charset=UTF-8" -s "$mail_subject" "$recipients"
 }
 
 # Exit without error if the package is up to date

From e490f02d7bf0795ff5101ab13650da81178f98ed Mon Sep 17 00:00:00 2001
From: ljf <ljf+git@grimaud.me>
Date: Sat, 6 Apr 2019 16:03:03 +0200
Subject: [PATCH 2/4] [enh] Upgrade to 3.16

---
 README.md     | 2 +-
 conf/app.src  | 6 +++---
 manifest.json | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 7ff9f1b..5fb2b5b 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 ## Overview
 LimeSurvey is used to create advanced poll.
 
-**Shipped version:** 2.62.5
+**Shipped version:** 3.16.1
 
 **Categories:** Productivity, Poll
 
diff --git a/conf/app.src b/conf/app.src
index 4390102..15d6c03 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,3 +1,3 @@
-SOURCE_URL=https://github.com/LimeSurvey/LimeSurvey/archive/3.5.0+180309.tar.gz
-SOURCE_SUM=2e55d6123a6f53a8ae7b909fcc0bb435469e995ab4815f86d2b01990aeb76734
-SOURCE_FILENAME=limesurvey-3-5-0-180309.tar.gz
+SOURCE_URL=https://github.com/LimeSurvey/LimeSurvey/archive/3.16.1+190314.tar.gz
+SOURCE_SUM=cfed9f8f8e4aa7fe70ae6c3e946f6f33d8aa3aab38f7ac994054af595b11f0a3
+SOURCE_FILENAME=limesurvey-3.16.1+190314.tar.gz
diff --git a/manifest.json b/manifest.json
index d20b094..e60b0e1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name": "LimeSurvey",
     "id": "limesurvey",
     "packaging_format": 1,
-    "version": "3.5.0-4",
+    "version": "3.16.1~ynh1",
     "description": {
         "en": "LimeSurvey is used to create advanced poll.",
         "fr": "LimeSurvey est un outil de création et diffusion de sondage en ligne."

From e62f162a9ee3b6872fe4270fae9cecac78c35493 Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Thu, 2 May 2019 17:48:13 +0200
Subject: [PATCH 3/4] [fix] Allow integration

---
 conf/nginx.conf.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/nginx.conf.j2 b/conf/nginx.conf.j2
index 48d4af7..ad5de13 100644
--- a/conf/nginx.conf.j2
+++ b/conf/nginx.conf.j2
@@ -32,3 +32,5 @@ location {{ path_url }}/ {
 location ~ ^{{ path_url }}(data|config|\.ht|db_structure\.xml|README) {
        deny all;
 }
+
+more_set_headers "X-Frame-Options : ALLOWALL";

From b7a06e65a89d4e7c26b3f0153fb46695b26110ff Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Thu, 2 May 2019 17:49:21 +0200
Subject: [PATCH 4/4] [fix] Version number

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

diff --git a/manifest.json b/manifest.json
index e60b0e1..1ea1d95 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name": "LimeSurvey",
     "id": "limesurvey",
     "packaging_format": 1,
-    "version": "3.16.1~ynh1",
+    "version": "3.16.1~ynh2",
     "description": {
         "en": "LimeSurvey is used to create advanced poll.",
         "fr": "LimeSurvey est un outil de création et diffusion de sondage en ligne."