Jonathan Wiltshire <j...@debian.org> writes: > Control: tag -1 confirmed moreinfo > > On Sat, Feb 25, 2017 at 09:10:01AM -0400, David Bremner wrote: >> I've appended a diff from upstream git, this also includes any debian >> changes except finalizing the date and distribution in the >> changelog(s). > > Please go ahead, and remove the moreinfo tag from this bug when it is built > on all architectures.
Here's an updated debdiff. I turned out my initial idea was flawed. Or gnupg is flawed. Or something. In anycase the new debdiff is actually smaller (not counting upstream changelog).
diff -Nru notmuch-0.23.5/bindings/python/notmuch/version.py notmuch-0.23.7/bindings/python/notmuch/version.py
--- notmuch-0.23.5/bindings/python/notmuch/version.py 2017-01-09 06:25:01.000000000 -0400
+++ notmuch-0.23.7/bindings/python/notmuch/version.py 2017-02-28 20:49:24.000000000 -0400
@@ -1,3 +1,3 @@
# this file should be kept in sync with ../../../version
-__VERSION__ = '0.23.5'
+__VERSION__ = '0.23.7'
SOVERSION = '4'
diff -Nru notmuch-0.23.5/debian/changelog notmuch-0.23.7/debian/changelog
--- notmuch-0.23.5/debian/changelog 2017-01-09 06:24:39.000000000 -0400
+++ notmuch-0.23.7/debian/changelog 2017-02-28 20:39:30.000000000 -0400
@@ -1,3 +1,10 @@
+notmuch (0.23.7-1) unstable; urgency=medium
+
+ * Move test suite $GNUPGHOME to /tmp to avoid problems with long build paths.
+ * Fix read-after-free bug in `notmuch new`.
+
+ -- David Bremner <brem...@debian.org> Tue, 28 Feb 2017 20:39:30 -0400
+
notmuch (0.23.5-1) unstable; urgency=medium
* Remove RUNPATH from /usr/bin/notmuch
diff -Nru notmuch-0.23.5/lib/database.cc notmuch-0.23.7/lib/database.cc
--- notmuch-0.23.5/lib/database.cc 2017-01-09 06:25:01.000000000 -0400
+++ notmuch-0.23.7/lib/database.cc 2017-02-28 20:49:24.000000000 -0400
@@ -652,7 +652,7 @@
ref = _parse_message_id (ctx, refs, &refs);
if (ref && strcmp (ref, message_id)) {
- g_hash_table_insert (hash, ref, NULL);
+ g_hash_table_add (hash, ref);
last_ref = ref;
}
}
@@ -661,7 +661,7 @@
* reference to the database. We should avoid making a message
* its own parent, thus the above check.
*/
- return last_ref;
+ return talloc_strdup(ctx, last_ref);
}
notmuch_status_t
diff -Nru notmuch-0.23.5/NEWS notmuch-0.23.7/NEWS
--- notmuch-0.23.5/NEWS 2017-01-09 06:25:01.000000000 -0400
+++ notmuch-0.23.7/NEWS 2017-02-28 20:49:24.000000000 -0400
@@ -1,3 +1,33 @@
+Notmuch 0.23.7 (2017-02-28)
+===========================
+
+Test Suite
+----------
+
+Drop use of gpgconf --create-socketdir. Move $GNUPGHOME to /tmp.
+
+ It turns out the hardcoded use of /run/user in gpg doesn't work out
+ that well in some environments. The more low tech fix is to move all
+ of $GNUPGHOME to somewhere where we can control the length of the
+ paths.
+
+Notmuch 0.23.6 (2017-02-27)
+===========================
+
+Command Line Interface
+----------------------
+
+Fix read-after-free bug in `notmuch new`.
+
+Test Suite
+----------
+
+Use gpgconf --create-socketdir if available.
+
+ GnuPG has a facility to use sockets in /run or /var/run to avoid
+ problems with long socket paths, but this is not enabled by default
+ for GNUPGHOME other than $HOME/.gnupg. Enable it, if possible.
+
Notmuch 0.23.5 (2017-01-09)
===========================
diff -Nru notmuch-0.23.5/test/test-lib-common.sh notmuch-0.23.7/test/test-lib-common.sh
--- notmuch-0.23.5/test/test-lib-common.sh 2017-01-09 06:25:01.000000000 -0400
+++ notmuch-0.23.7/test/test-lib-common.sh 2017-02-28 20:49:24.000000000 -0400
@@ -158,7 +158,6 @@
mkdir -p "${HOME}"
MAIL_DIR="${TMP_DIRECTORY}/mail"
-export GNUPGHOME="${TMP_DIRECTORY}/gnupg"
export NOTMUCH_CONFIG="${TMP_DIRECTORY}/notmuch-config"
mkdir -p "${test}"
diff -Nru notmuch-0.23.5/test/test-lib.sh notmuch-0.23.7/test/test-lib.sh
--- notmuch-0.23.5/test/test-lib.sh 2017-01-09 06:25:01.000000000 -0400
+++ notmuch-0.23.7/test/test-lib.sh 2017-02-28 20:49:24.000000000 -0400
@@ -270,6 +270,8 @@
GIT_EXIT_OK=
# Note: TEST_TMPDIR *NOT* exported!
TEST_TMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/notmuch-test-$$.XXXXXX")
+# Put GNUPGHOME in TMPDIR to avoid problems with long paths.
+export GNUPGHOME="${TEST_TMPDIR}/gnupg"
trap 'trap_exit' EXIT
trap 'trap_signal' HUP INT TERM
diff -Nru notmuch-0.23.5/version notmuch-0.23.7/version
--- notmuch-0.23.5/version 2017-01-09 06:29:27.000000000 -0400
+++ notmuch-0.23.7/version 2017-02-28 21:05:57.000000000 -0400
@@ -1 +1 @@
-0.23.5
+0.23.7
signature.asc
Description: PGP signature
