Merge branch 'release'

Changes from 0.25.2 release
This commit is contained in:
David Bremner 2017-11-05 20:25:54 -04:00
commit 7ac96b149f
5 changed files with 24 additions and 3 deletions

14
NEWS
View file

@ -28,6 +28,20 @@ Indexing cleartext of encrypted e-mails
that the notmuch index itself is adequately protected. DO NOT USE that the notmuch index itself is adequately protected. DO NOT USE
this feature without considering the security of your index. 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) Notmuch 0.25.1 (2017-09-11)
=========================== ===========================

View file

@ -1,3 +1,3 @@
# this file should be kept in sync with ../../../version # this file should be kept in sync with ../../../version
__VERSION__ = '0.25.1' __VERSION__ = '0.25.2'
SOVERSION = '5' SOVERSION = '5'

7
debian/changelog vendored
View file

@ -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 notmuch (0.25.1-1) unstable; urgency=medium
* new upstream bugfix release: mitigation for emacs bug 28350 * new upstream bugfix release: mitigation for emacs bug 28350

View file

@ -276,7 +276,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)
fprintf (stderr, "Warning: %s (%s).\n", notmuch_status_to_string (status), fprintf (stderr, "Warning: %s (%s).\n", notmuch_status_to_string (status),
protocol ? protocol : "NULL"); protocol ? protocol : "NULL");
if (!cryptoctx) if (!cryptoctx)
return NULL; return node;
} }
#endif #endif

View file

@ -1 +1 @@
0.25.1 0.25.2