From 69d8fdef9915127f016eb6424322a149cdff25d7 Mon Sep 17 00:00:00 2001
From: m-picc <105937591+m-picc@users.noreply.github.com>
Date: Sun, 5 Jun 2022 09:24:32 -0400
Subject: [PATCH 1/2] Specify b2sdk version 1.14.1 (#2125)

pin b2sdk version to 1.14.1 to resolve exception that occurs when attempting to use backblaze backups. See https://github.com/mail-in-a-box/mailinabox/issues/2124 for details.
---
 setup/management.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/management.sh b/setup/management.sh
index 8dc64f3b..40d0a7eb 100755
--- a/setup/management.sh
+++ b/setup/management.sh
@@ -30,7 +30,7 @@ apt_install duplicity python-pip virtualenv certbot rsync
 # b2sdk is used for backblaze backups.
 # boto is used for amazon aws backups.
 # Both are installed outside the pipenv, so they can be used by duplicity
-hide_output pip3 install --upgrade b2sdk boto
+hide_output pip3 install --upgrade b2sdk==1.14.1 boto
 
 # Create a virtualenv for the installation of Python 3 packages
 # used by the management daemon.

From 9004bb6e8ecf4ef8062859693919215149c68c47 Mon Sep 17 00:00:00 2001
From: jbandholz <20779634+jbandholz@users.noreply.github.com>
Date: Sun, 5 Jun 2022 09:40:54 -0400
Subject: [PATCH 2/2] Add IPV6 addresses to fail2ban ignoreip (#2069)

Update jails.conf to include IPV6 localhost and external ip to ignoreip line.  Update system.sh to include IPV6 address in replacement.  See mail-in-a-box#2066 for details.
---
 conf/fail2ban/jails.conf | 2 +-
 setup/system.sh          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/fail2ban/jails.conf b/conf/fail2ban/jails.conf
index ce957f41..c1514b45 100644
--- a/conf/fail2ban/jails.conf
+++ b/conf/fail2ban/jails.conf
@@ -5,7 +5,7 @@
 # Whitelist our own IP addresses. 127.0.0.1/8 is the default. But our status checks
 # ping services over the public interface so we should whitelist that address of
 # ours too. The string is substituted during installation.
-ignoreip = 127.0.0.1/8 PUBLIC_IP
+ignoreip = 127.0.0.1/8 PUBLIC_IP ::1 PUBLIC_IPV6
 
 [dovecot]
 enabled = true
diff --git a/setup/system.sh b/setup/system.sh
index 036fe3f9..9898cbcd 100755
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -363,6 +363,7 @@ systemctl restart systemd-resolved
 rm -f /etc/fail2ban/jail.local # we used to use this file but don't anymore
 rm -f /etc/fail2ban/jail.d/defaults-debian.conf # removes default config so we can manage all of fail2ban rules in one config
 cat conf/fail2ban/jails.conf \
+    | sed "s/PUBLIC_IPV6/$PUBLIC_IPV6/g" \
 	| sed "s/PUBLIC_IP/$PUBLIC_IP/g" \
 	| sed "s#STORAGE_ROOT#$STORAGE_ROOT#" \
 	> /etc/fail2ban/jail.d/mailinabox.conf