From 295d7f0a0588ea706823af12fb8b6588a8a1a289 Mon Sep 17 00:00:00 2001
From: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>
Date: Mon, 19 Dec 2022 08:40:49 +0100
Subject: [PATCH] update: update to latest version of Fail2Ban (#2903)

---
 Dockerfile                             | 1 +
 target/fail2ban/fail2ban.d/fixes.local | 9 +++++++++
 target/scripts/build/packages.sh       | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 target/fail2ban/fail2ban.d/fixes.local

diff --git a/Dockerfile b/Dockerfile
index 4a641d9b..a5e49567 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -133,6 +133,7 @@ EOF
 # -----------------------------------------------
 
 COPY target/fail2ban/jail.local /etc/fail2ban/jail.local
+COPY target/fail2ban/fail2ban.d/fixes.local /etc/fail2ban/fail2ban.d/fixes.local
 RUN <<EOF
   ln -s /var/log/mail/mail.log /var/log/mail.log
   # disable sshd jail
diff --git a/target/fail2ban/fail2ban.d/fixes.local b/target/fail2ban/fail2ban.d/fixes.local
new file mode 100644
index 00000000..01ba6e21
--- /dev/null
+++ b/target/fail2ban/fail2ban.d/fixes.local
@@ -0,0 +1,9 @@
+# * Contains settings that act as fixes, mostly for tests.
+# ! When adding new content, provide a comment on why the fix is necessary.
+
+[Definition]
+
+# Fail2Ban will complain when using `fail2ban-client -d` about this option
+# not being set. This screws up `assert_output` in BATS tests. Therefore,
+# the default value is explictly set here.
+allowipv6 = auto;
diff --git a/target/scripts/build/packages.sh b/target/scripts/build/packages.sh
index 6a29effe..f4142a0e 100644
--- a/target/scripts/build/packages.sh
+++ b/target/scripts/build/packages.sh
@@ -117,7 +117,7 @@ function _install_dovecot
 
 function _install_fail2ban
 {
-  local FAIL2BAN_DEB_URL='https://github.com/fail2ban/fail2ban/releases/download/0.11.2/fail2ban_0.11.2-1.upstream1_all.deb'
+  local FAIL2BAN_DEB_URL='https://github.com/fail2ban/fail2ban/releases/download/1.0.2/fail2ban_1.0.2-1.upstream1_all.deb'
   local FAIL2BAN_DEB_ASC_URL="${FAIL2BAN_DEB_URL}.asc"
   local FAIL2BAN_GPG_FINGERPRINT='8738 559E 26F6 71DF 9E2C  6D9E 683B F1BE BD0A 882C'
   local FAIL2BAN_GPG_PUBLIC_KEY_ID='0x683BF1BEBD0A882C'