Merge branch 'release'

Changes from 0.25.2 release

diff --git a/NEWS b/NEWS
index 895b76273313adf53e59287a2a8f3e2f554fedbe..412c678d1bfdddc823fd826b2a4ec49b855e3172 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,20 @@ Indexing cleartext of encrypted e-mails
   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 --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index afd591907aae6287e911fc57c2131e370a05afb1..36aaaeb75847763eb3ba3e1c4e631a2902371943 100644 (file)
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.25.1'
+__VERSION__ = '0.25.2'
 SOVERSION = '5'

diff --git a/debian/changelog b/debian/changelog
index d67d84f1073c1eff8e41525fcfa870b7cc86c748..67282a0729dcedec1d75d2a66ba7777fa84809e1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.25.2-1) unstable; urgency=medium
+
+  * New upstream bugfix release: fix for segfault when compiled
+    against gmime-2.6
+
+ -- David Bremner <bremner@debian.org>  Sun, 05 Nov 2017 20:05:49 -0400
+
 notmuch (0.25.1-1) unstable; urgency=medium
 
   * new upstream bugfix release: mitigation for emacs bug 28350

diff --git a/mime-node.c b/mime-node.c
index c3d5cb9b47595ad2a43606e8faf08b8a0e28283d..e1aca969bef775d06659a556b1140e37897c1da9 100644 (file)
--- a/mime-node.c
+++ b/mime-node.c
@@ -276,7 +276,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)
            fprintf (stderr, "Warning: %s (%s).\n", notmuch_status_to_string (status),
                     protocol ? protocol : "NULL");
        if (!cryptoctx)
-           return NULL;
+           return node;
     }
 #endif
 

diff --git a/version b/version
index af2dabf3ff68ad99a0f3bf238bedfa12267a2944..166c9e29b70b1e6a84168e2e608430f62da4254a 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.25.1
+0.25.2