# HG changeset patch # User Pascal Bellard # Date 1339000318 -7200 # Node ID 3c5a4b2eb7cd82f809fd32ec0af98f2eaa268037 # Parent f6f458d4977ac563b338cb38d88f96dbf8dc2f77 libsasl-without-ldap: Add support for db 5.x. diff -r f6f458d4977a -r 3c5a4b2eb7cd libsasl-without-ldap/receipt --- a/libsasl-without-ldap/receipt Wed Jun 06 18:28:24 2012 +0200 +++ b/libsasl-without-ldap/receipt Wed Jun 06 18:31:58 2012 +0200 @@ -16,7 +16,7 @@ compile_rules() { cd $src - + patch -Np1 -i $stuff/0027_db5_support.patch ./configure --prefix=/usr --infodir=/usr/share/info \ --without-pam --disable-anon \ --disable-cram --disable-digest \ diff -r f6f458d4977a -r 3c5a4b2eb7cd libsasl-without-ldap/stuff/0027_db5_support.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libsasl-without-ldap/stuff/0027_db5_support.patch Wed Jun 06 18:31:58 2012 +0200 @@ -0,0 +1,24 @@ +Author: Ondřej Surý +Description: Support newer Berkeley DB versions +--- 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);