From be6fea4e1de56b7a95730f247e3d35dca847c474 Mon Sep 17 00:00:00 2001
From: Brian Douglass <bhdouglass@gmail.com>
Date: Tue, 16 Jul 2019 00:06:30 -0400
Subject: [PATCH 1/7] Upgrade to upstream version 1.4.0-rc1

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

diff --git a/README.md b/README.md
index f65cb5f..9c5351e 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
 [Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with
 an application-like user interface.
 
-**Shipped version:** 1.3.9
+**Shipped version:** 1.4.0-rc1
 
 ## Screenshots
 
diff --git a/conf/app.src b/conf/app.src
index a5f0116..8751cfb 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.3.9/roundcubemail-1.3.9.tar.gz
-SOURCE_SUM=7775176dfcb1e4ed39586d95a4fad0ee7b4a582e071233b4e3bf7d59040c1b5a
+SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.4-rc1/roundcubemail-1.4-rc1.tar.gz
+SOURCE_SUM=73041cffbb6c5c56f50d4875d50465a36b5afdaf2a39af2737e4628f34c2a948
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 067dd99..3012672 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Open Source Webmail software",
         "fr": "Webmail Open Source"
     },
-    "version": "1.3.9~ynh1",
+    "version": "1.4.0-rc1~ynh1",
     "url": "https://roundcube.net/",
     "license": "GPL-3.0-only",
     "maintainer": {

From 0239f794905be14078224c0b8c015c1941ea1ba0 Mon Sep 17 00:00:00 2001
From: Brian Douglass <bhdouglass@gmail.com>
Date: Tue, 16 Jul 2019 00:24:07 -0400
Subject: [PATCH 2/7] Ensure the enigma directory exists befor chowning it

---
 scripts/install | 1 +
 scripts/restore | 1 +
 scripts/upgrade | 1 +
 3 files changed, 3 insertions(+)

diff --git a/scripts/install b/scripts/install
index df8a260..c793010 100644
--- a/scripts/install
+++ b/scripts/install
@@ -211,6 +211,7 @@ ynh_store_file_checksum --file="$rc_conf"
 
 # Set permissions to app files
 chown -R root: "$final_path"
+mkdir -p "$final_path/plugins/enigma/home"
 chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home}
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index ac1d5e3..7fa57b8 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -67,6 +67,7 @@ ynh_system_user_create --username=$app
 
 # Restore permissions on app files
 chown -R root: "$final_path"
+mkdir -p "$final_path/plugins/enigma/home"
 chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home}
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index b993aed..2d8d384 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -262,6 +262,7 @@ fi
 
 # Set permissions to app files
 chown -R root: "$final_path"
+mkdir -p "$final_path/plugins/enigma/home"
 chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home}
 
 #=================================================

From 3658f2b19f2f46eb5bf6994c5a04df662940606e Mon Sep 17 00:00:00 2001
From: Brian Douglass <bhdouglass@gmail.com>
Date: Tue, 16 Jul 2019 00:38:23 -0400
Subject: [PATCH 3/7] Set enigma home dir by default

---
 conf/enigma.config.inc.php | 77 ++++++++++++++++++++++++++++++++++++++
 scripts/install            |  6 ++-
 2 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 conf/enigma.config.inc.php

diff --git a/conf/enigma.config.inc.php b/conf/enigma.config.inc.php
new file mode 100644
index 0000000..4804bfb
--- /dev/null
+++ b/conf/enigma.config.inc.php
@@ -0,0 +1,77 @@
+<?php
+
+// Enigma Plugin options
+// --------------------
+
+// A driver to use for PGP. Default: "gnupg".
+$config['enigma_pgp_driver'] = 'gnupg';
+
+// A driver to use for S/MIME. Default: "phpssl".
+$config['enigma_smime_driver'] = 'phpssl';
+
+// Enables logging of enigma operations (including Crypt_GPG debug info)
+$config['enigma_debug'] = false;
+
+// REQUIRED! Keys directory for all users.
+// Must be writeable by PHP process, and not in the web server document root
+$config['enigma_pgp_homedir'] = '__DIR__';
+
+// Location of gpg binary. By default it will be auto-detected.
+// This is also a way to force gpg2 use if there are both 1.x and 2.x on the system.
+$config['enigma_pgp_binary'] = '';
+
+// Location of gpg-agent binary. By default it will be auto-detected.
+// It's used with GnuPG 2.x.
+$config['enigma_pgp_agent'] = '';
+
+// Location of gpgconf binary. By default it will be auto-detected.
+// It's used with GnuPG >= 2.1.
+$config['enigma_pgp_gpgconf'] = '';
+
+// Name of the PGP symmetric cipher algorithm.
+// Run gpg --version to see the list of supported algorithms
+$config['enigma_pgp_cipher_algo'] = null;
+
+// Name of the PGP digest (hash) algorithm.
+// Run gpg --version to see the list of supported algorithms
+$config['enigma_pgp_digest_algo'] = null;
+
+// Enables multi-host environments support.
+// Enable it if you have more than one HTTP server.
+// Make sure all servers run the same GnuPG version and have time in sync.
+// Keys will be stored in SQL database (make sure max_allowed_packet
+// is big enough).
+$config['enigma_multihost'] = false;
+
+// Enables signatures verification feature.
+$config['enigma_signatures'] = true;
+
+// Enables messages decryption feature.
+$config['enigma_decryption'] = true;
+
+// Enables messages encryption and signing feature.
+$config['enigma_encryption'] = true;
+
+// Enable signing all messages by default
+$config['enigma_sign_all'] = false;
+
+// Enable encrypting all messages by default
+$config['enigma_encrypt_all'] = false;
+
+// Enable attaching a public key to all messages by default
+$config['enigma_attach_pubkey'] = false;
+
+// Default for how long to store private key passwords (in minutes).
+// When set to 0 passwords will be stored for the whole session.
+$config['enigma_password_time'] = 5;
+
+// With this option you can lock composing options
+// of the plugin forcing the user to use configured settings.
+// The array accepts: 'sign', 'encrypt', 'pubkey'.
+//
+// For example, to force your users to sign every email,
+// you should set:
+//     - enigma_sign_all     = true
+//     - enigma_options_lock = array('sign')
+//     - dont_override       = array('enigma_sign_all')
+$config['enigma_options_lock'] = array();
diff --git a/scripts/install b/scripts/install
index c793010..77bf567 100644
--- a/scripts/install
+++ b/scripts/install
@@ -184,7 +184,11 @@ fi
 # Install Enigma plugin
 if [ $with_enigma -eq 1 ]
 then
-    cp -a "$final_path/plugins/enigma/config.inc.php.dist" "$final_path/plugins/enigma/config.inc.php" \
+    enigma_tmp_config="../conf/enigma.config.inc.php"
+
+    ynh_replace_string --match_string="__DIR__" --replace_string="$final_path/plugins/enigma/home" --target_file="$enigma_tmp_config"
+
+    cp "$enigma_tmp_config" "$final_path/plugins/enigma/config.inc.php" \
         && installed_plugins+=" 'enigma'," \
         || ynh_print_warn --message="Unable to install Enigma plugin"
 fi

From 0e30587f78a41088b38cd105722fa8459e1d44b1 Mon Sep 17 00:00:00 2001
From: Brian Douglass <bhdouglass@gmail.com>
Date: Wed, 18 Sep 2019 14:08:04 +0000
Subject: [PATCH 4/7] Upgrade to upstream version 1.4.0-rc2

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

diff --git a/README.md b/README.md
index 9c5351e..3dd4cf1 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
 # Roundcube for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/roundcube.svg)](https://dash.yunohost.org/appci/app/roundcube)  
+[![Integration level](https://dash.yunohost.org/integration/roundcube.svg)](https://dash.yunohost.org/appci/app/roundcube)
 [![Install Roundcube with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=roundcube)
 
-> *This package allow you to install Roundcube quickly and simply on a YunoHost server.  
+> *This package allow you to install Roundcube quickly and simply on a YunoHost server.
 If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
 
 ## Overview
 [Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with
 an application-like user interface.
 
-**Shipped version:** 1.4.0-rc1
+**Shipped version:** 1.4.0-rc2
 
 ## Screenshots
 
diff --git a/conf/app.src b/conf/app.src
index 8751cfb..cf53b1e 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.4-rc1/roundcubemail-1.4-rc1.tar.gz
-SOURCE_SUM=73041cffbb6c5c56f50d4875d50465a36b5afdaf2a39af2737e4628f34c2a948
+SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.4-rc2/roundcubemail-1.4-rc2.tar.gz
+SOURCE_SUM=6bbf6abdb242f81b8fffb8ee986a9aff4b3336879597db3a99a39ce232a91461
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 3012672..0039f10 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Open Source Webmail software",
         "fr": "Webmail Open Source"
     },
-    "version": "1.4.0-rc1~ynh1",
+    "version": "1.4.0-rc2~ynh1",
     "url": "https://roundcube.net/",
     "license": "GPL-3.0-only",
     "maintainer": {

From 214e97f7a2bb9cce27543e0c6fccc4c808c08cdc Mon Sep 17 00:00:00 2001
From: Brian Douglass <bhdouglass@gmail.com>
Date: Sun, 10 Nov 2019 23:33:43 -0500
Subject: [PATCH 5/7] Upgrade to upstream version 1.4.0

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

diff --git a/README.md b/README.md
index 3dd4cf1..8a6a339 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
 [Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with
 an application-like user interface.
 
-**Shipped version:** 1.4.0-rc2
+**Shipped version:** 1.4.0
 
 ## Screenshots
 
diff --git a/conf/app.src b/conf/app.src
index cf53b1e..6ecf728 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.4-rc2/roundcubemail-1.4-rc2.tar.gz
-SOURCE_SUM=6bbf6abdb242f81b8fffb8ee986a9aff4b3336879597db3a99a39ce232a91461
+SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.4.0/roundcubemail-1.4.0.tar.gz
+SOURCE_SUM=31a735a739cfe30fd3980248b0bce0e3722f1536bc19ec1caf78d416dfa5cadc
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 0039f10..f3c7796 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Open Source Webmail software",
         "fr": "Webmail Open Source"
     },
-    "version": "1.4.0-rc2~ynh1",
+    "version": "1.4.0~ynh1",
     "url": "https://roundcube.net/",
     "license": "GPL-3.0-only",
     "maintainer": {

From 4dca4a87c8155be64553c53b19d702491d7678b2 Mon Sep 17 00:00:00 2001
From: Brian Douglass <bhdouglass@gmail.com>
Date: Tue, 26 Nov 2019 00:23:41 -0500
Subject: [PATCH 6/7] Fix upgrade logic for enigma

---
 scripts/upgrade | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 2d8d384..da248f8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -226,7 +226,11 @@ then
     # Install Enigma plugin
     if [ $with_enigma -eq 1 ]
     then
-        cp -a "$final_path/plugins/enigma/config.inc.php.dist" "$final_path/plugins/enigma/config.inc.php" \
+        enigma_tmp_config="../conf/enigma.config.inc.php"
+
+        ynh_replace_string --match_string="__DIR__" --replace_string="$final_path/plugins/enigma/home" --target_file="$enigma_tmp_config"
+
+        cp "$enigma_tmp_config" "$final_path/plugins/enigma/config.inc.php" \
             && installed_plugins+=" 'enigma'," \
             || ynh_print_warn --message="Unable to install Enigma plugin"
     fi

From d82eb854b7126184d7df81a658615d2b112d88a3 Mon Sep 17 00:00:00 2001
From: Brian Douglass <bhdouglass@gmail.com>
Date: Tue, 26 Nov 2019 00:25:25 -0500
Subject: [PATCH 7/7] Updated to upstream version 1.4.1

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

diff --git a/README.md b/README.md
index 8a6a339..d737067 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
 [Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with
 an application-like user interface.
 
-**Shipped version:** 1.4.0
+**Shipped version:** 1.4.1
 
 ## Screenshots
 
diff --git a/conf/app.src b/conf/app.src
index 6ecf728..19f7188 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.4.0/roundcubemail-1.4.0.tar.gz
-SOURCE_SUM=31a735a739cfe30fd3980248b0bce0e3722f1536bc19ec1caf78d416dfa5cadc
+SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.4.1/roundcubemail-1.4.1.tar.gz
+SOURCE_SUM=33100013a8eacbc23082c8601cf370ac7701ae0e0778c4a960a23d0edfa0a7bc
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index f3c7796..6b47c9d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Open Source Webmail software",
         "fr": "Webmail Open Source"
     },
-    "version": "1.4.0~ynh1",
+    "version": "1.4.1~ynh1",
     "url": "https://roundcube.net/",
     "license": "GPL-3.0-only",
     "maintainer": {