diff options
| author | David Bremner <david@tethera.net> | 2017-11-05 20:25:54 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-11-05 20:25:54 -0400 |
| commit | 7ac96b149f5a0e5c03b64856d7c20789dab3c628 (patch) | |
| tree | ba3dc87131ebdce0c83584f47124ecf89ce000bf | |
| parent | 1b91884296f7e423f2e190ccf7f590ccb3028fdd (diff) | |
| parent | 83f266136369452b859393429b8530efac2e09fb (diff) | |
Merge branch 'release'
Changes from 0.25.2 release
| -rw-r--r-- | NEWS | 14 | ||||
| -rw-r--r-- | bindings/python/notmuch/version.py | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | mime-node.c | 2 | ||||
| -rw-r--r-- | version | 2 |
5 files changed, 24 insertions, 3 deletions
@@ -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 afd59190..36aaaeb7 100644 --- 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 d67d84f1..67282a07 100644 --- 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 c3d5cb9b..e1aca969 100644 --- 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 @@ -1 +1 @@ -0.25.1 +0.25.2 |