[PATCH] Update crypto test for gmime 2.6.5

diff --git a/9f/70e8b4ea4dad07bf11b840febe7c288ca9e439 b/9f/70e8b4ea4dad07bf11b840febe7c288ca9e439
new file mode 100644 (file)
index 0000000..0e57503
--- /dev/null
+++ b/9f/70e8b4ea4dad07bf11b840febe7c288ca9e439
@@ -0,0 +1,99 @@
+Return-Path: <schnouki@schnouki.net>\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 5927E431FAF\r
+       for <notmuch@notmuchmail.org>; Tue, 21 Feb 2012 08:06:05 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.1\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1]\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 O0PtBpCV4Z3t for <notmuch@notmuchmail.org>;\r
+       Tue, 21 Feb 2012 08:06:01 -0800 (PST)\r
+Received: from ks3536.kimsufi.com (schnouki.net [87.98.217.222])\r
+       by olra.theworths.org (Postfix) with ESMTP id 9BA72431FAE\r
+       for <notmuch@notmuchmail.org>; Tue, 21 Feb 2012 08:06:01 -0800 (PST)\r
+Received: from thor.loria.fr (thor.loria.fr [152.81.12.250])\r
+       by ks3536.kimsufi.com (Postfix) with ESMTPSA id 72BE86C000B;\r
+       Tue, 21 Feb 2012 17:06:00 +0100 (CET)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=schnouki.net;\r
+       s=key-schnouki; t=1329840360;\r
+       bh=O7xv1Km8W2iFZSi89ltLvc41ParGDtqbLNgiFNAIZdw=;\r
+       h=From:To:Subject:Date:Message-Id;\r
+       b=iphdEbQmK9i67pTtrXqo1SBgzJklPcKcUWJUJhF2PcGH9AbZUuA7s3iPCS/OV3BL0\r
+       Cp2sci6SnL5pvXtUXpO0kE/sFrRG+XhikpCvNDLwg4gZGS7Z+PSsXFWNRp+10zbxPN\r
+       61U5ea0bp/fhYfT5t5tRXs9xMOkm1DViN2ooJ+lI=\r
+From: Thomas Jost <schnouki@schnouki.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] Update crypto test for gmime 2.6.5\r
+Date: Tue, 21 Feb 2012 17:05:43 +0100\r
+Message-Id: <1329840343-10026-1-git-send-email-schnouki@schnouki.net>\r
+X-Mailer: git-send-email 1.7.9.1\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: Tue, 21 Feb 2012 16:06:05 -0000\r
+\r
+gmime 2.6 had a bug [1] which made it impossible to tell why a signature\r
+verification failed when the signer key was unavailable (empty "sigstatus" field\r
+in the JSON output). Since 00b5623d the corresponding test is marked as broken\r
+when using gmime 2.6 (2.4 is fine).\r
+\r
+The bug has been fixed in gmime 2.6.5. Consequently, the crypto test needs to be\r
+adjusted so that it is only marked broken for gmime 2.6.4 and below.\r
+\r
+[1] https://bugzilla.gnome.org/show_bug.cgi?id=668085\r
+---\r
+\r
+Hello world,\r
+\r
+Here's a little update about gmime 2.6. The latest version (2.6.5)\r
+fixes the little regression introduced in 2.6.\r
+\r
+In all honesty, I'm not sure adding such a workaround in the test\r
+suite is worth the effort. If gmime 2.6.5 is quickly packaged by major\r
+distros (it's already in Arch), we could as well make notmuch depend\r
+on gmime >= 2.6.5. (One line to change in configure). Or we could just\r
+stop trying to mark the test as broken and let it fail for buggy\r
+versions of gmime.\r
+\r
+What do you think?\r
+\r
+Best regards,\r
+Thomas\r
+\r
+ test/crypto |    4 ++--\r
+ 1 files changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/test/crypto b/test/crypto\r
+index 1dbb60a..cbab216 100755\r
+--- a/test/crypto\r
++++ b/test/crypto\r
+@@ -104,8 +104,8 @@ test_expect_equal \\r
+     "$expected"\r
+ \r
+ test_begin_subtest "signature verification with signer key unavailable"\r
+-# this is broken with current versions of gmime-2.6\r
+-(ldd $(which notmuch) | grep -Fq gmime-2.6) && test_subtest_known_broken\r
++# this is broken with gmime-2.6.x for x <= 4\r
++ldd $(which notmuch) | grep -Fq gmime-2.6 && pkg-config --max-version=2.6.4 gmime-2.6 && test_subtest_known_broken\r
+ # move the gnupghome temporarily out of the way\r
+ mv "${GNUPGHOME}"{,.bak}\r
+ output=$(notmuch show --format=json --verify subject:"test signed message 001" \\r
+-- \r
+1.7.9.1\r
+\r