From: Thomas Jost Date: Tue, 21 Feb 2012 19:35:35 +0000 (+0100) Subject: [PATCH] build: Require gmime 2.6.5 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=253fa8aa6d53c97a97d2731ebc91adca574cfa6a;p=notmuch-archives.git [PATCH] build: Require gmime 2.6.5 --- diff --git a/14/6f816aa24381d5a0b9ca288e570b4797bc12de b/14/6f816aa24381d5a0b9ca288e570b4797bc12de new file mode 100644 index 000000000..ad538a983 --- /dev/null +++ b/14/6f816aa24381d5a0b9ca288e570b4797bc12de @@ -0,0 +1,114 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 9ABBD431FAF + for ; Tue, 21 Feb 2012 11:35:55 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.1 +X-Spam-Level: +X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id NCPC+BCcilou for ; + Tue, 21 Feb 2012 11:35:51 -0800 (PST) +Received: from ks3536.kimsufi.com (schnouki.net [87.98.217.222]) + by olra.theworths.org (Postfix) with ESMTP id 7D337431FAE + for ; Tue, 21 Feb 2012 11:35:51 -0800 (PST) +Received: from odin.local (nancy.schnouki.net [78.238.0.45]) + by ks3536.kimsufi.com (Postfix) with ESMTPSA id 57F3B6C000B; + Tue, 21 Feb 2012 20:35:49 +0100 (CET) +DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=schnouki.net; + s=key-schnouki; t=1329852949; + bh=KwgQdqXIduiAdKWIEvjEk7q9XpPeGSxpYsHdIOQkbt0=; + h=From:To:Subject:Date:Message-Id:In-Reply-To:References; + b=MRil8RV2A4iJ0Z00O5EqOW+FDWUo8cZytub0kQNsLf8Ztq15tdwLw8w96mciOxYI9 + ugFvZ8ZEXUIMKLIuspqjdk1YCs0z7j5y3k0IgDpoz4E+BImxFPF8amA5dC8Aw4u8ZC + uqKO1fXD/iB4CkIfg2tBuo5gyRnZVEOIRuIrVD84= +From: Thomas Jost +To: notmuch@notmuchmail.org +Subject: [PATCH] build: Require gmime 2.6.5 +Date: Tue, 21 Feb 2012 20:35:35 +0100 +Message-Id: <1329852935-3019-1-git-send-email-schnouki@schnouki.net> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: +References: +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 21 Feb 2012 19:35:55 -0000 + +gmime-2.6 had a bug [1] which made it impossible to tell why a signature +verification failed when the signer key was unavailable (empty "sigstatus" field +in the JSON output). Since 00b5623d the corresponding test is marked as broken +when using gmime-2.6 (2.4 is fine). + +This bug has been fixed in gmime 2.6.5, which is now the minimal gmime-2.6 +version required for building notmuch (gmime-2.4 is still available). As a +consequence the version check in test/crypto can be removed. + +[1] https://bugzilla.gnome.org/show_bug.cgi?id=668085 +--- + +Hi Tomi, hi again list, + +I agree it's a better solution. + +Here is another patch that makes gmime >= 2.6.5 a requirement. +Building against gmime-2.4 is of course still possible. + +Apparently gmime 2.6.5 is not available yet in Debian, nor in Fedora, +so I think we should wait a little bit before pushing this. + +Best regards, +Thomas + + configure | 4 +++- + test/crypto | 2 -- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure b/configure +index 8b85b9d..279e650 100755 +--- a/configure ++++ b/configure +@@ -273,9 +273,11 @@ if [ ${have_xapian} = "0" ]; then + errors=$((errors + 1)) + fi + ++# If using GMime 2.6, we need to have a version >= 2.6.5 to avoid a ++# crypto bug. + printf "Checking for GMime development files... " + have_gmime=0 +-for gmimepc in gmime-2.6 gmime-2.4; do ++for gmimepc in 'gmime-2.6 >= 2.6.5' gmime-2.4; do + if pkg-config --exists $gmimepc; then + printf "Yes ($gmimepc).\n" + have_gmime=1 +diff --git a/test/crypto b/test/crypto +index 1dbb60a..6723ef8 100755 +--- a/test/crypto ++++ b/test/crypto +@@ -104,8 +104,6 @@ test_expect_equal \ + "$expected" + + test_begin_subtest "signature verification with signer key unavailable" +-# this is broken with current versions of gmime-2.6 +-(ldd $(which notmuch) | grep -Fq gmime-2.6) && test_subtest_known_broken + # move the gnupghome temporarily out of the way + mv "${GNUPGHOME}"{,.bak} + output=$(notmuch show --format=json --verify subject:"test signed message 001" \ +-- +1.7.9.1 +