summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorobache <obache>2007-06-12 11:34:29 +0000
committerobache <obache>2007-06-12 11:34:29 +0000
commitd20c3e5c7a673c54574e04177683d4633b5429d4 (patch)
treea8db067a7c73efe0c7868bdb8ac2a13fceec6ecf /mail
parent32b0ea46dcd36345b0186eafc056dd4e7a43edfd (diff)
downloadpkgsrc-d20c3e5c7a673c54574e04177683d4633b5429d4.tar.gz
Fix to build with db4>=4.5.
Diffstat (limited to 'mail')
-rw-r--r--mail/cyrus-imapd/distinfo3
-rw-r--r--mail/cyrus-imapd/patches/patch-ag20
2 files changed, 22 insertions, 1 deletions
diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo
index 26c93165280..62b1d5a6ec1 100644
--- a/mail/cyrus-imapd/distinfo
+++ b/mail/cyrus-imapd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2007/03/09 14:46:08 obache Exp $
+$NetBSD: distinfo,v 1.28 2007/06/12 11:34:29 obache Exp $
SHA1 (cyrus-imapd-2.2.13.tar.gz) = ba84b67a1cae4c15d5a588d010764031167970c4
RMD160 (cyrus-imapd-2.2.13.tar.gz) = 7e8ac84b5ddd9f1206e71d5b659d07d8400f9ac2
@@ -9,6 +9,7 @@ SHA1 (patch-ac) = 48557e05ef0d82413da18dd46d9c4baf802a771d
SHA1 (patch-ad) = e99638a062b2695514c6859788eac3fd02cf5c1d
SHA1 (patch-ae) = b1865b68a8f798a3766e53e60e9e68099df9bd54
SHA1 (patch-af) = 2aaf1be5fcb102b047a57fe0a908b3e8f95037ea
+SHA1 (patch-ag) = 85d931a197d9185cbcff592efd67c2090724d7fd
SHA1 (patch-al) = d28a0e604f0ddcf22c6753be333216780558e05c
SHA1 (patch-am) = 0804e6fa6694ed820861b740ac1bead29b3eeb4b
SHA1 (patch-ap) = 95b987e83ddd53065f7ffe503d0f07694f9bcd6b
diff --git a/mail/cyrus-imapd/patches/patch-ag b/mail/cyrus-imapd/patches/patch-ag
new file mode 100644
index 00000000000..fdb310870e6
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-ag
@@ -0,0 +1,20 @@
+$NetBSD: patch-ag,v 1.4 2007/06/12 11:34:29 obache Exp $
+
+--- lib/cyrusdb_berkeley.c.orig 2006-03-17 16:12:32.000000000 +0000
++++ lib/cyrusdb_berkeley.c
+@@ -173,7 +173,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));