summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspz <spz@pkgsrc.org>2011-02-05 10:12:03 +0000
committerspz <spz@pkgsrc.org>2011-02-05 10:12:03 +0000
commit8b57b8054f9606eef95b1014a227433754a3fb13 (patch)
treea687254147937227d73ac87ed86fc84bf3674e0a
parentfe744f9f8a58525b155aaacf0bdb0b0bceda7b3c (diff)
downloadpkgsrc-8b57b8054f9606eef95b1014a227433754a3fb13.tar.gz
Pullup ticket 3340 - requested by tron
functionality fix Revisions pulled up: - pkgsrc/mail/dovecot2/Makefile 1.7 - pkgsrc/mail/dovecot2/distinfo 1.7 Files added: pkgsrc/mail/dovecot2/patches/patch-ad ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: tron Date: Wed Feb 2 22:19:25 UTC 2011 Modified Files: pkgsrc/mail/dovecot2: Makefile distinfo Added Files: pkgsrc/mail/dovecot2/patches: patch-ad Log Message: Add fix by Timo Sirainen from the Dovecot Mercury repository to fix a hang when trying to COPY to a non existent mailbox via IMAP. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/dovecot2/Makefile \ pkgsrc/mail/dovecot2/distinfo cvs rdiff -u -r0 -r1.3 pkgsrc/mail/dovecot2/patches/patch-ad
-rw-r--r--mail/dovecot2/Makefile3
-rw-r--r--mail/dovecot2/distinfo3
-rw-r--r--mail/dovecot2/patches/patch-ad18
3 files changed, 22 insertions, 2 deletions
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 128893944c2..d5d3d067cfd 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/12/03 21:21:10 ghen Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2011/02/05 10:12:03 spz Exp $
DISTNAME= dovecot-2.0.8
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.dovecot.org/releases/2.0/
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index f0fc5105205..2fae1a34722 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2010/12/03 21:21:10 ghen Exp $
+$NetBSD: distinfo,v 1.5.2.1 2011/02/05 10:12:04 spz Exp $
SHA1 (dovecot-2.0.8.tar.gz) = daf25ba788369055f349f37c172be33beced916c
RMD160 (dovecot-2.0.8.tar.gz) = 3a0a42a771b0bff8a04731e6ae4847faf340a1ea
@@ -6,6 +6,7 @@ Size (dovecot-2.0.8.tar.gz) = 3177602 bytes
SHA1 (patch-aa) = b7e2923ead1ad1eacd3b8b1a37111325794135d2
SHA1 (patch-ab) = 218948585c96492a832ea903f31a6f9ad9fc69f0
SHA1 (patch-ac) = dc5db4870b14bf2424f0c957f5cf7f1a289fefe6
+SHA1 (patch-ad) = c6f369392b2d71f70495e7e0171824594b2bbdbc
SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656
SHA1 (patch-af) = 691cb36fcd5d71e1dea1812da5ed3e93a9ca029a
SHA1 (patch-ah) = 13d7b1e84610c7a694e4b79888e8ebc3cee9ab79
diff --git a/mail/dovecot2/patches/patch-ad b/mail/dovecot2/patches/patch-ad
new file mode 100644
index 00000000000..ec3918bbdd3
--- /dev/null
+++ b/mail/dovecot2/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.3.2.2 2011/02/05 10:12:04 spz Exp $
+
+Fix a hang when trying to COPY to a non existent mailbox via IMAP.
+Patch taken from here:
+
+http://hg.dovecot.org/dovecot-2.0/rev/826981b2c5c4
+
+--- src/imap/cmd-copy.c.orig 2010-03-25 15:03:33.000000000 +0000
++++ src/imap/cmd-copy.c 2011-02-02 22:10:21.000000000 +0000
+@@ -126,7 +126,7 @@
+ case MAILBOX_NAME_NOINFERIORS:
+ client_fail_mailbox_name_status(cmd, mailbox,
+ "TRYCREATE", status);
+- return NULL;
++ return TRUE;
+ }
+
+ if (mailbox_equals(client->mailbox, dest_ns, storage_name))