From 60a2b58e5735308c1f6f3292271948f8730b9559 Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Tue, 23 Jul 2024 06:15:18 -0400
Subject: [PATCH 1/2] Revert "Fixed SC2091: Remove surrounding $() to avoid
 executing output." and fix it another way

This reverts commit 67bcaea71e8d59e34787f5fd708ab4f664967e9d. The sub-shell was required to prevent the updated umask from affecting later steps. It broke the permissions of the fetched assets for the control panel: https://discourse.mailinabox.email/t/admin-panel-broken-after-restore-upgrade/12112/24

Instead, the `$()` is replaced with just `()` to create a subshell without executing its output.
---
 setup/management.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/management.sh b/setup/management.sh
index 7fd844ea..fb359cd3 100755
--- a/setup/management.sh
+++ b/setup/management.sh
@@ -54,7 +54,7 @@ hide_output $venv/bin/pip install --upgrade \
 # Create a backup directory and a random key for encrypting backups.
 mkdir -p "$STORAGE_ROOT/backup"
 if [ ! -f "$STORAGE_ROOT/backup/secret_key.txt" ]; then
-	umask 077; openssl rand -base64 2048 > "$STORAGE_ROOT/backup/secret_key.txt"
+	(umask 077; openssl rand -base64 2048 > "$STORAGE_ROOT/backup/secret_key.txt")
 fi
 
 

From 162e509b8bf0683a70cf92fb8b7623c0dba5d051 Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Tue, 23 Jul 2024 06:20:34 -0400
Subject: [PATCH 2/2] v69b

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b04be2f3..f27aff7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@ Other updates:
 * Added an undocumented option to proxy websockets.
 * Internal improvements to the code to make it more reliable and readable.
 
-Version 69a released on July 21, 2024 corrects a setup failure.
+Version 69a (July 21, 2024) and 69b (July 23, 2024) correct setup failures.
 
 Version 68 (April 1, 2024)
 --------------------------
diff --git a/setup/bootstrap.sh b/setup/bootstrap.sh
index d18cd8b8..18c53559 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=v69a
+		TAG=v69b
 	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.