[openldap] rebase to 2.4.25

[jvcelak]

commit a40d05ac93521616c4c79734d1ef0a80a4171e66
Author: Jan Vcelak <jvcelak at redhat.com>
Date:   Mon Jun 27 11:40:16 2011 +0200

    rebase to 2.4.25
    
    - remove upstream included patches

 .gitignore                      |    2 +-
 openldap-nss-null-pointer.patch |   25 ----------------
 openldap-slapadd-hang.patch     |   61 ---------------------------------------
 openldap.spec                   |   13 ++++----
 sources                         |    2 +-
 5 files changed, 8 insertions(+), 95 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3055693..296dabc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/openldap-2.4.24.tgz
+/openldap-2.4.25.tgz
diff --git a/openldap.spec b/openldap.spec
index 272ac43..6a96b65 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -6,8 +6,8 @@
 %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
 
 Name: openldap
-Version: 2.4.24
-Release: 2%{?dist}
+Version: 2.4.25
+Release: 1%{?dist}
 Summary: LDAP support libraries
 Group: System Environment/Daemons
 License: OpenLDAP
@@ -29,8 +29,6 @@ Patch6: openldap-smbk5pwd-overlay.patch
 Patch7: openldap-ldaprc-currentdir.patch
 Patch8: openldap-userconfig-setgid.patch
 Patch9: openldap-nss-nofork.patch
-Patch10: openldap-nss-null-pointer.patch
-Patch11: openldap-slapadd-hang.patch
 
 # patches for the evolution library (see README.evolution)
 Patch200: openldap-evolution-ntlm.patch
@@ -132,8 +130,6 @@ pushd openldap-%{version}
 %patch7 -p1 -b .ldaprc-currentdir
 %patch8 -p1 -b .userconfig-setgid
 %patch9 -p1 -b .nss-nofork
-%patch10 -p1 -b .nss-null-pointer
-%patch11 -p1 -b .slapadd-hang
 
 cp %{_datadir}/libtool/config/config.{sub,guess} build/
 
@@ -178,7 +174,7 @@ build() {
     --with-threads=posix \
     \
     --enable-local \
-	--enable-rlookups \
+    --enable-rlookups \
     \
     --with-tls=no \
     --with-cyrus-sasl \
@@ -675,6 +671,9 @@ exit 0
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Mon Jun 27 2011 Jan Vcelak <jvcelak at redhat.com> 2.4.25-1
+- rebase to new upstream release
+
 * Fri Mar 18 2011 Jan Vcelak <jvcelak at redhat.com> 2.4.24-2
 - new: system resource limiting for slapd using ulimit
 - fix update: openldap can't use TLS after a fork() (#636956)
diff --git a/sources b/sources
index d4acaf8..fa8c395 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-116fe1e23a7b67686d5e62274367e6c0  openldap-2.4.24.tgz
+ec63f9c2add59f323a0459128846905b  openldap-2.4.25.tgz