summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorrecht <recht@pkgsrc.org>2006-05-07 17:47:05 +0000
committerrecht <recht@pkgsrc.org>2006-05-07 17:47:05 +0000
commitff6df3eee239deee09ba83e978d3b776351bd9b9 (patch)
tree51dfdf5711241e3a2622438b11362abdace701d5 /mail
parente763fff148a8d9c6e74fac1b4880ea8fbb6eef2e (diff)
downloadpkgsrc-ff6df3eee239deee09ba83e978d3b776351bd9b9.tar.gz
Adapt the db_err function to bdb 4.4.
Addresses PR 32739 by John Kohl. Bump PKGREVISION.
Diffstat (limited to 'mail')
-rw-r--r--mail/cyrus-imapd/Makefile4
-rw-r--r--mail/cyrus-imapd/distinfo3
-rw-r--r--mail/cyrus-imapd/patches/patch-aq13
3 files changed, 17 insertions, 3 deletions
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index a79dca43172..16ee5d36a10 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2006/04/13 21:45:13 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2006/05/07 17:47:05 recht Exp $
DISTNAME= cyrus-imapd-2.2.12
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= mail
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo
index 5b6dc274ce3..bd7bb19d8c8 100644
--- a/mail/cyrus-imapd/distinfo
+++ b/mail/cyrus-imapd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2005/11/19 11:50:56 rillig Exp $
+$NetBSD: distinfo,v 1.22 2006/05/07 17:47:05 recht Exp $
SHA1 (cyrus-imapd-2.2.12.tar.gz) = 08adc5dfde1288c0d9e7de44e7ea4d17a7940d06
RMD160 (cyrus-imapd-2.2.12.tar.gz) = ff4a95e519ea066ed9b21b515b18bdacaf0d1852
@@ -11,6 +11,7 @@ SHA1 (patch-af) = de3c788417eaf8d7febd4903af4828c9a6e63e3d
SHA1 (patch-al) = 6fa8967eb97f7cfdb93de86a45aa90ab3a1bd129
SHA1 (patch-am) = 0804e6fa6694ed820861b740ac1bead29b3eeb4b
SHA1 (patch-ap) = 95b987e83ddd53065f7ffe503d0f07694f9bcd6b
+SHA1 (patch-aq) = 071fbe29ae526144e2bbea8b827eddfb8739693c
SHA1 (patch-ba) = 98bea064fa4d97b0bb1ba2d1fcb4d30611ac706e
SHA1 (patch-bb) = 8725d9008617acb392b904d76a353b8829fdfb33
SHA1 (patch-bc) = 3266d52067aef8f4835670cba1be6c190ff94f15
diff --git a/mail/cyrus-imapd/patches/patch-aq b/mail/cyrus-imapd/patches/patch-aq
new file mode 100644
index 00000000000..56148f34d05
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2006/05/07 17:47:05 recht Exp $
+
+--- lib/cyrusdb_berkeley.c.orig 2006-05-07 19:27:50.000000000 +0200
++++ lib/cyrusdb_berkeley.c 2006-05-07 19:28:04.000000000 +0200
+@@ -104,7 +104,7 @@
+ exit(EC_TEMPFAIL);
+ }
+
+-static void db_err(const char *db_prfx, char *buffer)
++static void db_err(const DB_ENV *dbenv, const char *db_prfx, char *buffer)
+ {
+ syslog(LOG_WARNING, "DBERROR %s: %s", db_prfx, buffer);
+ }