From 6d6ce25e03a42ea91888f9b99fcc31163917c5bb Mon Sep 17 00:00:00 2001
From: bilogic <946010+bilogic@users.noreply.github.com>
Date: Mon, 4 Dec 2023 22:22:54 +0800
Subject: [PATCH 1/2] Allow specifying another repo to install from in
 bootstrap.sh (#2334)

---
 setup/bootstrap.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setup/bootstrap.sh b/setup/bootstrap.sh
index 51863da9..d3bd6fac 100644
--- a/setup/bootstrap.sh
+++ b/setup/bootstrap.sh
@@ -59,10 +59,14 @@ if [ ! -d $HOME/mailinabox ]; then
 		echo
 	fi
 
+	if [ "$SOURCE" == "" ]; then
+		SOURCE=https://github.com/mail-in-a-box/mailinabox
+	fi
+
 	echo Downloading Mail-in-a-Box $TAG. . .
 	git clone \
 		-b $TAG --depth 1 \
-		https://github.com/mail-in-a-box/mailinabox \
+		$SOURCE \
 		$HOME/mailinabox \
 		< /dev/null 2> /dev/null
 

From fa8c7ddef59d5ae84c31ca50d1c3ec6b5f85f428 Mon Sep 17 00:00:00 2001
From: KiekerJan <kiekerjan@users.noreply.github.com>
Date: Mon, 4 Dec 2023 15:23:36 +0100
Subject: [PATCH 2/2] Upgrade roundcube to 1.6.5 (#2329)

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

diff --git a/setup/webmail.sh b/setup/webmail.sh
index 97fa24cb..62d18c86 100755
--- 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.4
-HASH=bfc693d6590542d63171e6a3997fc29f0a5f12ca
+VERSION=1.6.5
+HASH=326fcc206cddc00355e98d1e40fd0bcd9baec69f
 PERSISTENT_LOGIN_VERSION=bde7b6840c7d91de627ea14e81cf4133cbb3c07a # version 5.3
 HTML5_NOTIFIER_VERSION=68d9ca194212e15b3c7225eb6085dbcf02fd13d7 # version 0.6.4+
 CARDDAV_VERSION=4.4.3