From: David Bremner <david@tethera.net>
Date: Sat, 1 Apr 2017 12:36:34 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.25_rc0~85
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=33e58021958f8069ad46d7bd05cf586676fb6ae7;hp=c0a3bd956af91d08d95a993f4fd971a617a5517b

Merge branch 'release'

Final 0.24.1 release
---

diff --git a/NEWS b/NEWS
index b5101218..a63e340e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Notmuch 0.24.1 (UNRELEASED)
+Notmuch 0.24.1 (2017-04-01)
 ===========================
 
 General
@@ -17,6 +17,12 @@ Fix several memory leaks in `notmuch show`.
 
 Update NEWS for 0.24 to mention schema changes.
 
+Fix bug in dump header.
+
+  The previous version of the dump header failed to mention the
+  inclusion of tags. This fix bumps the version number of the dump
+  format to 3. There are no other changes to the format.
+
 Library Changes
 ---------------
 
diff --git a/debian/changelog b/debian/changelog
index 9dc3b608..478f450f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-notmuch (0.24.1-1) UNRELEASED; urgency=medium
+notmuch (0.24.1-1) experimental; urgency=medium
 
   * Restore Xapian wildcard queries to from: and subject:
+  * Handle empty queries for from: and subject:
+  * Memory leaks in notmuch show fixed
+  * Fix bug notmuch dump header generation
 
- -- David Bremner <bremner@debian.org>  Sat, 25 Mar 2017 11:21:34 -0300
+ -- David Bremner <bremner@debian.org>  Sat, 01 Apr 2017 09:17:47 -0300
 
 notmuch (0.24-1) experimental; urgency=medium
 
@@ -33,6 +36,12 @@ notmuch (0.24~rc0-1) experimental; urgency=medium
 
  -- David Bremner <bremner@debian.org>  Sun, 05 Mar 2017 19:32:08 -0400
 
+notmuch (0.23.7-2) unstable; urgency=medium
+
+  * Cherry pick 06adc276, fix use after free in libnotmuch4
+
+ -- David Bremner <bremner@debian.org>  Sun, 19 Mar 2017 09:38:17 -0300
+
 notmuch (0.23.7-1) unstable; urgency=medium
 
   * Move test suite $GNUPGHOME to /tmp to avoid problems with long build paths.
diff --git a/doc/man1/notmuch-dump.rst b/doc/man1/notmuch-dump.rst
index ca048aeb..f3f2b394 100644
--- a/doc/man1/notmuch-dump.rst
+++ b/doc/man1/notmuch-dump.rst
@@ -95,7 +95,7 @@ Supported options for **dump** include
 
       The default is to include all available types of data.  The
       option can be specified multiple times to select some subset. As
-      of version 2 of the dump format, there is a header line of the
+      of version 3 of the dump format, there is a header line of the
       following form
 
       |
diff --git a/notmuch-client.h b/notmuch-client.h
index 7a674873..a6f70eae 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -469,7 +469,7 @@ typedef enum dump_includes {
 
 #define DUMP_INCLUDE_DEFAULT (DUMP_INCLUDE_TAGS | DUMP_INCLUDE_CONFIG | DUMP_INCLUDE_PROPERTIES)
 
-#define NOTMUCH_DUMP_VERSION 2
+#define NOTMUCH_DUMP_VERSION 3
 
 int
 notmuch_database_dump (notmuch_database_t *notmuch,
diff --git a/notmuch-dump.c b/notmuch-dump.c
index 0cbcdc16..e451ac0c 100644
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -84,7 +84,7 @@ print_dump_header (gzFile output, int output_format, int include)
 	sep = ",";
     }
     if (include & DUMP_INCLUDE_TAGS) {
-	gzprintf (output, "%sproperties", sep);
+	gzprintf (output, "%stags", sep);
     }
     gzputs (output, "\n");
 }
diff --git a/test/T240-dump-restore.sh b/test/T240-dump-restore.sh
index f626a19e..1f1f0866 100755
--- a/test/T240-dump-restore.sh
+++ b/test/T240-dump-restore.sh
@@ -4,9 +4,8 @@ test_description="\"notmuch dump\" and \"notmuch restore\""
 
 NOTMUCH_NEW > /dev/null
 test_begin_subtest "dump header"
-test_subtest_known_broken
 cat <<EOF > EXPECTED
-#notmuch-dump batch-tag:2 config,properties,tags
+#notmuch-dump batch-tag:3 config,properties,tags
 EOF
 notmuch dump > OUTPUT
 test_expect_equal_file EXPECTED OUTPUT
diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh
index e8c078d5..1b308693 100755
--- a/test/T590-libconfig.sh
+++ b/test/T590-libconfig.sh
@@ -112,7 +112,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
 EOF
 notmuch dump --include=config >OUTPUT
 cat <<'EOF' >EXPECTED
-#notmuch-dump batch-tag:2 config
+#notmuch-dump batch-tag:3 config
 #@ aaabefore beforeval
 #@ key%20with%20spaces value,%20with,%20spaces%21
 #@ testkey1 testvalue1