From 13d1c21d4e0fb236f5753c3790083445f4a8be56 Mon Sep 17 00:00:00 2001
From: Jan Zeleny <jzeleny@fedoraproject.org>
Date: Mon, 11 Jan 2010 15:47:11 +0000
Subject: [PATCH] rebased both openldap and bdb

---
 .cvsignore    |  4 ++--
 openldap.spec | 12 +++++++-----
 sources       |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6ad21bc..996de70 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-db-4.8.24.tar.gz
-openldap-2.4.19.tgz
+openldap-2.4.21.tgz
+db-4.8.26.tar.gz
diff --git a/openldap.spec b/openldap.spec
index d64a8a2..32e0643 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -1,9 +1,9 @@
 # We distribute own version of Berkeley DB to prevent 
 # problems on db4.rpm upgrade - some versions of db4 do
 # not work with some versions of OpenLDAP.
-%define db_version 4.8.24
+%define db_version 4.8.26
 %define ldbm_backend berkeley
-%define version 2.4.19
+%define version 2.4.21
 %define evolution_connector_prefix %{_libdir}/evolution-openldap
 %define evolution_connector_includedir %{evolution_connector_prefix}/include
 %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -35,7 +35,6 @@ Patch6: openldap-2.3.19-gethostbyXXXX_r.patch
 Patch9: openldap-2.3.37-smbk5pwd.patch
 Patch10: openldap-2.4.6-multilib.patch
 Patch11: openldap-2.4.16-doc-cacertdir.patch
-Patch12: openldap-2.4.19-tls-accept.patch
 
 # Patches for the evolution library
 Patch200: openldap-2.4.6-evolution-ntlm.patch
@@ -131,7 +130,6 @@ pushd openldap-%{version}
 %patch9 -p1 -b .smbk5pwd
 %patch10 -p1 -b .multilib
 %patch11 -p1 -b .cacertdir
-%patch12 -p1 -b .tls-accept
 
 cp %{_datadir}/libtool/config/config.{sub,guess} build/
 popd
@@ -633,6 +631,10 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Mon Jan 11 2010 Jan Zeleny <jzeleny@redhat.com> - 2.4.21-1
+- rebased openldap to 2.4.21
+- rebased bdb to 4.8.26
+
 * Mon Nov 23 2009 Jan Zeleny <jzeleny@redhat.com> - 2.4.19-3
 - minor corrections in init script
 
diff --git a/sources b/sources
index 1b26437..f3aef1c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-147afdecf438ff99ade105a5272db158  db-4.8.24.tar.gz
-4a6dab2711fcf141f19bb680bc335887  openldap-2.4.19.tgz
+e7128c57b2bacd940e8906057c94ff26  openldap-2.4.21.tgz
+3476bac9ec0f3c40729c8a404151d5e3  db-4.8.26.tar.gz