From 9e4749e718226f3bb9d0222f5a89571f83816371 Mon Sep 17 00:00:00 2001
From: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>
Date: Sun, 17 Aug 2025 13:20:21 +0200
Subject: [PATCH] chore: update externally installed software (#4557)

---
 CHANGELOG.md                     | 8 ++++++++
 target/scripts/build/compile.sh  | 2 +-
 target/scripts/build/packages.sh | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1271ace2..2292ac20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,14 @@ All notable changes to this project will be documented in this file. The format
 - **SpamAssassin:**
   - Removed Pyzor + Razor due to maintenance concerns. From observations it is unlikely to have any notable regression ([#4548](https://github.com/docker-mailserver/docker-mailserver/pull/4548))
 
+### Updated
+
+- **Externally installed software**
+  - bumped `jaq` from `2.1.0` to [`2.3.0`](https://github.com/01mf02/jaq/releases/tag/v2.3.0) ([#4557](https://github.com/docker-mailserver/docker-mailserver/pull/4557))
+  - bumped `step` CLI from `0.28.2` to [`0.28.7`](https://github.com/smallstep/cli/releases/tag/v0.28.7)) ([#4557](https://github.com/docker-mailserver/docker-mailserver/pull/4557))
+- **Dovecot**
+  - Bumped Xapian version from `1.9` to [`1.9.1`](https://github.com/grosjo/fts-xapian/releases/tag/1.9.1) ([#4557](https://github.com/docker-mailserver/docker-mailserver/pull/4557)), which includes Dovecot 2.4 compatibility
+
 ## [v15.1.0](https://github.com/docker-mailserver/docker-mailserver/compare/v15.1.0...HEAD)
 
 > [!NOTE]
diff --git a/target/scripts/build/compile.sh b/target/scripts/build/compile.sh
index bad84f23..21a7869e 100644
--- a/target/scripts/build/compile.sh
+++ b/target/scripts/build/compile.sh
@@ -18,7 +18,7 @@ function _install_build_deps() {
 }
 
 function _build_package() {
-  local XAPIAN_VERSION='1.9'
+  local XAPIAN_VERSION='1.9.1'
   curl -fsSL "https://github.com/grosjo/fts-xapian/releases/download/${XAPIAN_VERSION}/dovecot-fts-xapian-${XAPIAN_VERSION}.tar.gz" \
     | tar -xz
   cd "fts-xapian-${XAPIAN_VERSION}"
diff --git a/target/scripts/build/packages.sh b/target/scripts/build/packages.sh
index 9ba631a2..b846a3cb 100644
--- a/target/scripts/build/packages.sh
+++ b/target/scripts/build/packages.sh
@@ -60,12 +60,12 @@ function _install_utils() {
   _log 'debug' 'Installing utils sourced from Github'
 
   _log 'trace' 'Installing jaq'
-  local JAQ_TAG='v2.1.0'
+  local JAQ_TAG='v2.3.0'
   curl -sSfL "https://github.com/01mf02/jaq/releases/download/${JAQ_TAG}/jaq-$(uname -m)-unknown-linux-gnu" -o /usr/local/bin/jaq
   chmod +x /usr/local/bin/jaq
 
   _log 'trace' 'Installing step'
-  local STEP_RELEASE='0.28.2'
+  local STEP_RELEASE='0.28.7'
   curl -sSfL "https://github.com/smallstep/cli/releases/download/v${STEP_RELEASE}/step_linux_${STEP_RELEASE}_${ARCH_B}.tar.gz" \
     | tar -xz --directory /usr/local/bin --no-same-owner --strip-components=2 "step_${STEP_RELEASE}/bin/step"