[packages/openldap] - updated to 2.4.37 - added db patch (db6 support)

[qboosh]

commit a20af4130165ab9a520657b842107c137911c70a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Nov 2 09:42:35 2013 +0100

    - updated to 2.4.37
    - added db patch (db6 support)

 openldap-db.patch | 18 ++++++++++++++++++
 openldap.spec     |  6 ++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/openldap.spec b/openldap.spec
index 24726ea..b0f7b5d 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -24,12 +24,12 @@ Summary(pt_BR.UTF-8):	Clientes e servidor para LDAP
 Summary(ru.UTF-8):	Образцы клиентов LDAP
 Summary(uk.UTF-8):	Зразки клієнтів LDAP
 Name:		openldap
-Version:	2.4.36
+Version:	2.4.37
 Release:	1
 License:	OpenLDAP Public License
 Group:		Networking/Daemons
 Source0:	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz
-# Source0-md5:	744701405d396b1fb9de6cb7a453c6e9
+# Source0-md5:	49f0e9a77ddd0d49f88bf7233a51efa8
 Source1:	http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
 # Source1-md5:	718082e7e35fc48478a2334b0bc4cd11
 Source2:	ldap.init
@@ -61,6 +61,7 @@ Patch18:	%{name}-format-security.patch
 Patch19:	%{name}-gcc47.patch
 Patch20:	enable-mdb.patch
 Patch22:	%{name}-am.patch
+Patch23:	%{name}-db.patch
 # Patch for the evolution library
 Patch100:	%{name}-ntlm.diff
 URL:		http://www.openldap.org/
@@ -1238,6 +1239,7 @@ cd %{name}-%{version}
 %patch19 -p1
 %patch20 -p1
 %patch22 -p1
+%patch23 -p1
 %if %{with krb5}
 %patch17 -p1
 %endif
diff --git a/openldap-db.patch b/openldap-db.patch
new file mode 100644
index 0000000..3e3a78b
--- /dev/null
+++ b/openldap-db.patch
@@ -0,0 +1,18 @@
+--- openldap-2.4.37/build/openldap.m4.orig	2013-11-01 20:06:42.762133271 +0100
++++ openldap-2.4.37/build/openldap.m4	2013-11-01 20:41:25.152045898 +0100
+@@ -357,7 +357,14 @@
+ AC_DEFUN([OL_BERKELEY_DB_LINK],
+ [ol_cv_lib_db=no
+ 
+-if test $ol_cv_bdb_major = 5 ; then
++if test $ol_cv_bdb_major = 6 ; then
++	OL_BERKELEY_DB_TRY(ol_cv_db_db_6_dot_m,[-ldb-6.$ol_cv_bdb_minor])
++	OL_BERKELEY_DB_TRY(ol_cv_db_db6m,[-ldb6$ol_cv_bdb_minor])
++	OL_BERKELEY_DB_TRY(ol_cv_db_db_6m,[-ldb-6$ol_cv_bdb_minor])
++	OL_BERKELEY_DB_TRY(ol_cv_db_db_6_m,[-ldb-6-$ol_cv_bdb_minor])
++	OL_BERKELEY_DB_TRY(ol_cv_db_db_6,[-ldb-6])
++	OL_BERKELEY_DB_TRY(ol_cv_db_db6,[-ldb6])
++elif test $ol_cv_bdb_major = 5 ; then
+ 	OL_BERKELEY_DB_TRY(ol_cv_db_db_5_dot_m,[-ldb-5.$ol_cv_bdb_minor])
+ 	OL_BERKELEY_DB_TRY(ol_cv_db_db5m,[-ldb5$ol_cv_bdb_minor])
+ 	OL_BERKELEY_DB_TRY(ol_cv_db_db_5m,[-ldb-5$ol_cv_bdb_minor])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openldap.git/commitdiff/a20af4130165ab9a520657b842107c137911c70a