From 36ed7bb4467f0b34703c534a26dace479f0a9cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Thu, 25 Jul 2024 12:29:08 +0200
Subject: [PATCH] Explicitly set default_database_type if lmdb map is used
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  Resolves: RHEL-50557

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
---
 postfix-3.8.5-openssl-no-engine.patch | 12 ++++++++++++
 postfix.spec                          | 10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 postfix-3.8.5-openssl-no-engine.patch

diff --git a/postfix-3.8.5-openssl-no-engine.patch b/postfix-3.8.5-openssl-no-engine.patch
new file mode 100644
index 0000000..8efb0e6
--- /dev/null
+++ b/postfix-3.8.5-openssl-no-engine.patch
@@ -0,0 +1,12 @@
+diff --git a/src/posttls-finger/posttls-finger.c b/src/posttls-finger/posttls-finger.c
+index b9a4699..29e6ec1 100644
+--- a/src/posttls-finger/posttls-finger.c
++++ b/src/posttls-finger/posttls-finger.c
+@@ -405,7 +405,6 @@
+ 
+ #ifdef USE_TLS
+ #include <tls_proxy.h>
+-#include <openssl/engine.h>
+ #endif
+ 
+  /*
diff --git a/postfix.spec b/postfix.spec
index f50493b..ef0210c 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -57,7 +57,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 3.8.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 2
 URL: http://www.postfix.org
 License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC
@@ -107,6 +107,7 @@ Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch
 Patch11: postfix-3.4.4-chroot-example-fix.patch
 # rhbz#1931403, sent upstream
 Patch13: pflogsumm-1.1.5-syslog-name-underscore-fix.patch
+Patch14: postfix-3.8.5-openssl-no-engine.patch
 
 # Optional patches - set the appropriate environment variables to include
 #                    them when building the package/spec file
@@ -270,6 +271,7 @@ popd
 %endif
 %patch11 -p1 -b .chroot-example-fix
 %patch13 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix
+%patch14 -p1 -b .openssl-no-engine
 
 # Backport 3.8-20221006 fix for uname -r detection
 sed -i makedefs -e '\@Linux\.@s|345|3456|'
@@ -284,6 +286,8 @@ done
 %if 0%{?defmap_lmdb}
   sed -i '/^\s*alias_maps\s*=\s*hash:\/etc\/aliases/ s|hash:|lmdb:|g' conf/main.cf
   sed -i '/^\s*alias_database\s*=\s*hash:\/etc\/aliases/ s|hash:|lmdb:|g' conf/main.cf
+  echo >> conf/main.cf
+  echo "default_database_type = lmdb" >> conf/main.cf
 %endif
 
 %build
@@ -836,6 +840,10 @@ fi
 %endif
 
 %changelog
+* Thu Jul 25 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.5-5
+- Explicitly set default_database_type if lmdb map is used
+  Resolves: RHEL-50557
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2:3.8.5-4
 - Bump release for June 2024 mass rebuild