[cyrus-sasl/f15] Add support for berkeley db 5

[Jan F. Chadima]

commit 436bfc7ddd55e80e6fd51467a7da314fb91c672b
Author: Jan F. Chadima <jfch at eglon.jagda.eu>
Date:   Mon Jul 25 19:48:26 2011 +0200

    Add support for berkeley db 5

 cyrus-sasl-2.1.23-db5.patch |   22 ++++++++++++++++++++++
 cyrus-sasl.spec             |    7 ++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/cyrus-sasl-2.1.23-db5.patch b/cyrus-sasl-2.1.23-db5.patch
new file mode 100644
index 0000000..ff831cd
--- /dev/null
+++ b/cyrus-sasl-2.1.23-db5.patch
@@ -0,0 +1,22 @@
+--- a/sasldb/db_berkeley.c
++++ b/sasldb/db_berkeley.c
+@@ -100,7 +100,7 @@ static int berkeleydb_open(const sasl_ut
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+--- a/utils/dbconverter-2.c
++++ b/utils/dbconverter-2.c
+@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index d018f8c..6c84801 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -8,7 +8,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.23
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: BSD with advertising
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -39,6 +39,7 @@ Patch34: cyrus-sasl-2.1.22-ldap-timeout.patch
 Patch35: cyrus-sasl-2.1.22-bad-elif.patch
 Patch36: cyrus-sasl-2.1.23-ac-quote.patch
 Patch37: cyrus-sasl-2.1.23-race.patch
+Patch38: cyrus-sasl-2.1.23-db5.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
@@ -159,6 +160,7 @@ chmod -x include/*.h
 %patch35 -p1 -b .elif
 %patch36 -p1 -b .ac-quote
 %patch37 -p1 -b .race
+%patch38 -p1 -b .db5
 
 %build
 # FIXME - we remove these files directly so that we can avoid using the -f
@@ -403,6 +405,9 @@ exit 0
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Mon Jul 25 2011 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-17
+- Add support for berkeley db 5
+
 * Wed Mar 23 2011 Tomas Mraz <tmraz at redhat.com> - 2.1.23-16
 - Rebuilt with new mysqlclient