aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorume <ume@FreeBSD.org>2010-05-27 23:41:43 +0800
committerume <ume@FreeBSD.org>2010-05-27 23:41:43 +0800
commit4543a5ccb416798f80b80e2f8875a3d3648d8bf8 (patch)
tree85a07bf39622c2562b07f7575a5f3d8b59d8a220 /security
parentaba3fb6f7f0537c42c20bf7ad8af53b89a49d5ee (diff)
downloadfreebsd-ports-gnome-4543a5ccb416798f80b80e2f8875a3d3648d8bf8.tar.gz
freebsd-ports-gnome-4543a5ccb416798f80b80e2f8875a3d3648d8bf8.tar.zst
freebsd-ports-gnome-4543a5ccb416798f80b80e2f8875a3d3648d8bf8.zip
Make it buildable with db50.
Diffstat (limited to 'security')
-rw-r--r--security/cyrus-sasl2/files/patch-sasldb::db_berkeley.c13
-rw-r--r--security/cyrus-sasl2/files/patch-utils::dbconverter-2.c13
2 files changed, 26 insertions, 0 deletions
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);