From 2bbc317873b7399ba8a08d2397654f5a1b56b5b8 Mon Sep 17 00:00:00 2001
From: KiekerJan <kiekerjan@users.noreply.github.com>
Date: Thu, 26 Oct 2023 15:03:29 +0200
Subject: [PATCH 1/3] Update Roundcube to 1.6.4 (#2317)

---
 setup/webmail.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup/webmail.sh b/setup/webmail.sh
index 0be0e1f8..97fa24cb 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -36,9 +36,9 @@ 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.1
-HASH=0e1c771ab83ea03bde1fd0be6ab5d09e60b4f293
-PERSISTENT_LOGIN_VERSION=bde7b6840c7d91de627ea14e81cf4133cbb3c07a # version 5.2
+VERSION=1.6.4
+HASH=bfc693d6590542d63171e6a3997fc29f0a5f12ca
+PERSISTENT_LOGIN_VERSION=bde7b6840c7d91de627ea14e81cf4133cbb3c07a # version 5.3
 HTML5_NOTIFIER_VERSION=68d9ca194212e15b3c7225eb6085dbcf02fd13d7 # version 0.6.4+
 CARDDAV_VERSION=4.4.3
 CARDDAV_HASH=74f8ba7aee33e78beb9de07f7f44b81f6071b644

From 46d55f786656b25f24bc9020f24880ca8200d3bb Mon Sep 17 00:00:00 2001
From: matidau <65836048+matidau@users.noreply.github.com>
Date: Fri, 27 Oct 2023 00:04:13 +1100
Subject: [PATCH 2/3] Update zpush.sh to version 2.7.1 (#2315)

Updating to latest release, bugfixes no new features.
---
 setup/zpush.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/zpush.sh b/setup/zpush.sh
index 51b197ff..152418c0 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.0
-TARGETHASH=a520bbdc1d637c5aac379611053457edd54f2bf0
+VERSION=2.7.1
+TARGETHASH=f15c566b1ad50de24f3f08f505f0c3d8155c2d0d
 needs_update=0 #NODOC
 if [ ! -f /usr/local/lib/z-push/version ]; then
 	needs_update=1 #NODOC

From 03145542076c80ab2af3a3b12b94c0da50a631fa Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Fri, 27 Oct 2023 06:02:22 -0400
Subject: [PATCH 3/3] Version 65

---
 CHANGELOG.md       | 7 +++++++
 README.md          | 2 +-
 setup/bootstrap.sh | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d41cb25b..420b6797 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+Version 65 (October 27, 2023)
+-----------------------------
+
+* Roundcube updated to 1.6.4 fixing a security vulnerability.
+* zpush.sh updated to version 2.7.1.
+* Fixed a typo in the control panel.
+
 Version 64 (September 2, 2023)
 ------------------------------
 
diff --git a/README.md b/README.md
index 06815cc7..df387ab4 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ Clone this repository and checkout the tag corresponding to the most recent rele
 
 	$ git clone https://github.com/mail-in-a-box/mailinabox
 	$ cd mailinabox
-	$ git checkout v64
+	$ git checkout v65
 
 Begin the installation.
 
diff --git a/setup/bootstrap.sh b/setup/bootstrap.sh
index 6693b329..51863da9 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=v64
+		TAG=v65
 	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.