From: David Bremner <david@tethera.net>
Date: Mon, 6 Nov 2017 00:25:54 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: 0.26_rc0~64
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=7ac96b149f5a0e5c03b64856d7c20789dab3c628

Merge branch 'release'

Changes from 0.25.2 release
---

7ac96b149f5a0e5c03b64856d7c20789dab3c628
diff --cc NEWS
index 895b7627,24e7982c..412c678d
--- a/NEWS
+++ b/NEWS
@@@ -1,33 -1,17 +1,47 @@@
 +Notmuch 0.26 (UNRELEASED)
 +=========================
 +
 +Test Suite
 +----------
 +
 +Out-of-tree builds
 +
 +  The test suite now works properly with out-of-tree builds, i.e. with
 +  separate source and build directories. The --root option to tests
 +  has been dropped. The same can now be achieved more reliably using
 +  out-of-tree builds.
 +
 +Encrypted Mail
 +--------------
 +
 +Indexing cleartext of encrypted e-mails
 +
 +  It's now possible to include the cleartext of encrypted e-mails in
 +  the notmuch index.  This makes it possible to search your encrypted
 +  e-mails with the same ease as searching cleartext.  This can be done
 +  on a per-message basis with the --try-decrypt argument to indexing
 +  commands (new, insert, reindex), or by default by running "notmuch
 +  config set index.try_decrypt true".
 +
 +  Note that the contents of the index are sufficient to roughly
 +  reconstruct the cleartext of the message itself, so please ensure
 +  that the notmuch index itself is adequately protected.  DO NOT USE
 +  this feature without considering the security of your index.
 +
+ Notmuch 0.25.2 (2017-11-05)
+ ===========================
+ 
+ Command Line Interface
+ ----------------------
+ 
+ Fix segfault in notmuch-show crypto handling when compiled against
+ GMime 2.6; this was a regression in 0.25.
+ 
+ General
+ -------
+ 
+ Support for GMime before 3.0 is now deprecated, and will be removed in
+ a future release.
  
  Notmuch 0.25.1 (2017-09-11)
  ===========================
diff --cc mime-node.c
index c3d5cb9b,16091735..e1aca969
--- a/mime-node.c
+++ b/mime-node.c
@@@ -269,14 -245,9 +269,14 @@@ _mime_node_create (mime_node_t *parent
  	|| (GMIME_IS_MULTIPART_SIGNED (part) && node->ctx->crypto->verify)) {
  	GMimeContentType *content_type = g_mime_object_get_content_type (part);
  	const char *protocol = g_mime_content_type_get_parameter (content_type, "protocol");
 -	cryptoctx = notmuch_crypto_get_context (node->ctx->crypto, protocol);
 +	notmuch_status_t status;
 +	status = _notmuch_crypto_get_gmime_ctx_for_protocol (node->ctx->crypto,
 +							     protocol, &cryptoctx);
 +	if (status) /* this is a warning, not an error */
 +	    fprintf (stderr, "Warning: %s (%s).\n", notmuch_status_to_string (status),
 +		     protocol ? protocol : "NULL");
  	if (!cryptoctx)
- 	    return NULL;
+ 	    return node;
      }
  #endif