[freeipa/f15] Rebuild slapi plugins against re-enterant version of libldap

[abbra]

commit 704648a71942a04c02c502ea5f665122682dce18
Author: Alexander Bokovoy <abokovoy at redhat.com>
Date:   Wed Dec 21 16:00:57 2011 +0200

    Rebuild slapi plugins against re-enterant version of libldap

 ...lapi-plugins-use-thread-safe-ldap-library.patch |   39 ++++++++++++++++++++
 freeipa.spec                                       |    9 ++++-
 2 files changed, 46 insertions(+), 2 deletions(-)
---
diff --git a/freeipa-2.1.4-slapi-plugins-use-thread-safe-ldap-library.patch b/freeipa-2.1.4-slapi-plugins-use-thread-safe-ldap-library.patch
new file mode 100644
index 0000000..2e51e09
--- /dev/null
+++ b/freeipa-2.1.4-slapi-plugins-use-thread-safe-ldap-library.patch
@@ -0,0 +1,39 @@
+>From e744b07fe589d36257590f31adf7a5dae3a51f55 Mon Sep 17 00:00:00 2001
+From: Simo Sorce <ssorce at redhat.com>
+Date: Tue, 20 Dec 2011 12:39:34 -0500
+Subject: [PATCH] slapi-plugins: use thread-safe ldap library
+
+---
+ daemons/configure.ac |    2 +-
+ freeipa.spec.in      |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/daemons/configure.ac b/daemons/configure.ac
+index d15a5c70c000a9d83f9ccb6d05851f1400ae4627..9ff858a6b360b011be95ff9aac729a0e837356c2 100644
+--- a/daemons/configure.ac
++++ b/daemons/configure.ac
+@@ -174,7 +174,7 @@ if test "$with_ldap" = "yes"; then
+   if test "$with_ldap_lber" = "yes" ; then
+     OPENLDAP_LIBS="${OPENLDAP_LIBS} -llber"
+   fi
+-  OPENLDAP_LIBS="${OPENLDAP_LIBS} -lldap"
++  OPENLDAP_LIBS="${OPENLDAP_LIBS} -lldap_r"
+ else
+   AC_MSG_ERROR([OpenLDAP not found])
+ fi
+diff --git a/freeipa.spec.in b/freeipa.spec.in
+index 3305fda55a30523d0b86a0fb79ee74f60a544b92..36b68795eec02d11176c2369b50ec6c732925ad1 100644
+--- a/freeipa.spec.in
++++ b/freeipa.spec.in
+@@ -24,7 +24,7 @@ Source0:        freeipa-%{version}.tar.gz
+ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ 
+ %if ! %{ONLY_CLIENT}
+-BuildRequires:  389-ds-base-devel >= 1.2.9
++BuildRequires:  389-ds-base-devel >= 1.2.10-0.6.a6
+ BuildRequires:  svrcore-devel
+ BuildRequires:  /usr/share/selinux/devel/Makefile
+ BuildRequires:  policycoreutils >= %{POLICYCOREUTILSVER}
+-- 
+1.7.7.4
+
diff --git a/freeipa.spec b/freeipa.spec
index 0a36516..5f287b3 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -14,18 +14,19 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:           freeipa
 Version:        2.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
 License:        GPLv3+
 URL:            http://www.freeipa.org/
 Source0:        http://www.freeipa.org/downloads/src/freeipa-%{version}.tar.gz
+Patch0:         freeipa-2.1.4-slapi-plugins-use-thread-safe-ldap-library.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 %if ! %{ONLY_CLIENT}
-BuildRequires:  389-ds-base-devel >= 1.2.9
+BuildRequires:  389-ds-base-devel >= 1.2.10-0.6.a6
 BuildRequires:  svrcore-devel
 BuildRequires:  /usr/share/selinux/devel/Makefile
 BuildRequires:  policycoreutils >= %{POLICYCOREUTILSVER}
@@ -209,6 +210,7 @@ package.
 
 %prep
 %setup -n freeipa-%{version} -q
+%patch0 -p1
 
 %build
 export CFLAGS="$CFLAGS %{optflags}"
@@ -516,6 +518,9 @@ fi
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf
 
 %changelog
+* Wed Dec 21 2011 Alexander Bokovoy <abokovoy at redhat.com> - 2.1.4-2
+- Rebuild slapi plugins against re-enterant version of libldap
+
 * Tue Dec  6 2011 Rob Crittenden <rcritten at redhat.com> - 2.1.4-1
 - Update to upstream 2.1.4 (CVE-2011-3636)