Re: fix for failing tests with gmime 2.6.19

diff --git a/e5/2e1f4f3e51fdab37c0de6c6229e5e6a15ccdf8 b/e5/2e1f4f3e51fdab37c0de6c6229e5e6a15ccdf8
new file mode 100644 (file)
index 0000000..f405d62
--- /dev/null
+++ b/e5/2e1f4f3e51fdab37c0de6c6229e5e6a15ccdf8
@@ -0,0 +1,111 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id E21BD431E84\r
+       for <notmuch@notmuchmail.org>; Mon, 11 Nov 2013 06:59:29 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id t8enFY4Es3L8 for <notmuch@notmuchmail.org>;\r
+       Mon, 11 Nov 2013 06:59:25 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id BC014431FD2\r
+       for <notmuch@notmuchmail.org>; Mon, 11 Nov 2013 06:59:25 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 499F7100033;\r
+       Mon, 11 Nov 2013 16:59:19 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>,\r
+       Daniel Kahn Gillmor <dkg@fifthhorseman.net>,\r
+       notmuch <notmuch@notmuchmail.org>\r
+Subject: Re: fix for failing tests with gmime 2.6.19\r
+In-Reply-To: <87iovzywua.fsf@zancas.localnet>\r
+References: <1384100482-15453-1-git-send-email-david@tethera.net>\r
+       <52805350.70004@fifthhorseman.net> <87iovzywua.fsf@zancas.localnet>\r
+User-Agent: Notmuch/0.16+119~g219c55f (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Mon, 11 Nov 2013 16:59:18 +0200\r
+Message-ID: <m2txfjyoft.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 11 Nov 2013 14:59:30 -0000\r
+\r
+On Mon, Nov 11 2013, David Bremner <david@tethera.net> wrote:\r
+\r
+> Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:\r
+>\r
+>>\r
+>> Please don't introduce this cruft into the notmuch codebase.  It should\r
+>> be fixed in gmime, not worked-around notmuch.\r
+>>\r
+>> I've just uploaded gmime 2.6.19-2 to unstable to address this issue.\r
+>>\r
+>\r
+> Hi Daniel;\r
+>\r
+> Thanks a lot for that. \r
+>\r
+> What I (still) wonder about is all the people not running Debian, in the\r
+> interval between the release of notmuch 0.17 and the next upstream\r
+> release of gmime (and propagation to various distros).  Even on Debian,\r
+> building on testing and backports complicates things a bit.\r
+\r
+Something like this could also be used...\r
+\r
+diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+index 9d6f843..2ab0f6e 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -26,6 +26,7 @@\r
+ static void\r
+ show_reply_headers (GMimeMessage *message)\r
+ {\r
++#if ! GMIME_CHECK_VERSION(2,6,19)\r
+     GMimeStream *stream_stdout = NULL;\r
+ \r
+     stream_stdout = g_mime_stream_file_new (stdout);\r
+@@ -35,6 +36,17 @@ show_reply_headers (GMimeMessage *message)\r
+       g_mime_object_write_to_stream (GMIME_OBJECT(message), stream_stdout);\r
+       g_object_unref(stream_stdout);\r
+     }\r
++#else\r
++    char * msg = g_mime_object_to_string (GMIME_OBJECT(message));\r
++    char * rp = strstr (msg, "References:  ");\r
++    if (rp) {\r
++      fwrite (msg, 1, rp - msg + 12, stdout); // Up to 'References: '\r
++      fputs (rp + 13, stdout);\r
++    }\r
++    else {\r
++      fputs (msg, stdout);\r
++    }\r
++#endif\r
+ }\r
+ \r
+ static void\r
+\r
+\r
+>\r
+> d\r
+\r
+Tomi\r