Merge branch 'release'

Second gnugpg test suite fix

7 files changed, 20 insertions, 37 deletions

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)
 ===========================
 
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/configure b/configure
index d0d8f18a..fa77eb8f 100755
--- a/configure
+++ b/configure
@@ -612,19 +612,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
-
 if [ $WITH_DESKTOP = "1" ]; then
     printf "Checking if desktop-file-install is available... "
     if command -v desktop-file-install > /dev/null; then
@@ -1199,9 +1186,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.
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 <bremner@debian.org>  Mon, 27 Feb 2017 06:56:28 -0400
+ -- David Bremner <bremner@debian.org>  Tue, 28 Feb 2017 20:39:30 -0400
 
 notmuch (0.23.5-1) unstable; urgency=medium
 
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 d8e15943..02634ac1 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -230,19 +230,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"
 }
 
@@ -280,6 +271,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
 
@@ -1286,11 +1279,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
 
 
diff --git a/version b/version
index df47809d..379191a4 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.23.6
+0.23.7