[PATCH] build: Require gmime >= 2.6.7

diff --git a/75/58fc80c10f16b535cf82a479245561858d5d6f b/75/58fc80c10f16b535cf82a479245561858d5d6f
new file mode 100644 (file)
index 0000000..1570567
--- /dev/null
+++ b/75/58fc80c10f16b535cf82a479245561858d5d6f
@@ -0,0 +1,118 @@
+Return-Path: <bremner@tethera.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 A87B1431FAF\r
+       for <notmuch@notmuchmail.org>; Sun, 11 Mar 2012 18:30:25 -0700 (PDT)\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 y8NYMOASnA8L for <notmuch@notmuchmail.org>;\r
+       Sun, 11 Mar 2012 18:30:24 -0700 (PDT)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 6859B431FAE\r
+       for <notmuch@notmuchmail.org>; Sun, 11 Mar 2012 18:30:24 -0700 (PDT)\r
+Received: from fctnnbsc30w-142166230117.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([142.166.230.117] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32)\r
+       (Exim 4.72) (envelope-from <bremner@tethera.net>)\r
+       id 1S6u5d-0000qA-3G; Sun, 11 Mar 2012 22:30:23 -0300\r
+Received: from bremner by zancas.localnet with local (Exim 4.77)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1S6u5X-00008S-Ov; Sun, 11 Mar 2012 22:30:15 -0300\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] build: Require gmime >= 2.6.7\r
+Date: Sun, 11 Mar 2012 22:29:46 -0300\r
+Message-Id: <1331515786-485-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1329852935-3019-1-git-send-email-schnouki@schnouki.net>\r
+References: <1329852935-3019-1-git-send-email-schnouki@schnouki.net>\r
+X-Spam_bar: -\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, 12 Mar 2012 01:30:25 -0000\r
+\r
+From: Thomas Jost <schnouki@schnouki.net>\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
+[Added by db]\r
+\r
+Although less unambigously a bug, Gmime 2.6 prior to 2.6.7 also was\r
+more strict about parsing, and rejected messages with initial "From "\r
+headers.  This restriction is relaxed in [2].  For reasons explained in [3],\r
+we want to keep this more relaxed parsing for now.\r
+\r
+[1] https://bugzilla.gnome.org/show_bug.cgi?id=668085\r
+\r
+[2] http://git.gnome.org/browse/gmime/commit/?id=d311f576baf750476e06e9a1367a2dc1793ea7eb\r
+\r
+[3] id:"1331385931-1610-1-git-send-email-david@tethera.net"\r
+---\r
+\r
+As an alternative to applying [3], I could apply this modified version of\r
+Thomas's patch. \r
+\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 dedb7d8..ee0ae73 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. We need 2.6.7 for permissive "From " header handling.\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.7' 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