[mutt] 01/01: restored 611410-no-implicit_autoview-for-text-html.patch which was incorrectly dropped (Closes: 823971)

[Antonio Radici]

This is an automated email from the git hooks/post-receive script.

antonio pushed a commit to branch master
in repository mutt.

commit e6cdf1a6c590a4230b44f8efcaaf722a2b26e277
Author: Antonio Radici <antonio at debian.org>
Date:   Sun Aug 28 19:40:16 2016 +0100

    restored 611410-no-implicit_autoview-for-text-html.patch which was incorrectly dropped (Closes: 823971)
---
 debian/changelog                                   |  5 +++-
 debian/patches/series                              |  1 +
 ...611410-no-implicit_autoview-for-text-html.patch | 34 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5f3c7d5..5947465 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,10 @@ mutt (1.7.0-1) UNRELEASED; urgency=medium
   * New upstream NeoMutt release, 2016-08-27.
     - neomutt-devel/restore-docfile-installation.patch removed (already
       upstream).
-  * Some patches were refreshed.
+  * debian/patches:
+    + some patches refreshed
+    + restored 611410-no-implicit_autoview-for-text-html.patch which was
+      incorrectly dropped (Closes: 823971)
 
  -- Antonio Radici <antonio at debian.org>  Sun, 28 Aug 2016 15:10:08 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index dd67680..5dc330e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ upstream/528233-readonly-open.patch
 upstream/228671-pipe-mime.patch
 upstream/383769-score-match.patch
 upstream/771125-CVE-2014-9116-jessie.patch
+upstream/611410-no-implicit_autoview-for-text-html.patch
diff --git a/debian/patches/upstream/611410-no-implicit_autoview-for-text-html.patch b/debian/patches/upstream/611410-no-implicit_autoview-for-text-html.patch
new file mode 100644
index 0000000..76d32ac
--- /dev/null
+++ b/debian/patches/upstream/611410-no-implicit_autoview-for-text-html.patch
@@ -0,0 +1,34 @@
+This patch blacklist text/html from the list of documents that will be
+shown automatically, the patch (the muttlib.c part) has been written by
+Loïc Minier <lool at dooz.org>, I've added the documentation bit.
+
+The patch has been forwarded upstream originally by Loïc on:
+http://bugs.mutt.org/3496.
+
+The original Debian bug for this problem is http://bugs.debian.org/611410
+
+--- a/init.h
++++ b/init.h
+@@ -1337,7 +1337,9 @@
+   ** ``\fCcopiousoutput\fP'' flag set for \fIevery\fP MIME attachment it doesn't have
+   ** an internal viewer defined for.  If such an entry is found, mutt will
+   ** use the viewer defined in that entry to convert the body part to text
+-  ** form.
++  ** form. MIME attachments with 'text' types, with the only exception
++  ** of text/html, are excluded: they will be shown as they are unless auto_view
++  ** is specified.
+   */
+   { "include",		DT_QUAD, R_NONE, OPT_INCLUDE, MUTT_ASKYES },
+   /*
+--- a/muttlib.c
++++ b/muttlib.c
+@@ -678,6 +678,9 @@
+   switch (m->type)
+   {
+     case TYPETEXT:
++      /* we don't want to display text/html */
++      if (!ascii_strcasecmp ("html", m->subtype))
++        return 1;
+       /* we can display any text, overridable by auto_view */
+       return 0;
+       break;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git