From 5d3d0ce081bc6728988ba1a8d35fa796c22d41df Mon Sep 17 00:00:00 2001
From: Simon Pichugin <spichugi@rehdat.com>
Date: Tue, 18 May 2021 10:28:43 +0200
Subject: [PATCH] Rebuild without MP_2 support and fix coverity issues

Resolves: #1967136
---
 ...binding-ITS-9215-fix-for-glibc-again.patch | 28 +++++++++++++++++++
 openldap.spec                                 | 10 +++++--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 openldap-cbinding-ITS-9215-fix-for-glibc-again.patch

diff --git a/openldap-cbinding-ITS-9215-fix-for-glibc-again.patch b/openldap-cbinding-ITS-9215-fix-for-glibc-again.patch
new file mode 100644
index 0000000..ec62c85
--- /dev/null
+++ b/openldap-cbinding-ITS-9215-fix-for-glibc-again.patch
@@ -0,0 +1,28 @@
+From d548ab15e0d615524c403440c01a9748bfcac87d Mon Sep 17 00:00:00 2001
+From: Howard Chu <hyc@openldap.org>
+Date: Tue, 28 Apr 2020 16:33:41 +0100
+Subject: [PATCH] ITS#9215 fix for glibc again
+
+---
+ libraries/libldap_r/thr_posix.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libraries/libldap_r/thr_posix.c b/libraries/libldap_r/thr_posix.c
+index e4b435707..62f94ca16 100644
+--- a/libraries/libldap_r/thr_posix.c
++++ b/libraries/libldap_r/thr_posix.c
+@@ -18,6 +18,11 @@
+ 
+ #if defined( HAVE_PTHREADS )
+ 
++#ifdef __GLIBC__
++#undef _FEATURES_H
++#define _XOPEN_SOURCE 500		/* For pthread_setconcurrency() on glibc */
++#endif
++
+ #include <ac/errno.h>
+ 
+ #ifdef REPLACE_BROKEN_YIELD
+-- 
+2.31.1
+
diff --git a/openldap.spec b/openldap.spec
index 0f2b7e1..036a244 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -7,7 +7,7 @@
 
 Name: openldap
 Version: 2.4.58
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: LDAP support libraries
 License: OpenLDAP
 URL: http://www.openldap.org/
@@ -53,6 +53,7 @@ Patch59: openldap-cbinding-ITS-9189_3-initialize-ldo_sasl_cbinding-in-LDAP_LDO_S
 Patch60: openldap-cbinding-Fix-slaptest-in-test077.patch
 Patch61: openldap-cbinding-Convert-test077-to-LDIF-config.patch
 Patch62: openldap-cbinding-Update-keys-to-RSA-4096.patch
+Patch63: openldap-cbinding-ITS-9215-fix-for-glibc-again.patch
 
 # check-password module specific patches
 Patch90: check-password-makefile.patch
@@ -159,6 +160,7 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi
 %patch60 -p1
 %patch61 -p1
 %patch62 -p1
+%patch63 -p1
 
 # build smbk5pwd with other overlays
 ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays
@@ -187,7 +189,7 @@ popd
 
 %set_build_flags
 # enable experimental support for LDAP over UDP (LDAP_CONNECTIONLESS)
-export CFLAGS="${CFLAGS} ${LDFLAGS} -Wl,--as-needed -DLDAP_CONNECTIONLESS -DLDAP_USE_NON_BLOCKING_TLS"
+export CFLAGS="${CFLAGS} ${LDFLAGS} -Wl,--as-needed -DLDAP_CONNECTIONLESS -DLDAP_USE_NON_BLOCKING_TLS -DOPENSSL_NO_MD2"
 
 pushd openldap-%{version}
 %configure \
@@ -552,6 +554,10 @@ exit 0
 %{_libdir}/libldap-2.4*.so.*
 
 %changelog
+* Thu Jun  3 2021 Simon Pichugin <spichugi@redhat.com> - 2.4.58-4
+- Rebuild without MP_2 support (#1967136)
+- Fix coverity issues
+
 * Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 2.4.58-3
 - Perl 5.34 rebuild