61 lines
2.2 KiB
Diff
61 lines
2.2 KiB
Diff
From 12870f410545fb055f664b588df2a2b7ab1c228e Mon Sep 17 00:00:00 2001
|
|
From: Viktor Ashirov <vashirov@redhat.com>
|
|
Date: Mon, 4 Mar 2024 07:22:00 +0100
|
|
Subject: [PATCH] Issue 5305 - OpenLDAP version autodetection doesn't work
|
|
|
|
Bug Description:
|
|
An error is logged during a build in `mock` with Bash 4.4:
|
|
|
|
```
|
|
checking for --with-libldap-r... ./configure: command substitution: line 22848: syntax error near unexpected token `>'
|
|
./configure: command substitution: line 22848: `ldapsearch -VV 2> >(sed -n '/ldapsearch/ s/.*ldapsearch \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/p')'
|
|
no
|
|
```
|
|
|
|
`mock` runs Bash as `sh` (POSIX mode). Support for process substitution
|
|
in POSIX mode was added in version 5.1:
|
|
https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00002.html
|
|
|
|
> Process substitution is now available in posix mode.
|
|
|
|
Fix Description:
|
|
* Add missing `BuildRequires` for openldap-clients
|
|
* Replace process substitution with a pipe
|
|
|
|
Fixes: https://github.com/389ds/389-ds-base/issues/5305
|
|
|
|
Reviewed by: @progier389, @tbordaz (Thanks!)
|
|
---
|
|
configure.ac | 2 +-
|
|
rpm/389-ds-base.spec.in | 1 +
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index ffc2aac14..a690765a3 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -912,7 +912,7 @@ AC_ARG_WITH(libldap-r, AS_HELP_STRING([--with-libldap-r],[Use lldap_r shared lib
|
|
AC_SUBST(with_libldap_r)
|
|
fi
|
|
],
|
|
-OPENLDAP_VERSION=`ldapsearch -VV 2> >(sed -n '/ldapsearch/ s/.*ldapsearch \([[[0-9]]]\+\.[[[0-9]]]\+\.[[[0-9]]]\+\) .*/\1/p')`
|
|
+OPENLDAP_VERSION=`ldapsearch -VV 2>&1 | sed -n '/ldapsearch/ s/.*ldapsearch \([[[0-9]]]\+\.[[[0-9]]]\+\.[[[0-9]]]\+\) .*/\1/p'`
|
|
AX_COMPARE_VERSION([$OPENLDAP_VERSION], [lt], [2.5], [ with_libldap_r=yes ], [ with_libldap_r=no ])
|
|
AC_MSG_RESULT($with_libldap_r))
|
|
|
|
diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in
|
|
index cd86138ea..b8c14cd14 100644
|
|
--- a/rpm/389-ds-base.spec.in
|
|
+++ b/rpm/389-ds-base.spec.in
|
|
@@ -65,6 +65,7 @@ Provides: ldif2ldbm
|
|
# Attach the buildrequires to the top level package:
|
|
BuildRequires: nspr-devel
|
|
BuildRequires: nss-devel >= 3.34
|
|
+BuildRequires: openldap-clients
|
|
BuildRequires: openldap-devel
|
|
BuildRequires: libdb-devel
|
|
BuildRequires: cyrus-sasl-devel
|
|
--
|
|
2.49.0
|
|
|