From 4543a5ccb416798f80b80e2f8875a3d3648d8bf8 Mon Sep 17 00:00:00 2001 From: ume Date: Thu, 27 May 2010 15:41:43 +0000 Subject: Make it buildable with db50. --- security/cyrus-sasl2/files/patch-sasldb::db_berkeley.c | 13 +++++++++++++ security/cyrus-sasl2/files/patch-utils::dbconverter-2.c | 13 +++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 security/cyrus-sasl2/files/patch-sasldb::db_berkeley.c create mode 100644 security/cyrus-sasl2/files/patch-utils::dbconverter-2.c (limited to 'security') diff --git a/security/cyrus-sasl2/files/patch-sasldb::db_berkeley.c b/security/cyrus-sasl2/files/patch-sasldb::db_berkeley.c new file mode 100644 index 000000000000..d0baf975a6f5 --- /dev/null +++ b/security/cyrus-sasl2/files/patch-sasldb::db_berkeley.c @@ -0,0 +1,13 @@ +Index: sasldb/db_berkeley.c +diff -u -p sasldb/db_berkeley.c.orig sasldb/db_berkeley.c +--- sasldb/db_berkeley.c.orig 2009-04-29 00:09:18.000000000 +0900 ++++ sasldb/db_berkeley.c 2010-05-27 14:25:14.458302060 +0900 +@@ -100,7 +100,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_MINOR >= 1) || DB_VERSION_MAJOR >= 5 + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); diff --git a/security/cyrus-sasl2/files/patch-utils::dbconverter-2.c b/security/cyrus-sasl2/files/patch-utils::dbconverter-2.c new file mode 100644 index 000000000000..f00988a95dff --- /dev/null +++ b/security/cyrus-sasl2/files/patch-utils::dbconverter-2.c @@ -0,0 +1,13 @@ +Index: utils/dbconverter-2.c +diff -u -p utils/dbconverter-2.c.orig utils/dbconverter-2.c +--- utils/dbconverter-2.c.orig 2003-02-14 04:56:17.000000000 +0900 ++++ utils/dbconverter-2.c 2010-05-27 14:28:26.249314464 +0900 +@@ -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_MINOR >= 1) || DB_VERSION_MAJOR >= 5 + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); -- cgit