From 7ef48ff93ac2838eab9ad4db7d179dd5822201da Mon Sep 17 00:00:00 2001 From: Dmitriy Alekseev <1865999+dragoangel@users.noreply.github.com> Date: Tue, 17 Dec 2024 16:27:53 +0100 Subject: [PATCH 1/3] Update Rspamd to 3.11 --- data/Dockerfiles/rspamd/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile index 64376bbd31..564ca2d723 100644 --- a/data/Dockerfiles/rspamd/Dockerfile +++ b/data/Dockerfiles/rspamd/Dockerfile @@ -2,7 +2,7 @@ FROM debian:bookworm-slim LABEL maintainer="The Infrastructure Company GmbH " ARG DEBIAN_FRONTEND=noninteractive -ARG RSPAMD_VER=rspamd_3.10.2-1~b8a232043 +ARG RSPAMD_VER=rspamd_3.11.0-1~90a175b45 ARG CODENAME=bookworm ENV LC_ALL=C From 8422b3326a1c6278fae1886d6b076bb533a7e199 Mon Sep 17 00:00:00 2001 From: Dmitriy Alekseev <1865999+dragoangel@users.noreply.github.com> Date: Tue, 17 Dec 2024 16:36:30 +0100 Subject: [PATCH 2/3] Enable SMTPUTF8 and hide it from SMTPD greeting --- data/conf/postfix/main.cf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/conf/postfix/main.cf b/data/conf/postfix/main.cf index 6721204cbf..07065f0455 100644 --- a/data/conf/postfix/main.cf +++ b/data/conf/postfix/main.cf @@ -162,10 +162,9 @@ transport_maps = pcre:/opt/postfix/conf/custom_transport.pcre, proxy:mysql:/opt/postfix/conf/sql/mysql_relay_ne.cf, proxy:mysql:/opt/postfix/conf/sql/mysql_transport_maps.cf smtp_sasl_auth_soft_bounce = no -postscreen_discard_ehlo_keywords = silent-discard, dsn, chunking -smtpd_discard_ehlo_keywords = chunking, silent-discard +postscreen_discard_ehlo_keywords = chunking, silent-discard, smtputf8, dsn +smtpd_discard_ehlo_keywords = chunking, silent-discard, smtputf8 compatibility_level = 3.7 -smtputf8_enable = no # Define protocols for SMTPS and submission service submission_smtpd_tls_mandatory_protocols = >=TLSv1.2 smtps_smtpd_tls_mandatory_protocols = >=TLSv1.2 From 463f9132b27669e4e79997c8b18413b7a4971e27 Mon Sep 17 00:00:00 2001 From: Dmitriy Alekseev <1865999+dragoangel@users.noreply.github.com> Date: Tue, 17 Dec 2024 17:01:28 +0100 Subject: [PATCH 3/3] Update options.inc --- data/conf/rspamd/local.d/options.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/data/conf/rspamd/local.d/options.inc b/data/conf/rspamd/local.d/options.inc index 99197ff558..f83ddf0fcc 100644 --- a/data/conf/rspamd/local.d/options.inc +++ b/data/conf/rspamd/local.d/options.inc @@ -3,6 +3,7 @@ dns { } map_watch_interval = 30s; task_timeout = 30s; +enable_mime_utf = true; disable_monitoring = true; # In case a task times out (like DNS lookup), soft reject the message # instead of silently accepting the message without further processing.