From b11157e0b63610a4079f8c545450fa2a859b36ad Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Mon, 10 Jul 2017 17:30:08 -0400 Subject: [PATCH 1/2] updated to Roundcube 1.3, but unfortunately dropping the vacation plugin Switched to the -complete download which has vendored assets. See https://github.com/mail-in-a-box/mailinabox/pull/1140. --- CHANGELOG.md | 7 +++++++ setup/webmail.sh | 38 +++++++------------------------------- 2 files changed, 14 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2adbaf3..d4964ecb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ CHANGELOG ========= +In Development +-------------- + +Mail: + +* Updated to Roundcube 1.3, but unfortunately dropping the Vacation plugin because it has not been supported by its author and is not compatible with Roundcube 1.3. + v0.23a (May 31, 2017) --------------------- diff --git a/setup/webmail.sh b/setup/webmail.sh index 34eba5f1..628fbb7f 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -32,17 +32,16 @@ apt_get_quiet remove php-mail-mimedecode # no longer needed since Roundcube 1.1. apt-get purge -qq -y roundcube* #NODOC # 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 vacation_sieve to track -# whether we have the latest version. -VERSION=1.2.4 -HASH=e2091ea775b80eda43ab225130d5a2e888c3789a -VACATION_SIEVE_VERSION=91ea6f52216390073d1f5b70b5f6bea0bfaee7e5 +# Combine the Roundcube version number with the commit hash of plugins to track +# whether we have the latest version of everything. +VERSION=1.3.0 +HASH=634c89b9c51c44fb757bb19c77ad5083cf7aa030 PERSISTENT_LOGIN_VERSION=c4516c4be37d12ef653de86497304e073a863c2a HTML5_NOTIFIER_VERSION=4b370e3cd60dabd2f428a26f45b677ad1b7118d5 CARDDAV_VERSION=2.0.4 CARDDAV_HASH=d93f3cfb3038a519e71c7c3212c1d16f5da609a4 -UPDATE_KEY=$VERSION:$VACATION_SIEVE_VERSION:$PERSISTENT_LOGIN_VERSION:$HTML5_NOTIFIER_VERSION:$CARDDAV_VERSION:a +UPDATE_KEY=$VERSION:$PERSISTENT_LOGIN_VERSION:$HTML5_NOTIFIER_VERSION:$CARDDAV_VERSION # paths that are often reused. RCM_DIR=/usr/local/lib/roundcubemail @@ -60,7 +59,7 @@ fi if [ $needs_update == 1 ]; then # install roundcube wget_verify \ - https://github.com/roundcube/roundcubemail/releases/download/$VERSION/roundcubemail-$VERSION.tar.gz \ + https://github.com/roundcube/roundcubemail/releases/download/$VERSION/roundcubemail-$VERSION-complete.tar.gz \ $HASH \ /tmp/roundcube.tgz tar -C /usr/local/lib --no-same-owner -zxf /tmp/roundcube.tgz @@ -68,9 +67,6 @@ if [ $needs_update == 1 ]; then mv /usr/local/lib/roundcubemail-$VERSION/ $RCM_DIR rm -f /tmp/roundcube.tgz - # install roundcube autoreply/vacation plugin - git_clone https://github.com/arodier/Roundcube-Plugins.git $VACATION_SIEVE_VERSION plugins/vacation_sieve ${RCM_PLUGIN_DIR}/vacation_sieve - # install roundcube persistent_login plugin git_clone https://github.com/mfreiholz/Roundcube-Persistent-Login-Plugin.git $PERSISTENT_LOGIN_VERSION '' ${RCM_PLUGIN_DIR}/persistent_login @@ -120,7 +116,7 @@ cat > $RCM_CONFIG < ${RCM_PLUGIN_DIR}/carddav/config.inc.php < /usr/local/lib/roundcubemail/plugins/vacation_sieve/config.inc.php < 'd/m/Y', - 'working_hours' => array(8,18), - 'msg_format' => 'text', - 'logon_transform' => array('#([a-z])[a-z]+(\.|\s)([a-z])#i', '\$1\$3'), - 'transfer' => array( - 'mode' => 'managesieve', - 'ms_activate_script' => true, - 'host' => '127.0.0.1', - 'port' => '4190', - 'usetls' => false, - 'path' => 'vacation', - ) -); -EOF - # Create writable directories. mkdir -p /var/log/roundcubemail /tmp/roundcubemail $STORAGE_ROOT/mail/roundcube chown -R www-data.www-data /var/log/roundcubemail /tmp/roundcubemail $STORAGE_ROOT/mail/roundcube From 2bd6cc4d6bb0ae38baf9188121a42ab5c373016f Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Mon, 10 Jul 2017 18:01:21 -0400 Subject: [PATCH 2/2] update to Z-Push 2.3.7 --- CHANGELOG.md | 3 ++- setup/zpush.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4964ecb..8988a22c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ In Development Mail: -* Updated to Roundcube 1.3, but unfortunately dropping the Vacation plugin because it has not been supported by its author and is not compatible with Roundcube 1.3. +* Updated to [Roundcube 1.3](https://roundcube.net/news/2017/06/26/roundcube-webmail-1.3.0-released), but unfortunately dropping the Vacation plugin because it has not been supported by its author and is not compatible with Roundcube 1.3. +* Updated to [Z-Push 2.3.7](http://download.z-push.org/final/2.3/z-push-2.3.7.txt). v0.23a (May 31, 2017) --------------------- diff --git a/setup/zpush.sh b/setup/zpush.sh index 0a9e3998..5507bc4d 100755 --- a/setup/zpush.sh +++ b/setup/zpush.sh @@ -22,8 +22,8 @@ apt_install \ php5enmod imap # Copy Z-Push into place. -TARGETHASH=131229a8feda09782dfd06449adce3d5a219183f -VERSION=2.3.6 +TARGETHASH=01cdfafcdf6855f566a9cbc5826b3d9930a9b35b +VERSION=2.3.7 needs_update=0 #NODOC if [ ! -f /usr/local/lib/z-push/version ]; then needs_update=1 #NODOC