From f3b5a9ac3d4330af4c6996b31dfda5940a7573a4 Mon Sep 17 00:00:00 2001
From: ace <ace@0xace.cc>
Date: Tue, 1 Aug 2023 18:42:57 +0300
Subject: [PATCH] rspamd: v3.5 build 2, move to AlmaLinux 9

---
 rspamd/Dockerfile | 16 ++++++++++------
 rspamd/Makefile   |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/rspamd/Dockerfile b/rspamd/Dockerfile
index 26788fa..a3dc1fb 100644
--- a/rspamd/Dockerfile
+++ b/rspamd/Dockerfile
@@ -1,22 +1,26 @@
-FROM almalinux:8
+FROM almalinux:9
 
 RUN useradd -m -s /bin/false vmail
 
-RUN dnf install -y epel-release && dnf update -y \
+RUN dnf install -y epel-release dnf-plugins-core \
+  && dnf update -y \
+  && dnf config-manager --enable crb \
   && dnf clean all \
   && rm -rf /var/cache/yum
 
-RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \
-  dovecot-2.3.16 dovecot-pigeonhole-2.3.16 opendkim opendmarc \
+RUN dnf install -y postfix-3.5.9 postfix-ldap-3.5.9 postfix-mysql-3.5.9 postfix-pgsql-3.5.9 \
+  dovecot-2.3.16 dovecot-pigeonhole-2.3.16 opendkim-2.11.0 opendmarc-1.4.2 \
   cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
   && dnf clean all \
   && rm -rf /var/cache/yum
 
-RUN curl https://rspamd.com/rpm-stable/centos-8/rspamd.repo > /etc/yum.repos.d/rspamd.repo \
+RUN update-crypto-policies --set DEFAULT:SHA1 \
+  && curl https://rspamd.com/rpm-stable/centos-9/rspamd.repo > /etc/yum.repos.d/rspamd.repo \
   && rpm --import https://rspamd.com/rpm/gpg.key \
   && dnf install -y rspamd-3.5 \
   && dnf clean all \
-  && rm -rf /var/cache/yum
+  && rm -rf /var/cache/yum \
+  && update-crypto-policies --set DEFAULT
 
 EXPOSE 11332
 
diff --git a/rspamd/Makefile b/rspamd/Makefile
index 2966909..64912f7 100644
--- a/rspamd/Makefile
+++ b/rspamd/Makefile
@@ -1,4 +1,4 @@
-VERSION=3.5-1
+VERSION=3.5-2
 IMAGE=rspamd
 REGISTRY=gitea.geekhome.org/ghp