From dab497e10d2692b11f826716639ea915873258e9 Mon Sep 17 00:00:00 2001 From: Francesco Montanari Date: Mon, 11 Nov 2019 10:50:50 +0200 Subject: [PATCH 1/8] Upgrade RoundCube to 1.4.0 and set the default skin to elastic --- setup/webmail.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/webmail.sh b/setup/webmail.sh index 6cbe55f9..ce5c3fd0 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.10 -HASH=431625fc737e301f9b7e502cccc61e50a24786b8 +VERSION=1.4.0 +HASH=9fc48d47a9ba89ce02e1aab38e01cf3ff6838c68 PERSISTENT_LOGIN_VERSION=dc5ca3d3f4415cc41edb2fde533c8a8628a94c76 HTML5_NOTIFIER_VERSION=4b370e3cd60dabd2f428a26f45b677ad1b7118d5 CARDDAV_VERSION=3.0.3 @@ -123,7 +123,7 @@ cat > $RCM_CONFIG < Date: Mon, 11 Nov 2019 15:37:19 +0200 Subject: [PATCH 2/8] Update changelog with Roundcube 1.4 update and new default skin --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e59bda9..29451540 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,14 @@ CHANGELOG Under Development ----------------- +WebMail: +* Set the default Roundcube skin to the new "Elastic" theme. + Software updates: * Upgraded Nextcloud from 15.0.8 to 16.0.5 (with Contacts from 3.1.1 to 3.1.4 and Calendar from 1.6.5 to 1.7.1) * Upgraded Z-Push to 2.5.1. +* Upgraded Roundcube from 1.3.10 to 1.4.0. Control panel: From 9e0621a13e924b87f2ec460a975bc1dce4d7eb47 Mon Sep 17 00:00:00 2001 From: Francesco Montanari Date: Mon, 11 Nov 2019 19:09:23 +0200 Subject: [PATCH 3/8] install php-ldap extension --- setup/webmail.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/setup/webmail.sh b/setup/webmail.sh index ce5c3fd0..5f61b366 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -194,4 +194,5 @@ chmod 664 $STORAGE_ROOT/mail/roundcube/roundcube.sqlite # Enable PHP modules. phpenmod -v php mcrypt imap +apt install -y php7.2-ldap restart_service php7.2-fpm From 3d1a1e86fc939628bbcfed957c71ddbe4c399266 Mon Sep 17 00:00:00 2001 From: Francesco Montanari Date: Mon, 11 Nov 2019 20:08:13 +0200 Subject: [PATCH 4/8] move the install php-dlap at the top --- setup/webmail.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup/webmail.sh b/setup/webmail.sh index 5f61b366..11642892 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -22,7 +22,7 @@ source /etc/mailinabox.conf # load global vars echo "Installing Roundcube (webmail)..." apt_install \ dbconfig-common \ - php-cli php-sqlite3 php-intl php-json php-common php-curl \ + php-cli php-sqlite3 php-intl php-json php-common php-curl php-ldap \ php-gd php-pspell tinymce libjs-jquery libjs-jquery-mousewheel libmagic1 php-mbstring # Install Roundcube from source if it is not already present or if it is out of date. @@ -194,5 +194,4 @@ chmod 664 $STORAGE_ROOT/mail/roundcube/roundcube.sqlite # Enable PHP modules. phpenmod -v php mcrypt imap -apt install -y php7.2-ldap restart_service php7.2-fpm From 1f979f9d8e4ea27777ef15638e09c80453fb7a5f Mon Sep 17 00:00:00 2001 From: Francesco Montanari Date: Mon, 11 Nov 2019 22:51:56 +0200 Subject: [PATCH 5/8] Clear the roundcube temp_dir if upgrading from 1.3.x --- setup/webmail.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/setup/webmail.sh b/setup/webmail.sh index 11642892..b7fa3510 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -51,6 +51,11 @@ elif [[ "$UPDATE_KEY" != `cat /usr/local/lib/roundcubemail/version` ]]; then needs_update=1 #NODOC fi if [ $needs_update == 1 ]; then + # if upgrading from 1.3.x, clear the temp_dir + if [ "$(cat /usr/local/lib/roundcubemail/version | cut -c1-3)" == '1.3' ]; then + find /var/tmp/roundcubemail/ -type f ! -name 'RCMTEMP*' -delete + fi + # install roundcube wget_verify \ https://github.com/roundcube/roundcubemail/releases/download/$VERSION/roundcubemail-$VERSION-complete.tar.gz \ From e5bbee48808b21ff85c970375f0ffe1736eabf02 Mon Sep 17 00:00:00 2001 From: Francesco Montanari Date: Fri, 22 Nov 2019 14:23:32 +0200 Subject: [PATCH 6/8] Upgrade Roundcube to 1.4.1 --- setup/webmail.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/webmail.sh b/setup/webmail.sh index b7fa3510..76f0478d 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.4.0 -HASH=9fc48d47a9ba89ce02e1aab38e01cf3ff6838c68 +VERSION=1.4.1 +HASH=f4ecc63185b8f7b4ce5bccdc9fc689571e82c489 PERSISTENT_LOGIN_VERSION=dc5ca3d3f4415cc41edb2fde533c8a8628a94c76 HTML5_NOTIFIER_VERSION=4b370e3cd60dabd2f428a26f45b677ad1b7118d5 CARDDAV_VERSION=3.0.3 From d4325420aa04a84b187bcd69a5091c2a881e2813 Mon Sep 17 00:00:00 2001 From: Francesco Montanari Date: Fri, 22 Nov 2019 19:18:39 +0200 Subject: [PATCH 7/8] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29451540..c0c75963 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ Software updates: * Upgraded Nextcloud from 15.0.8 to 16.0.5 (with Contacts from 3.1.1 to 3.1.4 and Calendar from 1.6.5 to 1.7.1) * Upgraded Z-Push to 2.5.1. -* Upgraded Roundcube from 1.3.10 to 1.4.0. +* Upgraded Roundcube from 1.3.10 to 1.4.1. Control panel: From a95e9b5b3c9384dd230bf185ea0deb3507ea9837 Mon Sep 17 00:00:00 2001 From: Francesco Montanari Date: Fri, 22 Nov 2019 19:20:38 +0200 Subject: [PATCH 8/8] Remove smtp parameters that are now the default --- setup/webmail.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup/webmail.sh b/setup/webmail.sh index 76f0478d..7dfeaac6 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -115,9 +115,6 @@ cat > $RCM_CONFIG < array( 'verify_peer' => false,