[PATCH] build: Require gmime 2.6.5

diff --git a/14/6f816aa24381d5a0b9ca288e570b4797bc12de b/14/6f816aa24381d5a0b9ca288e570b4797bc12de
new file mode 100644 (file)
index 0000000..ad538a9
--- /dev/null
+++ b/14/6f816aa24381d5a0b9ca288e570b4797bc12de
@@ -0,0 +1,114 @@
+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 9ABBD431FAF\r
+       for <notmuch@notmuchmail.org>; Tue, 21 Feb 2012 11:35:55 -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 NCPC+BCcilou for <notmuch@notmuchmail.org>;\r
+       Tue, 21 Feb 2012 11:35:51 -0800 (PST)\r
+Received: from ks3536.kimsufi.com (schnouki.net [87.98.217.222])\r
+       by olra.theworths.org (Postfix) with ESMTP id 7D337431FAE\r
+       for <notmuch@notmuchmail.org>; Tue, 21 Feb 2012 11:35:51 -0800 (PST)\r
+Received: from odin.local (nancy.schnouki.net [78.238.0.45])\r
+       by ks3536.kimsufi.com (Postfix) with ESMTPSA id 57F3B6C000B;\r
+       Tue, 21 Feb 2012 20:35:49 +0100 (CET)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=schnouki.net;\r
+       s=key-schnouki; t=1329852949;\r
+       bh=KwgQdqXIduiAdKWIEvjEk7q9XpPeGSxpYsHdIOQkbt0=;\r
+       h=From:To:Subject:Date:Message-Id:In-Reply-To:References;\r
+       b=MRil8RV2A4iJ0Z00O5EqOW+FDWUo8cZytub0kQNsLf8Ztq15tdwLw8w96mciOxYI9\r
+       ugFvZ8ZEXUIMKLIuspqjdk1YCs0z7j5y3k0IgDpoz4E+BImxFPF8amA5dC8Aw4u8ZC\r
+       uqKO1fXD/iB4CkIfg2tBuo5gyRnZVEOIRuIrVD84=\r
+From: Thomas Jost <schnouki@schnouki.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] build: Require gmime 2.6.5\r
+Date: Tue, 21 Feb 2012 20:35:35 +0100\r
+Message-Id: <1329852935-3019-1-git-send-email-schnouki@schnouki.net>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <m2obssyvwi.fsf@guru.guru-group.fi>\r
+References: <m2obssyvwi.fsf@guru.guru-group.fi>\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 19:35:55 -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
+This bug has been fixed in gmime 2.6.5, which is now the minimal gmime-2.6\r
+version required for building notmuch (gmime-2.4 is still available). As a\r
+consequence the version check in test/crypto can be removed.\r
+\r
+[1] https://bugzilla.gnome.org/show_bug.cgi?id=668085\r
+---\r
+\r
+Hi Tomi, hi again list,\r
+\r
+I agree it's a better solution.\r
+\r
+Here is another patch that makes gmime >= 2.6.5 a requirement.\r
+Building against gmime-2.4 is of course still possible.\r
+\r
+Apparently gmime 2.6.5 is not available yet in Debian, nor in Fedora,\r
+so I think we should wait a little bit before pushing this.\r
+\r
+Best regards,\r
+Thomas\r
+\r
+ configure   |    4 +++-\r
+ test/crypto |    2 --\r
+ 2 files changed, 3 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/configure b/configure\r
+index 8b85b9d..279e650 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -273,9 +273,11 @@ if [ ${have_xapian} = "0" ]; then\r
+     errors=$((errors + 1))\r
+ fi\r
+ \r
++# If using GMime 2.6, we need to have a version >= 2.6.5 to avoid a\r
++# crypto bug.\r
+ printf "Checking for GMime development files... "\r
+ have_gmime=0\r
+-for gmimepc in gmime-2.6 gmime-2.4; do\r
++for gmimepc in 'gmime-2.6 >= 2.6.5' gmime-2.4; do\r
+     if pkg-config --exists $gmimepc; then\r
+       printf "Yes ($gmimepc).\n"\r
+       have_gmime=1\r
+diff --git a/test/crypto b/test/crypto\r
+index 1dbb60a..6723ef8 100755\r
+--- a/test/crypto\r
++++ b/test/crypto\r
+@@ -104,8 +104,6 @@ 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
+ # 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