From 00585839132922da136fc5786373e1bf9c7fb3c5 Mon Sep 17 00:00:00 2001
From: KiekerJan <github@kiekerjan.isdronken.nl>
Date: Fri, 19 Aug 2022 19:59:38 +0200
Subject: [PATCH] update roundcube email to 1.6, update plugins and add
 logrotate entry

---
 conf/logrotate/mailinabox | 11 +++++++++++
 setup/system.sh           |  3 +++
 setup/webmail.sh          | 15 ++++++++-------
 3 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 conf/logrotate/mailinabox

diff --git a/conf/logrotate/mailinabox b/conf/logrotate/mailinabox
new file mode 100644
index 00000000..6b629de1
--- /dev/null
+++ b/conf/logrotate/mailinabox
@@ -0,0 +1,11 @@
+/var/log/roundcubemail/errors.log
+/var/log/roundcubemail/sendmail.log
+{
+	rotate 4
+	weekly
+	missingok
+	notifempty
+	compress
+	delaycompress
+	sharedscripts
+}
diff --git a/setup/system.sh b/setup/system.sh
index e9b9f8c2..e9758ce7 100755
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -412,3 +412,6 @@ tools/editconf.py /etc/fail2ban/fail2ban.conf dbpurgeage=7d
 restart_service fail2ban
 
 systemctl enable fail2ban
+
+# Create a logrotate entry
+cp -f conf/logrotate/mailinabox /etc/logrotate.d/
diff --git a/setup/webmail.sh b/setup/webmail.sh
index 120e4f7a..a1d82f4c 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -33,15 +33,16 @@ apt_install \
 #   https://github.com/mfreiholz/persistent_login/commits/master
 #   https://github.com/stremlau/html5_notifier/commits/master
 #   https://github.com/mstilkerich/rcmcarddav/releases
+#   https://github.com/johndoh/roundcube-contextmenu
 # The easiest way to get the package hashes is to run this script and get the hash from
 # the error message.
-VERSION=1.5.2
-HASH=208ce4ca0be423cc0f7070ff59bd03588b4439bf
-PERSISTENT_LOGIN_VERSION=59ca1b0d3a02cff5fa621c1ad581d15f9d642fe8
-HTML5_NOTIFIER_VERSION=68d9ca194212e15b3c7225eb6085dbcf02fd13d7 # version 0.6.4+
-CARDDAV_VERSION=4.3.0
-CARDDAV_HASH=4ad7df8843951062878b1375f77c614f68bc5c61
-CONTEXT_MENU_VERSION=602a3812922fb8f71814eb3b8d91e9b7859aab7e # version 3.2.1
+VERSION=1.6.0
+HASH=fd84b4fac74419bb73e7a3bcae1978d5589c52de
+PERSISTENT_LOGIN_VERSION=bde7b6840c7d91de627ea14e81cf4133cbb3c07a # version 5.2
+HTML5_NOTIFIER_VERSION=68d9ca194212e15b3c7225eb6085dbcf02fd13d7   # version 0.6.4+
+CARDDAV_VERSION=4.4.3
+CARDDAV_HASH=74f8ba7aee33e78beb9de07f7f44b81f6071b644
+CONTEXT_MENU_VERSION=dd13a92a9d8910cce7b2234f45a0b2158214956c     # version 3.3.1
 TWOFACT_COMMIT=06e21b0c03aeeb650ee4ad93538873185f776f8b # master @ 21-04-2022
 
 UPDATE_KEY=$VERSION:$PERSISTENT_LOGIN_VERSION:$HTML5_NOTIFIER_VERSION:$CARDDAV_VERSION:$CONTEXT_MENU_VERSION:$TWOFACT_COMMIT