From d8f729db645ffe37f519d28639769b5f66cde48f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 13 Nov 2025 21:22:45 +0000
Subject: [PATCH 1/2] Initial plan


From e1b6b5fc8fec5624c14cbb1cabd01d33757fdb54 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 13 Nov 2025 21:28:58 +0000
Subject: [PATCH 2/2] Replace manual flatcurve build with Alpine package

Co-authored-by: DavidePrincipi <2920838+DavidePrincipi@users.noreply.github.com>
---
 build-images.sh | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/build-images.sh b/build-images.sh
index 841bd38d..d83b8f34 100644
--- a/build-images.sh
+++ b/build-images.sh
@@ -74,20 +74,8 @@ apk add --no-cache rspamd-client
     mv -v .post-install /usr/local/bin/dovecot-post-install
     rm -rvf "${tmpdir}"
 )
-(
-    apk add --no-cache build-base git autoconf automake libtool dovecot-dev xapian-core-dev  icu-dev
-    mkdir /tmp/build
-    cd /tmp/build
-    git clone https://github.com/slusarz/dovecot-fts-flatcurve.git
-    cd dovecot-fts-flatcurve/
-    ash autogen.sh
-    ./configure --disable-static --with-dovecot=/usr/lib/dovecot/
-    make
-    make install
-    # clean what we installed
-    rm -rf /tmp/build
-    apk del build-base git autoconf automake libtool xapian-core-dev dovecot-dev icu-dev
-)
+# Install pre-built dovecot-fts-flatcurve package from Alpine repository
+apk add --no-cache dovecot-fts-flatcurve
 mkdir -p /var/lib/dovecot/dict/uquota
 mkdir -p /var/lib/umail
 sed -i 's/^!/#!/' /etc/dovecot/conf.d/10-auth.conf