Bug#725043: pu: package mutt/1.5.21-6.2+deb7u1

[Evgeni Golov <evgeni@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

I would like to update mutt in wheezy to fix a segfault (#626294) and
a data-loss (#721860) bug. Both patches have been in unstable since
13.09.2013 and noone complained so far.

The debdiff between -6.2 and -6.2+deb7u1 is attached.

Regards
Evgeni

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.10-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -u mutt-1.5.21/debian/changelog mutt-1.5.21/debian/changelog
--- mutt-1.5.21/debian/changelog
+++ mutt-1.5.21/debian/changelog
@@ -1,3 +1,17 @@
+mutt (1.5.21-6.2+deb7u1) stable; urgency=low
+
+  * Non-maintainer upload with maintainer approval.
+  * Update 584138-mx_update_context-segfault.patch
+    Stop segfaulting when listing folders with new mails over imap.
+    Thanks: Nikolaus Schulz <microschulz@web.de>
+    Closes: #626294
+  * Update features/imap_fast_trash
+    Don't send saved messages to trash
+    Thanks: Chow Loong Jin <hyperair@debian.org>
+    Closes: #721860
+
+ -- Evgeni Golov <evgeni@debian.org>  Mon, 30 Sep 2013 22:00:22 +0200
+
 mutt (1.5.21-6.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u mutt-1.5.21/debian/patches/upstream/584138-mx_update_context-segfault.patch mutt-1.5.21/debian/patches/upstream/584138-mx_update_context-segfault.patch
--- mutt-1.5.21/debian/patches/upstream/584138-mx_update_context-segfault.patch
+++ mutt-1.5.21/debian/patches/upstream/584138-mx_update_context-segfault.patch
@@ -26,7 +26,15 @@
          ctx->hdrs[idx] = imap_hcache_get (idata, h.data->uid);
          if (ctx->hdrs[idx])
          {
-@@ -282,13 +282,14 @@
+@@ -211,6 +211,7 @@
+           dprint (3, (debugfile, "bad cache entry at %d, giving up\n", h.sid - 1));
+           imap_free_header_data((void**) (void*) &h.data);
+           evalhc = 0;
++          idx--;
+         }
+       }
+       while (rc != IMAP_CMD_OK && mfhrc == -1);
+@@ -273,18 +274,20 @@
        {
          dprint (2, (debugfile, "msg_fetch_header: ignoring fetch response with no body\n"));
          mfhrc = -1;
@@ -44,0 +53,15 @@
+                     "unknown message number %d\n", h.sid));
+         mfhrc = -1;
++        idx--;
+         continue;
+       }
+       /* May receive FLAGS updates in a separate untagged response (#2935) */
+@@ -292,6 +295,7 @@
+       {
+ 	dprint (2, (debugfile, "imap_read_headers: message %d is not new\n",
+ 		    h.sid));
++        idx--;
+ 	continue;
+       }
+ 
+
diff -u mutt-1.5.21/debian/patches/features/imap_fast_trash mutt-1.5.21/debian/patches/features/imap_fast_trash
--- mutt-1.5.21/debian/patches/features/imap_fast_trash
+++ mutt-1.5.21/debian/patches/features/imap_fast_trash
@@ -14,7 +14,7 @@
 +	  if (hdrs[n]->purged)
 +	    break;
 +          if (hdrs[n]->deleted != HEADER_DATA(hdrs[n])->deleted)
-+            match = invert ^ hdrs[n]->deleted;
++            match = invert ^ (hdrs[n]->deleted && !hdrs[n]->appended);
 +	  break;
          case M_FLAG:
            if (hdrs[n]->flagged != HEADER_DATA(hdrs[n])->flagged)