From da3d876de8b227e54530828ac589ff0a95af6e2e Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 17 May 2022 09:53:21 +0200
Subject: [PATCH 1/9] PHP8

---
 manifest.json      | 2 +-
 scripts/_common.sh | 4 ++--
 scripts/install    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 97e5ab0..44e5943 100644
--- a/manifest.json
+++ b/manifest.json
@@ -26,7 +26,7 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.4-fpm"
+        "php8.0-fpm"
     ],
     "arguments": {
         "install" : [
diff --git a/scripts/_common.sh b/scripts/_common.sh
index caaacd9..6ba4b0e 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,9 +4,9 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.4"
+YNH_PHP_VERSION="8.0"
 
-pkg_dependencies="php-uuid php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring"
+pkg_dependencies="php-uuid php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index c84ec01..a7cfb5d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -27,6 +27,7 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
+phpversion=$YNH_PHP_VERSION
 
 app=$YNH_APP_INSTANCE_NAME
 

From bac1c4f75c168f9d3ca1dc6c9ea2415367756b8a Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 18 May 2022 15:07:43 +0200
Subject: [PATCH 2/9] Update check_process

---
 check_process | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check_process b/check_process
index 9f8650a..52b9ba5 100644
--- a/check_process
+++ b/check_process
@@ -14,7 +14,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		#upgrade=1	from_commit=CommitHash
+		#upgrade=1	from_commit=e94c50dabce1e91564e1dd41770c846eb6784e8a
 		backup_restore=1
 		multi_instance=1
 		change_url=1
@@ -22,6 +22,6 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=CommitHash
-		name=Name and date of the commit.
+	; commit=e94c50dabce1e91564e1dd41770c846eb6784e8a
+		name=Merge pull request #13 from YunoHost-Apps/testing
 		manifest_arg=domain=DOMAIN&path=PATH&is_public=1&language=fr&admin=USER&password=pass&port=666&

From 82a81f451e4153cf42cde481178ea80de10b65bd Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 19 May 2022 11:25:56 +0200
Subject: [PATCH 3/9] 2.16.0

---
 conf/app.src  | 4 ++--
 manifest.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 8e20434..87d7aab 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/the-djmaze/snappymail/releases/download/v2.15.3/snappymail-2.15.3.tar.gz
-SOURCE_SUM=c5c0f3185b1ae9adb17ea61db3904b1f149d9f7fda128f173a777f8e45955d00
+SOURCE_URL=https://github.com/the-djmaze/snappymail/releases/download/v2.16.0/snappymail-2.16.0.tar.gz
+SOURCE_SUM=a2ef1f11dd66b50635dee261808f5a238716fc57c627da253b8f4ba2e60a52cf
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=false
diff --git a/manifest.json b/manifest.json
index 97e5ab0..3949e64 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Simple, modern, lightweight & fast web-based email client",
         "fr": "Client de messagerie Web simple, moderne, léger et rapide"
     },
-    "version": "2.15.3~ynh1",
+    "version": "2.16.0~ynh1",
     "url": "https://snappymail.eu/",
     "upstream": {
         "license": "AGPL-3.0-only",

From c0ecbfa4ee7df3a2ddb537d6ca3b6958fc020e25 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Thu, 19 May 2022 09:26:02 +0000
Subject: [PATCH 4/9] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0a4571e..5032e14 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition.
 
 
-**Shipped version:** 2.15.3~ynh1
+**Shipped version:** 2.16.0~ynh1
 
 **Demo:** https://snappymail.eu/demo/
 
diff --git a/README_fr.md b/README_fr.md
index 3ad6a63..764d1e9 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition.
 
 
-**Version incluse :** 2.15.3~ynh1
+**Version incluse :** 2.16.0~ynh1
 
 **Démo :** https://snappymail.eu/demo/
 

From 437aaca64a66f5643228b94cc6f7b2c485b95f99 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 19 May 2022 11:37:09 +0200
Subject: [PATCH 5/9] Fix

---
 doc/DISCLAIMER.md | 4 ++++
 scripts/upgrade   | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md
index bf65560..00c24da 100644
--- a/doc/DISCLAIMER.md
+++ b/doc/DISCLAIMER.md
@@ -1 +1,5 @@
+:heavy_exclamation_mark: The password-file is created after first opening the admin UI!
+
+:heavy_exclamation_mark: Be sure to immediately change the default password!
+
 Open the admin UI `https://example.com/?admin` to configure your mail server settings. Login with user "admin" and password from the file `/var/www/snappymail/data/_data_/_default_/admin_password.txt`.
diff --git a/scripts/upgrade b/scripts/upgrade
index 614d56f..a1b86b0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -57,9 +57,13 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=5
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/data/_data_"
+	ynh_setup_source --dest_dir="$final_path"
+	# Remove the app directory securely
+	ynh_secure_remove --file="$final_path/snappymail/v/2.15.3"
 fi
 
+
+
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"

From cc34dcf632841872440d468e86a53e23786a6cb0 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Thu, 19 May 2022 09:37:15 +0000
Subject: [PATCH 6/9] Auto-update README

---
 README.md    | 4 ++++
 README_fr.md | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 5032e14..157e1de 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,10 @@ Simple, modern, lightweight & fast web-based email client. The drastically upgra
 
 ## Disclaimers / important information
 
+:heavy_exclamation_mark: The password-file is created after first opening the admin UI!
+
+:heavy_exclamation_mark: Be sure to immediately change the default password!
+
 Open the admin UI `https://example.com/?admin` to configure your mail server settings. Login with user "admin" and password from the file `/var/www/snappymail/data/_data_/_default_/admin_password.txt`.
 
 ## Documentation and resources
diff --git a/README_fr.md b/README_fr.md
index 764d1e9..55fec77 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -20,6 +20,10 @@ Simple, modern, lightweight & fast web-based email client. The drastically upgra
 
 ## Avertissements / informations importantes
 
+:heavy_exclamation_mark: The password-file is created after first opening the admin UI!
+
+:heavy_exclamation_mark: Be sure to immediately change the default password!
+
 Open the admin UI `https://example.com/?admin` to configure your mail server settings. Login with user "admin" and password from the file `/var/www/snappymail/data/_data_/_default_/admin_password.txt`.
 
 ## Documentations et ressources

From deaee9e177075ae3fd7848a626ad95e8cf93a1ff Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 19 May 2022 15:09:47 +0200
Subject: [PATCH 7/9] 2.16.1

---
 conf/app.src  | 4 ++--
 manifest.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 87d7aab..5ec64bd 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/the-djmaze/snappymail/releases/download/v2.16.0/snappymail-2.16.0.tar.gz
-SOURCE_SUM=a2ef1f11dd66b50635dee261808f5a238716fc57c627da253b8f4ba2e60a52cf
+SOURCE_URL=https://github.com/the-djmaze/snappymail/releases/download/v2.16.1/snappymail-2.16.1.tar.gz
+SOURCE_SUM=bf62279e2b1051b566a5a5d080a71555ae7c5e134d36d395a442f5a46e12729f
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=false
diff --git a/manifest.json b/manifest.json
index 1715b90..41728dc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Simple, modern, lightweight & fast web-based email client",
         "fr": "Client de messagerie Web simple, moderne, léger et rapide"
     },
-    "version": "2.16.0~ynh1",
+    "version": "2.16.1~ynh1",
     "url": "https://snappymail.eu/",
     "upstream": {
         "license": "AGPL-3.0-only",

From 49da2c4b318673e4845f1571d603f518244cf640 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Thu, 19 May 2022 13:09:53 +0000
Subject: [PATCH 8/9] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 157e1de..be16c0c 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition.
 
 
-**Shipped version:** 2.16.0~ynh1
+**Shipped version:** 2.16.1~ynh1
 
 **Demo:** https://snappymail.eu/demo/
 
diff --git a/README_fr.md b/README_fr.md
index 55fec77..9d312f0 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition.
 
 
-**Version incluse :** 2.16.0~ynh1
+**Version incluse :** 2.16.1~ynh1
 
 **Démo :** https://snappymail.eu/demo/
 

From aa9af4097373c68975122bc1f5098768b8900379 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 19 May 2022 15:26:21 +0200
Subject: [PATCH 9/9] Update _common.sh

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 6ba4b0e..8e040bd 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,7 +6,7 @@
 
 YNH_PHP_VERSION="8.0"
 
-pkg_dependencies="php-uuid php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring"
+pkg_dependencies="php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring"
 
 #=================================================
 # PERSONAL HELPERS