wok-6.x diff cyrus-sasl/stuff/0027_db5_support.patch @ rev 15008

strigi, cryptsetup: typos
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Aug 11 10:33:55 2013 +0000 (2013-08-11)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/cyrus-sasl/stuff/0027_db5_support.patch	Sun Aug 11 10:33:55 2013 +0000
     1.3 @@ -0,0 +1,24 @@
     1.4 +Author: Ondřej Surý <ondrej@debian.org>
     1.5 +Description: Support newer Berkeley DB versions
     1.6 +--- a/sasldb/db_berkeley.c
     1.7 ++++ b/sasldb/db_berkeley.c
     1.8 +@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
     1.9 +     ret = db_create(mbdb, NULL, 0);
    1.10 +     if (ret == 0 && *mbdb != NULL)
    1.11 +     {
    1.12 +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
    1.13 ++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
    1.14 + 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
    1.15 + #else
    1.16 + 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
    1.17 +--- a/utils/dbconverter-2.c
    1.18 ++++ b/utils/dbconverter-2.c
    1.19 +@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
    1.20 +     ret = db_create(mbdb, NULL, 0);
    1.21 +     if (ret == 0 && *mbdb != NULL)
    1.22 +     {
    1.23 +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
    1.24 ++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
    1.25 + 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
    1.26 + #else
    1.27 + 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);