[mutt] 01/02: upstream/833192-preserve-messageid-for-postponed-emails.patch: do not remove the message-id of postponed emails (Closes: 833192).
Antonio Radici
antonio at moszumanska.debian.org
Sun Sep 4 18:17:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
antonio pushed a commit to branch master
in repository mutt.
commit d117ef9f4db5f7ae96665fa1f13c87762d4d1af4
Author: Antonio Radici <antonio at debian.org>
Date: Sun Sep 4 19:06:15 2016 +0100
upstream/833192-preserve-messageid-for-postponed-emails.patch: do not remove the message-id of postponed emails (Closes: 833192).
---
debian/changelog | 4 +-
debian/patches/series | 1 +
...2-preserve-messageid-for-postponed-emails.patch | 54 ++++++++++++++++++++++
3 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 0211e17..626006e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,9 @@ mutt (1.7.0-2) UNRELEASED; urgency=medium
* debian/patches:
+ upstream/569038-interrupt-socket-read-write.patch: allow the interruption
of operations which can be long-running
- (Closes: 569038, 774746, 423931, 599136, 618425)
+ (Closes: 569038, 774746, 423931, 599136, 618425).
+ + upstream/833192-preserve-messageid-for-postponed-emails.patch: do not
+ remove the message-id of postponed emails (Closes: 833192).
-- Antonio Radici <antonio at debian.org> Mon, 29 Aug 2016 21:27:08 +0100
diff --git a/debian/patches/series b/debian/patches/series
index d74ac0c..577187a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@ upstream/835421-pop-digest-md5.patch
upstream/693993-manpage-corrections.patch
upstream/749483-conststrings.patch
upstream/569038-interrupt-socket-read-write.patch
+upstream/833192-preserve-messageid-for-postponed-emails.patch
diff --git a/debian/patches/upstream/833192-preserve-messageid-for-postponed-emails.patch b/debian/patches/upstream/833192-preserve-messageid-for-postponed-emails.patch
new file mode 100644
index 0000000..c975c30
--- /dev/null
+++ b/debian/patches/upstream/833192-preserve-messageid-for-postponed-emails.patch
@@ -0,0 +1,54 @@
+The purpose of this patch is to preserve the Message-Id for email that are
+initially composed and then postponed. This will allow threads not to be broken.
+
+This patch addresses bug report 833192, which was forwarded to the mutt devs in
+http://bugs.mutt.org/3081.
+
+The patch can be dropped when upstream mutt > 1.7.0 is imported, as this is
+already upstream:
+https://dev.mutt.org/trac/changeset/a9757cff92da3ac8ed8814b775afdcc465f51d50
+
+--- a/postpone.c
++++ b/postpone.c
+@@ -546,9 +546,17 @@
+ }
+
+
+-
++/* args:
++ * fp If not NULL, file containing the template
++ * ctx If fp is NULL, the context containing the header with the template
++ * newhdr The template is read into this HEADER
++ * hdr The message to recall/resend
++ * resend Set if resending (as opposed to recalling a postponed msg).
++ * Resent messages enable header weeding, and also
++ * discard any existing Message-ID and Mail-Followup-To.
++ */
+ int mutt_prepare_template (FILE *fp, CONTEXT *ctx, HEADER *newhdr, HEADER *hdr,
+- short weed)
++ short resend)
+ {
+ MESSAGE *msg = NULL;
+ char file[_POSIX_PATH_MAX];
+@@ -571,15 +579,16 @@
+
+ fseeko (fp, hdr->offset, 0);
+ newhdr->offset = hdr->offset;
+- newhdr->env = mutt_read_rfc822_header (fp, newhdr, 1, weed);
++ /* enable header weeding for resent messages */
++ newhdr->env = mutt_read_rfc822_header (fp, newhdr, 1, resend);
+ newhdr->content->length = hdr->content->length;
+ mutt_parse_part (fp, newhdr->content);
+
+- /* If message_id is set, then we are resending a message and don't want
+- * message_id or mail_followup_to. Otherwise, we are resuming a
+- * postponed message, and want to keep the mail_followup_to.
++ /* If resending a message, don't keep message_id or mail_followup_to.
++ * Otherwise, we are resuming a postponed message, and want to keep those
++ * headers if they exist.
+ */
+- if (newhdr->env->message_id != NULL)
++ if (resend)
+ {
+ FREE (&newhdr->env->message_id);
+ FREE (&newhdr->env->mail_followup_to);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git
More information about the pkg-mutt-commits
mailing list