CLDAP ldap_result hangs if nobody listens on the port

Resolves: #1877754

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -19,26 +19,3 @@
 /openldap-2.4.46.tgz
 /openldap-2.4.47.tgz
 /openldap-2.4.50.tgz
-/openldap-2.4.52.tgz
-/openldap-2.4.53.tgz
-/openldap-2.4.54.tgz
-/openldap-2.4.55.tgz
-/openldap-2.4.56.tgz
-/openldap-2.4.57.tgz
-/openldap-2.4.58.tgz
-/openldap-2.4.59.tgz
-/openldap-2.5.4.tgz
-/openldap-ppolicy-check-password-1.1.tar.gz
-/openldap-2.5.5.tgz
-/openldap-2.5.7.tgz
-/openldap-2.5.8.tgz
-/openldap-2.6.1.tgz
-/openldap-2.6.2.tgz
-/openldap-2.6.3.tgz
-/openldap-2.6.4.tgz
-/openldap-2.6.5.tgz
-/openldap-2.6.6.tgz
-/openldap-2.6.7.tgz
-/openldap-2.6.8.tgz
-/openldap-2.6.9.tgz
-/openldap-2.6.10.tgz

UPGRADE_INSTRUCTIONS

@@ -1,30 +0,0 @@
-You have upgraded your openldap-servers package.
-Any major version upgrade can cause database corruption or loss.
-Please, make sure that you have up-to-date back up and read this document carefully.
-
-It's still recommended to do the backup even on the minor version upgrade.
-
-Please, review the next links before performing any action:
-
-Upgrading from 2.4.x - https://www.openldap.org/doc/admin25/appendix-upgrading.html
-Upgrading from 2.5.x - https://www.openldap.org/doc/admin26/appendix-upgrading.html
-The normal upgrade procedure - https://www.openldap.org/doc/admin26/maintenance.html
-
-Additionally, please, review and perform the following steps that can help you with the upgrade:
-
-         1. Back up both data and configuration directories into a safe place;
-         2. Export data to an LDIF file using slapcat;
-a. If you have the deprecated DB type and you haven't performed the slapcat command, you need to move your data and configuration to the system with OpenLDAP 2.4 version and run slapcat command there;
-         3. Change the server's configuration according to the changes in the above documents;
-          a. If you are replacing the BDB/HDB with MDB, make sure to replace the BDB/HDB sections with their MDB counterparts;
-4. Clear out the current data directory;
-         5. Import data to a new database from the LDIF file using slapadd;
-         6. Make sure that your data is intact.
-
-After you have completed the above operations, you can remove this file (/usr/share/openldap-servers/UPGRADE_INSTRUCTIONS) and start the server:
-
-        systemctl start slapd.service
-
-Be careful with this document's procedure, make sure you understand it, and test it in a non-production environment first. Always make sure that all backups are in place.
-
-You have been warned about the possibility of data corruption or loss.

check-password-makefile.patch

@@ -1,45 +1,32 @@
-diff --git a/Makefile b/Makefile
-index 4457bad..91de40b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -13,17 +13,10 @@ CRACKLIB=/usr/share/cracklib/pw_dict
+--- a/Makefile	2009-10-31 18:59:06.000000000 +0100
++++ b/Makefile	2014-12-17 09:42:37.586079225 +0100
+@@ -13,22 +13,11 @@
  #
  CONFIG=/etc/openldap/check_password.conf
  
--
+-OPT=-g -O2 -Wall -fpic 						\
+-	-DHAVE_CRACKLIB -DCRACKLIB_DICTPATH="\"$(CRACKLIB)\""	\
+-	-DCONFIG_FILE="\"$(CONFIG)\""					\
++CFLAGS+=-fpic                                                  \
++	-DHAVE_CRACKLIB -DCRACKLIB_DICTPATH="\"$(CRACKLIB)\""  \
++	-DCONFIG_FILE="\"$(CONFIG)\""                          \
+ 	-DDEBUG
+ 
 -# Where to find the OpenLDAP headers.
 -#
--LDAP_INC=-I/usr/include/openldap/include \
--	 -I/usr/include/openldap/servers/slapd
+-LDAP_INC=-I/home/pyb/tmp/openldap-2.3.39/include \
+-	 -I/home/pyb/tmp/openldap-2.3.39/servers/slapd
 -
 -# Where to find the CrackLib headers.
 -#
 -CRACK_INC=
 -
 -INCS=$(LDAP_INC) $(CRACK_INC)
-+CFLAGS+=-fpic                                                  \
-+	-DHAVE_CRACKLIB -DCRACKLIB_DICTPATH="\"$(CRACKLIB)\""  \
-+	-DCONFIG_FILE="\"$(CONFIG)\""                          \
-+	-DDEBUG
- 
+-
  LDAP_LIB=-lldap_r -llber
  
-@@ -33,27 +26,21 @@ LDAP_LIB=-lldap_r -llber
- #
- CRACKLIB_LIB=-lcrack
- 
--CC_FLAGS=-g -O2 -Wall -fpic
--CRACKLIB_OPT=-DHAVE_CRACKLIB -DCRACKLIB_DICTPATH="\"$(CRACKLIB)\""
--DEBUG_OPT=-DDEBUG
--CONFIG_OPT=-DCONFIG_FILE="\"$(CONFIG)\""
--
--OPT=$(CC_FLAGS) $(CRACKLIB_OPT) $(CONFIG_OPT) $(DEBUG_OPT)
--
- LIBS=$(LDAP_LIB) $(CRACKLIB_LIB)
- 
- LIBDIR=/usr/lib/openldap/
- 
-+
+ # Comment out this line if you do NOT want to use the cracklib.
+@@ -45,10 +34,10 @@
  all: 	check_password
  
  check_password.o:
@@ -51,8 +38,4 @@ index 4457bad..91de40b 100644
 +	$(CC) $(LDFLAGS) -shared -o check_password.so check_password.o $(CRACKLIB_LIB)
  
  install: check_password
--	cp -f check_password.so $(LIBDIR)
-+	cp -f check_password.so ../../../usr/lib/openldap/modules/
- 
- clean:
- 	$(RM) check_password.o check_password.so check_password.lo
+ 	cp -f check_password.so ../../../usr/lib/openldap/modules/

libexec-check-config.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/sh
+#!/bin/sh
 # Author: Jan Vcelak <jvcelak@redhat.com>
 
 . /usr/libexec/openldap/functions
@@ -41,7 +41,7 @@ function check_db_perms()
 	retcode=0
 	for dbdir in `databases`; do
 		[ -d "$dbdir" ] || continue
-		for dbfile in `find ${dbdir} -maxdepth 1 -name "*.mdb"` ; do
+		for dbfile in `find ${dbdir} -maxdepth 1 -name "*.dbb" -or -name "*.gdbm" -or -name "*.bdb" -or -name "__db.*" -or -name "log.*" -or -name "alock"`; do
 			run_as_ldap "/usr/bin/test -r \"$dbfile\" -a -w \"$dbfile\""
 			if [ $? -ne 0 ]; then
 				error "Read/write permissions for DB file '%s' are required." "$dbfile"
@@ -56,7 +56,8 @@ function check_everything()
 {
 	retcode=0
 	check_config_syntax || retcode=1
-	check_certs_perms || retcode=1
+	# TODO: need support for Mozilla NSS, disabling temporarily
+	#check_certs_perms || retcode=1
 	check_db_perms || retcode=1
 	return $retcode
 }

libexec-functions

@@ -84,6 +84,14 @@ function databases_new()
 		ldif_value
 }
 
+function databases_old()
+{
+	awk	'begin { database="" }
+		$1 == "database" { database=$2 }
+		$1 == "directory" { if (database == "bdb" || database == "hdb") print $2}' \
+		"$SLAPD_CONFIG_FILE"
+}
+
 function certificates_new()
 {
 	slapcat $SLAPD_GLOBAL_OPTIONS -c -H 'ldap:///cn=config???(cn=config)' 2>/dev/null | \
@@ -92,14 +100,20 @@ function certificates_new()
 		ldif_value
 }
 
+function certificates_old()
+{
+	awk '$1 ~ "^TLS(CACertificate(File|Path)|CertificateFile|CertificateKeyFile)$" { print $2 } ' \
+		"$SLAPD_CONFIG_FILE"
+}
+
 function certificates()
 {
-	uses_new_config && certificates_new
+	uses_new_config && certificates_new || certificates_old
 }
 
 function databases()
 {
-	uses_new_config && databases_new
+	uses_new_config && databases_new || databases_old
 }
 
 

libexec-upgrade-db.sh

@@ -0,0 +1,40 @@
+#!/bin/sh
+# Author: Jan Vcelak <jvcelak@redhat.com>
+
+. /usr/libexec/openldap/functions
+
+if [ `id -u` -ne 0 ]; then
+	error "You have to be root to run this command."
+	exit 4
+fi
+
+load_sysconfig
+retcode=0
+
+for dbdir in `databases`; do
+	upgrade_log="$dbdir/db_upgrade.`date +%Y%m%d%H%M%S`.log"
+	bdb_files=`find "$dbdir" -maxdepth 1 -name "*.bdb" -printf '"%f" '`
+
+	# skip uninitialized database
+	[ -z "$bdb_files"]  || continue
+
+	printf "Updating '%s', logging into '%s'\n" "$dbdir" "$upgrade_log"
+
+	# perform the update
+	for command in \
+		"/usr/bin/db_recover -v -h \"$dbdir\"" \
+		"/usr/bin/db_upgrade -v -h \"$dbdir\" $bdb_files" \
+		"/usr/bin/db_checkpoint -v -h \"$dbdir\" -1" \
+	; do
+		printf "Executing: %s\n" "$command" &>>$upgrade_log
+		run_as_ldap "$command" &>>$upgrade_log
+		result=$?
+		printf "Exit code: %d\n" $result >>"$upgrade_log"
+		if [ $result -ne 0 ]; then
+			printf "Upgrade failed: %d\n" $result
+			retcode=1
+		fi
+	done
+done
+
+exit $retcode

openldap-ITS-10297-Defer-hostname-resolution-til-first-use.patch

@@ -1,120 +0,0 @@
-From 606349836109cfb201bc5b5b424dffb749150a68 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= <ondra@mistotebe.net>
-Date: Mon, 28 Apr 2025 14:36:24 +0100
-Subject: [PATCH] ITS#10297 Defer hostname resolution til first use
-
----
- libraries/libldap/init.c     | 33 +++++++++++++++++++--------------
- libraries/libldap/ldap-int.h |  1 +
- libraries/libldap/os-ip.c    |  2 ++
- libraries/libldap/tls_g.c    |  3 +++
- libraries/libldap/tls_o.c    |  3 +++
- 6 files changed, 28 insertions(+), 14 deletions(-)
-
-diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
-index 213276b4b5..90fc34c5a6 100644
---- a/libraries/libldap/init.c
-+++ b/libraries/libldap/init.c
-@@ -631,6 +631,25 @@ void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl
- 
- #if defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
- char * ldap_int_hostname = NULL;
-+
-+void
-+ldap_int_resolve_hostname(void)
-+{
-+	static int resolved = 0;
-+
-+	LDAP_MUTEX_LOCK( &ldap_int_hostname_mutex );
-+	if ( !resolved ) {
-+		char	*name = ldap_int_hostname;
-+
-+		ldap_int_hostname = ldap_pvt_get_fqdn( name );
-+
-+		if ( name != NULL && name != ldap_int_hostname ) {
-+			LDAP_FREE( name );
-+		}
-+		resolved = 1;
-+	}
-+	LDAP_MUTEX_UNLOCK( &ldap_int_hostname_mutex );
-+}
- #endif
- 
- #ifdef LDAP_R_COMPILE
-@@ -688,20 +707,6 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
- }
- #endif
- 
--#if defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
--	LDAP_MUTEX_LOCK( &ldap_int_hostname_mutex );
--	{
--		char	*name = ldap_int_hostname;
--
--		ldap_int_hostname = ldap_pvt_get_fqdn( name );
--
--		if ( name != NULL && name != ldap_int_hostname ) {
--			LDAP_FREE( name );
--		}
--	}
--	LDAP_MUTEX_UNLOCK( &ldap_int_hostname_mutex );
--#endif
--
- #ifndef HAVE_POLL
- 	if ( ldap_int_tblsize == 0 ) ldap_int_ip_init();
- #endif
-diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
-index 7e754775e8..435b859066 100644
---- a/libraries/libldap/ldap-int.h
-+++ b/libraries/libldap/ldap-int.h
-@@ -743,6 +743,7 @@ LDAP_F (int) ldap_int_poll( LDAP *ld, ber_socket_t s,
- 
- #if defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
- LDAP_V (char *) ldap_int_hostname;
-+LDAP_F (void) ldap_int_resolve_hostname(void);
- LDAP_F (char *) ldap_host_connected_to( Sockbuf *sb,
- 	const char *host );
- #endif
-diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
-index 6c86edd055..629b540352 100644
---- a/libraries/libldap/os-ip.c
-+++ b/libraries/libldap/os-ip.c
-@@ -890,6 +890,8 @@ ldap_host_connected_to( Sockbuf *sb, const char *host )
- 	 * this is necessary for kerberos to work right, since the official
- 	 * hostname is used as the kerberos instance.
- 	 */
-+	if ( !ldap_int_hostname )
-+		ldap_int_resolve_hostname();
- 
- 	switch (sa->sa_family) {
- #ifdef LDAP_PF_LOCAL
-diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c
-index de5b7f7c84..d4e7ee0bf7 100644
---- a/libraries/libldap/tls_g.c
-+++ b/libraries/libldap/tls_g.c
-@@ -597,6 +597,9 @@ tlsg_session_chkhost( LDAP *ld, tls_session *session, const char *name_in )
- 	int len1 = 0, len2 = 0;
- 	int ntype = IS_DNS;
- 
-+	if ( !ldap_int_hostname )
-+		ldap_int_resolve_hostname();
-+
- 	if( ldap_int_hostname &&
- 		( !name_in || !strcasecmp( name_in, "localhost" ) ) )
- 	{
-diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
-index 71677847a9..155f685c99 100644
---- a/libraries/libldap/tls_o.c
-+++ b/libraries/libldap/tls_o.c
-@@ -830,6 +830,9 @@ tlso_session_chkhost( LDAP *ld, tls_session *sess, const char *name_in )
- 	struct in_addr addr;
- #endif
- 
-+	if ( !ldap_int_hostname )
-+		ldap_int_resolve_hostname();
-+
- 	if( ldap_int_hostname &&
- 		( !name_in || !strcasecmp( name_in, "localhost" ) ) )
- 	{
--- 
-GitLab
-

openldap-ITS-8650-Fix-Debug-usage-to-follow-RE24-format.patch

@@ -0,0 +1,36 @@
+From 85fc8974f5c32a9a052baafaa9499c8484e043c2 Mon Sep 17 00:00:00 2001
+From: Quanah Gibson-Mount <quanah@openldap.org>
+Date: Tue, 28 Apr 2020 20:49:53 +0000
+Subject: [PATCH] ITS#8650 - Fix Debug usage to follow RE24 format
+
+---
+ libraries/libldap/tls2.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
+index c1f15cbc1..ebe5bf125 100644
+--- a/libraries/libldap/tls2.c
++++ b/libraries/libldap/tls2.c
+@@ -907,8 +907,8 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv )
+ 			} else if ( sb->sb_trans_needs_write ) {
+ 				wr=1;
+ 			}
+-			Debug1( LDAP_DEBUG_TRACE, "ldap_int_tls_start: ldap_int_tls_connect needs %s\n",
+-					wr ? "write": "read" );
++			Debug( LDAP_DEBUG_TRACE, "ldap_int_tls_start: ldap_int_tls_connect needs %s\n",
++					wr ? "write": "read", 0, 0 );
+ 
+ 			/* This is mostly copied from result.c:wait4msg(), should
+ 			 * probably be moved into a separate function */
+@@ -946,7 +946,7 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv )
+ 			start_time_tv.tv_sec = curr_time_tv.tv_sec;
+ 			start_time_tv.tv_usec = curr_time_tv.tv_usec;
+ 			tv = tv0;
+-			Debug3( LDAP_DEBUG_TRACE, "ldap_int_tls_start: ld %p %ld s %ld us to go\n",
++			Debug( LDAP_DEBUG_TRACE, "ldap_int_tls_start: ld %p %ld s %ld us to go\n",
+ 				(void *)ld, (long) tv.tv_sec, (long) tv.tv_usec );
+ 			ret = ldap_int_poll( ld, sd, &tv, wr);
+ 			if ( ret < 0 ) {
+-- 
+2.25.4
+

openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch

@@ -1,37 +0,0 @@
-From 6779e56fafb0aa8ae5efa7068da34a630b51b530 Mon Sep 17 00:00:00 2001
-From: Simon Pichugin <spichugi@redhat.com>
-Date: Fri, 5 Aug 2022 13:23:52 -0700
-Subject: [PATCH] Add export symbols related to LDAP_CONNECTIONLESS
-
----
- libraries/liblber/lber.map | 1 +
- libraries/libldap/ldap.map | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/libraries/liblber/lber.map b/libraries/liblber/lber.map
-index 9a4094b0f..083cd1f32 100644
---- a/libraries/liblber/lber.map
-+++ b/libraries/liblber/lber.map
-@@ -121,6 +121,7 @@ OPENLDAP_2.200
-     ber_sockbuf_io_fd;
-     ber_sockbuf_io_readahead;
-     ber_sockbuf_io_tcp;
-+    ber_sockbuf_io_udp;
-     ber_sockbuf_remove_io;
-     ber_sos_dump;
-     ber_start;
-diff --git a/libraries/libldap/ldap.map b/libraries/libldap/ldap.map
-index b28c9c21e..021aaba63 100644
---- a/libraries/libldap/ldap.map
-+++ b/libraries/libldap/ldap.map
-@@ -200,6 +200,7 @@ OPENLDAP_2.200
-     ldap_is_ldap_url;
-     ldap_is_ldapi_url;
-     ldap_is_ldaps_url;
-+    ldap_is_ldapc_url;
-     ldap_is_read_ready;
-     ldap_is_write_ready;
-     ldap_ld_free;
--- 
-2.37.1
-

openldap-add-tls-sni-support-to-libldap.patch

@@ -1,197 +0,0 @@
-From 19e631e977c4f57905b2380cf79ccaf8e6d99e9d Mon Sep 17 00:00:00 2001
-From: Howard Chu <hyc@openldap.org>
-Date: Mon, 27 Apr 2020 03:41:12 +0100
-Subject: [PATCH 1/4] ITS#9176 Add TLS SNI support to libldap
-
-Implemented for OpenSSL, GnuTLS just stubbed
----
- libraries/libldap/ldap-tls.h | 2 +-
- libraries/libldap/tls2.c     | 2 +-
- libraries/libldap/tls_g.c    | 2 +-
- libraries/libldap/tls_o.c    | 8 ++++++--
- 4 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/libraries/libldap/ldap-tls.h b/libraries/libldap/ldap-tls.h
-index c8a27112f1..c149b1867c 100644
---- a/libraries/libldap/ldap-tls.h
-+++ b/libraries/libldap/ldap-tls.h
-@@ -34,7 +34,7 @@ typedef void (TI_ctx_free)(tls_ctx *ctx);
- typedef int (TI_ctx_init)(struct ldapoptions *lo, struct ldaptls *lt, int is_server);
- 
- typedef tls_session *(TI_session_new)(tls_ctx *ctx, int is_server);
--typedef int (TI_session_connect)(LDAP *ld, tls_session *s);
-+typedef int (TI_session_connect)(LDAP *ld, tls_session *s, const char *name_in);
- typedef int (TI_session_accept)(tls_session *s);
- typedef int (TI_session_upflags)(Sockbuf *sb, tls_session *s, int rc);
- typedef char *(TI_session_errmsg)(tls_session *s, int rc, char *buf, size_t len );
-diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
-index 82ca5272cc..cbeea8c6c4 100644
---- a/libraries/libldap/tls2.c
-+++ b/libraries/libldap/tls2.c
-@@ -368,7 +368,7 @@ ldap_int_tls_connect( LDAP *ld, LDAPConn *conn, const char *host )
- 			lo->ldo_tls_connect_cb( ld, ssl, ctx, lo->ldo_tls_connect_arg );
- 	}
- 
--	err = tls_imp->ti_session_connect( ld, ssl );
-+	err = tls_imp->ti_session_connect( ld, ssl, host );
- 
- #ifdef HAVE_WINSOCK
- 	errno = WSAGetLastError();
-diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c
-index 3b72cd2a1f..5468ed3f05 100644
---- a/libraries/libldap/tls_g.c
-+++ b/libraries/libldap/tls_g.c
-@@ -336,7 +336,7 @@ tlsg_session_accept( tls_session *session )
- }
- 
- static int
--tlsg_session_connect( LDAP *ld, tls_session *session )
-+tlsg_session_connect( LDAP *ld, tls_session *session, const char *name_in )
- {
- 	return tlsg_session_accept( session);
- }
-diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
-index 498f805fa1..455b23c0e9 100644
---- a/libraries/libldap/tls_o.c
-+++ b/libraries/libldap/tls_o.c
-@@ -548,12 +548,16 @@ tlso_session_new( tls_ctx *ctx, int is_server )
- }
- 
- static int
--tlso_session_connect( LDAP *ld, tls_session *sess )
-+tlso_session_connect( LDAP *ld, tls_session *sess, const char *name_in )
- {
- 	tlso_session *s = (tlso_session *)sess;
-+	int rc;
- 
-+#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
-+	SSL_set_tlsext_host_name( s, name_in );
-+#endif
- 	/* Caller expects 0 = success, OpenSSL returns 1 = success */
--	int rc = SSL_connect( s ) - 1;
-+	rc = SSL_connect( s ) - 1;
- #ifdef LDAP_USE_NON_BLOCKING_TLS
- 	if ( rc < 0 ) {
- 		int sockerr = sock_errno();
-
-From 421c2021c7209bd7cd947ccb8b989bddab7b63cb Mon Sep 17 00:00:00 2001
-From: Howard Chu <hyc@openldap.org>
-Date: Mon, 27 Apr 2020 18:25:10 +0100
-Subject: [PATCH 2/4] ITS#9176 check for numeric addrs before passing SNI
-
----
- libraries/libldap/tls2.c  | 22 +++++++++++++++++++++-
- libraries/libldap/tls_o.c |  4 +++-
- 2 files changed, 24 insertions(+), 2 deletions(-)
-
-diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
-index cbeea8c6c4..85628bc3b3 100644
---- a/libraries/libldap/tls2.c
-+++ b/libraries/libldap/tls2.c
-@@ -334,6 +334,7 @@ ldap_int_tls_connect( LDAP *ld, LDAPConn *conn, const char *host )
- 	Sockbuf *sb = conn->lconn_sb;
- 	int	err;
- 	tls_session	*ssl = NULL;
-+	char *sni = host;
- 
- 	if ( HAS_TLS( sb )) {
- 		ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_SSL, (void *)&ssl );
-@@ -368,7 +369,26 @@ ldap_int_tls_connect( LDAP *ld, LDAPConn *conn, const char *host )
- 			lo->ldo_tls_connect_cb( ld, ssl, ctx, lo->ldo_tls_connect_arg );
- 	}
- 
--	err = tls_imp->ti_session_connect( ld, ssl, host );
-+	/* pass hostname for SNI, but only if it's an actual name
-+	 * and not a numeric address
-+	 */
-+	{
-+		int numeric = 1;
-+		char *c;
-+		for ( c = sni; *c; c++ ) {
-+			if ( *c == ':' )	/* IPv6 address */
-+				break;
-+			if ( *c == '.' )
-+				continue;
-+			if ( !isdigit( *c )) {
-+				numeric = 0;
-+				break;
-+			}
-+		}
-+		if ( numeric )
-+			sni = NULL;
-+	}
-+	err = tls_imp->ti_session_connect( ld, ssl, sni );
- 
- #ifdef HAVE_WINSOCK
- 	errno = WSAGetLastError();
-diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
-index 455b23c0e9..45948dbc64 100644
---- a/libraries/libldap/tls_o.c
-+++ b/libraries/libldap/tls_o.c
-@@ -554,7 +554,9 @@ tlso_session_connect( LDAP *ld, tls_session *sess, const char *name_in )
- 	int rc;
- 
- #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
--	SSL_set_tlsext_host_name( s, name_in );
-+	if ( name_in ) {
-+		SSL_set_tlsext_host_name( s, name_in );
-+	}
- #endif
- 	/* Caller expects 0 = success, OpenSSL returns 1 = success */
- 	rc = SSL_connect( s ) - 1;
-
-From 05a65a46c684031a841bcc39cf01a82e8cc713a0 Mon Sep 17 00:00:00 2001
-From: Howard Chu <hyc@openldap.org>
-Date: Mon, 27 Apr 2020 18:54:02 +0100
-Subject: [PATCH 3/4] ITS#9176 check for failure setting SNI
-
----
- libraries/libldap/tls_o.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
-index 45948dbc64..86e86db3b6 100644
---- a/libraries/libldap/tls_o.c
-+++ b/libraries/libldap/tls_o.c
-@@ -555,7 +555,9 @@ tlso_session_connect( LDAP *ld, tls_session *sess, const char *name_in )
- 
- #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
- 	if ( name_in ) {
--		SSL_set_tlsext_host_name( s, name_in );
-+		rc = SSL_set_tlsext_host_name( s, name_in );
-+		if ( !rc )		/* can fail to strdup the name */
-+			return -1;
- 	}
- #endif
- 	/* Caller expects 0 = success, OpenSSL returns 1 = success */
-
-From d059488fa86b58744ad70819516d3bf4a37dbb8e Mon Sep 17 00:00:00 2001
-From: Ryan Tandy <ryan@nardis.ca>
-Date: Mon, 27 Apr 2020 11:01:01 -0700
-Subject: [PATCH 4/4] ITS#9176 Implement SNI for GnuTLS
-
----
- libraries/libldap/tls_g.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c
-index 5468ed3f05..5fceb3e935 100644
---- a/libraries/libldap/tls_g.c
-+++ b/libraries/libldap/tls_g.c
-@@ -338,6 +338,16 @@ tlsg_session_accept( tls_session *session )
- static int
- tlsg_session_connect( LDAP *ld, tls_session *session, const char *name_in )
- {
-+	tlsg_session *s = (tlsg_session *)session;
-+	int rc;
-+
-+	if ( name_in ) {
-+		rc = gnutls_server_name_set( s->session, GNUTLS_NAME_DNS, name_in, strlen(name_in) );
-+		if ( rc != GNUTLS_E_SUCCESS ) {
-+			return rc;
-+		}
-+	}
-+
- 	return tlsg_session_accept( session);
- }
- 

openldap-ai-addrconfig.patch

@@ -5,10 +5,10 @@ Upstream ITS: #7326
 Resolves: #835013
 
 diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
-index 14899cc..b25e750 100644
+index b31e05d..fa361ab 100644
 --- a/libraries/libldap/os-ip.c
 +++ b/libraries/libldap/os-ip.c
-@@ -620,8 +620,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
+@@ -594,8 +594,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
  
  #if defined( HAVE_GETADDRINFO ) && defined( HAVE_INET_NTOP )
  	memset( &hints, '\0', sizeof(hints) );

openldap-allop-overlay.patch

@@ -4,10 +4,9 @@ Author: Matus Honek <mhonek@redhat.com>
 Resolves: #1319782
 
 diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
-index b5c3fc8..9aa8a4f 100644
 --- a/servers/slapd/overlays/Makefile.in
 +++ b/servers/slapd/overlays/Makefile.in
-@@ -38,7 +38,8 @@ SRCS = overlays.c \
+@@ -33,7 +33,8 @@ SRCS = overlays.c \
  	translucent.c \
  	unique.c \
  	valsort.c \
@@ -17,7 +16,7 @@ index b5c3fc8..9aa8a4f 100644
  OBJS = statover.o \
  	@SLAPD_STATIC_OVERLAYS@ \
  	overlays.o
-@@ -58,7 +59,7 @@ NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+@@ -53,7 +54,7 @@ NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
  UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
  
  LIBRARY = ../liboverlays.a
@@ -26,7 +25,7 @@ index b5c3fc8..9aa8a4f 100644
  
  XINCPATH = -I.. -I$(srcdir)/..
  XDEFS = $(MODULES_CPPFLAGS)
-@@ -148,6 +149,12 @@ smbk5pwd.lo : smbk5pwd.c
+@@ -125,6 +126,12 @@ unique.la : unique.lo
  smbk5pwd.la : smbk5pwd.lo
  	$(LTLINK_MOD) -module -o $@ smbk5pwd.lo version.lo $(LINK_LIBS) $(shell pkg-config openssl --libs)
  

openldap-cldap-check-for-error-on-connected-socket.patch

@@ -0,0 +1,41 @@
+From ec5eba5393e5cc65b05e54658c55500cdbff775a Mon Sep 17 00:00:00 2001
+From: Howard Chu <hyc@openldap.org>
+Date: Wed, 26 Aug 2020 13:22:52 +0100
+Subject: [PATCH 01/34] ITS#9328 cldap: check for error on connected socket
+
+libldap doesn't use a connected socket for UDP sessions, but 3rd
+parties can, passed in with ldap_init_fd().
+---
+ libraries/libldap/result.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
+index bdced135b..e2b220630 100644
+--- a/libraries/libldap/result.c
++++ b/libraries/libldap/result.c
+@@ -486,7 +486,8 @@ retry:
+ #ifdef LDAP_CONNECTIONLESS
+ 	if ( LDAP_IS_UDP(ld) ) {
+ 		struct sockaddr_storage from;
+-		ber_int_sb_read( lc->lconn_sb, &from, sizeof(struct sockaddr_storage) );
++		if ( ber_int_sb_read( lc->lconn_sb, &from, sizeof(struct sockaddr_storage) ) < 0 )
++			goto fail;
+ 		if ( ld->ld_options.ldo_version == LDAP_VERSION2 ) isv2 = 1;
+ 	}
+ nextresp3:
+@@ -502,10 +503,11 @@ nextresp3:
+ 		break;
+ 
+ 	case LBER_DEFAULT:
++fail:
+ 		err = sock_errno();
+ #ifdef LDAP_DEBUG		   
+ 		Debug( LDAP_DEBUG_CONNS,
+-			"ber_get_next failed.\n", 0, 0, 0 );
++			"ber_get_next failed, errno=%d.\n", err, 0, 0 );
+ #endif		   
+ 		if ( err == EWOULDBLOCK ) return LDAP_MSG_X_KEEP_LOOKING;
+ 		if ( err == EAGAIN ) return LDAP_MSG_X_KEEP_LOOKING;
+-- 
+2.26.2
+

openldap-configure-c99.patch

@@ -1,906 +0,0 @@
-commit 14f81bc47a4c462ccc609fce74feb014185e2bf9
-Author: Sam James <sam@gentoo.org>
-Date:   Thu Feb 9 23:17:53 2023 +0000
-
-    ITS#10011 build: fix compatibility with stricter C99 compilers
-    
-    Fix the following warnings:
-    - -Wimplicit-int (fatal with Clang 16)
-    - -Wimplicit-function-declaration (fatal with Clang 16)
-    - -Wincompatible-function-pointer-types (fatal with Clang 16)
-    - -Wint-conversion (fatal with Clang 15)
-    - Old style prototypes (K&R, removed from C23)
-    
-    These warnings-now-error led to misconfigurations and failure to build
-    OpenLDAP, as the tests used during configure caused the wrong results
-    to be emitted.
-    
-    For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2],
-    or the (new) c-std-porting mailing list [3].
-    
-    [0] https://lwn.net/Articles/913505/
-    [1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
-    [2] https://wiki.gentoo.org/wiki/Modern_C_porting
-    [3] hosted at lists.linux.dev.
-    
-    Bug: https://bugs.gentoo.org/871288
-    Signed-off-by: Sam James <sam@gentoo.org>
-
-diff -ur openldap-2.6.4.orig/openldap-2.6.4/build/openldap.m4 openldap-2.6.4/openldap-2.6.4/build/openldap.m4
---- openldap-2.6.4.orig/openldap-2.6.4/build/openldap.m4	2023-02-08 19:53:35.000000000 +0100
-+++ openldap-2.6.4/openldap-2.6.4/build/openldap.m4	2023-04-15 19:21:07.377380382 +0200
-@@ -154,6 +154,7 @@
- if test $ol_cv_header_stdc = yes; then
-   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <ctype.h>
-+#include <stdlib.h>
- #ifndef HAVE_EBCDIC
- #	define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- #	define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -303,8 +304,12 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
-@@ -360,9 +365,13 @@
- AC_DEFUN([OL_PTHREAD_TEST_PROGRAM],
- [AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- OL_PTHREAD_TEST_FUNCTION
- }
-@@ -484,7 +493,7 @@
- #include <sys/types.h>
- #include <regex.h>
- static char *pattern, *string;
--main()
-+int main(void)
- {
- 	int rc;
- 	regex_t re;
-@@ -511,7 +520,8 @@
- [AC_CACHE_CHECK([if toupper() requires islower()],ol_cv_c_upper_lower,[
- 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <ctype.h>
--main()
-+#include <stdlib.h>
-+int main(void)
- {
- 	if ('C' == toupper('C'))
- 		exit(0);
-@@ -569,7 +579,7 @@
- 			]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no])
- 	else
- 		AC_RUN_IFELSE([AC_LANG_SOURCE([[
--			main() {
-+			int main(void) {
- 				char buf[100];
- 				buf[0] = 0;
- 				strerror_r( 1, buf, sizeof buf );
-diff -ur openldap-2.6.4.orig/openldap-2.6.4/configure openldap-2.6.4/openldap-2.6.4/configure
---- openldap-2.6.4.orig/openldap-2.6.4/configure	2023-02-08 19:53:35.000000000 +0100
-+++ openldap-2.6.4/openldap-2.6.4/configure	2023-04-15 19:23:17.437078213 +0200
-@@ -14978,6 +14966,7 @@
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <ctype.h>
-+#include <stdlib.h>
- #ifndef HAVE_EBCDIC
- #	define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- #	define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -15946,6 +15935,10 @@
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+#include <stdlib.h>
-+#ifdef HAVE_SYS_POLL_H
-+#include <sys/epoll.h>
-+#endif
- int main(int argc, char **argv)
- {
- 	int epfd = epoll_create(256);
-@@ -16126,7 +16119,7 @@
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
--			main() {
-+			int main(void) {
- 				char buf[100];
- 				buf[0] = 0;
- 				strerror_r( 1, buf, sizeof buf );
-@@ -16326,7 +16319,7 @@
- #include <sys/types.h>
- #include <regex.h>
- static char *pattern, *string;
--main()
-+int main(void)
- {
- 	int rc;
- 	regex_t re;
-@@ -17559,16 +17552,24 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
- 
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 
- 	/* pthread test function */
-@@ -17664,8 +17665,12 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
-@@ -17744,16 +17749,24 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
- 
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 
- 	/* pthread test function */
-@@ -17854,8 +17867,12 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
-@@ -17934,16 +17951,24 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
- 
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 
- 	/* pthread test function */
-@@ -18044,8 +18069,12 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
-@@ -18124,16 +18153,24 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
- 
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 
- 	/* pthread test function */
-@@ -18234,8 +18271,12 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
-@@ -18314,16 +18355,24 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
- 
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 
- 	/* pthread test function */
-@@ -18424,8 +18473,12 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
-@@ -18504,16 +18557,24 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
- 
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 
- 	/* pthread test function */
-@@ -18615,8 +18676,12 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
-@@ -18695,16 +18760,24 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
- 
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 
- 	/* pthread test function */
-@@ -18805,8 +18878,12 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
-@@ -18885,16 +18962,24 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
- 
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 
- 	/* pthread test function */
-@@ -18996,8 +19081,12 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
-@@ -19076,16 +19165,24 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
- 
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 
- 	/* pthread test function */
-@@ -19187,8 +19284,12 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
-@@ -19267,16 +19368,24 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
- 
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 
- 	/* pthread test function */
-@@ -19377,8 +19486,12 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
-@@ -19457,16 +19570,24 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
- 
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 
- 	/* pthread test function */
-@@ -19568,8 +19689,12 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
-@@ -19648,16 +19773,24 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
- 
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 
- 	/* pthread test function */
-@@ -19759,8 +19892,12 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
-@@ -19839,16 +19976,24 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
- 
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 
- 	/* pthread test function */
-@@ -19949,8 +20094,12 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
-@@ -20029,16 +20178,24 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
- 
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 
- 	/* pthread test function */
-@@ -20139,8 +20296,12 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
-@@ -20219,16 +20380,24 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
- 
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 
- 	/* pthread test function */
-@@ -20330,8 +20499,12 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
-@@ -20410,16 +20583,24 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
- 
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 
- 	/* pthread test function */
-@@ -20631,14 +20812,12 @@
- /* end confdefs.h.  */
- 
- #include <pthread.h>
--#ifndef NULL
--#define NULL (void*)0
--#endif
-+pthread_t thread;
- 
- int
- main ()
- {
--pthread_detach(NULL);
-+pthread_detach(thread);
-   ;
-   return 0;
- }
-@@ -20752,16 +20931,24 @@
- #define NULL (void*)0
- #endif
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	return (void *) (p == NULL);
- }
- 
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 
- 	/* pthread test function */
-@@ -20851,6 +21038,9 @@
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-+#define _XOPEN_SOURCE 500               /* For pthread_setconcurrency() on glibc */
-+#include <stdlib.h>
-+#include <stdio.h>
- #include <sys/types.h>
- #include <sys/time.h>
- #include <unistd.h>
-@@ -20861,8 +21051,12 @@
- 
- static int fildes[2];
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	int i;
- 	struct timeval tv;
-@@ -20886,9 +21080,13 @@
- 	exit(0); /* if we exit here, the select blocked the whole process */
- }
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 	pthread_t t;
- 
-@@ -23241,7 +23439,8 @@
- /* end confdefs.h.  */
- 
- #include <ctype.h>
--main()
-+#include <stdlib.h>
-+int main(void)
- {
- 	if ('C' == toupper('C'))
- 		exit(0);
-diff -ur openldap-2.6.4.orig/openldap-2.6.4/configure.ac openldap-2.6.4/openldap-2.6.4/configure.ac
---- openldap-2.6.4.orig/openldap-2.6.4/configure.ac	2023-02-08 19:53:35.000000000 +0100
-+++ openldap-2.6.4/openldap-2.6.4/configure.ac	2023-04-15 19:21:07.377380382 +0200
-@@ -1003,7 +1003,11 @@
- AC_CHECK_HEADERS( sys/epoll.h )
- if test "${ac_cv_header_sys_epoll_h}" = yes; then
- 	AC_MSG_CHECKING(for epoll system call)
--	AC_RUN_IFELSE([AC_LANG_SOURCE([[int main(int argc, char **argv)
-+	AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdlib.h>
-+#ifdef HAVE_SYS_POLL_H
-+#include <sys/epoll.h>
-+#endif
-+int main(int argc, char **argv)
- {
- 	int epfd = epoll_create(256);
- 	exit (epfd == -1 ? 1 : 0);
-@@ -1356,10 +1360,10 @@
- 		dnl 	pthread_create() in -lpthread (many)
- 		dnl 	pthread_create() in -lc_r (FreeBSD)
- 		dnl
--		dnl Check pthread (draft4) flags (depreciated)
-+		dnl Check pthread (draft4) flags (deprecated)
- 		dnl 	pthread_create() with -threads (OSF/1)
- 		dnl
--		dnl Check pthread (draft4) libraries (depreciated)
-+		dnl Check pthread (draft4) libraries (deprecated)
- 		dnl 	pthread_mutex_unlock() in -lpthreads -lmach -lexc -lc_r (OSF/1)
- 		dnl 	pthread_mutex_lock() in -lpthreads -lmach -lexc (OSF/1)
- 		dnl 	pthread_mutex_trylock() in -lpthreads -lexc (OSF/1)
-@@ -1378,7 +1382,7 @@
- 			ol_link_threads=posix
- 			ol_link_pthreads=""
- 		fi
--		
-+
- dnl		OL_PTHREAD_TRY([-mt],		[ol_cv_pthread_mt])
- 		OL_PTHREAD_TRY([-kthread],	[ol_cv_pthread_kthread])
- 		OL_PTHREAD_TRY([-pthread],	[ol_cv_pthread_pthread])
-@@ -1465,10 +1469,8 @@
- 				dnl save the flags
- 				AC_LINK_IFELSE([AC_LANG_PROGRAM([[
- #include <pthread.h>
--#ifndef NULL
--#define NULL (void*)0
--#endif
--]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
-+pthread_t thread;
-+]], [[pthread_detach(thread);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
- 			])
- 
- 			if test $ol_cv_func_pthread_detach = no ; then
-@@ -1523,6 +1525,9 @@
- 				AC_CACHE_CHECK([if select yields when using pthreads],
- 					ol_cv_pthread_select_yields,[
- 				AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+#define _XOPEN_SOURCE 500               /* For pthread_setconcurrency() on glibc */
-+#include <stdlib.h>
-+#include <stdio.h>
- #include <sys/types.h>
- #include <sys/time.h>
- #include <unistd.h>
-@@ -1533,8 +1538,12 @@
- 
- static int fildes[2];
- 
-+#ifdef __STDC__
-+static void *task(void *p)
-+#else
- static void *task(p)
- 	void *p;
-+#endif
- {
- 	int i;
- 	struct timeval tv;
-@@ -1558,9 +1567,13 @@
- 	exit(0); /* if we exit here, the select blocked the whole process */
- }
- 
-+#ifdef __STDC__
-+int main(int argc, char **argv)
-+#else
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-+#endif
- {
- 	pthread_t t;
- 

openldap-explicitly-cast-private-values.patch

@@ -1,70 +0,0 @@
-From fb9e6a81bbee880549e7ec18f0a74ddddbd2d1ab Mon Sep 17 00:00:00 2001
-From: Stephen Gallagher <sgallagh@redhat.com>
-Date: Tue, 6 Feb 2024 21:38:24 -0500
-Subject: [PATCH] ITS#10171 - Explicitly cast private values
-
-Fixes issues with -Werror=incompatible-pointer-types
-
-Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
----
- servers/slapd/config.c              | 2 +-
- servers/slapd/overlays/constraint.c | 2 +-
- servers/slapd/overlays/dyngroup.c   | 2 +-
- servers/slapd/overlays/valsort.c    | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/servers/slapd/config.c b/servers/slapd/config.c
-index 80333f359c..987c862d91 100644
---- a/servers/slapd/config.c
-+++ b/servers/slapd/config.c
-@@ -151,7 +151,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
- 	int rc, arg_user, arg_type, arg_syn, iarg;
- 	unsigned uiarg;
- 	long larg;
--	size_t ularg;
-+	unsigned long ularg;
- 	ber_len_t barg;
- 	
- 	if(Conf->arg_type == ARG_IGNORED) {
-diff --git a/servers/slapd/overlays/constraint.c b/servers/slapd/overlays/constraint.c
-index f939b37762..0d6156af4d 100644
---- a/servers/slapd/overlays/constraint.c
-+++ b/servers/slapd/overlays/constraint.c
-@@ -557,7 +557,7 @@ done:;
- 				a2->restrict_filter = ap.restrict_filter;
- 				a2->restrict_val = ap.restrict_val;
- 
--				for ( app = &on->on_bi.bi_private; *app; app = &(*app)->ap_next )
-+				for ( app = (constraint **)&on->on_bi.bi_private; *app; app = &(*app)->ap_next )
- 					/* Get to the end */ ;
- 
- 				a2->ap_next = *app;
-diff --git a/servers/slapd/overlays/dyngroup.c b/servers/slapd/overlays/dyngroup.c
-index 5d890d6650..e0e70af2d9 100644
---- a/servers/slapd/overlays/dyngroup.c
-+++ b/servers/slapd/overlays/dyngroup.c
-@@ -111,7 +111,7 @@ static int dgroup_cf( ConfigArgs *c )
- 		 */
- 		a2 = ch_malloc( sizeof(adpair) );
- 
--		for ( app = &on->on_bi.bi_private; *app; app = &(*app)->ap_next )
-+		for ( app = (adpair **)&on->on_bi.bi_private; *app; app = &(*app)->ap_next )
- 			/* Get to the end */ ;
- 
- 		a2->ap_mem = ap.ap_mem;
-diff --git a/servers/slapd/overlays/valsort.c b/servers/slapd/overlays/valsort.c
-index 3d998e2fcb..e251500d0b 100644
---- a/servers/slapd/overlays/valsort.c
-+++ b/servers/slapd/overlays/valsort.c
-@@ -201,7 +201,7 @@ valsort_cf_func(ConfigArgs *c) {
- 		return(1);
- 	}
- 
--	for ( vip = &on->on_bi.bi_private; *vip; vip = &(*vip)->vi_next )
-+	for ( vip = (valsort_info **)&on->on_bi.bi_private; *vip; vip = &(*vip)->vi_next )
- 		/* Get to the end */ ;
- 
- 	vi = ch_malloc( sizeof(valsort_info) );
--- 
-GitLab
-

openldap-libldap-avoid-SSL-context-cleanup-during-library-des.patch

@@ -1,92 +0,0 @@
-From 5f4569f0605a73eb1a282ee5251ead073ed3b26e Mon Sep 17 00:00:00 2001
-From: Simon Pichugin <spichugi@redhat.com>
-Date: Tue, 26 Nov 2024 12:32:07 -0800
-Subject: [PATCH] libldap: avoid SSL context cleanup during library destruction
-
-Given that libldap can be pulled into random applications and applications
-are allowed to call OPENSSL_cleanup() before exiting, the only sane thing
-to do is to avoid trying to touch SSL context in ldap destructors, and just
-let them leak if the application does not explicitly free the ldap context.
-
-Add ldap_int_tls_destroy_safe() which skips SSL context cleanup while
-maintaining all other cleanup operations, and use it in the library
-destructor path.
-
-Fixes: https://bugs.openldap.org/show_bug.cgi?id=9952
----
- libraries/libldap/init.c     |  2 +-
- libraries/libldap/ldap-int.h |  1 +
- libraries/libldap/tls2.c     | 25 +++++++++++++++++++++----
- 3 files changed, 23 insertions(+), 5 deletions(-)
-
-diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
-index 213276b4b5..aa017f4128 100644
---- a/libraries/libldap/init.c
-+++ b/libraries/libldap/init.c
-@@ -545,7 +545,7 @@ ldap_int_destroy_global_options(void)
- 	}
- #endif
- #ifdef HAVE_TLS
--	ldap_int_tls_destroy( gopts );
-+	ldap_int_tls_destroy_safe( gopts );
- #endif
- }
- 
-diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
-index 7e754775e8..b73097ccc7 100644
---- a/libraries/libldap/ldap-int.h
-+++ b/libraries/libldap/ldap-int.h
-@@ -914,6 +914,7 @@ LDAP_F (int) ldap_int_tls_start LDAP_P(( LDAP *ld,
- 	LDAPConn *conn, LDAPURLDesc *srv ));
- 
- LDAP_F (void) ldap_int_tls_destroy LDAP_P(( struct ldapoptions *lo ));
-+LDAP_F (void) ldap_int_tls_destroy_safe LDAP_P(( struct ldapoptions *lo ));
- 
- /*
-  *	in getvalues.c
-diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
-index 0841005a59..82f8573602 100644
---- a/libraries/libldap/tls2.c
-+++ b/libraries/libldap/tls2.c
-@@ -97,10 +97,14 @@ tls_ctx_ref( tls_ctx *ctx )
- static ldap_pvt_thread_mutex_t tls_def_ctx_mutex;
- #endif
- 
--void
--ldap_int_tls_destroy( struct ldapoptions *lo )
--{
--	if ( lo->ldo_tls_ctx ) {
-+/*
-+ * Implementation function that handles all cleanup.
-+ * skip_ctx_cleanup: 1 when called from destructor, 0 for normal operation
-+ */
-+static void
-+ldap_int_tls_destroy_impl( struct ldapoptions *lo, int skip_ctx_cleanup )
-+ {
-+	if ( lo->ldo_tls_ctx && !skip_ctx_cleanup ) {
- 		ldap_pvt_tls_ctx_free( lo->ldo_tls_ctx );
- 		lo->ldo_tls_ctx = NULL;
- 	}
-@@ -147,6 +151,19 @@ ldap_int_tls_destroy( struct ldapoptions *lo )
- 	BER_BVZERO( &lo->ldo_tls_pin );
- }
- 
-+
-+void
-+ldap_int_tls_destroy( struct ldapoptions *lo )
-+{
-+	ldap_int_tls_destroy_impl(lo, 0);
-+}
-+
-+/* Safe version for destructor use */
-+void ldap_int_tls_destroy_safe( struct ldapoptions *lo )
-+{
-+	ldap_int_tls_destroy_impl(lo, 1);
-+}
-+
- /*
-  * Tear down the TLS subsystem. Should only be called once.
-  */
--- 
-2.47.0
-

openldap-manpages.patch

@@ -1,20 +1,35 @@
 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 3def6da..466c772 100644
+--- a/doc/man/man1/ldapmodify.1
++++ b/doc/man/man1/ldapmodify.1
+@@ -397,8 +397,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 d47481d6ed..ff86fc52ca 100644
+index cfde143..63592cb 100644
 --- a/doc/man/man5/ldap.conf.5
 +++ b/doc/man/man5/ldap.conf.5
-@@ -341,6 +341,7 @@ be specified, separated by a semi-colon.  The
+@@ -317,6 +317,7 @@ certificates in separate individual files. The
  .B TLS_CACERT
  is always used before
- .BR TLS_CACERTDIR .
+ .B 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.
+ This parameter is ignored with GnuTLS.
+ 
+ When using Mozilla NSS, <path> may contain a Mozilla NSS cert/key
 diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8
-index 807634e52d..a06110687b 100644
+index b739f4d..e2a1a00 100644
 --- a/doc/man/man8/slapd.8
 +++ b/doc/man/man8/slapd.8
 @@ -5,7 +5,7 @@
@@ -24,18 +39,18 @@ index 807634e52d..a06110687b 100644
 -.B LIBEXECDIR/slapd 
 +.B slapd
  [\c
- .BR \-V [ V [ V ]]
+ .BR \-4 | \-6 ]
  [\c
-@@ -333,7 +333,7 @@ the LDAP databases defined in the default config file, just type:
+@@ -317,7 +317,7 @@ the LDAP databases defined in the default config file, just type:
  .LP
  .nf
  .ft tt
 -	LIBEXECDIR/slapd
-+        slapd
++	slapd
  .ft
  .fi
  .LP
-@@ -344,7 +344,7 @@ on voluminous debugging which will be printed on standard error, type:
+@@ -328,7 +328,7 @@ on voluminous debugging which will be printed on standard error, type:
  .LP
  .nf
  .ft tt
@@ -44,7 +59,7 @@ index 807634e52d..a06110687b 100644
  .ft
  .fi
  .LP
-@@ -352,7 +352,7 @@ To test whether the configuration file is correct or not, type:
+@@ -336,7 +336,7 @@ To test whether the configuration file is correct or not, type:
  .LP
  .nf
  .ft tt
@@ -53,3 +68,6 @@ index 807634e52d..a06110687b 100644
  .ft
  .fi
  .LP
+-- 
+1.8.1.4
+

openldap-openssl-manpage-defaultCA.patch

@@ -6,10 +6,9 @@ certificates.
 Author: Matus Honek <mhonek@redhat.com>
 
 diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
-index 6084298..3070bb4 100644
 --- a/doc/man/man5/ldap.conf.5
 +++ b/doc/man/man5/ldap.conf.5
-@@ -327,6 +327,9 @@ are more options you can specify.  These options are used when an
+@@ -307,6 +307,9 @@ are more options you can specify.  These options are used when an
  .B ldaps:// URI
  is selected (by default or otherwise) or when the application
  negotiates TLS by issuing the LDAP StartTLS operation.
@@ -20,10 +19,9 @@ index 6084298..3070bb4 100644
  .B TLS_CACERT <filename>
  Specifies the file that contains certificates for all of the Certificate
 diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5
-index a559b0c..adda87a 100644
 --- a/doc/man/man5/slapd-config.5
 +++ b/doc/man/man5/slapd-config.5
-@@ -878,6 +878,10 @@ If
+@@ -801,6 +801,10 @@ If
  .B slapd
  is built with support for Transport Layer Security, there are more options
  you can specify.
@@ -35,10 +33,9 @@ index a559b0c..adda87a 100644
  .B olcTLSCipherSuite: <cipher-suite-spec>
  Permits configuring what ciphers will be accepted and the preference order.
 diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
-index b6e9250..1653a1b 100644
 --- a/doc/man/man5/slapd.conf.5
 +++ b/doc/man/man5/slapd.conf.5
-@@ -1108,6 +1108,10 @@ If
+@@ -1032,6 +1032,10 @@ If
  .B slapd
  is built with support for Transport Layer Security, there are more options
  you can specify.

openldap-reentrant-gethostby.patch

@@ -8,7 +8,7 @@ Resolves: #179730
 Author: Jeffery Layton <jlayton@redhat.com>
 
 diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
-index aa69f70..4461bf2 100644
+index 373c81c..a012062 100644
 --- a/libraries/libldap/util-int.c
 +++ b/libraries/libldap/util-int.c
 @@ -52,8 +52,8 @@ extern int h_errno;
@@ -22,7 +22,7 @@ index aa69f70..4461bf2 100644
  
  #else
  # include <ldap_pvt_thread.h>
-@@ -442,7 +442,7 @@ ldap_pvt_csnstr(char *buf, size_t len, unsigned int replica, unsigned int mod)
+@@ -317,7 +317,7 @@ ldap_pvt_csnstr(char *buf, size_t len, unsigned int replica, unsigned int mod)
  #define BUFSTART (1024-32)
  #define BUFMAX (32*1024-32)
  

openldap-slapi-fix-plugin-plugin_pblock_new-usage.patch

@@ -1,23 +0,0 @@
-From c7a4bd27f5dcf93806972aab236001f1d4801e80 Mon Sep 17 00:00:00 2001
-From: Howard Chu <hyc@openldap.org>
-Date: Wed, 31 Jan 2024 16:00:30 +0000
-Subject: [PATCH] ITS#10166 slapi: fix plugin.c plugin_pblock_new() usage
-
-Broken in 9142da8eaf691720f7d6288954250ef085bd3da0
----
- servers/slapd/slapi/plugin.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/servers/slapd/slapi/plugin.c b/servers/slapd/slapi/plugin.c
-index ca5dbead59..bfa5c10344 100644
---- a/servers/slapd/slapi/plugin.c
-+++ b/servers/slapd/slapi/plugin.c
-@@ -694,7 +694,7 @@ slapi_int_read_config(
- 		int rc;
- 		Slapi_PBlock *pPlugin;
- 
--		pPlugin = plugin_pblock_new( iType, numPluginArgc, c->argv );
-+		pPlugin = plugin_pblock_new( iType, numPluginArgc, c );
- 		if (pPlugin == NULL) {
- 			return 1;
- 		}

openldap-smbk5pwd-overlay.patch

@@ -9,7 +9,7 @@ Author: Jan Vcelak <jvcelak@redhat.com>
 Resolves: #841560
 
 diff --git a/contrib/slapd-modules/smbk5pwd/README b/contrib/slapd-modules/smbk5pwd/README
-index 4a710a7..0cd4e9e 100644
+index f20ad94..b6433ff 100644
 --- a/contrib/slapd-modules/smbk5pwd/README
 +++ b/contrib/slapd-modules/smbk5pwd/README
 @@ -1,3 +1,8 @@
@@ -22,10 +22,10 @@ index 4a710a7..0cd4e9e 100644
  PasswordModify Extended Operation to update Kerberos keys and Samba
  password hashes for an LDAP user.
 diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
-index b84bc54..b5c3fc8 100644
+index 3af20e8..ef73663 100644
 --- a/servers/slapd/overlays/Makefile.in
 +++ b/servers/slapd/overlays/Makefile.in
-@@ -37,7 +37,8 @@ SRCS = overlays.c \
+@@ -33,7 +33,8 @@ SRCS = overlays.c \
  	syncprov.c \
  	translucent.c \
  	unique.c \
@@ -35,7 +35,7 @@ index b84bc54..b5c3fc8 100644
  OBJS = statover.o \
  	@SLAPD_STATIC_OVERLAYS@ \
  	overlays.o
-@@ -57,7 +58,7 @@ NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+@@ -53,7 +54,7 @@ NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
  UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
  
  LIBRARY = ../liboverlays.a
@@ -44,7 +44,7 @@ index b84bc54..b5c3fc8 100644
  
  XINCPATH = -I.. -I$(srcdir)/..
  XDEFS = $(MODULES_CPPFLAGS)
-@@ -141,6 +142,12 @@ unique.la : unique.lo
+@@ -125,6 +126,12 @@ unique.la : unique.lo
  valsort.la : valsort.lo
  	$(LTLINK_MOD) -module -o $@ valsort.lo version.lo $(LINK_LIBS)
  
@@ -57,3 +57,6 @@ index b84bc54..b5c3fc8 100644
  install-local:	$(PROGRAMS)
  	@if test -n "$?" ; then \
  		$(MKDIR) $(DESTDIR)$(moduledir); \
+-- 
+1.7.10.4
+

openldap-switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.patch

@@ -6,12 +6,10 @@ Proof of concept for fixing http://bugs.debian.org/327585
 (patch ported from freeradius bug http://bugs.debian.org/416266)
 
 Resolves: #960048
-
-diff --git a/servers/slapd/module.c b/servers/slapd/module.c
-index e616f1d..52bacff 100644
---- a/servers/slapd/module.c
-+++ b/servers/slapd/module.c
-@@ -117,6 +117,20 @@ int module_unload( const char *file_name )
+---
+--- openldap/servers/slapd/module.c.orig	2010-05-18 17:42:04.000000000 +0200
++++ openldap/servers/slapd/module.c	2010-05-18 17:45:46.000000000 +0200
+@@ -117,6 +117,20 @@
  	return -1;	/* not found */
  }
  
@@ -32,7 +30,7 @@ index e616f1d..52bacff 100644
  int module_load(const char* file_name, int argc, char *argv[])
  {
  	module_loaded_t *module;
-@@ -179,7 +193,7 @@ int module_load(const char* file_name, int argc, char *argv[])
+@@ -180,7 +194,7 @@
  	 * to calling Debug. This is because Debug is a macro that expands
  	 * into multiple function calls.
  	 */

openldap.spec

@@ -3,83 +3,46 @@
 %global systemctl_bin /usr/bin/systemctl
 %global check_password_version 1.1
 
-%global so_ver 2
-%global so_ver_compat 2
-
-# Build openldap-servers package and its libslapi in openldap-devel and openldap-compat
-%bcond servers 1
-
-# Build with argon2 support
-%bcond argon2 %{undefined rhel}
-
-# When you change "Version: " to the new major version, remember to change this value too
-%global major_version 2.6
-
-# Disable automatic .la file removal
-%global __brp_remove_la_files %nil
-
 Name: openldap
-Version: 2.6.10
-Release: 6%{?dist}
+Version: 2.4.50
+Release: 5%{?dist}
 Summary: LDAP support libraries
-License: OLDAP-2.8
+License: OpenLDAP
 URL: http://www.openldap.org/
 
-Source0: https://openldap.org/software/download/OpenLDAP/openldap-release/openldap-%{version}.tgz
+Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
 Source1: slapd.service
 Source2: slapd.tmpfiles
 Source3: slapd.ldif
 Source4: ldap.conf
-Source6: openldap.sysusers
-Source10: https://github.com/ltb-project/openldap-ppolicy-check-password/archive/v%{check_password_version}/openldap-ppolicy-check-password-%{check_password_version}.tar.gz
+Source10: ltb-project-openldap-ppolicy-check-password-%{check_password_version}.tar.gz
 Source50: libexec-functions
 Source52: libexec-check-config.sh
+Source53: libexec-upgrade-db.sh
 
-# Patches for 2.6
+# patches for 2.4
 Patch0: openldap-manpages.patch
-Patch1: openldap-reentrant-gethostby.patch
-
+Patch2: openldap-reentrant-gethostby.patch
 Patch3: openldap-smbk5pwd-overlay.patch
-Patch4: openldap-ai-addrconfig.patch
-Patch5: openldap-allop-overlay.patch
+Patch5: openldap-ai-addrconfig.patch
+Patch17: openldap-allop-overlay.patch
+Patch18: openldap-cldap-check-for-error-on-connected-socket.patch
 
 # fix back_perl problems with lt_dlopen()
 # might cause crashes because of symbol collisions
 # the proper fix is to link all perl modules against libperl
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=327585
-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-libldap-avoid-SSL-context-cleanup-during-library-des.patch
-Patch10: openldap-ITS-10297-Defer-hostname-resolution-til-first-use.patch
+Patch19: openldap-switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.patch
+Patch24: openldap-openssl-manpage-defaultCA.patch
+Patch25: openldap-ITS-8650-Fix-Debug-usage-to-follow-RE24-format.patch
 
 # check-password module specific patches
 Patch90: check-password-makefile.patch
 Patch91: check-password.patch
 
-BuildRequires: cyrus-sasl-devel
+BuildRequires: cyrus-sasl-devel, openssl-devel, krb5-devel, unixODBC-devel
+BuildRequires: glibc-devel, libtool, libtool-ltdl-devel, groff, perl-interpreter, perl-devel, perl-generators, perl(ExtUtils::Embed)
 BuildRequires: gcc
-BuildRequires: glibc-devel
-BuildRequires: groff
-BuildRequires: krb5-devel
-BuildRequires: libtool-ltdl-devel
-BuildRequires: libevent-devel
-BuildRequires: libxcrypt-devel
-BuildRequires: make
-BuildRequires: openssl-devel
-BuildRequires: perl(ExtUtils::Embed)
-BuildRequires: perl-devel
-BuildRequires: perl-generators
-BuildRequires: perl-interpreter
-BuildRequires: unixODBC-devel
-BuildRequires: cracklib-devel
-BuildRequires: systemd
-BuildRequires: systemd-rpm-macros
-%if %{with argon2}
-BuildRequires: libsodium-devel
-%endif
 
 %description
 OpenLDAP is an open source suite of LDAP (Lightweight Directory Access
@@ -92,8 +55,7 @@ libraries, and documentation for OpenLDAP.
 
 %package devel
 Summary: LDAP development libraries and header files
-Requires: openldap%{?_isa} = %{version}-%{release}
-Requires: cyrus-sasl-devel%{?_isa}
+Requires: openldap%{?_isa} = %{version}-%{release}, cyrus-sasl-devel%{?_isa}
 
 %description devel
 The openldap-devel package includes the development libraries and
@@ -103,41 +65,15 @@ protocols for enabling directory services over the Internet. Install
 this package only if you plan to develop or will need to compile
 customized LDAP clients.
 
-%package compat
-Summary: Package providing legacy non-threaded libldap
-Requires: openldap%{?_isa} = %{version}-%{release}
-# since libldap is manually linked from libldap_r, the provides is not generated automatically
-%ifarch armv7hl i686
-Provides: libldap-2.4.so.%{so_ver_compat}
-Provides: libldap_r-2.4.so.%{so_ver_compat}
-Provides: liblber-2.4.so.%{so_ver_compat}
-%if %{with servers}
-Provides: libslapi-2.4.so.%{so_ver_compat}
-%endif
-%else
-Provides: libldap-2.4.so.%{so_ver_compat}()(%{__isa_bits}bit)
-Provides: libldap_r-2.4.so.%{so_ver_compat}()(%{__isa_bits}bit)
-Provides: liblber-2.4.so.%{so_ver_compat}()(%{__isa_bits}bit)
-%if %{with servers}
-Provides: libslapi-2.4.so.%{so_ver_compat}()(%{__isa_bits}bit)
-%endif
-%endif
-
-%description compat
-The openldap-compat package contains shared libraries named as libldap-2.4.so,
-%if %{with servers}
-libldap_r-2.4.so, liblber-2.4.so and libslapi-2.4.so.
-%else
-libldap_r-2.4.so and liblber-2.4.so
-%endif
-The libraries are just links to the current version shared libraries,
-and are available for compatibility reasons.
-
-%if %{with servers}
 %package servers
 Summary: LDAP server
-Requires: openldap%{?_isa} = %{version}-%{release}
+License: OpenLDAP
+Requires: openldap%{?_isa} = %{version}-%{release}, libdb-utils
+Requires(pre): shadow-utils
+BuildRequires: systemd
 %{?systemd_requires}
+BuildRequires: libdb-devel
+BuildRequires: cracklib-devel
 # migrationtools (slapadd functionality):
 Provides: ldif2ldbm
 
@@ -148,8 +84,6 @@ protocols for accessing directory services (usually phone book style
 information, but other information is possible) over the Internet,
 similar to the way DNS (Domain Name System) information is propagated
 over the Internet. This package contains the slapd server and related files.
-# endif servers
-%endif
 
 %package clients
 Summary: LDAP client utilities
@@ -168,16 +102,18 @@ programs needed for accessing and modifying OpenLDAP directories.
 %setup -q -c -a 0 -a 10
 
 pushd openldap-%{version}
-%patch -P0 -p1
-%patch -P1 -p1
-%patch -P3 -p1
-%patch -P4 -p1
-%patch -P5 -p1
-%patch -P6 -p1
-%patch -P7 -p1
-%patch -P8 -p1
-%patch -P9 -p1
-%patch -P10 -p1
+
+AUTOMAKE=%{_bindir}/true autoreconf -fi
+
+%patch0 -p1
+%patch2 -p1
+%patch3 -p1
+%patch5 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch24 -p1
+%patch25 -p1
 
 # build smbk5pwd with other overlays
 ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays
@@ -191,30 +127,27 @@ mv servers/slapd/back-perl/README{,.back_perl}
 
 # fix documentation encoding
 for filename in doc/drafts/draft-ietf-ldapext-acl-model-xx.txt; do
-  iconv -f iso-8859-1 -t utf-8 "$filename" > "$filename.utf8"
-  mv "$filename.utf8" "$filename"
+	iconv -f iso-8859-1 -t utf-8 "$filename" > "$filename.utf8"
+	mv "$filename.utf8" "$filename"
 done
 
 popd
 
-pushd openldap-ppolicy-check-password-%{check_password_version}
-%patch -P90 -p1
-%patch -P91 -p1
+pushd ltb-project-openldap-ppolicy-check-password-%{check_password_version}
+%patch90 -p1
+%patch91 -p1
 popd
 
 %build
 
 %set_build_flags
 # enable experimental support for LDAP over UDP (LDAP_CONNECTIONLESS)
-export CFLAGS="${CFLAGS} ${LDFLAGS} -Wl,--as-needed -Wl,-z,now -DLDAP_CONNECTIONLESS"
-# disable legacy hash algorithm
-export CFLAGS="${CFLAGS} -DOPENSSL_NO_MD2"
+export CFLAGS="${CFLAGS} ${LDFLAGS} -Wl,--as-needed -DLDAP_CONNECTIONLESS -DLDAP_USE_NON_BLOCKING_TLS"
 
 pushd openldap-%{version}
 %configure \
 	--enable-debug \
 	--enable-dynamic \
-	--enable-versioning \
 	\
 	--enable-dynacl \
 	--enable-cleartext \
@@ -222,15 +155,9 @@ pushd openldap-%{version}
 	--enable-lmpasswd \
 	--enable-spasswd \
 	--enable-modules \
-	--enable-perl \
 	--enable-rewrite \
 	--enable-rlookups \
-%if %{with servers}
 	--enable-slapi \
-%if %{with argon2}
-        --enable-argon2 \
-%endif
-%endif
 	--disable-slp \
 	\
 	--enable-backends=mod \
@@ -240,14 +167,11 @@ pushd openldap-%{version}
 	--enable-monitor=yes \
 	--disable-ndb \
 	--disable-sql \
-	--disable-wt \
 	\
 	--enable-overlays=mod \
 	\
 	--disable-static \
 	\
-	--enable-balancer=mod \
-        \
 	--with-cyrus-sasl \
 	--without-fetch \
 	--with-threads \
@@ -259,7 +183,7 @@ pushd openldap-%{version}
 %make_build
 popd
 
-pushd openldap-ppolicy-check-password-%{check_password_version}
+pushd ltb-project-openldap-ppolicy-check-password-%{check_password_version}
 %make_build LDAP_INC="-I../openldap-%{version}/include \
  -I../openldap-%{version}/servers/slapd \
  -I../openldap-%{version}/build-servers/include"
@@ -268,16 +192,13 @@ popd
 %install
 
 mkdir -p %{buildroot}%{_libdir}/
-%if %{with servers}
-install -p -D -m 0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/openldap.conf
-%endif
 
 pushd openldap-%{version}
-%make_install STRIP_OPTS=""
+%make_install STRIP=""
 popd
 
 # install check_password module
-pushd openldap-ppolicy-check-password-%{check_password_version}
+pushd ltb-project-openldap-ppolicy-check-password-%{check_password_version}
 mv check_password.so check_password.so.%{check_password_version}
 ln -s check_password.so.%{check_password_version} %{buildroot}%{_libdir}/openldap/check_password.so
 install -m 755 check_password.so.%{check_password_version} %{buildroot}%{_libdir}/openldap/
@@ -310,7 +231,7 @@ mkdir -p %{buildroot}%{_tmpfilesdir}
 install -m 0644 %SOURCE2 %{buildroot}%{_tmpfilesdir}/slapd.conf
 
 # install default ldap.conf (customized)
-rm %{buildroot}%{_sysconfdir}/openldap/ldap.conf
+rm -f %{buildroot}%{_sysconfdir}/openldap/ldap.conf
 install -m 0644 %SOURCE4 %{buildroot}%{_sysconfdir}/openldap/ldap.conf
 
 # setup maintainance scripts
@@ -318,13 +239,15 @@ mkdir -p %{buildroot}%{_libexecdir}
 install -m 0755 -d %{buildroot}%{_libexecdir}/openldap
 install -m 0644 %SOURCE50 %{buildroot}%{_libexecdir}/openldap/functions
 install -m 0755 %SOURCE52 %{buildroot}%{_libexecdir}/openldap/check-config.sh
+install -m 0755 %SOURCE53 %{buildroot}%{_libexecdir}/openldap/upgrade-db.sh
 
 # remove build root from config files and manual pages
 perl -pi -e "s|%{buildroot}||g" %{buildroot}%{_sysconfdir}/openldap/*.conf
 perl -pi -e "s|%{buildroot}||g" %{buildroot}%{_mandir}/*/*.*
 
 # we don't need the default files -- RPM handles changes
-rm %{buildroot}%{_sysconfdir}/openldap/*.default
+rm -f %{buildroot}%{_sysconfdir}/openldap/*.default
+rm -f %{buildroot}%{_sysconfdir}/openldap/schema/*.default
 
 # install an init script for the servers
 mkdir -p %{buildroot}%{_unitdir}
@@ -334,74 +257,65 @@ install -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/slapd.service
 mv %{buildroot}%{_libdir}/slapd %{buildroot}%{_sbindir}/
 
 # setup tools as symlinks to slapd
-for X in acl add auth cat dn index modify passwd test schema ; do
-  rm %{buildroot}%{_sbindir}/slap$X
-  ln -s slapd %{buildroot}%{_sbindir}/slap$X
-done
+rm -f %{buildroot}%{_sbindir}/slap{acl,add,auth,cat,dn,index,passwd,test,schema}
+rm -f %{buildroot}%{_libdir}/slap{acl,add,auth,cat,dn,index,passwd,test,schema}
+for X in acl add auth cat dn index passwd test schema; do ln -s slapd %{buildroot}%{_sbindir}/slap$X ; done
 
 # re-symlink unversioned libraries, so ldconfig is not confused
 pushd %{buildroot}%{_libdir}
 v=%{version}
 version=$(echo ${v%.[0-9]*})
-for lib in liblber libldap %{?with_servers:libslapi}; do
-        rm -f ${lib}.so
-        ln -s ${lib}.so.%{so_ver} ${lib}.so
+for lib in liblber libldap libldap_r libslapi; do
+	rm -f ${lib}.so
+	ln -s ${lib}-${version}.so.2 ${lib}.so
 done
-
-for lib in $(ls | grep libldap); do
-    IFS='.'
-    read -r -a libsplit <<< "$lib"
-    if [[ -z "${libsplit[3]}" && -n "${libsplit[2]}" ]]
-    then
-        so_ver_short_2_4="%{so_ver_compat}"
-    elif [ -n "${libsplit[3]}" ]
-    then
-        so_ver_full_2_4="%{so_ver_compat}.${libsplit[3]}.${libsplit[4]}"
-    fi
-    unset IFS
-done
-
-# Provide only libldap and copy it to libldap_r for both 2.4 and 2.6+ versions, make a versioned lib link
-# We increase it by 2 because libldap-2.4 has the 'so.2' major version on 2.4.59 (one of the last versions which is EOL)
-gcc -shared -o "%{buildroot}%{_libdir}/libldap-2.4.so.${so_ver_short_2_4}" -Wl,--no-as-needed \
-       -Wl,-soname -Wl,libldap-2.4.so.${so_ver_short_2_4} -L "%{buildroot}%{_libdir}" -Wl,-z,now -lldap
-gcc -shared -o "%{buildroot}%{_libdir}/libldap_r-2.4.so.${so_ver_short_2_4}" -Wl,--no-as-needed \
-       -Wl,-soname -Wl,libldap_r-2.4.so.${so_ver_short_2_4} -L "%{buildroot}%{_libdir}" -Wl,-z,now -lldap
-gcc -shared -o "%{buildroot}%{_libdir}/liblber-2.4.so.${so_ver_short_2_4}" -Wl,--no-as-needed \
-       -Wl,-soname -Wl,liblber-2.4.so.${so_ver_short_2_4} -L "%{buildroot}%{_libdir}" -Wl,-z,now -llber
-%if %{with servers}
-gcc -shared -o "%{buildroot}%{_libdir}/libslapi-2.4.so.${so_ver_short_2_4}" -Wl,--no-as-needed \
-       -Wl,-soname -Wl,libslapi-2.4.so.${so_ver_short_2_4} -L "%{buildroot}%{_libdir}" -Wl,-z,now -lslapi
-ln -s libslapi-2.4.so.{${so_ver_short_2_4},${so_ver_full_2_4}}
-%endif
-ln -s libldap-2.4.so.{${so_ver_short_2_4},${so_ver_full_2_4}}
-ln -s libldap_r-2.4.so.{${so_ver_short_2_4},${so_ver_full_2_4}}
-ln -s liblber-2.4.so.{${so_ver_short_2_4},${so_ver_full_2_4}}
-
 popd
 
 # tweak permissions on the libraries to make sure they're correct
 chmod 0755 %{buildroot}%{_libdir}/lib*.so*
 chmod 0644 %{buildroot}%{_libdir}/lib*.*a
-chmod 0644 %{buildroot}%{_libdir}/openldap/*.la
 
 # slapd.conf(5) is obsoleted since 2.3, see slapd-config(5)
 mkdir -p %{buildroot}%{_datadir}
 install -m 0755 -d %{buildroot}%{_datadir}/openldap-servers
 install -m 0644 %SOURCE3 %{buildroot}%{_datadir}/openldap-servers/slapd.ldif
 install -m 0700 -d %{buildroot}%{_sysconfdir}/openldap/slapd.d
-rm %{buildroot}%{_sysconfdir}/openldap/slapd.conf
-rm %{buildroot}%{_sysconfdir}/openldap/slapd.ldif
+rm -f %{buildroot}%{_sysconfdir}/openldap/slapd.conf
+rm -f %{buildroot}%{_sysconfdir}/openldap/slapd.ldif
 
 # move doc files out of _sysconfdir
 mv %{buildroot}%{_sysconfdir}/openldap/schema/README README.schema
+mv %{buildroot}%{_sysconfdir}/openldap/DB_CONFIG.example %{buildroot}%{_datadir}/openldap-servers/DB_CONFIG.example
+chmod 0644 %{buildroot}%{_datadir}/openldap-servers/DB_CONFIG.example
 
 # remove files which we don't want packaged
-rm %{buildroot}%{_libdir}/*.la  # because we do not want files in %{_libdir}/openldap/ removed, yet
+rm -f %{buildroot}%{_libdir}/*.la  # because we do not want files in %{_libdir}/openldap/ removed, yet
+
+rm -f %{buildroot}%{_localstatedir}/openldap-data/DB_CONFIG.example
+rmdir %{buildroot}%{_localstatedir}/openldap-data
 
 %ldconfig_scriptlets
 
-%if %{with servers}
+%pre servers
+
+# create ldap user and group
+getent group ldap &>/dev/null || groupadd -r -g 55 ldap
+getent passwd ldap &>/dev/null || \
+	useradd -r -g ldap -u 55 -d %{_sharedstatedir}/ldap -s /sbin/nologin -c "OpenLDAP server" ldap
+
+if [ $1 -eq 2 ]; then
+	# package upgrade
+
+	old_version=$(rpm -q --qf=%%{version} openldap-servers)
+	new_version=%{version}
+
+	if [ "$old_version" != "$new_version" ]; then
+		touch %{_sharedstatedir}/ldap/rpm_upgrade_openldap &>/dev/null
+	fi
+fi
+
+exit 0
+
 
 %post servers
 %systemd_post slapd.service
@@ -417,9 +331,26 @@ if [[ ! -f %{_sysconfdir}/openldap/slapd.d/cn=config.ldif && \
       %{systemctl_bin} try-restart slapd.service &>/dev/null
 fi
 
+start_slapd=0
+
+# upgrade the database
+if [ -f %{_sharedstatedir}/ldap/rpm_upgrade_openldap ]; then
+	if %{systemctl_bin} --quiet is-active slapd.service; then
+		%{systemctl_bin} stop slapd.service
+		start_slapd=1
+	fi
+
+	%{_libexecdir}/openldap/upgrade-db.sh &>/dev/null
+	rm -f %{_sharedstatedir}/ldap/rpm_upgrade_openldap
+fi
+
 # restart after upgrade
 if [ $1 -ge 1 ]; then
-    %{systemctl_bin} condrestart slapd.service &>/dev/null || :
+	if [ $start_slapd -eq 1 ]; then
+		%{systemctl_bin} start slapd.service &>/dev/null || :
+	else
+		%{systemctl_bin} condrestart slapd.service &>/dev/null || :
+	fi
 fi
 
 exit 0
@@ -429,8 +360,41 @@ exit 0
 
 %postun servers
 %systemd_postun_with_restart slapd.service
-%endif
-# endif servers
+
+%triggerin servers -- libdb
+
+# libdb upgrade (setup for %%triggerun)
+if [ $2 -eq 2 ]; then
+	# we are interested in minor version changes (both versions of libdb are installed at this moment)
+	if [ "$(rpm -q --qf="%%{version}\n" libdb | sed 's/\.[0-9]*$//' | sort -u | wc -l)" != "1" ]; then
+		touch %{_sharedstatedir}/ldap/rpm_upgrade_libdb
+	else
+		rm -f %{_sharedstatedir}/ldap/rpm_upgrade_libdb
+	fi
+fi
+
+exit 0
+
+
+%triggerun servers -- libdb
+
+# libdb upgrade (finish %%triggerin)
+if [ -f %{_sharedstatedir}/ldap/rpm_upgrade_libdb ]; then
+	if %{systemctl_bin} --quiet is-active slapd.service; then
+		%{systemctl_bin} stop slapd.service
+		start=1
+	else
+		start=0
+	fi
+
+	%{_libexecdir}/openldap/upgrade-db.sh &>/dev/null
+	rm -f %{_sharedstatedir}/ldap/rpm_upgrade_libdb
+
+	[ $start -eq 1 ] && %{systemctl_bin} start slapd.service &>/dev/null
+fi
+
+exit 0
+
 
 %files
 %doc openldap-%{version}/ANNOUNCEMENT
@@ -442,22 +406,21 @@ exit 0
 %dir %{_sysconfdir}/openldap/certs
 %config(noreplace) %{_sysconfdir}/openldap/ldap.conf
 %dir %{_libexecdir}/openldap/
-%{_libdir}/liblber.so.*
-%{_libdir}/libldap.so.*
-%if %{with servers}
-%{_libdir}/libslapi.so.*
-%endif
+%{_libdir}/liblber-2.4*.so.*
+%{_libdir}/libldap-2.4*.so.*
+%{_libdir}/libldap_r-2.4*.so.*
+%{_libdir}/libslapi-2.4*.so.*
 %{_mandir}/man5/ldif.5*
 %{_mandir}/man5/ldap.conf.5*
 
-%if %{with servers}
 %files servers
 %doc openldap-%{version}/contrib/slapd-modules/smbk5pwd/README.smbk5pwd
 %doc openldap-%{version}/doc/guide/admin/*.html
 %doc openldap-%{version}/doc/guide/admin/*.png
 %doc openldap-%{version}/servers/slapd/back-perl/SampleLDAP.pm
 %doc openldap-%{version}/servers/slapd/back-perl/README.back_perl
-%doc openldap-ppolicy-check-password-%{check_password_version}/README.check_pwd
+%doc openldap-%{version}/servers/slapd/back-perl/README.back_perl
+%doc ltb-project-openldap-ppolicy-check-password-%{check_password_version}/README.check_pwd
 %doc README.schema
 %config(noreplace) %dir %attr(0750,ldap,ldap) %{_sysconfdir}/openldap/slapd.d
 %config(noreplace) %{_sysconfdir}/openldap/schema
@@ -468,39 +431,27 @@ exit 0
 %{_unitdir}/slapd.service
 %{_datadir}/openldap-servers/
 %{_libdir}/openldap/accesslog*
-%{_libdir}/openldap/allop*
-%if %{with argon2}
-%{_libdir}/openldap/argon2*
-%{_mandir}/man5/slappw-argon2.5*
-%else
-%exclude %{_mandir}/man5/slappw-argon2.5*
-%endif
 %{_libdir}/openldap/auditlog*
-%{_libdir}/openldap/autoca*
-%{_libdir}/openldap/back_asyncmeta*
+%{_libdir}/openldap/allop*
 %{_libdir}/openldap/back_dnssrv*
 %{_libdir}/openldap/back_ldap*
 %{_libdir}/openldap/back_meta*
 %{_libdir}/openldap/back_null*
 %{_libdir}/openldap/back_passwd*
 %{_libdir}/openldap/back_relay*
+%{_libdir}/openldap/back_shell*
 %{_libdir}/openldap/back_sock*
-%{_libdir}/openldap/check_password*
+%{_libdir}/openldap/back_perl*
 %{_libdir}/openldap/collect*
 %{_libdir}/openldap/constraint*
 %{_libdir}/openldap/dds*
 %{_libdir}/openldap/deref*
 %{_libdir}/openldap/dyngroup*
 %{_libdir}/openldap/dynlist*
-%{_libdir}/openldap/home*
-%{_libdir}/openldap/lloadd*
 %{_libdir}/openldap/memberof*
-%{_libdir}/openldap/nestgroup*
-%{_libdir}/openldap/otp*
 %{_libdir}/openldap/pcache*
 %{_libdir}/openldap/ppolicy*
 %{_libdir}/openldap/refint*
-%{_libdir}/openldap/remoteauth*
 %{_libdir}/openldap/retcode*
 %{_libdir}/openldap/rwm*
 %{_libdir}/openldap/seqmod*
@@ -510,265 +461,30 @@ exit 0
 %{_libdir}/openldap/translucent*
 %{_libdir}/openldap/unique*
 %{_libdir}/openldap/valsort*
+%{_libdir}/openldap/check_password*
 %{_libexecdir}/openldap/functions
 %{_libexecdir}/openldap/check-config.sh
-%{_sbindir}/slap*
-%{_mandir}/man5/lloadd.conf.5*
-%{_mandir}/man8/lloadd.8*
+%{_libexecdir}/openldap/upgrade-db.sh
+%{_sbindir}/sl*
+%{_mandir}/man8/*
 %{_mandir}/man5/slapd*.5*
 %{_mandir}/man5/slapo-*.5*
-%{_mandir}/man8/slap*.8*
-%{_sysusersdir}/openldap.conf
 # obsolete configuration
 %ghost %config(noreplace,missingok) %attr(0640,ldap,ldap) %{_sysconfdir}/openldap/slapd.conf
-%else
-%exclude %{_datadir}/openldap-servers/
-%exclude %{_libdir}/openldap/
-%exclude %{_libexecdir}/openldap/check-config.sh
-%exclude %{_libexecdir}/openldap/functions
-%exclude %{_mandir}/man5/slapd*.5*
-%exclude %{_mandir}/man5/slapo-*.5*
-%exclude %{_mandir}/man5/lloadd.conf.5*
-%exclude %{_mandir}/man5/slappw-argon2.5*
-%exclude %{_mandir}/man8/*
-%exclude %{_sbindir}/slap*
-%exclude %{_sysconfdir}/openldap/check_password.conf
-%exclude %{_sysconfdir}/openldap/schema
-%exclude %{_tmpfilesdir}/slapd.conf
-%exclude %{_unitdir}/slapd.service
-%endif
-# endif servers
-
 
 %files clients
-%{_bindir}/ldap*
-%{_mandir}/man1/ldap*.1*
+%{_bindir}/*
+%{_mandir}/man1/*
 
 %files devel
 %doc openldap-%{version}/doc/drafts openldap-%{version}/doc/rfc
-%{_libdir}/liblber.so
-%{_libdir}/libldap.so
-%if %{with servers}
-%{_libdir}/libslapi.so
-%endif
+%{_libdir}/lib*.so
 %{_includedir}/*
-%{_libdir}/pkgconfig/lber.pc
-%{_libdir}/pkgconfig/ldap.pc
 %{_mandir}/man3/*
 
-%files compat
-%{_libdir}/libldap-2.4*.so.*
-%{_libdir}/libldap_r-2.4*.so.*
-%{_libdir}/liblber-2.4*.so.*
-%if %{with servers}
-%{_libdir}/libslapi-2.4*.so.*
-%endif
-
 %changelog
-* Wed Jan 14 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 2.6.10-6
-- Enable argon2 only in Fedora
-
-* Tue Jan 13 2026 Simon Pichugin <spichugi@redhat.com> - 2.6.10-5
-- Add support for argon2 (rhbz#2229405)
-- Bump version 2.6.10-5
-
-* Fri Aug 29 2025 Simon Pichugin <spichugi@redhat.com> - 2.6.10-4
-- Fix LDAP initialization does unnecessary resolution of hostname (rhbz#2331728)
-- Convert STI tests to FMF (rhbz#2382998)
-
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.10-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Jul 07 2025 Jitka Plesnikova <jplesnik@redhat.com> - 2.6.10-2
-- Perl 5.42 rebuild
-
-* Tue Jun 10 2025 Simon Pichugin <spichugi@redhat.com> - 2.6.10-1
-- Rebase to version 2.6.10 (rhbz#2368103)
-
-* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.6.9-5
-- Drop call to %sysusers_create_compat
-
-* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 2.6.9-4
-- Add explicit BR: libxcrypt-devel
-
-* Fri Jan 24 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.6.9-3
-- Adjust file patterns for the sbin merge
-
-* Thu Jan 16 2025 Simon Pichugin <spichugi@redhat.com> - 2.6.9-2
-- Disable MD2 hash algorithm (rhbz#2338556)
-
-* Thu Jan 9 2025 Simon Pichugin <spichugi@redhat.com> - 2.6.9-1
-- Rebase to version 2.6.9 (rhbz#2329002)
-
-* Tue Dec 3 2024 Simon Pichugin <spichugi@redhat.com> - 2.6.8-6
-- Avoid SSL context cleanup during library destruction
-
-* Tue Jul 23 2024 Simon Pichugin <spichugi@redhat.com> - 2.6.8-5
-- Clean up spec file so it's aligned with c10s
-- Remove UPGRADE_INSTRUCTIONS for openldap-server upgrade (rhbz#2133526)
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.8-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Jun 24 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 2.6.8-3
-- Disable libslapi and servers in RHEL builds
-
-* Tue Jun 11 2024 Jitka Plesnikova <jplesnik@redhat.com> - 2.6.8-2
-- Perl 5.40 rebuild
-
-* Wed May 22 2024 Simon Pichugin <spichugi@redhat.com> - 2.6.8-1
-- Rebase to version 2.6.8 (rhbz#2282258)
-
-* Fri Feb 9 2024 Simon Pichugin <spichugi@redhat.com> - 2.6.7-1
-- Rebase to version 2.6.7 (rhbz#2261163)
-- Use systemd-sysusers for ldap user and group (rhbz#2173965)
-- Fix compiler errors (rhbz#2261427)
-- Replace License with SPDX identifier
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jul 31 2023 Simon Pichugin <spichugi@redhat.com> - 2.6.6-1
-- Rebase to version 2.6.6
-  Related: rhbz#2227948
-
-* 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
-
-* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 2.6.4-3
-- Perl 5.38 rebuild
-
-* Sat Apr 15 2023 Florian Weimer <fweimer@redhat.com> - 2.6.4-2
-- Apply upstream patch to fix C99 compatibility issues
-
-* Mon Feb 27 2023 Simon Pichugin <spichugi@redhat.com> - 2.6.4-1
-- Rebase to version 2.6.4
-  Related: rhbz#2168351
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Aug 17 2022 Simon Pichugin <spichugi@redhat.com> - 2.6.3-1
-- Rebase to version 2.6.3
-  Related: rhbz#2107382
-
-* Thu Aug 11 2022 Simon Pichugin <spichugi@redhat.com> - 2.6.2-5
-- Add export symbols related to LDAP_CONNECTIONLESS
-  Related: rhbz#2117825
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 27 2022 Simon Pichugin <spichugi@redhat.com> - 2.6.2-3
-- Fix debuginfo missing issue (#2101615)
-
-* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 2.6.2-2
-- Perl 5.36 rebuild
-
-* Wed May 25 2022 Simon Pichugin <spichugi@redhat.com> - 2.6.2-1
-- Rebase to version 2.6.2 (#2090447)
-
-* Wed Feb 2 2022 Simon Pichugin <spichugi@redhat.com> - 2.6.1-2
-- Fix twice packaged compat libraries issue (#2049085)
-
-* Mon Jan 31 2022 Simon Pichugin <spichugi@redhat.com> - 2.6.1-1
-- Update to new major release OpenLDAP 2.6.1 (#1955293)
-  + rediff all patches and remove patches now upstream
-  + use upstream source location for check password module
-  + and rediff patch due to this
-  + add patch to fix build issue in 2.5.4 (from upstream)
-  + clean and sort buildreqs
-  + remove various refs to bdb
-  + remove now default -DLDAP_USE_NON_BLOCKING_TLS
-  + add new modules and enable load balancer as module
-  + disable wiredtired backend due to missing build deps
-  + don't remove files that don't exist
-  + let check-config work on *.mdb over legacy files
-  + remove refs to old-style config
-  + new soname names
-  + remove libldap_r link as the library was merged with libldap
-  + refactor openldap-compat package to support the transition from 2.4
-  + add UPGRADE_INSTRUCTIONS for openldap-server upgrade
-- The original patch was submitted by Fedora user - terjeros
-  https://src.fedoraproject.org/rpms/openldap/pull-request/6
-
-* Mon Jan 24 2022 Timm Bäder <tbaeder@redhat.com> - 2.4.59-6
-- Disable automatic .la file removal
-- https://fedoraproject.org/wiki/Changes/RemoveLaFiles
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.59-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Sep 30 2021 Simon Pichugin <spichugi@redhat.com> - 2.4.59-4
-- Backport TLS SNI feature from OpenLDAP 2.5 (#2009534)
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.4.59-3
-- Rebuilt with OpenSSL 3.0.0
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.59-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jul  7 2021 Simon Pichugin <spichugi@redhat.com> - 2.4.59-1
-- Rebase to version 2.4.59 (#1980015)
-- Update the spec file for upcoming autoconf-2.71 (#1943079)
-
-* Tue Jun 15 2021 Simon Pichugin <spichugi@redhat.com> - 2.4.58-5
-- Fix slapd.tmpfiles complaints (#1972147)
-- Use https:// for source (#1972141)
-
-* 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
-
-* Thu Apr  8 2021 Simon Pichugin <spichugi@redhat.com> - 2.4.58-2
-- Backport Channel Binding support (#1822904, #1822737)
-
-* Tue Mar 23 2021 Simon Pichugin <spichugi@redhat.com> - 2.4.58-1
-- Rebase to version 2.4.58 (#1939663)
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.4.57-3
-- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.57-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jan 19 2021 Simon Pichugin <spichugi@redhat.com> - 2.4.57-1
-- Rebase to version 2.4.57 (#1917583)
-
-* Thu Nov 26 2020 Simon Pichugin <spichugi@redhat.com> - 2.4.56-4
-- Use gcc to link libldap_r to libldap (#1537260)
-
-* Fri Nov 20 2020 Simon Pichugin <spichugi@redhat.com> - 2.4.56-3
-- Fix 32-bit libraries build (#1537260)
-
-* Fri Nov 20 2020 Simon Pichugin <spichugi@redhat.com> - 2.4.56-2
-- Drop non-threaded libldap (#1537260)
-
-* Wed Nov 18 2020 Simon Pichugin <spichugi@redhat.com> - 2.4.56-1
-- Rebase to version 2.4.56 (#1896508)
-
-* Mon Nov 02 2020 Simon Pichugin <spichugi@redhat.com> - 2.4.55-1
-- Rebase to version 2.4.55 (#1891622)
-
-* Tue Oct 13 2020 Simon Pichugin <spichugi@redhat.com> - 2.4.54-1
-- Rebase to version 2.4.54 (#1887581)
-
-* Thu Sep 10 2020 Simon Pichugin <spichugi@redhat.com> - 2.4.53-1
-- Rebase to version 2.4.53 (#1868240)
-
-* Thu Sep 03 2020 Simon Pichugin <spichugi@redhat.com> - 2.4.52-1
-- Rebase to version 2.4.52 (#1868240)
+* Thu Sep 10 2020 Simon Pichugin <spichugi@redhat.com> - 2.4.50-5
+- CLDAP ldap_result hangs if nobody listens on the port (#1877754)
 
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.50-4
 - Second attempt - Rebuilt for

openldap.sysusers

@@ -1,3 +0,0 @@
-#Type Name     ID             GECOS                   Home directory  Shell
-g     ldap     55
-u     ldap     55:55          "OpenLDAP server"       /var/lib/ldap   /sbin/nologin

plans/gating.fmf

@@ -1,8 +0,0 @@
-summary: Test plan for openldap
-
-discover:
-   how: fmf
-
-execute:
-  how: tmt
-

slapd.ldif

@@ -42,41 +42,36 @@ cn: config
 #
 # Load dynamic backend modules:
 # - modulepath is architecture dependent value (32/64-bit system)
+# - back_sql.la backend requires openldap-servers-sql package
 # - dyngroup.la and dynlist.la cannot be used at the same time
 #
 
 #dn: cn=module,cn=config
 #objectClass: olcModuleList
 #cn: module
-#olcModulepath: /usr/lib/openldap
-#olcModulepath: /usr/lib64/openldap
+#olcModulepath:	/usr/lib/openldap
+#olcModulepath:	/usr/lib64/openldap
 #olcModuleload: accesslog.la
-#olcModuleload: allop.la
 #olcModuleload: auditlog.la
-#olcModuleload: autoca.la
-#olcModuleload: back_asyncmeta.la
 #olcModuleload: back_dnssrv.la
 #olcModuleload: back_ldap.la
+#olcModuleload: back_mdb.la
 #olcModuleload: back_meta.la
 #olcModuleload: back_null.la
 #olcModuleload: back_passwd.la
 #olcModuleload: back_relay.la
+#olcModuleload: back_shell.la
 #olcModuleload: back_sock.la
-#olcModuleload: check_password.la
 #olcModuleload: collect.la
 #olcModuleload: constraint.la
 #olcModuleload: dds.la
 #olcModuleload: deref.la
 #olcModuleload: dyngroup.la
 #olcModuleload: dynlist.la
-#olcModuleload: home.la
-#olcModuleload: lloadd.la
 #olcModuleload: memberof.la
-#olcModuleload: otp.la
 #olcModuleload: pcache.la
 #olcModuleload: ppolicy.la
 #olcModuleload: refint.la
-#olcModuleload: remoteauth.la
 #olcModuleload: retcode.la
 #olcModuleload: rwm.la
 #olcModuleload: seqmod.la

slapd.service

@@ -3,6 +3,7 @@ Description=OpenLDAP Server Daemon
 After=syslog.target network-online.target
 Documentation=man:slapd
 Documentation=man:slapd-config
+Documentation=man:slapd-hdb
 Documentation=man:slapd-mdb
 Documentation=file:///usr/share/doc/openldap-servers/guide.html
 

slapd.tmpfiles

@@ -1,2 +1,2 @@
 # openldap runtime directory for slapd.arg and slapd.pid
-d /run/openldap 0755 ldap ldap -
+d /var/run/openldap 0755 ldap ldap -

sources

@@ -1,2 +1,2 @@
-SHA512 (openldap-ppolicy-check-password-1.1.tar.gz) = a92854d7438cb95fac361da80a49d084d502155e8ce0ad2ea679db9529bbe0182aa4354e6139793c775e496349375d8f017678941d23315ff1c20fefc9573cdc
-SHA512 (openldap-2.6.10.tgz) = 18129ad9a385457941e3203de5f130fe2571701abf24592c5beffb01361aae3182c196b2cd48ffeecb792b9b0e5f82c8d92445a7ec63819084757bdedba63b20
+SHA512 (ltb-project-openldap-ppolicy-check-password-1.1.tar.gz) = f3384a164ce5db488908cf6380bad8500b800b09d12a8f04e1b6ccb6f6af6ab3971fcdbe4acca7a1b6d16b408a11065c2b1ab2497863fe07d3c28262b0f6776e
+SHA512 (openldap-2.4.50.tgz) = f528043ff9de36f7b65d8816c9a9c24f0ac400041b2969965178ee6eae62c92a11af33a0a883e4954e5fff98a0738a9f9aa2faf5b385d21974754e045aab31ae

tests/smoke-test/Makefile

@@ -46,7 +46,7 @@ clean:
 include /usr/share/rhts/lib/rhts-make.include
 
 $(METADATA): Makefile
-	@echo "Owner:           Viktor Ashirov <vashirov@redhat.com>" > $(METADATA)
+	@echo "Owner:           Ondrej Moris <omoris@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
@@ -57,23 +57,25 @@ $(METADATA): Makefile
 	@echo "Requires:        openldap" >> $(METADATA)
 	@echo "Requires:        openldap-clients" >> $(METADATA)
 	@echo "Requires:        openldap-servers" >> $(METADATA)
-	@echo "Requires:       	nss-devel" >> $(METADATA)
-	@echo "Requires:        cracklib-devel" >> $(METADATA)
 	@echo "Requires:        cyrus-sasl-devel" >> $(METADATA)
 	@echo "Requires:        gdbm-devel" >> $(METADATA)
-	@echo "Requires:        groff" >> $(METADATA)
-	@echo "Requires:        krb5-devel" >> $(METADATA)
-	@echo "Requires:        libdb-devel" >> $(METADATA)
 	@echo "Requires:        libtool" >> $(METADATA)
-	@echo "Requires:        libtool-ltdl-devel" >> $(METADATA)
-	@echo "Requires:        nfs-utils" >> $(METADATA)
+	@echo "Requires:        krb5-devel" >> $(METADATA)
 	@echo "Requires:        openssl-devel" >> $(METADATA)
 	@echo "Requires:        pam-devel" >> $(METADATA)
 	@echo "Requires:        perl" >> $(METADATA)
-	@echo "Requires:        perl-ExtUtils-Embed" >> $(METADATA)
 	@echo "Requires:        pkgconfig" >> $(METADATA)
-	@echo "Requires:        rpm-build" >> $(METADATA)
+	@echo "Requires:        tcp_wrappers-devel" >> $(METADATA)
+	@echo "Requires:        bind-libbind-devel" >> $(METADATA)
 	@echo "Requires:        unixODBC-devel" >> $(METADATA)
+	@echo "Requires:        libtool-ltdl-devel" >> $(METADATA)
+	@echo "Requires:        nfs-utils" >> $(METADATA)
+	@echo "Requires:        rpm-build" >> $(METADATA)
+	@echo "Requires:       	nss-devel" >> $(METADATA)
+	@echo "Requires:        libdb-devel" >> $(METADATA)
+	@echo "Requires:        groff" >> $(METADATA)
+	@echo "Requires:        cracklib-devel" >> $(METADATA)
+	@echo "Requires:        perl-ExtUtils-Embed" >> $(METADATA)
 	@echo "Requires:        yum-utils" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)

tests/smoke-test/main.fmf

@@ -1,31 +0,0 @@
-summary: Test calls upstream test suite
-description: Test calls upstream test suite
-contact: Viktor Ashirov <vashirov@redhat.com>
-component:
-  - openldap
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-  - openldap
-  - openldap-clients
-  - openldap-servers
-  - cracklib-devel
-  - cyrus-sasl-devel
-  - gdbm-devel
-  - groff
-  - krb5-devel
-  - libdb-devel
-  - libtool
-  - libtool-ltdl-devel
-  - nfs-utils
-  - nss-devel
-  - openssl-devel
-  - pam-devel
-  - perl
-  - perl-ExtUtils-Embed
-  - pkgconf-pkg-config
-  - pkgconfig
-  - rpm-build
-  - unixODBC-devel
-  - yum-utils
-duration: 3h

tests/smoke-test/runtest.sh

@@ -27,6 +27,7 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include rhts environment
+. /usr/bin/rhts-environment.sh
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="openldap"
@@ -44,46 +45,58 @@ PACKAGES=("openldap"           \
           "unixODBC-devel"     \
           "libtool-ltdl-devel" \
           "nfs-utils"          \
-          "rpm-build"          \
-          "nss-devel"          \
-          "libdb-devel"        \
-          "groff"              \
-          "cracklib-devel"     \
-          "perl-ExtUtils-Embed"\
-          "pkgconf-pkg-config" )
+          "rpm-build"          )
 
-LDAP_SERVICE='slapd'
+if rlIsRHEL 5; then
+    PACKAGES=( ${PACKAGES[@]} "bind-libbind-devel" )
+elif rlIsRHEL 6; then
+    PACKAGES=( ${PACKAGES[@]} "tcp_wrappers-devel" )
+else
+    PACKAGES=( ${PACKAGES[@]} "tcp_wrappers-devel" "nss-devel" "libdb-devel" "groff" "cracklib-devel" "perl-ExtUtils-Embed" )
+fi
+if rlIsFedora; then
+    PACKAGES=( ${PACKAGES[@]} "pkgconf-pkg-config" )
+else
+    PACKAGES=( ${PACKAGES[@]} "pkgconfig" )
+fi
+
+if rlIsRHEL 5; then
+    LDAP_SERVICE='ldap'
+else
+    LDAP_SERVICE='slapd'
+fi
 
 rlJournalStart
 
     rlPhaseStartSetup "General Setup"
 
-        rlRun "TmpDir=$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
         rlRun "pushd $TmpDir"
-
+    
         for P in "${PACKAGES[@]}"; do rlCheckRpm $P || rlDie; done
 
         rlFetchSrcForInstalled $PACKAGE
         rlRun "yum-builddep -y openldap*src.rpm" 0
         rlRun "rpm -ihv *.rpm" 0
 
-        rlServiceStop $LDAP_SERVICE
+        rlServiceStop $LDAP_SERVICE 
 
     rlPhaseEnd
 
     rlPhaseStartTest
 
-        TOPDIR=$(rpm --eval %_topdir)
+        TOPDIR=`rpm --eval %_topdir`
         rlRun "pushd $TOPDIR" 0
 
         rlRun "rpmbuild -vv -bc SPECS/openldap.spec >build.log 2>&1" 0
         [[ $? -ne 0 ]] && cat build.log
-        VERSION=$(rpm -q --qf "%{VERSION}\n" openldap | tail -1)
-        rlRun "pushd BUILD/openldap-${VERSION}-build/openldap-${VERSION}/openldap-${VERSION}" 0
+        VERSION=`rpm -q --qf "%{VERSION}\n" openldap | tail -1`
+        rlRun "pushd BUILD/openldap-${VERSION}/openldap-${VERSION}" 0
         # workaround for failing test, it tests unsupported configuration
         # see http://www.openldap.org/lists/openldap-technical/201204/msg00080.html for upstream reply
         # change of check after test is not enough because run of all tests with hdb is skipped if test058 fails with bdb
-        #rm -f tests/scripts/test058-syncrepl-asymmetric
+        rm -f tests/scripts/test058-syncrepl-asymmetric
+        rlIsRHEL 5 6 && rlRun "pushd build-servers" 0
 
         rlRun "make check > make_check.out 2>&1" 0
 
@@ -94,14 +107,15 @@ rlJournalStart
 
         rlAssertNotGrep "failed" make_check.results
 
+        rlIsRHEL 5 6 && rlRun "popd" 0
         rlRun "popd" 0
         rlRun "popd" 0
     rlPhaseEnd
 
     rlPhaseStartCleanup
 
-        rlServiceRestore $LDAP_SERVICE
-        rlRun "rm -rf BUILD/opendap-$(rpm -q --qf "%{VERSION}" openldap)" 0
+        rlServiceRestore $LDAP_SERVICE 
+        rlRun "rm -rf BUILD/opendap-`rpm -q --qf "%{VERSION}" openldap`" 0
         rlRun "popd"
         rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
 

tests/tests.yml

@@ -0,0 +1,34 @@
+---
+# Tests that run in all contexts
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - classic
+    tests:
+    - smoke-test
+    required_packages:
+    - openldap            # Required for smoke-test
+    - openldap-clients    # Required for smoke-test
+    - openldap-servers    # Required for smoke-test
+    - cyrus-sasl-devel    # Required for smoke-test
+    - gdbm-devel          # Required for smoke-test
+    - libtool             # Required for smoke-test
+    - krb5-devel          # Required for smoke-test
+    - openssl-devel       # Required for smoke-test
+    - pam-devel           # Required for smoke-test
+    - perl                # Required for smoke-test
+    - pkgconfig           # Required for smoke-test
+    - tcp_wrappers-devel  # Required for smoke-test
+    - bind-libbind-devel  # Required for smoke-test
+    - unixODBC-devel      # Required for smoke-test
+    - nfs-utils           # Required for smoke-test
+    - rpm-build           # Required for smoke-test
+    - nss-devel           # Required for smoke-test
+    - libdb-devel         # Required for smoke-test
+    - groff               # Required for smoke-test
+    - cracklib-devel      # Required for smoke-test
+    - perl-ExtUtils-Embed # Required for smoke-test
+    - yum-utils           # Required for smoke-test
+    - libtool-ltdl-devel  # Required for smoke-test
+    - wget                # Required for smoke-test