debian/patches/upstream/545316-header-color.patch: do not store the color in header...

diff --git a/debian/changelog b/debian/changelog
index 27825f4378e9839b593d38f80c0c31405d4f6b8b..f7f9c70b55e38c6c518c0f474abac4742404dc85 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ mutt (1.5.20-7) unstable; urgency=low
       with large ASCII escape sequences (Closes: 553321)
     + upstream/557395-muttrc-crypto.patch: small fix to the muttrc man 
       (Closes: 557395)
       with large ASCII escape sequences (Closes: 553321)
     + upstream/557395-muttrc-crypto.patch: small fix to the muttrc man 
       (Closes: 557395)

+    + debian/patches/upstream/545316-header-color.patch: do not store the color
+      in header cache (Closes: 545316)

     + debian-specific/Muttrc: set time_inc to be 250ms (Closes: 537746)
   * debian/control: 
     + bumping Standards-Version to 3.8.4, nothing to be done
     + debian-specific/Muttrc: set time_inc to be 250ms (Closes: 537746)
   * debian/control: 
     + bumping Standards-Version to 3.8.4, nothing to be done

diff --git a/debian/patches/series b/debian/patches/series
index 63d2298b8c80fa7689640e7a74371c7b8dd3296d..b9b67cbf7a7a25f0bc238577e00e33ca3ece1232 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -54,6 +54,7 @@ upstream/548494-swedish-intl.patch
 upstream/553321-ansi-escape-segfault.patch
 upstream/553238-german-intl.patch
 upstream/557395-muttrc-crypto.patch
 upstream/553321-ansi-escape-segfault.patch
 upstream/553238-german-intl.patch
 upstream/557395-muttrc-crypto.patch

+upstream/545316-header-color.patch

 
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch

diff --git a/debian/patches/upstream/545316-header-color.patch b/debian/patches/upstream/545316-header-color.patch
new file mode 100644 (file)
index 0000000..267baf8
--- /dev/null
+++ b/debian/patches/upstream/545316-header-color.patch
@@ -0,0 +1,13 @@
+Do not store the header color into hcache, see http://bugs.mutt.org/3376 and
+http://dev.mutt.org/trac/changeset/b7d2cb7c7ce1 for more info
+
+--- a/hcache.c
++++ b/hcache.c
+@@ -623,6 +623,7 @@
+   nh.limited = 0;
+   nh.num_hidden = 0;
+   nh.recipient = 0;
++  nh.pair = 0;
+   nh.attach_valid = 0;
+   nh.path = NULL;
+   nh.tree = NULL;