1 Return-Path: <schnouki@schnouki.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 9ABBD431FAF
\r
6 for <notmuch@notmuchmail.org>; Tue, 21 Feb 2012 11:35:55 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1]
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id NCPC+BCcilou for <notmuch@notmuchmail.org>;
\r
17 Tue, 21 Feb 2012 11:35:51 -0800 (PST)
\r
18 Received: from ks3536.kimsufi.com (schnouki.net [87.98.217.222])
\r
19 by olra.theworths.org (Postfix) with ESMTP id 7D337431FAE
\r
20 for <notmuch@notmuchmail.org>; Tue, 21 Feb 2012 11:35:51 -0800 (PST)
\r
21 Received: from odin.local (nancy.schnouki.net [78.238.0.45])
\r
22 by ks3536.kimsufi.com (Postfix) with ESMTPSA id 57F3B6C000B;
\r
23 Tue, 21 Feb 2012 20:35:49 +0100 (CET)
\r
24 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=schnouki.net;
\r
25 s=key-schnouki; t=1329852949;
\r
26 bh=KwgQdqXIduiAdKWIEvjEk7q9XpPeGSxpYsHdIOQkbt0=;
\r
27 h=From:To:Subject:Date:Message-Id:In-Reply-To:References;
\r
28 b=MRil8RV2A4iJ0Z00O5EqOW+FDWUo8cZytub0kQNsLf8Ztq15tdwLw8w96mciOxYI9
\r
29 ugFvZ8ZEXUIMKLIuspqjdk1YCs0z7j5y3k0IgDpoz4E+BImxFPF8amA5dC8Aw4u8ZC
\r
30 uqKO1fXD/iB4CkIfg2tBuo5gyRnZVEOIRuIrVD84=
\r
31 From: Thomas Jost <schnouki@schnouki.net>
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH] build: Require gmime 2.6.5
\r
34 Date: Tue, 21 Feb 2012 20:35:35 +0100
\r
35 Message-Id: <1329852935-3019-1-git-send-email-schnouki@schnouki.net>
\r
36 X-Mailer: git-send-email 1.7.9.1
\r
37 In-Reply-To: <m2obssyvwi.fsf@guru.guru-group.fi>
\r
38 References: <m2obssyvwi.fsf@guru.guru-group.fi>
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.13
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Tue, 21 Feb 2012 19:35:55 -0000
\r
53 gmime-2.6 had a bug [1] which made it impossible to tell why a signature
\r
54 verification failed when the signer key was unavailable (empty "sigstatus" field
\r
55 in the JSON output). Since 00b5623d the corresponding test is marked as broken
\r
56 when using gmime-2.6 (2.4 is fine).
\r
58 This bug has been fixed in gmime 2.6.5, which is now the minimal gmime-2.6
\r
59 version required for building notmuch (gmime-2.4 is still available). As a
\r
60 consequence the version check in test/crypto can be removed.
\r
62 [1] https://bugzilla.gnome.org/show_bug.cgi?id=668085
\r
65 Hi Tomi, hi again list,
\r
67 I agree it's a better solution.
\r
69 Here is another patch that makes gmime >= 2.6.5 a requirement.
\r
70 Building against gmime-2.4 is of course still possible.
\r
72 Apparently gmime 2.6.5 is not available yet in Debian, nor in Fedora,
\r
73 so I think we should wait a little bit before pushing this.
\r
80 2 files changed, 3 insertions(+), 3 deletions(-)
\r
82 diff --git a/configure b/configure
\r
83 index 8b85b9d..279e650 100755
\r
86 @@ -273,9 +273,11 @@ if [ ${have_xapian} = "0" ]; then
\r
87 errors=$((errors + 1))
\r
90 +# If using GMime 2.6, we need to have a version >= 2.6.5 to avoid a
\r
92 printf "Checking for GMime development files... "
\r
94 -for gmimepc in gmime-2.6 gmime-2.4; do
\r
95 +for gmimepc in 'gmime-2.6 >= 2.6.5' gmime-2.4; do
\r
96 if pkg-config --exists $gmimepc; then
\r
97 printf "Yes ($gmimepc).\n"
\r
99 diff --git a/test/crypto b/test/crypto
\r
100 index 1dbb60a..6723ef8 100755
\r
103 @@ -104,8 +104,6 @@ test_expect_equal \
\r
106 test_begin_subtest "signature verification with signer key unavailable"
\r
107 -# this is broken with current versions of gmime-2.6
\r
108 -(ldd $(which notmuch) | grep -Fq gmime-2.6) && test_subtest_known_broken
\r
109 # move the gnupghome temporarily out of the way
\r
110 mv "${GNUPGHOME}"{,.bak}
\r
111 output=$(notmuch show --format=json --verify subject:"test signed message 001" \
\r