From ad5b6fe27edb2da3bdcdbd2bda7e72cc30dc25d4 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Mon, 9 Oct 2023 10:53:45 +0200
Subject: [PATCH] Upgrade dovecot: fix proxying ipv6 via xclient

---
 core/dovecot/Dockerfile           | 3 ++-
 towncrier/newsfragments/2918.misc | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 towncrier/newsfragments/2918.misc

diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile
index 872e1ecf0..4f682ee04 100644
--- a/core/dovecot/Dockerfile
+++ b/core/dovecot/Dockerfile
@@ -7,7 +7,8 @@ ARG VERSION
 LABEL version=$VERSION
 
 RUN set -euxo pipefail \
-  ; apk add --no-cache dovecot dovecot-fts-xapian dovecot-lmtpd dovecot-pigeonhole-plugin dovecot-pop3d dovecot-submissiond rspamd-client xapian-core \
+  ; apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main 'dovecot<2.4' dovecot-fts-xapian dovecot-lmtpd dovecot-pigeonhole-plugin dovecot-pop3d dovecot-submissiond xapian-core \
+  ; apk add rspamd-client \
   ; mkdir /var/lib/dovecot
 
 COPY conf/ /conf/
diff --git a/towncrier/newsfragments/2918.misc b/towncrier/newsfragments/2918.misc
new file mode 100644
index 000000000..441806c4c
--- /dev/null
+++ b/towncrier/newsfragments/2918.misc
@@ -0,0 +1 @@
+Upgrade dovecot to ensure we can proxy ipv6 via XCLIENT.