wok rev 13003

cyrus-sasl: Add support for db 5.x.
author Christopher Rogers <slaxemulator@gmail.com>
date Wed Jun 06 10:21:24 2012 +0000 (2012-06-06)
parents 9fb2b5586121
children 73d3e81a7167
files cyrus-sasl/receipt cyrus-sasl/stuff/0027_db5_support.patch
line diff
     1.1 --- a/cyrus-sasl/receipt	Wed Jun 06 10:19:55 2012 +0000
     1.2 +++ b/cyrus-sasl/receipt	Wed Jun 06 10:21:24 2012 +0000
     1.3 @@ -16,6 +16,7 @@
     1.4  compile_rules()
     1.5  {
     1.6  	cd $src
     1.7 +	patch -Np1 -i $stuff/0027_db5_support.patch
     1.8  	./configure \
     1.9  		--with-ldap=/usr \
    1.10  		--with-openssl=/usr \
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/cyrus-sasl/stuff/0027_db5_support.patch	Wed Jun 06 10:21:24 2012 +0000
     2.3 @@ -0,0 +1,24 @@
     2.4 +Author: Ondřej Surý <ondrej@debian.org>
     2.5 +Description: Support newer Berkeley DB versions
     2.6 +--- a/sasldb/db_berkeley.c
     2.7 ++++ b/sasldb/db_berkeley.c
     2.8 +@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
     2.9 +     ret = db_create(mbdb, NULL, 0);
    2.10 +     if (ret == 0 && *mbdb != NULL)
    2.11 +     {
    2.12 +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
    2.13 ++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
    2.14 + 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
    2.15 + #else
    2.16 + 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
    2.17 +--- a/utils/dbconverter-2.c
    2.18 ++++ b/utils/dbconverter-2.c
    2.19 +@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
    2.20 +     ret = db_create(mbdb, NULL, 0);
    2.21 +     if (ret == 0 && *mbdb != NULL)
    2.22 +     {
    2.23 +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
    2.24 ++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
    2.25 + 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
    2.26 + #else
    2.27 + 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);