added a patch to correctly parse the IMAP url (Closes: 534543)

diff --git a/debian/changelog b/debian/changelog
index d29f619c2c40117c02427b0b4001bd5eed2a4bbc..d43c0e7c7241f4692db0d12e082eec9d2eb805e1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ mutt (1.5.20-2) unstable; urgency=low
       mboxes when opened (Closes: 533439)
     + upstream/531430-imapuser.patch: ask the user for the right information
       while logging in on IMAP servers (Closes: 531430)
+    + upstream/534543-imap-port.patch: correctly parse the port in an IMAP
+      url (Closes: 534543)
     + added the right copyright misc/smime_keys-manpage.patch
     + mutt-patched/sidebar: refreshed
     + mutt-patched/sidebar-{dotted,sorted} added (Closes: 523774)

diff --git a/debian/patches/series b/debian/patches/series
index 9eaf09655a2988c70c79018b13e2d5e23e3aca25..6dc892674e86a84ef0ecf210e0135616adc254e5 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,10 +32,10 @@ upstream/533209-mutt_perror.patch
 upstream/533459-unmailboxes.patch
 upstream/533439-mbox-time.patch
 upstream/531430-imapuser.patch
+upstream/534543-imap-port.patch
 
 # the following two patches are also in upstream hg repo
 # plese drop them if there is a new release
-534543-imap-port.patch
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 misc/smime_keys-manpage.patch

diff --git a/debian/patches/upstream/534543-imap-port.patch b/debian/patches/upstream/534543-imap-port.patch
new file mode 100644 (file)
index 0000000..3c1a76c
--- /dev/null
+++ b/debian/patches/upstream/534543-imap-port.patch
@@ -0,0 +1,21 @@
+a bug in 1.5.20 upstream prevented mutt from correctly parsing the port
+in an IMAP url (imap[s]://...:<port>), this was fixed by upstream bug
+3264 and backported to the Debian package in 534543
+
+Index: mutt/url.c
+===================================================================
+--- mutt.orig/url.c    2009-06-25 12:37:59.000000000 +0200
++++ mutt/url.c 2009-06-25 12:39:05.000000000 +0200
+@@ -143,9 +143,11 @@
+   
+   if ((p = strchr (t, ':')))
+   {
++    int t;
+     *p++ = '\0';
+-    if (mutt_atos (p, (short*) &ciss->port) < 0)
++    if (mutt_atoi (p, &t) < 0 || t < 0 || t > 0xffff)
+       return NULL;
++    ciss->port = (unsigned short)t;
+   }
+   else
+     ciss->port = 0;