[openldap] new upstream release (2.4.32)

[jvcelak]

commit 6304a48a5499de181d458f21f59293a97913e192
Author: Jan Vcelak <jvcelak at redhat.com>
Date:   Wed Aug 1 13:39:25 2012 +0200

    new upstream release (2.4.32)

 .gitignore                                         |    1 +
 openldap-cve-nss-cipher-suite-ignored.patch        |   27 ------
 openldap-nss-allow-ca-dbdir-pemfile.patch          |   56 -----------
 openldap-nss-clean-memory-for-token-pin.patch      |   31 ------
 ...ldap-nss-dont-overwrite-verify-cert-error.patch |   35 -------
 ...p-nss-ignore-untrusted-issuer-server-cert.patch |   99 --------------------
 openldap-smbk5pwd-overlay.patch                    |   19 +----
 openldap-tls-unbind-shutdown-order.patch           |   37 -------
 openldap.spec                                      |   32 +++----
 sources                                            |    2 +-
 10 files changed, 16 insertions(+), 323 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c43ebb8..f566e2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /openldap-2.4.29.tgz
 /openldap-2.4.30.tgz
 /openldap-2.4.31.tgz
+/openldap-2.4.32.tgz
diff --git a/openldap-smbk5pwd-overlay.patch b/openldap-smbk5pwd-overlay.patch
index 9f14b38..38936cf 100644
--- a/openldap-smbk5pwd-overlay.patch
+++ b/openldap-smbk5pwd-overlay.patch
@@ -3,7 +3,7 @@ Compile smbk5pwd together with other overlays.
 Author: Jan Šafránek <jsafrane at redhat.com>
 Resolves: #550895
 
-Update to link against OpenSSL, avoid to compile with unsupported backend.
+Update to link against OpenSSL
 
 Author: Jan Vcelak <jvcelak at redhat.com>
 Resolves: #841560
@@ -57,23 +57,6 @@ index 3af20e8..ef73663 100644
  install-local:	$(PROGRAMS)
  	@if test -n "$?" ; then \
  		$(MKDIR) $(DESTDIR)$(moduledir); \
-diff --git a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
-index d4d7f6f..37f55da 100644
---- a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
-+++ b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
-@@ -68,9 +68,11 @@ static ObjectClass *oc_krb5KDCEntry;
- #ifdef HAVE_GNUTLS
- #include <gcrypt.h>
- typedef unsigned char DES_cblock[8];
--#else
-+#elif HAVE_OPENSSL
- #include <openssl/des.h>
- #include <openssl/md4.h>
-+#else
-+#error Unsupported crypto backend.
- #endif
- #include "ldap_utf8.h"
- 
 -- 
 1.7.10.4
 
diff --git a/openldap.spec b/openldap.spec
index f30cab7..2c329cf 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -7,8 +7,8 @@
 %global systemctl_bin /usr/bin/systemctl
 
 Name: openldap
-Version: 2.4.31
-Release: 7%{?dist}
+Version: 2.4.32
+Release: 1%{?dist}
 Summary: LDAP support libraries
 Group: System Environment/Daemons
 License: OpenLDAP
@@ -39,15 +39,7 @@ Patch7: openldap-dns-priority.patch
 Patch8: openldap-syncrepl-unset-tls-options.patch
 Patch9: openldap-constraint-count.patch
 Patch10: openldap-man-sasl-nocanon.patch
-Patch11: openldap-nss-allow-ca-dbdir-pemfile.patch
-Patch12: openldap-tls-unbind-shutdown-order.patch
-Patch13: openldap-nss-dont-overwrite-verify-cert-error.patch
-Patch14: openldap-nss-clean-memory-for-token-pin.patch
-Patch15: openldap-cve-nss-cipher-suite-ignored.patch
-Patch16: openldap-nss-default-cipher-suite-always-selected.patch
-Patch17: openldap-nss-multiple-tls-contexts.patch
-Patch18: openldap-ai-addrconfig.patch
-Patch19: openldap-nss-ignore-untrusted-issuer-server-cert.patch
+Patch11: openldap-ai-addrconfig.patch
 
 # Fedora specific patches
 Patch100: openldap-autoconf-pkgconfig-nss.patch
@@ -161,14 +153,6 @@ ln -s %{_includedir}/nspr4 include/nspr
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
 
 %patch101 -p1
 
@@ -626,6 +610,16 @@ exit 0
 %{evolution_connector_prefix}/
 
 %changelog
+* Wed Aug 01 2012 Jan Vcelak <jvcelak at redhat.com> 2.4.32-1
+- new upstream release
+  + library: double free, SASL handling
+  + tools: read SASL_NOCANON from config file
+  + slapd: config index renumbering, duplicate error response
+  + backends: various fixes in mdb, bdb/hdb, ldap
+  + accesslog, syncprov: fix memory leaks in with replication
+  + sha2: portability, thread safety, support SSHA256,384,512
+  + documentation fixes
+
 * Sat Jul 21 2012 Jan Vcelak <jvcelak at redhat.com> 2.4.31-7
 - fix: slapd refuses to set up TLS with self-signed PEM certificate (#842022)
 
diff --git a/sources b/sources
index 46fa8b3..77e6d92 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-804c6cb5698db30b75ad0ff1c25baefd  openldap-2.4.31.tgz
+6a3e85cf61860ca5e8a1eba6753dd9d0  openldap-2.4.32.tgz