From 5a42bb96c1ad4fcbcbf3dc882ba814c06e657f98 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 27 Feb 2017 18:26:47 -0400 Subject: [PATCH 1/6] Revert "test: use gpgconf --create-socketdir if available" This reverts commit e7b88e8b0a93ca83d807edc00e0c97af54c5b5f1. It turns out that this does not work well in environments without a running systemd (or some other provider of /run/user) --- test/test-lib.sh | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/test/test-lib.sh b/test/test-lib.sh index ba1580cd..86e792a8 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -229,19 +229,10 @@ test_fixed=0 test_broken=0 test_success=0 - -_shutdown_gpg_agent () { - if [ ${NOTMUCH_HAVE_GPGCONF_SOCKETDIR} = 1 ]; then - gpgconf --kill gpg-agent - gpgconf --remove-socketdir - fi -} - _exit_common () { code=$? trap - EXIT set +ex - _shutdown_gpg_agent rm -rf "$TEST_TMPDIR" } @@ -1285,11 +1276,6 @@ test_init_ () { . ./test-lib-common.sh || exit 1 -# we need the setting of GNUPGHOME in test-lib-common.sh -if [ ${NOTMUCH_HAVE_GPGCONF_SOCKETDIR} = 1 ]; then - gpgconf --create-socketdir -fi - emacs_generate_script From a4ddc63b2372bcb826d8c46e79e0f64ac7af255b Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 27 Feb 2017 18:27:49 -0400 Subject: [PATCH 2/6] Revert "configure: add test for gpgconf --create-socketdir" This reverts commit 12f7d4e61d30fb9a5c99e128ab1aab0bf069cdb4. Since we're not using gpgconf anymore, drop the unneeded test in configure. --- configure | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/configure b/configure index 46063b5d..f1773044 100755 --- a/configure +++ b/configure @@ -602,19 +602,6 @@ if [ $WITH_DOCS = "1" ] ; then fi fi -have_gpgconf_socketdir=0 -printf "Checking for gpgconf --{create,remove}-socketdir... " -if gpgconf --dump-options > /dev/null ; then - if gpgconf --dump-options | grep -q create-socketdir ; then - printf "Yes.\n" - have_gpgconf_socketdir=1 - else - printf "No.\n" - fi -else - printf "No. (missing or broken gpgconf?)\n" -fi - libdir_in_ldconfig=0 printf "Checking which platform we are on... " @@ -1192,9 +1179,6 @@ NOTMUCH_PYTHON=${python} # Are the ruby development files (and ruby) available? If not skip # building/testing ruby bindings. NOTMUCH_HAVE_RUBY_DEV=${have_ruby_dev} - -# Recent enough gnupg to support gpgconf --create-socketdir? -NOTMUCH_HAVE_GPGCONF_SOCKETDIR=${have_gpgconf_socketdir} EOF # Finally, after everything configured, inform the user how to continue. From 1044775fc003914ee63b53254b7ca8700983a6e7 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 27 Feb 2017 19:53:56 -0400 Subject: [PATCH 3/6] test: move GNUPGHOME to TEST_TMPDIR We already use this directory for dtach sockets, so it makes sense to put gnupg sockets there as well. There doesn't seem to be a clean way to put a fully functional socket in a different location than GNUPGHOME. --- test/test-lib-common.sh | 1 - test/test-lib.sh | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh index 03ef1d2d..a96cfbeb 100644 --- a/test/test-lib-common.sh +++ b/test/test-lib-common.sh @@ -158,7 +158,6 @@ export HOME="${TMP_DIRECTORY}/home" mkdir -p "${HOME}" MAIL_DIR="${TMP_DIRECTORY}/mail" -export GNUPGHOME="${TMP_DIRECTORY}/gnupg" export NOTMUCH_CONFIG="${TMP_DIRECTORY}/notmuch-config" mkdir -p "${test}" diff --git a/test/test-lib.sh b/test/test-lib.sh index 86e792a8..518d9c7f 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -270,6 +270,8 @@ die () { 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 From 1c9aa39822427e9dc4c1f15b6b982311e9e5c75f Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 27 Feb 2017 20:07:52 -0400 Subject: [PATCH 4/6] add changelog stanza for 0.23.7-1 --- debian/changelog | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index b9b4992e..f3167549 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,9 @@ -notmuch (0.23.6-1) unstable; urgency=medium +notmuch (0.23.7-1) unstable; urgency=medium - * Use gpgconf --create-socketdir to create gpg-agent sockets for - test suite. + * Move test suite $GNUPGHOME to /tmp to avoid problems with long build paths. * Fix read-after-free bug in `notmuch new`. - -- David Bremner Mon, 27 Feb 2017 06:56:28 -0400 + -- David Bremner Tue, 28 Feb 2017 20:39:30 -0400 notmuch (0.23.5-1) unstable; urgency=medium From cab1c36d5244427bd1067914015e8cb38c64e572 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 28 Feb 2017 20:46:53 -0400 Subject: [PATCH 5/6] NEWS: add news for 0.23.7 --- NEWS | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/NEWS b/NEWS index 3b25925f..7f25ca79 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,16 @@ +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) =========================== From 770d00a8955b2ad8be9daf2923e31221c4847043 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 28 Feb 2017 20:49:24 -0400 Subject: [PATCH 6/6] update version to 0.23.7 --- bindings/python/notmuch/version.py | 2 +- version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index 8d700260..e1a49522 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.23.6' +__VERSION__ = '0.23.7' SOVERSION = '4' diff --git a/version b/version index df47809d..379191a4 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.23.6 +0.23.7