[lfs-patches] r2386 - trunk/cyrus-sasl

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Mon Mar 5 11:45:19 PST 2012


Author: bdubbs
Date: 2012-03-05 12:45:14 -0700 (Mon, 05 Mar 2012)
New Revision: 2386

Added:
   trunk/cyrus-sasl/cyrus-sasl-2.1.25-bdb5-1.patch
Log:
Add bdb5 patch for cyrus-sasl

Added: trunk/cyrus-sasl/cyrus-sasl-2.1.25-bdb5-1.patch
===================================================================
--- trunk/cyrus-sasl/cyrus-sasl-2.1.25-bdb5-1.patch	                        (rev 0)
+++ trunk/cyrus-sasl/cyrus-sasl-2.1.25-bdb5-1.patch	2012-03-05 19:45:14 UTC (rev 2386)
@@ -0,0 +1,29 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2012-03-04
+Initial Package Version: 2.1.25
+Upstream Status:         Unknown
+Origin:                  http://patch-tracker.debian.org/package/cyrus-sasl2/2.1.25.dfsg1-3
+Description:             Support Berkeley DB 5.x
+
+--- a/sasldb/db_berkeley.c
++++ b/sasldb/db_berkeley.c
+@@ -101,7 +101,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);




More information about the patches mailing list