[openldap] rebase to 2.4.26

[jvcelak]

commit 583cde50edf8d0f920ad6f9debc4becf788ae275
Author: Jan Vcelak <jvcelak at redhat.com>
Date:   Wed Jul 20 15:17:58 2011 +0200

    rebase to 2.4.26
    
    - remove upstream included patches

 .gitignore                              |    2 +-
 openldap-export-ldif.patch              |   18 --------
 openldap-ldapexop-double-free.patch     |   28 -------------
 openldap-nss-cacertdir-soft-error.patch |   68 -------------------------------
 openldap-nss-nofork.patch               |   19 ---------
 openldap-segfault-ldif-indent.patch     |   19 ---------
 openldap-segfault-ldif-nl-end.patch     |   31 --------------
 openldap.spec                           |   29 +++++---------
 sources                                 |    2 +-
 9 files changed, 12 insertions(+), 204 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 296dabc..6fb7efc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/openldap-2.4.25.tgz
+/openldap-2.4.26.tgz
diff --git a/openldap.spec b/openldap.spec
index d1207d5..b5b6db2 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -5,7 +5,7 @@
 %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
 
 Name: openldap
-Version: 2.4.25
+Version: 2.4.26
 Release: 1%{?dist}
 Summary: LDAP support libraries
 Group: System Environment/Daemons
@@ -23,15 +23,9 @@ Patch0: openldap-manpages.patch
 Patch1: openldap-security-pie.patch
 Patch2: openldap-sql-linking.patch
 Patch3: openldap-reentrant-gethostby.patch
-Patch4: openldap-export-ldif.patch
-Patch5: openldap-smbk5pwd-overlay.patch
-Patch6: openldap-ldaprc-currentdir.patch
-Patch7: openldap-userconfig-setgid.patch
-Patch8: openldap-nss-nofork.patch
-Patch9: openldap-nss-cacertdir-soft-error.patch
-Patch10: openldap-ldapexop-double-free.patch
-Patch11: openldap-segfault-ldif-indent.patch
-Patch12: openldap-segfault-ldif-nl-end.patch
+Patch4: openldap-smbk5pwd-overlay.patch
+Patch5: openldap-ldaprc-currentdir.patch
+Patch6: openldap-userconfig-setgid.patch
 
 # patches for the evolution library (see README.evolution)
 Patch200: openldap-evolution-ntlm.patch
@@ -128,15 +122,9 @@ pushd openldap-%{version}
 %patch1 -p1 -b .security-pie
 %patch2 -p1 -b .sql-linking
 %patch3 -p1 -b .reentrant-gethostby
-%patch4 -p1 -b .export-ldif
-%patch5 -p1 -b .smbk5pwd-overlay
-%patch6 -p1 -b .ldaprc-currentdir
-%patch7 -p1 -b .userconfig-setgid
-%patch8 -p1 -b .nss-nofork
-%patch9 -p1 -b .nss-cacertdir-soft-error
-%patch10 -p1 -b .ldapexop-double-free
-%patch11 -p1 -b .segfault-ldif-indent
-%patch12 -p1 -b .segfault-ldif-nl-end
+%patch4 -p1 -b .smbk5pwd-overlay
+%patch5 -p1 -b .ldaprc-currentdir
+%patch6 -p1 -b .userconfig-setgid
 
 cp %{_datadir}/libtool/config/config.{sub,guess} build/
 
@@ -659,6 +647,9 @@ exit 0
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Wed Jul 20 2011 Jan Vcelak <jvcelak at redhat.com> 2.4.26-1
+- rebase to new upstream release
+
 * Mon Jun 27 2011 Jan Vcelak <jvcelak at redhat.com> 2.4.25-1
 - rebase to new upstream release
 - change default database type from BDB to HDB
diff --git a/sources b/sources
index fa8c395..e809d56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec63f9c2add59f323a0459128846905b  openldap-2.4.25.tgz
+f36f3086031dd56ae94f722ffae8df5e  openldap-2.4.26.tgz