From fb25013334dcb05fa6a025c8fe0694b96c05001b Mon Sep 17 00:00:00 2001
From: mbraem <1116286+mbraem@users.noreply.github.com>
Date: Sun, 14 Apr 2019 20:17:43 +0200
Subject: [PATCH 1/3] user privileges is a set (#1551)

fixes #1540
---
 management/mailconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/management/mailconfig.py b/management/mailconfig.py
index 28e1c623..5f253c14 100755
--- a/management/mailconfig.py
+++ b/management/mailconfig.py
@@ -150,7 +150,7 @@ def get_mail_users_ex(env, with_archived=False):
 					if email in active_accounts: continue
 					user = {
 						"email": email,
-						"privileges": "",
+						"privileges": [],
 						"status": "inactive",
 						"mailbox": mbox,
 					}

From 9b46637aff8851db98f9eac1f38b9a32f69a14fa Mon Sep 17 00:00:00 2001
From: dexbleeker <dex@bleeker.nl>
Date: Sun, 14 Apr 2019 20:19:21 +0200
Subject: [PATCH 2/3] Update Roundcube to version 1.3.9 (#1546)

---
 CHANGELOG.md     | 4 ++++
 setup/webmail.sh | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 089aa68d..32f04763 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+In Development
+--------------
+ * Update to Roundcube 1.3.9.
+
 v0.41 (February 26, 2019)
 -------------------------
 
diff --git a/setup/webmail.sh b/setup/webmail.sh
index b0e11c9b..cbe6bfca 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -28,8 +28,8 @@ apt_install \
 # Install Roundcube from source if it is not already present or if it is out of date.
 # Combine the Roundcube version number with the commit hash of plugins to track
 # whether we have the latest version of everything.
-VERSION=1.3.8
-HASH=90c7900ccf7b2f46fe49c650d5adb9b85ee9cc22
+VERSION=1.3.9
+HASH=02850972b416bbfa1c13580f16d06fd7ae2774aa
 PERSISTENT_LOGIN_VERSION=dc5ca3d3f4415cc41edb2fde533c8a8628a94c76
 HTML5_NOTIFIER_VERSION=4b370e3cd60dabd2f428a26f45b677ad1b7118d5
 CARDDAV_VERSION=3.0.3

From 25fec63a03be972c8989eeada1ca09b9d7b7ae50 Mon Sep 17 00:00:00 2001
From: just4t <just4test@gmx.com>
Date: Sun, 14 Apr 2019 22:33:50 +0200
Subject: [PATCH 3/3] RAM limit to 502Mb to meet EC2 & Vultr 512Mb inst.
 (#1560)

AS told here: https://github.com/mail-in-a-box/mailinabox/pull/1534
---
 setup/preflight.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/preflight.sh b/setup/preflight.sh
index d087efe2..2547c410 100644
--- a/setup/preflight.sh
+++ b/setup/preflight.sh
@@ -26,7 +26,7 @@ fi
 #
 # Skip the check if we appear to be running inside of Vagrant, because that's really just for testing.
 TOTAL_PHYSICAL_MEM=$(head -n 1 /proc/meminfo | awk '{print $2}')
-if [ $TOTAL_PHYSICAL_MEM -lt 500000 ]; then
+if [ $TOTAL_PHYSICAL_MEM -lt 490000 ]; then
 if [ ! -d /vagrant ]; then
 	TOTAL_PHYSICAL_MEM=$(expr \( \( $TOTAL_PHYSICAL_MEM \* 1024 \) / 1000 \) / 1000)
 	echo "Your Mail-in-a-Box needs more memory (RAM) to function properly."