From 5740af7cce47abd6f414bd3785d797e7d759fe38 Mon Sep 17 00:00:00 2001
From: Simon Pichugin <spichugi@redhat.com>
Date: Tue, 5 Aug 2025 17:21:32 -0700
Subject: [PATCH] Rebase to version 2.6.10

Resolves: rhbz#2386671
---
 .gitignore              |  1 +
 openldap-manpages.patch | 31 ++++++++-----------------------
 openldap.spec           |  7 +++++--
 sources                 |  2 +-
 4 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 400752c..50fa4b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@
 /openldap-2.6.7.tgz
 /openldap-2.6.8.tgz
 /openldap-2.6.9.tgz
+/openldap-2.6.10.tgz
diff --git a/openldap-manpages.patch b/openldap-manpages.patch
index df0d879..2303570 100644
--- a/openldap-manpages.patch
+++ b/openldap-manpages.patch
@@ -1,35 +1,20 @@
 Various manual pages changes:
 * removes LIBEXECDIR from slapd.8
-* removes references to non-existing manpages (bz 624616)
 
-diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1
-index 353b075..cf37856 100644
---- a/doc/man/man1/ldapmodify.1
-+++ b/doc/man/man1/ldapmodify.1
-@@ -382,8 +382,7 @@ exit status and a diagnostic message being written to standard error.
- .BR ldap_add_ext (3),
- .BR ldap_delete_ext (3),
- .BR ldap_modify_ext (3),
--.BR ldap_modrdn_ext (3),
--.BR ldif (5).
-+.BR ldif (5)
- .SH AUTHOR
- The OpenLDAP Project <http://www.openldap.org/>
- .SH ACKNOWLEDGEMENTS
 diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
-index 17b7154..6084298 100644
+index d47481d6ed..ff86fc52ca 100644
 --- a/doc/man/man5/ldap.conf.5
 +++ b/doc/man/man5/ldap.conf.5
-@@ -338,6 +338,7 @@ certificates in separate individual files. The
+@@ -341,6 +341,7 @@ be specified, separated by a semi-colon.  The
  .B TLS_CACERT
  is always used before
- .B TLS_CACERTDIR.
+ .BR TLS_CACERTDIR .
 +The specified directory must be managed with the OpenSSL c_rehash utility.
  .TP
  .B TLS_CERT <filename>
  Specifies the file that contains the client certificate.
 diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8
-index 8504b37..f02f1fa 100644
+index 807634e52d..a06110687b 100644
 --- a/doc/man/man8/slapd.8
 +++ b/doc/man/man8/slapd.8
 @@ -5,7 +5,7 @@
@@ -41,16 +26,16 @@ index 8504b37..f02f1fa 100644
  [\c
  .BR \-V [ V [ V ]]
  [\c
-@@ -332,7 +332,7 @@ the LDAP databases defined in the default config file, just type:
+@@ -333,7 +333,7 @@ the LDAP databases defined in the default config file, just type:
  .LP
  .nf
  .ft tt
 -	LIBEXECDIR/slapd
-+	slapd
++        slapd
  .ft
  .fi
  .LP
-@@ -343,7 +343,7 @@ on voluminous debugging which will be printed on standard error, type:
+@@ -344,7 +344,7 @@ on voluminous debugging which will be printed on standard error, type:
  .LP
  .nf
  .ft tt
@@ -59,7 +44,7 @@ index 8504b37..f02f1fa 100644
  .ft
  .fi
  .LP
-@@ -351,7 +351,7 @@ To test whether the configuration file is correct or not, type:
+@@ -352,7 +352,7 @@ To test whether the configuration file is correct or not, type:
  .LP
  .nf
  .ft tt
diff --git a/openldap.spec b/openldap.spec
index 60c7adc..5d24ea5 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -16,8 +16,8 @@
 %global __brp_remove_la_files %nil
 
 Name: openldap
-Version: 2.6.9
-Release: 4%{?dist}
+Version: 2.6.10
+Release: 1%{?dist}
 Summary: LDAP support libraries
 License: OLDAP-2.8
 URL: http://www.openldap.org/
@@ -555,6 +555,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Aug 5 2025 Simon Pichugin <spichugi@redhat.com> - 2.6.10-1
+- Rebase to version 2.6.9 (rhbz#2386671)
+
 * Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 2.6.9-4
 - Add explicit BR: libxcrypt-devel
 
diff --git a/sources b/sources
index 51594b5..0b0bd67 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (openldap-ppolicy-check-password-1.1.tar.gz) = a92854d7438cb95fac361da80a49d084d502155e8ce0ad2ea679db9529bbe0182aa4354e6139793c775e496349375d8f017678941d23315ff1c20fefc9573cdc
-SHA512 (openldap-2.6.9.tgz) = d3f839d3cf1030caa410e54f968e9c0caf3bc371c06ea0f64cf3a6ece6d31013c9dbfb08a3a63ea9137a2062aa6edc6e0bc542b365fe4ad66608df4cdbe94a4e
+SHA512 (openldap-2.6.10.tgz) = 18129ad9a385457941e3203de5f130fe2571701abf24592c5beffb01361aae3182c196b2cd48ffeecb792b9b0e5f82c8d92445a7ec63819084757bdedba63b20