Explicitly set default_database_type if lmdb map is used

Resolves: RHEL-50557

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
This commit is contained in:
Jaroslav Škarvada 2024-07-25 12:29:08 +02:00
parent a47c88aab8
commit 36ed7bb446
2 changed files with 21 additions and 1 deletions

View File

@ -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
/*

View File

@ -57,7 +57,7 @@
Name: postfix Name: postfix
Summary: Postfix Mail Transport Agent Summary: Postfix Mail Transport Agent
Version: 3.8.5 Version: 3.8.5
Release: 4%{?dist} Release: 5%{?dist}
Epoch: 2 Epoch: 2
URL: http://www.postfix.org URL: http://www.postfix.org
License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC 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 Patch11: postfix-3.4.4-chroot-example-fix.patch
# rhbz#1931403, sent upstream # rhbz#1931403, sent upstream
Patch13: pflogsumm-1.1.5-syslog-name-underscore-fix.patch 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 # Optional patches - set the appropriate environment variables to include
# them when building the package/spec file # them when building the package/spec file
@ -270,6 +271,7 @@ popd
%endif %endif
%patch11 -p1 -b .chroot-example-fix %patch11 -p1 -b .chroot-example-fix
%patch13 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-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 # Backport 3.8-20221006 fix for uname -r detection
sed -i makedefs -e '\@Linux\.@s|345|3456|' sed -i makedefs -e '\@Linux\.@s|345|3456|'
@ -284,6 +286,8 @@ done
%if 0%{?defmap_lmdb} %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_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 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 %endif
%build %build
@ -836,6 +840,10 @@ fi
%endif %endif
%changelog %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 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2:3.8.5-4
- Bump release for June 2024 mass rebuild - Bump release for June 2024 mass rebuild