Rebuild against newer OpenLDAP version

Resolves: rhbz#2032691

Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Alexander Bokovoy 2022-02-01 08:39:03 +02:00
parent f3a2601486
commit 2b349e8aed
2 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,36 @@
From 610cf4ce34ad850eda67d9fba1f98f8ab6001e6e Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Tue, 1 Feb 2022 08:28:18 +0200
Subject: [PATCH] Update OpenLDAP detection code to deal with libldap_r removal
in 2.6
Resolves: rhbz#2032691
Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
---
configure.ac | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7cd7d76..24fbe20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,8 +71,13 @@ dirsrv)
;;
openldap)
runtime_modules="nss nspr"
- LDAP_CFLAGS=
- LDAP_LIBS="-lldap_r -llber"
+ SAVE_LIBS="$LIBS"
+ LIBS=
+ AC_SEARCH_LIBS([ldap_search], [ldap_r ldap], [], [AC_MSG_ERROR([libldap or libldap_r not found])])
+ AC_SEARCH_LIBS([ber_peek_tag], [lber], [], [AC_MSG_ERROR([liblber not found])])
+ LDAP_LIBS="$LIBS"
+ LDAP_CFLAGS=""
+ LIBS="$SAVE_LIBS"
;;
*)
runtime_modules="nss nspr"
--
2.34.1

View File

@ -11,12 +11,14 @@
Name: slapi-nis
Version: 0.56.7
Release: 4%{?dist}
Release: 5%{?dist}
Summary: NIS Server and Schema Compatibility plugins for Directory Server
License: GPLv2
URL: http://pagure.io/slapi-nis/
Source0: https://releases.pagure.org/slapi-nis/slapi-nis-%{version}.tar.gz
Source1: https://releases.pagure.org/slapi-nis/slapi-nis-%{version}.tar.gz.asc
Patch0: slapi-nis-openldap-2.6.patch
BuildRequires: make
BuildRequires: autoconf
BuildRequires: automake
@ -55,6 +57,7 @@ for attributes from multiple entries in the tree.
%prep
%setup -q
%patch0 -p1
%build
autoconf --force
@ -82,6 +85,10 @@ make check
%{_sbindir}/nisserver-plugin-defs
%changelog
* Tue Feb 01 2022 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.7-5
- Resolves: rhbz#2032691
- Rebuild against newer OpenLDAP version
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild