wok annotate cyrus-sasl/stuff/0027_db5_support.patch @ rev 21645

updated orc and orc-dev (0.4.18 -> 0.4.29)
author Hans-G?nter Theisgen
date Thu May 30 08:44:12 2019 +0100 (2019-05-30)
parents
children
rev   line source
slaxemulator@13003 1 Author: Ondřej Surý <ondrej@debian.org>
slaxemulator@13003 2 Description: Support newer Berkeley DB versions
slaxemulator@13003 3 --- a/sasldb/db_berkeley.c
slaxemulator@13003 4 +++ b/sasldb/db_berkeley.c
slaxemulator@13003 5 @@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
slaxemulator@13003 6 ret = db_create(mbdb, NULL, 0);
slaxemulator@13003 7 if (ret == 0 && *mbdb != NULL)
slaxemulator@13003 8 {
slaxemulator@13003 9 -#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
slaxemulator@13003 10 +#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
slaxemulator@13003 11 ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
slaxemulator@13003 12 #else
slaxemulator@13003 13 ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
slaxemulator@13003 14 --- a/utils/dbconverter-2.c
slaxemulator@13003 15 +++ b/utils/dbconverter-2.c
slaxemulator@13003 16 @@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
slaxemulator@13003 17 ret = db_create(mbdb, NULL, 0);
slaxemulator@13003 18 if (ret == 0 && *mbdb != NULL)
slaxemulator@13003 19 {
slaxemulator@13003 20 -#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
slaxemulator@13003 21 +#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
slaxemulator@13003 22 ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
slaxemulator@13003 23 #else
slaxemulator@13003 24 ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);