From 1861718cc140a6b6466b7a644fee35d22f132943 Mon Sep 17 00:00:00 2001
From: georglauterbach <44545919+georglauterbach@users.noreply.github.com>
Date: Mon, 4 Dec 2023 00:38:39 +0100
Subject: [PATCH] use PPA for Rspamd

---
 CHANGELOG.md                     | 3 +++
 target/scripts/build/packages.sh | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2834728f..5a3f458b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,9 @@ All notable changes to this project will be documented in this file. The format
   - updated note about Rspamd on ARM64 lacking behind in version
 - **Internal:**
   - Postfix configures `virtual_mailbox_maps` and `virtual_transport` during startup instead of using defaults (configured for Dovecot) via our `main.cf` ([#3681](https://github.com/docker-mailserver/docker-mailserver/pull/3681))
+  - `packages.sh` now uses `/etc/os-release` to determine the release name of Debian
+  - removed custom installations of Fail2Ban, getmail6 and Rspamd
+  - use official Rspamd PPA on AMD64; no PPA is used on ARM64
 
 ### Fixed
 
diff --git a/target/scripts/build/packages.sh b/target/scripts/build/packages.sh
index 5ac846e4..f057439e 100644
--- a/target/scripts/build/packages.sh
+++ b/target/scripts/build/packages.sh
@@ -31,6 +31,13 @@ function _pre_installation_steps() {
   )
   apt-get "${QUIET}" install --no-install-recommends "${EARLY_PACKAGES[@]}" 2>/dev/null
 
+  _log 'trace' 'Adding Rspamd PPA'
+  curl -sSfL https://rspamd.com/apt-stable/gpg.key | gpg --dearmor >/etc/apt/trusted.gpg.d/rspamd.gpg
+  echo "deb [signed-by=/etc/apt/trusted.gpg.d/rspamd.gpg] http://rspamd.com/apt-stable/ ${VERSION_CODENAME} main" >/etc/apt/sources.list.d/rspamd.list
+
+  _log 'trace' 'Updating package index after adding PPAs'
+  apt-get "${QUIET}" update
+
   _log 'trace' 'Upgrading packages'
   apt-get "${QUIET}" upgrade
 }