--- /dev/null
+Return-Path: <jani@nikula.org>\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 A47F6431FD4\r
+ for <notmuch@notmuchmail.org>; Mon, 11 Nov 2013 08:08:11 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.699\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.699 tagged_above=-999 required=5\r
+ tests=[HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 PQC+VUCHHRJK for <notmuch@notmuchmail.org>;\r
+ Mon, 11 Nov 2013 08:08:02 -0800 (PST)\r
+Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com\r
+ [209.85.128.175]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 75945431FD2\r
+ for <notmuch@notmuchmail.org>; Mon, 11 Nov 2013 08:08:02 -0800 (PST)\r
+Received: by mail-ve0-f175.google.com with SMTP id jw12so2778149veb.34\r
+ for <notmuch@notmuchmail.org>; Mon, 11 Nov 2013 08:08:01 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:mime-version:in-reply-to:references:date\r
+ :message-id:subject:from:to:cc:content-type;\r
+ bh=+X9VNmBbbKr4ewAD6phXl5773i1d3SZdR4IoNVgSMXY=;\r
+ b=mbcnn7OABkCyXq3raJpSmBoJXMddR9rbsSRdn4vxXaGErTMEPgc4nYkOoq9GVfqcpT\r
+ ZAtWboL5Iq9r8GDrvKKjzAQXjxMOivk2OjcpK1mAnPi93a7AgvxN2xBYKe4Y8LWAWOka\r
+ 6dGHuOu58jb1ikrOJUEEpcrlKDUSoxd2s7m+jiM44HCGReD7u06ouky/qC4wRYi70bMg\r
+ YsmnQFmG6HYFP+z2cUrrBc+d+rOGBhsBmK3EM4o7VXaiOdWI7QODmxrPgBU0BW2iHZkh\r
+ ePIFQUzeyX5gjnSbkxaVt6Tau7FW/Vy9fK4RDQGupCaDfrQy1Q3dp1kCaakOfBS3d8G0\r
+ W9fg==\r
+X-Gm-Message-State:\r
+ ALoCoQnAlyVi0b6C+HAFOVY6ELH4AWooS7tr3tetFKZxZQQcGx4V/BXQGzW+8+oNbv9oLcVgu2Ul\r
+MIME-Version: 1.0\r
+X-Received: by 10.58.67.168 with SMTP id o8mr4627136vet.22.1384185674376; Mon,\r
+ 11 Nov 2013 08:01:14 -0800 (PST)\r
+Received: by 10.58.96.20 with HTTP; Mon, 11 Nov 2013 08:01:14 -0800 (PST)\r
+Received: by 10.58.96.20 with HTTP; Mon, 11 Nov 2013 08:01:14 -0800 (PST)\r
+In-Reply-To: <m2txfjyoft.fsf@guru.guru-group.fi>\r
+References: <1384100482-15453-1-git-send-email-david@tethera.net>\r
+ <52805350.70004@fifthhorseman.net> <87iovzywua.fsf@zancas.localnet>\r
+ <m2txfjyoft.fsf@guru.guru-group.fi>\r
+Date: Mon, 11 Nov 2013 18:01:14 +0200\r
+Message-ID:\r
+ <CAB+hUn8muZLYu5YPYtAgq-i37cU+K-2-T4DGqsTjkKBSULELwQ@mail.gmail.com>\r
+Subject: Re: fix for failing tests with gmime 2.6.19\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>\r
+Content-Type: multipart/alternative; boundary=047d7b33d0f46cc3ad04eae8d729\r
+Cc: Notmuch Mail <notmuch@notmuchmail.org>,\r
+ Daniel Kahn Gillmor <dkg@fifthhorseman.net>\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 16:08:11 -0000\r
+\r
+--047d7b33d0f46cc3ad04eae8d729\r
+Content-Type: text/plain; charset=UTF-8\r
+\r
+Gmime doesn't do anything standards incompliant, so I'd prefer patching the\r
+test suite. Which is also why I'd like to work around this in notmuch.\r
+On Nov 11, 2013 4:59 PM, "Tomi Ollila" <tomi.ollila@iki.fi> wrote:\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),\r
+> 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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
+>\r
+\r
+--047d7b33d0f46cc3ad04eae8d729\r
+Content-Type: text/html; charset=UTF-8\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+<p dir=3D"ltr">Gmime doesn't do anything standards incompliant, so I=\r
+9;d prefer patching the test suite. Which is also why I'd like to work =\r
+around this in notmuch.</p>\r
+<div class=3D"gmail_quote">On Nov 11, 2013 4:59 PM, "Tomi Ollila"=\r
+ <<a href=3D"mailto:tomi.ollila@iki.fi">tomi.ollila@iki.fi</a>> wrote=\r
+:<br type=3D"attribution"><blockquote class=3D"gmail_quote" style=3D"margin=\r
+:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">\r
+On Mon, Nov 11 2013, David Bremner <<a href=3D"mailto:david@tethera.net"=\r
+>david@tethera.net</a>> wrote:<br>\r
+<br>\r
+> Daniel Kahn Gillmor <<a href=3D"mailto:dkg@fifthhorseman.net">dkg@f=\r
+ifthhorseman.net</a>> writes:<br>\r
+><br>\r
+>><br>\r
+>> Please don't introduce this cruft into the notmuch codebase. =\r
+=C2=A0It should<br>\r
+>> be fixed in gmime, not worked-around notmuch.<br>\r
+>><br>\r
+>> I've just uploaded gmime 2.6.19-2 to unstable to address this =\r
+issue.<br>\r
+>><br>\r
+><br>\r
+> Hi Daniel;<br>\r
+><br>\r
+> Thanks a lot for that.<br>\r
+><br>\r
+> What I (still) wonder about is all the people not running Debian, in t=\r
+he<br>\r
+> interval between the release of notmuch 0.17 and the next upstream<br>\r
+> release of gmime (and propagation to various distros). =C2=A0Even on D=\r
+ebian,<br>\r
+> building on testing and backports complicates things a bit.<br>\r
+<br>\r
+Something like this could also be used...<br>\r
+<br>\r
+diff --git a/notmuch-reply.c b/notmuch-reply.c<br>\r
+index 9d6f843..2ab0f6e 100644<br>\r
+--- a/notmuch-reply.c<br>\r
++++ b/notmuch-reply.c<br>\r
+@@ -26,6 +26,7 @@<br>\r
+=C2=A0static void<br>\r
+=C2=A0show_reply_headers (GMimeMessage *message)<br>\r
+=C2=A0{<br>\r
++#if ! GMIME_CHECK_VERSION(2,6,19)<br>\r
+=C2=A0 =C2=A0 =C2=A0GMimeStream *stream_stdout =3D NULL;<br>\r
+<br>\r
+=C2=A0 =C2=A0 =C2=A0stream_stdout =3D g_mime_stream_file_new (stdout);<br>\r
+@@ -35,6 +36,17 @@ show_reply_headers (GMimeMessage *message)<br>\r
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 g_mime_object_write_to_stream (GMIME_OBJECT(mes=\r
+sage), stream_stdout);<br>\r
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 g_object_unref(stream_stdout);<br>\r
+=C2=A0 =C2=A0 =C2=A0}<br>\r
++#else<br>\r
++ =C2=A0 =C2=A0char * msg =3D g_mime_object_to_string (GMIME_OBJECT(message=\r
+));<br>\r
++ =C2=A0 =C2=A0char * rp =3D strstr (msg, "References: =C2=A0");<=\r
+br>\r
++ =C2=A0 =C2=A0if (rp) {<br>\r
++ =C2=A0 =C2=A0 =C2=A0 fwrite (msg, 1, rp - msg + 12, stdout); // Up to =\r
+9;References: '<br>\r
++ =C2=A0 =C2=A0 =C2=A0 fputs (rp + 13, stdout);<br>\r
++ =C2=A0 =C2=A0}<br>\r
++ =C2=A0 =C2=A0else {<br>\r
++ =C2=A0 =C2=A0 =C2=A0 fputs (msg, stdout);<br>\r
++ =C2=A0 =C2=A0}<br>\r
++#endif<br>\r
+=C2=A0}<br>\r
+<br>\r
+=C2=A0static void<br>\r
+<br>\r
+<br>\r
+><br>\r
+> d<br>\r
+<br>\r
+Tomi<br>\r
+_______________________________________________<br>\r
+notmuch mailing list<br>\r
+<a href=3D"mailto:notmuch@notmuchmail.org">notmuch@notmuchmail.org</a><br>\r
+<a href=3D"http://notmuchmail.org/mailman/listinfo/notmuch" target=3D"_blan=\r
+k">http://notmuchmail.org/mailman/listinfo/notmuch</a><br>\r
+</blockquote></div>\r
+\r
+--047d7b33d0f46cc3ad04eae8d729--\r
projects / notmuch-archives.git / commitdiff