From da61eb21a306a066eff80f986fa9dd38407ab4cc Mon Sep 17 00:00:00 2001
From: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>
Date: Sun, 17 Aug 2025 11:00:01 +0200
Subject: [PATCH] chore: Remove Pyzor + Razor packages (#4548)

---
 CHANGELOG.md                       |  5 +++++
 Dockerfile                         | 16 ----------------
 docs/content/config/environment.md |  4 ++--
 target/scripts/build/packages.sh   |  4 ++--
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfab4287..1271ace2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ All notable changes to this project will be documented in this file. The format
 
 > **Note**: Changes and additions listed here are contained in the `:edge` image tag. These changes may not be as stable as released changes.
 
+### Removed
+
+- **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))
+
 ## [v15.1.0](https://github.com/docker-mailserver/docker-mailserver/compare/v15.1.0...HEAD)
 
 > [!NOTE]
diff --git a/Dockerfile b/Dockerfile
index 32ac9ae8..e2f7fc0d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -151,22 +151,6 @@ RUN <<EOF
   chmod 644 /etc/amavis/conf.d/*
 EOF
 
-# overcomplication necessary for CI
-# hadolint ignore=SC2086
-RUN <<EOF
-  for _ in {1..10}; do
-    su - amavis -c "razor-admin -create"
-    sleep 3
-    if su - amavis -c "razor-admin -register"; then
-      EC=0
-      break
-    else
-      EC=${?}
-    fi
-  done
-  exit ${EC}
-EOF
-
 # -----------------------------------------------
 # --- Fail2Ban, DKIM & DMARC --------------------
 # -----------------------------------------------
diff --git a/docs/content/config/environment.md b/docs/content/config/environment.md
index 5a7016f1..67b0b4b6 100644
--- a/docs/content/config/environment.md
+++ b/docs/content/config/environment.md
@@ -656,8 +656,8 @@ Mail is not yet considered spam at this spam score, but for purposes like diagno
     X-Spam-Level: ****
     X-Spam-Status: No, score=4.162 tagged_above=2 required=4
             tests=[BODY_SINGLE_WORD=1, DKIM_ADSP_NXDOMAIN=0.8,
-            NO_DNS_FOR_FROM=0.379, NO_RECEIVED=-0.001, NO_RELAYS=-0.001,
-            PYZOR_CHECK=1.985] autolearn=no autolearn_force=no
+            NO_DNS_FOR_FROM=0.379, NO_RECEIVED=-0.001, NO_RELAYS=-0.001]
+            autolearn=no autolearn_force=no
     ```
 
     !!! info "The `X-Spam-Score` is `4.162`"
diff --git a/target/scripts/build/packages.sh b/target/scripts/build/packages.sh
index 6fdab42c..9ba631a2 100644
--- a/target/scripts/build/packages.sh
+++ b/target/scripts/build/packages.sh
@@ -83,8 +83,8 @@ function _install_packages() {
 
   local ANTI_VIRUS_SPAM_PACKAGES=(
     clamav clamav-daemon
-    # spamassassin is used only with amavisd-new, while pyzor + razor are used by spamassassin
-    amavisd-new spamassassin pyzor razor
+    # spamassassin is used only with amavisd-new
+    amavisd-new spamassassin
   )
 
   # predominantly for Amavis support