From c8934806548ca8c2f60d1150606f67da27cb2546 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Sun, 1 Jan 2017 19:20:30 +0200 Subject: [PATCH 1/5] configure: fix $prefix expansion for libdir_expanded Since the sed expansion line which did $prefix expansion for libdir_expanded was changed from the legacy `...` format to the new $(...) expression, the subtle backslash expansion change went unnoticed -- \\$ which used to escape '$' now escapes '\' and the following '$prefix' was attempted to expand as a variable. So changing \\$ to \$ fixes this. Also, replaced echo with printf %s -- echo does expansions of its own. While at it, the following 2 inconsistencies were fixed: 1) the /g flag was removed from first expression; second didn't have it 2) first expression did not end with /, so "dropped" it from second configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 2a0ce9eb..f1773044 100755 --- a/configure +++ b/configure @@ -274,7 +274,7 @@ if [ -z "$LIBDIR" ] ; then libdir_expanded="${PREFIX}/lib" else # very non-general variable expansion - libdir_expanded=$(echo "$LIBDIR" | sed "s|\\${prefix}|${PREFIX}|g; s|\\$prefix/|${PREFIX}/|; s|//*|/|g") + libdir_expanded=$(printf %s "$LIBDIR" | sed "s|\${prefix}|${PREFIX}|; s|\$prefix\>|${PREFIX}|; s|//*|/|g") fi cat < Date: Sun, 8 Jan 2017 08:30:08 -0400 Subject: [PATCH 2/5] NEWS for 0.23.5 --- NEWS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/NEWS b/NEWS index 8125e09f..7d634621 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ +Notmuch 0.23.5 (UNRELEASED) +=========================== + +Build system +------------ + +Fix quoting bug in configure. This had introduced a RUNPATH into the +notmuch binary in cases where it was not not needed. + Notmuch 0.23.4 (2016-12-24) =========================== From 6c2e22db07bc015a077bb658ef26cc0e5e45b9a5 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 8 Jan 2017 08:31:28 -0400 Subject: [PATCH 3/5] debian: changelog for 0.23.5-1 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 18788d86..8d82049f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +notmuch (0.23.5-1) unstable; urgency=medium + + * Remove RUNPATH from /usr/bin/notmuch + + -- David Bremner Sun, 08 Jan 2017 08:31:03 -0400 + notmuch (0.23.4-1) unstable; urgency=medium * Improve error handling in notmuch insert From 186436a04c818cfb6c64a5239475623cc6d4fd35 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 8 Jan 2017 08:32:56 -0400 Subject: [PATCH 4/5] bump version to 0.23.5 --- 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 b5d308e2..1397fefd 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.4' +__VERSION__ = '0.23.5' SOVERSION = '4' diff --git a/version b/version index 40a6dfed..f6de0017 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.23.4 +0.23.5 From 44520bb6add5e39e12de689a168007d3d2c7c734 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 8 Jan 2017 08:35:17 -0400 Subject: [PATCH 5/5] docs: add 2017 to copyright years --- doc/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/conf.py b/doc/conf.py index 8b932966..356a2b2b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -12,7 +12,7 @@ master_doc = 'index' # General information about the project. project = u'notmuch' -copyright = u'2009-2016, Carl Worth and many others' +copyright = u'2009-2017, Carl Worth and many others' location = os.path.dirname(__file__)