Re: fix for failing tests with gmime 2.6.19

diff --git a/9c/ba3be06dd8e0a939ce86b0b33689ebcdb8023b b/9c/ba3be06dd8e0a939ce86b0b33689ebcdb8023b
new file mode 100644 (file)
index 0000000..38a5556
--- /dev/null
+++ b/9c/ba3be06dd8e0a939ce86b0b33689ebcdb8023b
@@ -0,0 +1,101 @@
+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 1702D431FD5\r
+       for <notmuch@notmuchmail.org>; Mon, 18 Nov 2013 09:55:10 -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 dyd+18EBFJLK for <notmuch@notmuchmail.org>;\r
+       Mon, 18 Nov 2013 09:55:02 -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 A61C3431FC7\r
+       for <notmuch@notmuchmail.org>; Mon, 18 Nov 2013 09:55:02 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 23D85100030;\r
+       Mon, 18 Nov 2013 19:54:53 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: fix for failing tests with gmime 2.6.19\r
+In-Reply-To: <1384100482-15453-1-git-send-email-david@tethera.net>\r
+References: <1384100482-15453-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.16+175~g19e97d6 (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, 18 Nov 2013 19:54:52 +0200\r
+Message-ID: <m2txf9ioib.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, 18 Nov 2013 17:55:10 -0000\r
+\r
+On Sun, Nov 10 2013, David Bremner <david@tethera.net> wrote:\r
+\r
+> Although Jeffrey Stedfast fixed gmime bug 711305 amazingly quickly, it\r
+> looks like many people still have to live with a buggy version of\r
+> gmime for a while yet. Here is an opt-in fix that stops the test suite\r
+> from failing; this is a simple fix for e.g. the debian build process.\r
+\r
+After looking throught all the comments and thinking about the options\r
+I see the following 2 options\r
+\r
+1) Keep things as those currently are. Anyone who runs tests when \r
+   gmime 2.6.19 is in use will see some tests fail (and some may not have\r
+   a clue what's going on). We could mention this first thing in the NEWS\r
+   so that the "professional" users who run test *and* reads NEWS will\r
+   get the clue. \r
+\r
+2) Push the current patches to release branch *only* (maybe the test\r
+   could be changed to if [ pkg-config --exact-version=2.6.19 gmime-2.6 ] (*)\r
+   instead of checking the WORKAROUNDS flag so that users would not have\r
+   to bother (and some may not have a clue what's going on)). During merge\r
+   to master (as it has been done in the past) these changes would probably\r
+   be dropped.\r
+\r
+2b) Merge to master, release 0.17, follow gmime deployments, revert\r
+    patches.\r
+\r
+\r
+IMHO for temporary problems there could be temporary cruft (which would\r
+not be cruft if the problem wasn't temporary). The test system must\r
+be as strict as it can be to ensure best failure coverage.\r
+\r
+Tomi\r
+\r
+\r
+(*) The fastest (& most cruftiest) implementation:\r
+\r
+notmuch_reply_sanitize ()\r
+{\r
+   if pkg-config --exact-version=2.6.19 gmime-2.6 >/dev/null\r
+   then\r
+        notmuch_reply_sanitize () {\r
+          # work around GMIME bug #711305\r
+           sed -e 's/^References:  /References: /'\r
+        }\r
+   else     \r
+        notmuch_reply_sanitize () {\r
+           cat\r
+        }\r
+   fi\r
+   notmuch_reply_sanitize # call just rewritten version of this function\r
+}\r