From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 1A6EA6DE141E for ; Thu, 2 May 2019 06:19:58 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.288 X-Spam-Level: X-Spam-Status: No, score=-0.288 tagged_above=-999 required=5 tests=[AWL=-0.087, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2VqHio1akaRi for ; Thu, 2 May 2019 06:19:57 -0700 (PDT) Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118]) by arlo.cworth.org (Postfix) with ESMTPS id 167966DE1333 for ; Thu, 2 May 2019 06:19:52 -0700 (PDT) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019; t=1556803192; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=dEy2nlorIlvY3oZFSCWzd6eccV1zJwF3JGFKV+7CX9E=; b=XyiipPiKU3xmaqO+ndPrjjWXjZiWj3Zo8kfs81J9Ig6KNYrHR9r5Yf8h tae66GU0nKsNpcILW0R2BGe6DOMMCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019rsa; t=1556803191; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=dEy2nlorIlvY3oZFSCWzd6eccV1zJwF3JGFKV+7CX9E=; b=DB51dXhrksXvKbmw2UuyliUzuQZaKRAAABEtFmcDhxnqXVOcWZbZyxnB z5GLwvLs1ENSXrT3ZS53xfMgGx7tqNCKSIXkwmtrrD2FpzemwkR8PEhQuL RDbVYiy+/ncUQ5HyOBcnq2CXWCxqY8Tj9a7JwJEB6MCaH00GM2j7OYuU3F tb3bTmi1A+T3WVrim+w39yIqSGPMsPu/MzzLncCYvxG+IDrHygQIM9Kqdz 4sQndt+Ak26xNmdCPyPnNSzWjPSlpGYePa5GWY4cOth+nPsZOio4JcdXcP z48feaUq/GUcv//2EQDyXkQ5Zz1e3ME+iKURTu8gQH1Urg0ibkT1TQ== Received: from fifthhorseman.net (unknown [IPv6:2001:470:1f07:60d:4864:1fff:fe17:5aa8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by che.mayfirst.org (Postfix) with ESMTPSA id 9F1A6F9AA; Thu, 2 May 2019 09:19:51 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id 98957201D7; Thu, 2 May 2019 09:19:47 -0400 (EDT) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH v2 01/15] build: drop support for gmime-2.6 Date: Thu, 2 May 2019 09:19:33 -0400 Message-Id: <20190502131947.16509-1-dkg@fifthhorseman.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502051653.8502-1-dkg@fifthhorseman.net> References: <20190502051653.8502-1-dkg@fifthhorseman.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 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: Thu, 02 May 2019 13:19:58 -0000 From: David Bremner GMime 3.0 is over 2 years old now, and 2.6 has been deprecated in notmuch for about 1.5 years. Comments and documentation no longer need to refer to GMime 2.6, so clean them all up. Signed-off-by: Daniel Kahn Gillmor --- INSTALL | 2 +- configure | 24 +++++------------------- debian/control | 2 +- mime-node.c | 8 ++++---- notmuch-reply.c | 6 ------ notmuch-show.c | 2 +- 6 files changed, 12 insertions(+), 32 deletions(-) diff --git a/INSTALL b/INSTALL index 6e6f4799..f1236e71 100644 --- a/INSTALL +++ b/INSTALL @@ -20,7 +20,7 @@ configure stage. Dependencies ------------ -Notmuch depends on four libraries: Xapian, GMime 2.6, +Notmuch depends on four libraries: Xapian, GMime 3.0, Talloc, and zlib which are each described below: Xapian diff --git a/configure b/configure index 5e7e5aa9..e6f33575 100755 --- a/configure +++ b/configure @@ -489,30 +489,16 @@ EOF rm -rf test.db _default_backend _default_backend.cc fi -# we need to have a version >= 2.6.5 to avoid a crypto bug. We need -# 2.6.7 for permissive "From " header handling. -GMIME_MINVER=2.6.7 -GMIME3_MINVER=3.0.3 +GMIME_MINVER=3.0.3 printf "Checking for GMime development files... " -if pkg-config --exists "gmime-3.0 > $GMIME3_MINVER"; then - printf "Yes (3.0).\n" +if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then + printf "Yes.\n" have_gmime=1 gmime_cflags=$(pkg-config --cflags gmime-3.0) gmime_ldflags=$(pkg-config --libs gmime-3.0) gmime_major=3 have_gmime_session_keys=1 -elif pkg-config --exists "gmime-2.6 >= $GMIME_MINVER"; then - printf "Yes (2.6).\n" - have_gmime=1 - gmime_cflags=$(pkg-config --cflags gmime-2.6) - gmime_ldflags=$(pkg-config --libs gmime-2.6) - gmime_major=2 - if pkg-config --exists "gmime-2.6 >= 2.6.21"; then - have_gmime_session_keys=1 - else - have_gmime_session_keys=0 - fi else have_gmime=0 have_gmime_session_keys=0 @@ -788,7 +774,7 @@ EOF echo fi if [ $have_gmime -eq 0 ]; then - echo " GMime 2.6 library >= $GMIME_MINVER" + echo " GMime library >= $GMIME_MINVER" echo " (including development files such as headers)" echo " https://github.com/jstedfast/gmime/" echo @@ -810,7 +796,7 @@ case a simple command will install everything you need. For example: On Debian and similar systems: - sudo apt-get install libxapian-dev libgmime-2.6-dev libtalloc-dev zlib1g-dev + sudo apt-get install libxapian-dev libgmime-3.0-dev libtalloc-dev zlib1g-dev Or on Fedora and similar systems: diff --git a/debian/control b/debian/control index 922f6d8c..31d6471c 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 11~), pkg-config, libxapian-dev, - libgmime-3.0-dev (>= 3.0.3~) | libgmime-2.6-dev (>= 2.6.7~), + libgmime-3.0-dev (>= 3.0.3~), libtalloc-dev, libz-dev, python-all (>= 2.6.6-3~), diff --git a/mime-node.c b/mime-node.c index 1bfb479b..053f044a 100644 --- a/mime-node.c +++ b/mime-node.c @@ -149,7 +149,7 @@ DONE: return status; } -/* Signature list destructor (GMime 2.6) */ +/* Signature list destructor */ static int _signature_list_free (GMimeSignatureList **proxy) { @@ -157,7 +157,7 @@ _signature_list_free (GMimeSignatureList **proxy) return 0; } -/* Set up signature list destructor (GMime 2.6) */ +/* Set up signature list destructor */ static void set_signature_list_destructor (mime_node_t *node) { @@ -168,7 +168,7 @@ set_signature_list_destructor (mime_node_t *node) } } -/* Verify a signed mime node (GMime 2.6) */ +/* Verify a signed mime node */ static void node_verify (mime_node_t *node, GMimeObject *part, g_mime_3_unused(GMimeCryptoContext *cryptoctx)) @@ -189,7 +189,7 @@ node_verify (mime_node_t *node, GMimeObject *part, g_error_free (err); } -/* Decrypt and optionally verify an encrypted mime node (GMime 2.6) */ +/* Decrypt and optionally verify an encrypted mime node */ static void node_decrypt_and_verify (mime_node_t *node, GMimeObject *part, g_mime_3_unused(GMimeCryptoContext *cryptoctx)) diff --git a/notmuch-reply.c b/notmuch-reply.c index d87ec06d..cd1b602b 100644 --- a/notmuch-reply.c +++ b/notmuch-reply.c @@ -325,12 +325,6 @@ add_recipients_from_message (GMimeMessage *reply, GMimeMessage *message, bool reply_all) { - - /* There is a memory leak here with gmime-2.6 because get_sender - * returns a newly allocated list, while the others return - * references to libgmime owned data. This leak will be fixed with - * the transition to gmime-3.0. - */ struct { InternetAddressList * (*get_header)(GMimeMessage *message); GMimeRecipientType recipient_type; diff --git a/notmuch-show.c b/notmuch-show.c index 88699e90..4ed5ff2b 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -427,7 +427,7 @@ format_signature_errors (sprinter_t *sp, GMimeSignature *signature) } #endif -/* Signature status sprinter (GMime 2.6) */ +/* Signature status sprinter */ static void format_part_sigstatus_sprinter (sprinter_t *sp, GMimeSignatureList *siglist) { -- 2.20.1