--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Please unblock package notmuch
I recently discovered a bug in the output of "notmuch dump",
specifically that in listing the types of metadata included in the
dump, it lists "properties" a second time rather than "tags". This
doesn't cause any data loss when using the output with notmuch
restore. I guess in some (probably contrived) situations it might
cause data loss for third party tools. The main downside of
ignoring this bug for the stretch cycle would be forcing people to
write workarounds for it into their scripts.
diff -Nru notmuch-0.23.7/debian/changelog notmuch-0.23.7/debian/changelog
- --- notmuch-0.23.7/debian/changelog 2017-03-19 09:38:17.000000000 -0300
+++ notmuch-0.23.7/debian/changelog 2017-04-01 21:09:36.000000000 -0300
@@ -1,3 +1,9 @@
+notmuch (0.23.7-3) unstable; urgency=medium
+
+ * Cherry pick fixes to dump header from 0.24.1
+
+ -- David Bremner <bremner@debian.org> Sat, 01 Apr 2017 21:09:36 -0300
+
notmuch (0.23.7-2) unstable; urgency=medium
* Cherry pick 06adc276, fix use after free in libnotmuch4
diff -Nru notmuch-0.23.7/debian/patches/0001-debcherry-fixup-patch.patch notmuch-0.23.7/debian/patches/0001-debcherry-fixup-patch.patch
- --- notmuch-0.23.7/debian/patches/0001-debcherry-fixup-patch.patch 2017-03-19 09:38:17.000000000 -0300
+++ notmuch-0.23.7/debian/patches/0001-debcherry-fixup-patch.patch 2017-04-01 21:09:36.000000000 -0300
@@ -1,7 +1,7 @@
- -From 0fa0d9586e63d44e53aa7cf6cde5d1bd88bdbf35 Mon Sep 17 00:00:00 2001
+From dbdf6942f7e829cf3f1ab5cfd04ec3008a822856 Mon Sep 17 00:00:00 2001
From: David Bremner <david@tethera.net>
- -Date: Sun, 19 Mar 2017 09:48:03 -0300
- -Subject: [PATCH] debcherry fixup patch
+Date: Sat, 1 Apr 2017 21:13:02 -0300
+Subject: [PATCH 1/3] debcherry fixup patch
aa0bccba lib/message.cc: fix Coverity finding (use after free)
- extra changes or conflicts
diff -Nru notmuch-0.23.7/debian/patches/0002-cli-dump-fix-bug-in-dump-header.patch notmuch-0.23.7/debian/patches/0002-cli-dump-fix-bug-in-dump-header.patch
- --- notmuch-0.23.7/debian/patches/0002-cli-dump-fix-bug-in-dump-header.patch 1969-12-31 20:00:00.000000000 -0400
+++ notmuch-0.23.7/debian/patches/0002-cli-dump-fix-bug-in-dump-header.patch 2017-04-01 21:09:36.000000000 -0300
@@ -0,0 +1,26 @@
+From bb60768e31f681f161ac00079e869dec1d35bc85 Mon Sep 17 00:00:00 2001
+From: David Bremner <david@tethera.net>
+Date: Tue, 28 Mar 2017 08:09:03 -0300
+Subject: [PATCH 2/3] cli/dump: fix bug in dump header
+
+Fix copy paste error.
+
+(cherry picked from commit 1f3c7916f82774cacbfbb0fbc9d0e0aaae9399b3)
+(changes to missing test dropped)
+---
+ notmuch-dump.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/notmuch-dump.c b/notmuch-dump.c
+index e7965cea..0bb946f8 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 -Nru notmuch-0.23.7/debian/patches/0003-cli-dump-bump-dump-format-version-to-3.patch notmuch-0.23.7/debian/patches/0003-cli-dump-bump-dump-format-version-to-3.patch
- --- notmuch-0.23.7/debian/patches/0003-cli-dump-bump-dump-format-version-to-3.patch 1969-12-31 20:00:00.000000000 -0400
+++ notmuch-0.23.7/debian/patches/0003-cli-dump-bump-dump-format-version-to-3.patch 2017-04-01 21:09:36.000000000 -0300
@@ -0,0 +1,52 @@
+From cad718ad2098f5359dfa7e55d13247ce98c679d6 Mon Sep 17 00:00:00 2001
+From: David Bremner <david@tethera.net>
+Date: Fri, 31 Mar 2017 07:55:17 -0300
+Subject: [PATCH 3/3] cli/dump: bump dump format version to 3
+
+No changes to the format of the body, but the header format was
+fixed, and version 2 headers probably shouldn't be relied on.
+---
+ doc/man1/notmuch-dump.rst | 2 +-
+ notmuch-client.h | 2 +-
+ test/T590-libconfig.sh | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/doc/man1/notmuch-dump.rst b/doc/man1/notmuch-dump.rst
+index 58570272..738ba4a3 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 d026e600..dc640326 100644
+--- a/notmuch-client.h
++++ b/notmuch-client.h
+@@ -465,7 +465,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/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
diff -Nru notmuch-0.23.7/debian/patches/series notmuch-0.23.7/debian/patches/series
- --- notmuch-0.23.7/debian/patches/series 2017-03-19 09:38:17.000000000 -0300
+++ notmuch-0.23.7/debian/patches/series 2017-04-01 21:09:36.000000000 -0300
@@ -1,2 +1,4 @@
# exported from git by git-debcherry
0001-debcherry-fixup-patch.patch
+0002-cli-dump-fix-bug-in-dump-header.patch
+0003-cli-dump-bump-dump-format-version-to-3.patch
unblock notmuch/0.23.7-3
- -- System Information:
Debian Release: 9.0
APT prefers testing
APT policy: (900, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 4.9.0-2-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
-----BEGIN PGP SIGNATURE-----
iQGzBAEBCAAdFiEE3VS2dnyDRXKVCQCp8gKXHaSnniwFAljg4FQACgkQ8gKXHaSn
nixHXQv/QgWqbxXHy8xg4M7S89dUSXlMaMREpXqgNi/3XSRuHaJRi27Fo0gp5Hjv
VI3PMj6tfP+hUF+Vg1maySqkQX9Ob4T6bRNGP7f9A3R8g6mmZokX0sFLP0A6N/lp
xUM06HmaUjoRQA8E60qWBPlsLYRJZvkb8hdV0VUL7OYkYuzTdtp08Ro4lzU+WFKZ
PXTlkk3RqJ1DVGF5Z/4qdgBmsDJ4r8dFZYvVNSLX8EOHk5ZGSq1cdvcFP+eLr8hG
EKTr+Wm51/hStYqXlOJxTAj62yiKUGvwh3tJpCrVzTz+bEQAx/yQmgGt0eFybJI5
VGR95NNEsxaaFHkaILm98iJGWG67DJocRhMUF+gXqJWUP5cZ4a6ijtp/kFcGV1dR
ik3GP7wtsw8sE58ObhBUDeG8SdvpfJdnF2VqV2tgqyk5F32s3InSQUVextuFmxzl
igTrYu0HZ+vdvOqzNrnFzKMYT4fhn0zINRcOKZyvjlFfNXE6uFYJAIb51tD/jJvp
Iw7J4gFj
=55KR
-----END PGP SIGNATURE-----
--- End Message ---