summaryrefslogtreecommitdiff
path: root/mail/cyrus-imapd24
diff options
context:
space:
mode:
authorHajimu UMEMOTO <ume@FreeBSD.org>2007-08-06 14:44:11 +0000
committerHajimu UMEMOTO <ume@FreeBSD.org>2007-08-06 14:44:11 +0000
commit1608985acd23a837c4c635a6cb4d84fe8b51672e (patch)
tree5fdba3421112064f73f94a4f2182c456d23bedc2 /mail/cyrus-imapd24
parentUpdate WWW line to point to http://dbus.freedesktop.org/doc/dbus-python/ (diff)
compatibility fix for DBENV->set_lk_max()
Obtained from: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/cyrusdb_berkeley.c.diff?r1=1.17;r2=1.18
Notes
Notes: svn path=/head/; revision=197225
Diffstat (limited to 'mail/cyrus-imapd24')
-rw-r--r--mail/cyrus-imapd24/files/patch-lib::cyrusdb_berkeley.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/mail/cyrus-imapd24/files/patch-lib::cyrusdb_berkeley.c b/mail/cyrus-imapd24/files/patch-lib::cyrusdb_berkeley.c
new file mode 100644
index 000000000000..722b7bde206d
--- /dev/null
+++ b/mail/cyrus-imapd24/files/patch-lib::cyrusdb_berkeley.c
@@ -0,0 +1,20 @@
+Index: lib/cyrusdb_berkeley.c
+diff -u -p lib/cyrusdb_berkeley.c.orig lib/cyrusdb_berkeley.c
+--- lib/cyrusdb_berkeley.c.orig 2007-02-06 03:43:26.000000000 +0900
++++ lib/cyrusdb_berkeley.c 2007-08-06 23:04:15.000000000 +0900
+@@ -176,7 +176,15 @@ static int init(const char *dbdir, int m
+ syslog(LOG_WARNING,
+ "DBERROR: invalid berkeley_locks_max value, using internal default");
+ } else {
++#if DB_VERSION_MAJOR >= 4
++ r = dbenv->set_lk_max_locks(dbenv, opt);
++ if (!r)
++ r = dbenv->set_lk_max_lockers(dbenv, opt);
++ if (!r)
++ r = dbenv->set_lk_max_objects(dbenv, opt);
++#else
+ r = dbenv->set_lk_max(dbenv, opt);
++#endif
+ if (r) {
+ dbenv->err(dbenv, r, "set_lk_max");
+ syslog(LOG_ERR, "DBERROR: set_lk_max(): %s", db_strerror(r));