From 9175424d0f3c67622c030311cc720d7477f1c2b6 Mon Sep 17 00:00:00 2001
From: Brennan Kinney <5098581+polarathene@users.noreply.github.com>
Date: Wed, 3 Jul 2024 22:16:02 +1200
Subject: [PATCH] fix: Update `dovecot-fts-xapian` to `1.7.13` (#4095)

* fix: Update `dovecot-fts-xapian` to `1.7.13`

Contains a fix to a regression introduced that broke indexing

---------

Co-authored-by: casperklein <casperklein@users.noreply.github.com>
---
 CHANGELOG.md                    | 3 ++-
 Dockerfile                      | 4 ++--
 target/scripts/build/compile.sh | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 832e25d2..2d9e6ceb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,8 @@ All notable changes to this project will be documented in this file. The format
 
 #### Fixes
 - **Dovecot:**
-  - `logwatch`  Update logwatch `ignore.conf` to exclude Xapian messages about pending documents
+  - `logwatch`  Update logwatch `ignore.conf` to exclude Xapian messages about pending documents ([#4060](https://github.com/docker-mailserver/docker-mailserver/pull/4060))
+  - `dovecot-fts-xapian` plugin was updated to `1.7.13`, fixing a regression with indexing ([#4095](https://github.com/docker-mailserver/docker-mailserver/pull/4095))
 
 ## [v14.0.0](https://github.com/docker-mailserver/docker-mailserver/releases/tag/v14.0.0)
 
diff --git a/Dockerfile b/Dockerfile
index da9aa83d..f6199fd4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -82,8 +82,8 @@ EOF
 
 # install fts_xapian plugin
 
-COPY --from=stage-compile dovecot-fts-xapian-1.7.12_1.7.12_*.deb /
-RUN dpkg -i /dovecot-fts-xapian-1.7.12_1.7.12_*.deb && rm /dovecot-fts-xapian-1.7.12_1.7.12_*.deb
+COPY --from=stage-compile dovecot-fts-xapian-*.deb /
+RUN dpkg -i /dovecot-fts-xapian-*.deb && rm /dovecot-fts-xapian-*.deb
 
 COPY target/dovecot/*.inc target/dovecot/*.conf /etc/dovecot/conf.d/
 COPY target/dovecot/dovecot-purge.cron /etc/cron.d/dovecot-purge.disabled
diff --git a/target/scripts/build/compile.sh b/target/scripts/build/compile.sh
index 4c6fba82..299ba7c8 100644
--- a/target/scripts/build/compile.sh
+++ b/target/scripts/build/compile.sh
@@ -16,7 +16,7 @@ function _compile_dovecot_fts_xapian() {
   apt-get "${QUIET}" --no-install-recommends install \
     automake libtool pkg-config libicu-dev libsqlite3-dev libxapian-dev make build-essential dh-make devscripts dovecot-dev
 
-  local XAPIAN_VERSION='1.7.12'
+  local XAPIAN_VERSION='1.7.13'
   curl -sSfL -o dovecot-fts-xapian.tar.gz \
     "https://github.com/grosjo/fts-xapian/releases/download/${XAPIAN_VERSION}/dovecot-fts-xapian-${XAPIAN_VERSION}.tar.gz"
   tar xf dovecot-fts-xapian.tar.gz