From 56edfd4bcf56c7a1f41e29ff12439a771a9202c8 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 29 Dec 2013 11:24:23 -0400 Subject: [PATCH 1/4] debian: disable atomicity tests on ia64 The following fails on Debian ia64: % gdb /bin/mv (gdb) break rename Since this breaks our atomicity test, disable them until someone is motivated to figure out whose fault that is. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 816998bc..1f8cbff7 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: ruby, ruby-dev (>>1:1.9.3~), emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~) | emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~), - gdb [!s390x], + gdb [!s390x !ia64], dtach (>= 0.8) Standards-Version: 3.9.4 Homepage: http://notmuchmail.org/ From be9a871fa506bf49f3dcb7626fdf52c67bc1b89b Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 30 Dec 2013 20:32:53 -0400 Subject: [PATCH 2/4] debian: add changelog and NEWS.Debian for release NEWS.Debian is displayed at install, so we include the news item about the disruptive change in sha1 computation. --- debian/NEWS.Debian | 17 +++++++++++++++++ debian/changelog | 10 ++++++++++ 2 files changed, 27 insertions(+) diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian index e57b4d41..8049a933 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS.Debian @@ -1,3 +1,20 @@ +notmuch (0.17-1) unstable; urgency=low + + * Previously on big endian architectures like sparc and powerpc the + computation of SHA1 hashes was incorrect. This meant that messages + with overlong or missing message-ids were given different computed + message-ids than on more common little endian architectures like + i386 and amd64. If you use notmuch on a big endian architecture, + you are strongly advised to make a backup of your tags using + `notmuch dump` before this upgrade. You can locate the affected + files using something like: + + notmuch dump | \ + awk '/^notmuch-sha1-[0-9a-f]{40} / \ + {system("notmuch search --exclude=false --output=files id:" $1)}' + + -- David Bremner Mon, 30 Dec 2013 20:31:16 -0400 + notmuch (0.16-1) unstable; urgency=low * The vim interface has been rewritten from scratch. In particular diff --git a/debian/changelog b/debian/changelog index 9cbfdcaf..0663f1d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +notmuch (0.17-1) unstable; urgency=low + + * New upstream feature release. See /usr/share/doc/notmuch/NEWS.gz + for details. Highlights include: + - notmuch compact command (Closes: #720543). + - emacs "tree" view + * Remove madduck from uploaders (Closes: #719100). + + -- David Bremner Mon, 30 Dec 2013 20:28:20 -0400 + notmuch (0.17~rc4-1) experimental; urgency=low * New upstream release candidate From ceef57b3d95d3e4e1ea90001d99792626529dca3 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 30 Dec 2013 20:34:23 -0400 Subject: [PATCH 3/4] version: bump to 0.17 --- NEWS | 4 ++-- bindings/python/notmuch/version.py | 2 +- man/man1/notmuch-compact.1 | 2 +- man/man1/notmuch-config.1 | 2 +- man/man1/notmuch-count.1 | 2 +- man/man1/notmuch-dump.1 | 2 +- man/man1/notmuch-insert.1 | 2 +- man/man1/notmuch-new.1 | 2 +- man/man1/notmuch-reply.1 | 2 +- man/man1/notmuch-restore.1 | 2 +- man/man1/notmuch-search.1 | 2 +- man/man1/notmuch-show.1 | 2 +- man/man1/notmuch-tag.1 | 2 +- man/man1/notmuch.1 | 2 +- man/man5/notmuch-hooks.5 | 2 +- man/man7/notmuch-search-terms.7 | 2 +- version | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NEWS b/NEWS index f4d2abe9..28788d8d 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,5 @@ -Notmuch 0.17~rc4 (2013-12-28) -============================= +Notmuch 0.17 (2013-12-30) +========================= Incompatible change in SHA1 computation --------------------------------------- diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index 27124f4f..fa3f93b8 100644 --- a/bindings/python/notmuch/version.py +++ b/bindings/python/notmuch/version.py @@ -1,2 +1,2 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.17~rc4' +__VERSION__ = '0.17' diff --git a/man/man1/notmuch-compact.1 b/man/man1/notmuch-compact.1 index 5ab9b513..ea6218fb 100644 --- a/man/man1/notmuch-compact.1 +++ b/man/man1/notmuch-compact.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-COMPACT 1 2013-12-28 "Notmuch 0.17~rc4" +.TH NOTMUCH-COMPACT 1 2013-12-30 "Notmuch 0.17" .SH NAME notmuch-compact \- compact the notmuch database .SH SYNOPSIS diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index b90987eb..00a420f9 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-CONFIG 1 2013-12-28 "Notmuch 0.17~rc4" +.TH NOTMUCH-CONFIG 1 2013-12-30 "Notmuch 0.17" .SH NAME notmuch-config \- access notmuch configuration file .SH SYNOPSIS diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1 index 9e2e2c11..562dde15 100644 --- a/man/man1/notmuch-count.1 +++ b/man/man1/notmuch-count.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-COUNT 1 2013-12-28 "Notmuch 0.17~rc4" +.TH NOTMUCH-COUNT 1 2013-12-30 "Notmuch 0.17" .SH NAME notmuch-count \- count messages matching the given search terms .SH SYNOPSIS diff --git a/man/man1/notmuch-dump.1 b/man/man1/notmuch-dump.1 index e1f69836..0c52d1b7 100644 --- a/man/man1/notmuch-dump.1 +++ b/man/man1/notmuch-dump.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-DUMP 1 2013-12-28 "Notmuch 0.17~rc4" +.TH NOTMUCH-DUMP 1 2013-12-30 "Notmuch 0.17" .SH NAME notmuch-dump \- creates a plain-text dump of the tags of each message diff --git a/man/man1/notmuch-insert.1 b/man/man1/notmuch-insert.1 index bbf5793c..8ce8413e 100644 --- a/man/man1/notmuch-insert.1 +++ b/man/man1/notmuch-insert.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-INSERT 1 2013-12-28 "Notmuch 0.17~rc4" +.TH NOTMUCH-INSERT 1 2013-12-30 "Notmuch 0.17" .SH NAME notmuch-insert \- add a message to the maildir and notmuch database .SH SYNOPSIS diff --git a/man/man1/notmuch-new.1 b/man/man1/notmuch-new.1 index ef6d88ce..5725b7d8 100644 --- a/man/man1/notmuch-new.1 +++ b/man/man1/notmuch-new.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-NEW 1 2013-12-28 "Notmuch 0.17~rc4" +.TH NOTMUCH-NEW 1 2013-12-30 "Notmuch 0.17" .SH NAME notmuch-new \- incorporate new mail into the notmuch database .SH SYNOPSIS diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1 index 4742aad0..93f90673 100644 --- a/man/man1/notmuch-reply.1 +++ b/man/man1/notmuch-reply.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-REPLY 1 2013-12-28 "Notmuch 0.17~rc4" +.TH NOTMUCH-REPLY 1 2013-12-30 "Notmuch 0.17" .SH NAME notmuch-reply \- constructs a reply template for a set of messages diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1 index 649000d0..4cb02e3e 100644 --- a/man/man1/notmuch-restore.1 +++ b/man/man1/notmuch-restore.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-RESTORE 1 2013-12-28 "Notmuch 0.17~rc4" +.TH NOTMUCH-RESTORE 1 2013-12-30 "Notmuch 0.17" .SH NAME notmuch-restore \- restores the tags from the given file (see notmuch dump) diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1 index be427248..55a81e79 100644 --- a/man/man1/notmuch-search.1 +++ b/man/man1/notmuch-search.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH 1 2013-12-28 "Notmuch 0.17~rc4" +.TH NOTMUCH-SEARCH 1 2013-12-30 "Notmuch 0.17" .SH NAME notmuch-search \- search for messages matching the given search terms .SH SYNOPSIS diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 index 68e5e8a9..7eefdec6 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SHOW 1 2013-12-28 "Notmuch 0.17~rc4" +.TH NOTMUCH-SHOW 1 2013-12-30 "Notmuch 0.17" .SH NAME notmuch-show \- show messages matching the given search terms .SH SYNOPSIS diff --git a/man/man1/notmuch-tag.1 b/man/man1/notmuch-tag.1 index 1a611520..710fae6a 100644 --- a/man/man1/notmuch-tag.1 +++ b/man/man1/notmuch-tag.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-TAG 1 2013-12-28 "Notmuch 0.17~rc4" +.TH NOTMUCH-TAG 1 2013-12-30 "Notmuch 0.17" .SH NAME notmuch-tag \- add/remove tags for all messages matching the search terms diff --git a/man/man1/notmuch.1 b/man/man1/notmuch.1 index 87662cf2..605b5146 100644 --- a/man/man1/notmuch.1 +++ b/man/man1/notmuch.1 @@ -16,7 +16,7 @@ .\" along with this program. If not, see http://www.gnu.org/licenses/ . .\" .\" Author: Carl Worth -.TH NOTMUCH 1 2013-12-28 "Notmuch 0.17~rc4" +.TH NOTMUCH 1 2013-12-30 "Notmuch 0.17" .SH NAME notmuch \- thread-based email index, search, and tagging .SH SYNOPSIS diff --git a/man/man5/notmuch-hooks.5 b/man/man5/notmuch-hooks.5 index 9fec30fb..11c55ddd 100644 --- a/man/man5/notmuch-hooks.5 +++ b/man/man5/notmuch-hooks.5 @@ -1,4 +1,4 @@ -.TH NOTMUCH-HOOKS 5 2013-12-28 "Notmuch 0.17~rc4" +.TH NOTMUCH-HOOKS 5 2013-12-30 "Notmuch 0.17" .SH NAME notmuch-hooks \- hooks for notmuch diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7 index 0f8b1860..a768b630 100644 --- a/man/man7/notmuch-search-terms.7 +++ b/man/man7/notmuch-search-terms.7 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH-TERMS 7 2013-12-28 "Notmuch 0.17~rc4" +.TH NOTMUCH-SEARCH-TERMS 7 2013-12-30 "Notmuch 0.17" .SH NAME notmuch-search-terms \- syntax for notmuch queries diff --git a/version b/version index fb5096cf..50653ad0 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.17~rc4 +0.17 From 0c097d9f6ed4cfaa43b0a7d4a55e7d0b8a795ac9 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Wed, 4 Dec 2013 21:31:58 +0200 Subject: [PATCH 4/4] devel/release-checks.sh: adjust to LIBNOTMUCH version checks NOTMUCH_VERSION_* macros in lib/notmuch.h are replaced with LIBNOTMUCH_VERSION_* macros. Check that the values of those match the LIBNOTMUCH_*_VERSION values in lib/Makefile.local. --- devel/release-checks.sh | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/devel/release-checks.sh b/devel/release-checks.sh index d6410add..8938905e 100755 --- a/devel/release-checks.sh +++ b/devel/release-checks.sh @@ -77,37 +77,36 @@ case $VERSION in *) verfail "'$VERSION' is a single number" ;; esac -_set_version_components () -{ - VERSION_MAJOR=$1 - VERSION_MINOR=$2 - VERSION_MICRO=${3:-0} # set to 0 in case $3 is unset or "null" (string) -} +echo -n "Checking that LIBNOTMUCH version macros & variables match ... " +# lib/notmuch.h +LIBNOTMUCH_MAJOR_VERSION=broken +LIBNOTMUCH_MINOR_VERSION=broken +LIBNOTMUCH_MICRO_VERSION=broken +# lib/Makefile.local +LIBNOTMUCH_VERSION_MAJOR=borken +LIBNOTMUCH_VERSION_MINOR=borken +LIBNOTMUCH_VERSION_RELEASE=borken -IFS=. -_set_version_components $VERSION -IFS=$DEFAULT_IFS - -echo -n "Checking that libnotmuch version macros match $VERSION... " -NOTMUCH_MAJOR_VERSION=broken -NOTMUCH_MINOR_VERSION=broken -NOTMUCH_MICRO_VERSION=broken -eval `awk 'NF == 3 && $1 == "#define" && $2 ~ /^NOTMUCH_[A-Z]+_VERSION$/ \ +eval `awk 'NF == 3 && $1 == "#define" && $2 ~ /^LIBNOTMUCH_[A-Z]+_VERSION$/ \ && $3 ~ /^[0-9]+$/ { print $2 "=" $3 }' lib/notmuch.h` +eval `awk 'NF == 3 && $1 ~ /^LIBNOTMUCH_VERSION_[A-Z]+$/ && $2 == "=" \ + && $3 ~ /^[0-9]+$/ { print $1 "=" $3 }' lib/Makefile.local` + + check_version_component () { - eval local v1=\$VERSION_$1 - eval local v2=\$NOTMUCH_$1_VERSION + eval local v1=\$LIBNOTMUCH_$1_VERSION + eval local v2=\$LIBNOTMUCH_VERSION_$2 if [ $v1 != $v2 ] - then append_emsg "NOTMUCH_$1_VERSION is defined as '$v2' in lib/notmuch.h instead of '$v1'" + then append_emsg "LIBNOTMUCH_$1_VERSION ($v1) does not equal LIBNOTMUCH_VERSION_$2 ($v2)" fi } old_emsg_count=$emsg_count -check_version_component MAJOR -check_version_component MINOR -check_version_component MICRO +check_version_component MAJOR MAJOR +check_version_component MINOR MINOR +check_version_component MICRO RELEASE [ $old_emsg_count = $emsg_count ] && echo Yes. || echo No. echo -n "Checking that this is Debian package for notmuch... "