From e1d14a261f2801d35fa44263f99527369566c88a Mon Sep 17 00:00:00 2001
From: Simon Pichugin <spichugi@redhat.com>
Date: Wed, 26 Jul 2023 19:14:16 -0700
Subject: [PATCH] Rebase to version 2.6.5

Related: rhbz#2221798
---
 .gitignore    |  1 +
 openldap.spec | 10 ++++++----
 sources       |  3 +--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1284f15..5076f63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@
 /openldap-2.6.2.tgz
 /openldap-2.6.3.tgz
 /openldap-2.6.4.tgz
+/openldap-2.6.5.tgz
diff --git a/openldap.spec b/openldap.spec
index 90171fc..368c084 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -13,8 +13,8 @@
 %global __brp_remove_la_files %nil
 
 Name: openldap
-Version: 2.6.4
-Release: 4%{?dist}
+Version: 2.6.5
+Release: 1%{?dist}
 Summary: LDAP support libraries
 License: OpenLDAP
 URL: http://www.openldap.org/
@@ -46,7 +46,6 @@ Patch6: openldap-switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.patch
 # System-wide default for CA certs
 Patch7: openldap-openssl-manpage-defaultCA.patch
 Patch8: openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch
-Patch9: openldap-configure-c99.patch
 
 # check-password module specific patches
 Patch90: check-password-makefile.patch
@@ -155,7 +154,6 @@ pushd openldap-%{version}
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p2
 
 # build smbk5pwd with other overlays
 ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays
@@ -506,6 +504,10 @@ exit 0
 %{_libdir}/libslapi-2.4*.so.*
 
 %changelog
+* Wed Jul 26 2023 Simon Pichugin <spichugi@redhat.com> - 2.6.5-1
+- Rebase to version 2.6.5
+  Related: rhbz#2221798
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index 502b716..21c997b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 SHA512 (openldap-ppolicy-check-password-1.1.tar.gz) = a92854d7438cb95fac361da80a49d084d502155e8ce0ad2ea679db9529bbe0182aa4354e6139793c775e496349375d8f017678941d23315ff1c20fefc9573cdc
-SHA512 (openldap-2.6.3.tgz) = 56efbbfc68779ad635d2c25228eb9c4f1553b107b96e8a438029b1c5d2f2647cf4d437770554392b436718ea44a4813e17f5195049f67fc09d063a981096cd85
-SHA512 (openldap-2.6.4.tgz) = 4be49c4866e47e96677d0e1f7caa380791917c9df8d6bb343d032aba45031c87db3bd4f6b953e914a1f40044fa68f4886ae96929a410b7188c0ed9bb75073a30
+SHA512 (openldap-2.6.5.tgz) = 1babc2950382bc7c7da687bf60b798d4eb7d5543fc9bb321636302adfefa8b86b333ba734807bebd5100b23bfa9a3d534413268e462f95441ffdc4cdd3776961