upstream/537061-dont-recode-saved-attachments.patch: as the patch says, see the patch...

diff --git a/debian/changelog b/debian/changelog
index 881d87e396efe2ce613c21210588bb84f6503355..be95df8cbbeefc08cec18c237f3bd6e6a33c1cec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ mutt (1.5.21-2) UNRELEASED; urgency=low
       messages (Closes: 578087, 578583)
     + upstream/603288-split-fetches.patch: split FETCH's into smaller chunks,
       workaround for Exchange 2010 (Closes: 603288)
       messages (Closes: 578087, 578583)
     + upstream/603288-split-fetches.patch: split FETCH's into smaller chunks,
       workaround for Exchange 2010 (Closes: 603288)

+    + upstream/537061-dont-recode-saved-attachments.patch: as the patch says,
+      see the patch for more info (Closes: 537061)

     + debian-specific/566076-build_doc_adjustments.patch: use w3m to build the
       manual (Closes: 566076)
   * debian/extra/lib/mailto-mutt: replaced by a wrapper, added the reason to
     + debian-specific/566076-build_doc_adjustments.patch: use w3m to build the
       manual (Closes: 566076)
   * debian/extra/lib/mailto-mutt: replaced by a wrapper, added the reason to

diff --git a/debian/patches/series b/debian/patches/series
index 2b59bf4cf3ad699f5ea1b528eac845353611ad23..bd611a53ef7521bfc5511054366217c69af529a9 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,6 +43,7 @@ upstream/383769-score-match.patch
 upstream/578087-header-strchr.patch
 
 upstream/603288-split-fetches.patch
 upstream/578087-header-strchr.patch
 
 upstream/603288-split-fetches.patch

+upstream/537061-dont-recode-saved-attachments.patch

 upstream/path_max
 
 mutt.org
 upstream/path_max
 
 mutt.org

diff --git a/debian/patches/upstream/537061-dont-recode-saved-attachments.patch b/debian/patches/upstream/537061-dont-recode-saved-attachments.patch
new file mode 100644 (file)
index 0000000..4e5396b
--- /dev/null
+++ b/debian/patches/upstream/537061-dont-recode-saved-attachments.patch
@@ -0,0 +1,14 @@
+As a side effect of the fix for http://bugs.mutt.org/3234, mutt is recoding all
+save attachments, this is causing problems; a proper fix for this issue is being
+tracked on http://bugs.mutt.org/3293
+
+--- a/attach.c
++++ b/attach.c
+@@ -807,7 +807,6 @@
+       STATE s;
+ 
+       memset (&s, 0, sizeof (s));
+-      s.flags |= M_CHARCONV;
+ 
+       if ((s.fpout = mutt_save_attachment_open (path, flags)) == NULL)
+       {