fixes two problems with subdirs on dovecot (Closes: 530671, 530887)

diff --git a/debian/changelog b/debian/changelog
index 2c743777e6b9b1e5987ff2d741466082061fad11..d9344c2f0c8313a85a1a9e4d6d8cee3cd83bde13 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ mutt (1.5.19-4) unstable; urgency=low
     + doc update: clarify what attach_charset does (Closes: 502628)
   * patches/upstream/504530-stunnel-account_hook-doc.patch 
     + doc update: mention account-hook in the docs for $tunnel (Closes: 504530)
+  * patches/upstream/530887-dovecot-imap.patch
+    + fixes two problems with subdirs on dovecot (Closes: 530671, 530887)
 
  -- Antonio Radici <antonio@dyne.org>  Tue, 26 May 2009 23:42:51 +0100
 

diff --git a/debian/patches/misc/hyphen-as-minus.patch b/debian/patches/misc/hyphen-as-minus.patch
index 6dba3c47ae2365eb2e90d9c9f15261f35efbd559..e8310ad5d691fc11ee97a251b8ca1b05398603c5 100644 (file)
--- a/debian/patches/misc/hyphen-as-minus.patch
+++ b/debian/patches/misc/hyphen-as-minus.patch
@@ -141,7 +141,7 @@ signs and lintian will not complain
  .B mutt_dotlock
 --- a/init.h
 +++ b/init.h
-@@ -2867,7 +2867,7 @@
+@@ -2874,7 +2874,7 @@
    ** smtp[s]://[user[:pass]@]host[:port]/
    ** .te
    ** .pp

diff --git a/debian/patches/series b/debian/patches/series
index 13d5da80898e4d57e27b909db4ebf028869adb6b..c5d211222202f930a210ff691f67a769f8786b23 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,6 +37,7 @@ upstream/524420-segfault-reconnect-sasl.patch
 upstream/350957-postponed-to-bcc.patch
 upstream/502628-attach_charset-doc.patch
 upstream/504530-stunnel-account_hook-doc.patch
+upstream/530887-dovecot-imap.patch
 
 misc/hyphen-as-minus.patch
 misc/manpage-typos.patch

diff --git a/debian/patches/upstream/530887-dovecot-imap.patch b/debian/patches/upstream/530887-dovecot-imap.patch
new file mode 100644 (file)
index 0000000..3b67a18
--- /dev/null
+++ b/debian/patches/upstream/530887-dovecot-imap.patch
@@ -0,0 +1,28 @@
+--- a/imap/util.c
++++ b/imap/util.c
+@@ -393,19 +393,19 @@
+     size_t plen)
+ {
+   int i = 0;
+-  char delim;
++  char delim = '\0';
+   
+   if (idata)
+     delim = idata->delim;
+-  else if (ImapDelimChars && ImapDelimChars[0])
+-    delim = ImapDelimChars[0];
+-  else
+-    delim = '/';
+ 
+   while (mailbox && *mailbox && i < plen - 1)
+   {
+-    if (strchr(ImapDelimChars, *mailbox) || *mailbox == delim)
++    if ((ImapDelimChars && strchr(ImapDelimChars, *mailbox)) 
++        || *mailbox == delim)
+     {
++      /* use connection delimiter if known. Otherwise use user delimiter */
++      if (!idata)
++        delim = *mailbox; 
+       while (*mailbox &&
+            (strchr(ImapDelimChars, *mailbox) || *mailbox == delim))
+         mailbox++;