From 81f7bd4085e25116cceb3a4dfb38c7c81bdf999b Mon Sep 17 00:00:00 2001 From: Antonio Radici Date: Thu, 5 May 2011 15:02:01 +0000 Subject: [PATCH] =?utf8?q?611410-no-implicit=5Fautoview-for-text-html.patc?= =?utf8?q?h:=20blacklist=20text/html=20from=20implicit=5Fautoview,=20patch?= =?utf8?q?=20by=20Lo=C3=AFc=20Minier=20(Closes:=20611410)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- debian/changelog | 4 ++- debian/patches/series | 1 + ...0-no-implicit_autoview-for-text-html.patch | 34 +++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 debian/patches/upstream/611410-no-implicit_autoview-for-text-html.patch diff --git a/debian/changelog b/debian/changelog index 8642a54..dd49a1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,13 +27,15 @@ mutt (1.5.21-5) unstable; urgency=low (Closes: 584138) + 619216-gnutls-CN-validation.patch: fix the validation of the commonname in the gnutls code (Closes: 619216) + + 611410-no-implicit_autoview-for-text-html.patch: blacklist + text/html from implicit_autoview, patch by Loïc Minier (Closes: 611410) * debian/patches/compressed-folders: remove partially uncompressed folder if the open fails (Closes: 578098) * debian/extra/samples/sidebar.muttrc: documented the options that the sidebar-{sorted,dotted} patches are introducing; documentation submitted by Julien Valroff (Closes: 603186) - -- Antonio Radici Fri, 29 Apr 2011 17:24:49 +0100 + -- Antonio Radici Thu, 05 May 2011 15:00:56 +0000 mutt (1.5.21-4) unstable; urgency=low diff --git a/debian/patches/series b/debian/patches/series index 08a2104..49dac3d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -51,6 +51,7 @@ upstream/624058-gnutls-deprecated-set-priority.patch upstream/624085-gnutls-deprecated-verify-peers.patch upstream/584138-mx_update_context-segfault.patch upstream/619216-gnutls-CN-validation.patch +upstream/611410-no-implicit_autoview-for-text-html.patch upstream/path_max mutt.org 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..61f5ae7 --- /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 , 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 +@@ -1211,7 +1211,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, M_ASKYES }, + /* +--- a/muttlib.c ++++ b/muttlib.c +@@ -658,6 +658,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; -- 2.43.0