From b9c5cd248f3adc5fac39c0a93e2f72104bccee00 Mon Sep 17 00:00:00 2001 From: matidau <65836048+matidau@users.noreply.github.com> Date: Thu, 15 Aug 2024 22:49:52 +1000 Subject: [PATCH 1/6] Update Roundcube to 1.6.8 (#2422) --- setup/webmail.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/webmail.sh b/setup/webmail.sh index 66a85596..4591119c 100644 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -36,8 +36,8 @@ apt_install \ # https://github.com/mstilkerich/rcmcarddav/releases # The easiest way to get the package hashes is to run this script and get the hash from # the error message. -VERSION=1.6.6 -HASH=7705d2736890c49e7ae3ac75e3ae00ba56187056 +VERSION=1.6.8 +HASH=00586f5163b3f6c1b0798be745982e3547b1b24a PERSISTENT_LOGIN_VERSION=bde7b6840c7d91de627ea14e81cf4133cbb3c07a # version 5.3 HTML5_NOTIFIER_VERSION=68d9ca194212e15b3c7225eb6085dbcf02fd13d7 # version 0.6.4+ CARDDAV_VERSION=4.4.3 From 41870d22b0c679f433c2c568b8fd0eb85b720f4c Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Thu, 15 Aug 2024 08:52:48 -0400 Subject: [PATCH 2/6] v70 --- CHANGELOG.md | 5 +++++ setup/bootstrap.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f27aff7c..718e6682 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +Version 70 (August 15, 2024) +---------------------------- + +* Roundcube is updated to version 1.6.8 fixing security vulnerabilities. + Version 69 (July 20, 2024) -------------------------- diff --git a/setup/bootstrap.sh b/setup/bootstrap.sh index 18c53559..00d1b214 100644 --- a/setup/bootstrap.sh +++ b/setup/bootstrap.sh @@ -23,7 +23,7 @@ if [ -z "$TAG" ]; then if [ "$UBUNTU_VERSION" == "Ubuntu 22.04 LTS" ]; then # This machine is running Ubuntu 22.04, which is supported by # Mail-in-a-Box versions 60 and later. - TAG=v69b + TAG=v70 elif [ "$UBUNTU_VERSION" == "Ubuntu 18.04 LTS" ]; then # This machine is running Ubuntu 18.04, which is supported by # Mail-in-a-Box versions 0.40 through 5x. From f453c44d524b68a3a99f567168dd401f88556633 Mon Sep 17 00:00:00 2001 From: darren Date: Fri, 30 Aug 2024 11:26:05 -0700 Subject: [PATCH 3/6] Update setup to handle multiple SSH ports (#2437) This PR addresses an issue reported in the mailinabox Slack channel where a system had sshd configured to listen on two ports. Co-authored-by: Darren Sanders --- setup/system.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/setup/system.sh b/setup/system.sh index fac50df7..b8d65608 100755 --- a/setup/system.sh +++ b/setup/system.sh @@ -270,14 +270,14 @@ if [ -z "${DISABLE_FIREWALL:-}" ]; then # ssh might be running on an alternate port. Use sshd -T to dump sshd's #NODOC # settings, find the port it is supposedly running on, and open that port #NODOC # too. #NODOC - SSH_PORT=$(sshd -T 2>/dev/null | grep "^port " | sed "s/port //") #NODOC + SSH_PORT=$(sshd -T 2>/dev/null | grep "^port " | sed "s/port //" | tr '\n' ' ') #NODOC if [ -n "$SSH_PORT" ]; then - if [ "$SSH_PORT" != "22" ]; then - - echo "Opening alternate SSH port $SSH_PORT." #NODOC - ufw_limit "$SSH_PORT" #NODOC - - fi + for $port in $SSH_PORT; do + if [ "$port" != "22" ]; then + echo "Opening alternate SSH port $port." #NODOC + ufw_limit "$port" #NODOC + fi + done fi ufw --force enable; From 3b8f4a2fe8bd686f9d3ff405d9bb380c3c6315a8 Mon Sep 17 00:00:00 2001 From: matidau <65836048+matidau@users.noreply.github.com> Date: Sat, 31 Aug 2024 04:27:44 +1000 Subject: [PATCH 4/6] Z-Push remove config lines no longer supported (#2433) --- setup/zpush.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup/zpush.sh b/setup/zpush.sh index 3b14c047..a5538d70 100755 --- a/setup/zpush.sh +++ b/setup/zpush.sh @@ -57,8 +57,6 @@ fi sed -i "s^define('TIMEZONE', .*^define('TIMEZONE', '$(cat /etc/timezone)');^" /usr/local/lib/z-push/config.php sed -i "s/define('BACKEND_PROVIDER', .*/define('BACKEND_PROVIDER', 'BackendCombined');/" /usr/local/lib/z-push/config.php sed -i "s/define('USE_FULLEMAIL_FOR_LOGIN', .*/define('USE_FULLEMAIL_FOR_LOGIN', true);/" /usr/local/lib/z-push/config.php -sed -i "s/define('LOG_MEMORY_PROFILER', .*/define('LOG_MEMORY_PROFILER', false);/" /usr/local/lib/z-push/config.php -sed -i "s/define('BUG68532FIXED', .*/define('BUG68532FIXED', false);/" /usr/local/lib/z-push/config.php sed -i "s/define('LOGLEVEL', .*/define('LOGLEVEL', LOGLEVEL_ERROR);/" /usr/local/lib/z-push/config.php # Configure BACKEND From ca123515aad102327701b18a7d65d180f800b815 Mon Sep 17 00:00:00 2001 From: Downtown Allday Date: Mon, 2 Sep 2024 21:30:01 -0400 Subject: [PATCH 5/6] fix variable (#2439) --- setup/system.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/system.sh b/setup/system.sh index b8d65608..7467a72c 100755 --- a/setup/system.sh +++ b/setup/system.sh @@ -272,7 +272,7 @@ if [ -z "${DISABLE_FIREWALL:-}" ]; then # too. #NODOC SSH_PORT=$(sshd -T 2>/dev/null | grep "^port " | sed "s/port //" | tr '\n' ' ') #NODOC if [ -n "$SSH_PORT" ]; then - for $port in $SSH_PORT; do + for port in $SSH_PORT; do if [ "$port" != "22" ]; then echo "Opening alternate SSH port $port." #NODOC ufw_limit "$port" #NODOC From 1699ab8c02e6813075a65fff9903c85e31d52445 Mon Sep 17 00:00:00 2001 From: matidau <65836048+matidau@users.noreply.github.com> Date: Wed, 18 Sep 2024 04:51:26 +1000 Subject: [PATCH 6/6] Update zpush.sh to version 2.7.4 (#2423) --- setup/zpush.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/zpush.sh b/setup/zpush.sh index a5538d70..5c3e5b30 100755 --- a/setup/zpush.sh +++ b/setup/zpush.sh @@ -22,8 +22,8 @@ apt_install \ phpenmod -v "$PHP_VER" imap # Copy Z-Push into place. -VERSION=2.7.3 -TARGETHASH=9d4bec41935e9a4e07880c5ff915bcddbda4443b +VERSION=2.7.4 +TARGETHASH=78744d56b8799d9828ec8f99a12c1af4e9f9239b needs_update=0 #NODOC if [ ! -f /usr/local/lib/z-push/version ]; then needs_update=1 #NODOC