Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package notmuch for openSUSE:Factory checked
in at 2021-07-01 07:05:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/notmuch (Old)
and /work/SRC/openSUSE:Factory/.notmuch.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "notmuch"
Thu Jul 1 07:05:29 2021 rev:34 rq:903184 version:0.32.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/notmuch/notmuch.changes 2021-06-09
21:53:03.550555708 +0200
+++ /work/SRC/openSUSE:Factory/.notmuch.new.2625/notmuch.changes
2021-07-01 07:05:35.307498636 +0200
@@ -1,0 +2,33 @@
+Mon Jun 28 06:35:16 UTC 2021 - Dan ??erm??k <dcer...@suse.com>
+
+What's new in notmuch 0.32.2
+=========================
+
+General
+-------
+
+Fix a bug from 2017 that can add duplicate thread-id terms to message
+documents.
+
+CLI
+---
+
+Fix small memory leak in notmuch new.
+
+Emacs
+-----
+
+Add `(require 'seq)` for `seq-some`.
+
+Documentation
+-------------
+
+Fix man page build for Sphinx 4.x. Fix variable name in emacs docs.
+
+Tests
+-----
+
+Fix backup creation in `perf-test/T00-new`. Check openssl
+prerequisite in `add_gpgsm_home`.
+
+-------------------------------------------------------------------
Old:
----
notmuch-0.32.1.tar.xz
notmuch-0.32.1.tar.xz.asc
New:
----
notmuch-0.32.2.tar.xz
notmuch-0.32.2.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ notmuch.spec ++++++
--- /var/tmp/diff_new_pack.nnnIQE/_old 2021-07-01 07:05:35.891494074 +0200
+++ /var/tmp/diff_new_pack.nnnIQE/_new 2021-07-01 07:05:35.895494042 +0200
@@ -18,7 +18,7 @@
%define libversion 5
Name: notmuch
-Version: 0.32.1
+Version: 0.32.2
Release: 0
Summary: The mail indexer
License: GPL-3.0-or-later
@@ -126,7 +126,6 @@
%if %{with python3}
%package -n python3-%{name}
Summary: Python3 bindings for %{name}
-Requires: python = %{?py3_ver:%py3_ver}%{?!py3_ver:%(python3
--version|awk '{print $2}')}
Recommends: python-%{name}-doc = %{version}
%description -n python3-%{name}
++++++ notmuch-0.32.1.tar.xz -> notmuch-0.32.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.32.1/NEWS new/notmuch-0.32.2/NEWS
--- old/notmuch-0.32.1/NEWS 2021-05-15 14:04:24.000000000 +0200
+++ new/notmuch-0.32.2/NEWS 2021-06-27 13:56:21.000000000 +0200
@@ -1,3 +1,33 @@
+Notmuch 0.32.2 (2021-06-27)
+===========================
+
+General
+-------
+
+Fix a bug from 2017 that can add duplicate thread-id terms to message
+documents.
+
+CLI
+---
+
+Fix small memory leak in notmuch new.
+
+Emacs
+-----
+
+Add `(require 'seq)` for `seq-some`.
+
+Documentation
+-------------
+
+Fix man page build for Sphinx 4.x. Fix variable name in emacs docs.
+
+Tests
+-----
+
+Fix backup creation in `perf-test/T00-new`. Check openssl
+prerequisite in `add_gpgsm_home`.
+
Notmuch 0.32.1 (2021-05-15)
===========================
@@ -93,6 +123,13 @@
`notmuch-sexp-eof`, `notmuch-split-content-type`, and
`notmuch-tree-button-activate`.
+Keymaps are no longer fset, which means they need to be referred to in
+define-key directly (without quotes). If your Emacs configuration has a
+keybinding like:
+ (define-key 'notmuch-show-mode-map "7" 'foo)
+you should change it to:
+ (define-key notmuch-show-mode-map "7" 'foo)
+
Notmuch 0.31.4 (2021-02-18)
===========================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.32.1/bindings/python/notmuch/version.py
new/notmuch-0.32.2/bindings/python/notmuch/version.py
--- old/notmuch-0.32.1/bindings/python/notmuch/version.py 2021-05-15
14:04:24.000000000 +0200
+++ new/notmuch-0.32.2/bindings/python/notmuch/version.py 2021-06-27
13:56:21.000000000 +0200
@@ -1,3 +1,3 @@
# this file should be kept in sync with ../../../version
-__VERSION__ = '0.32.1'
+__VERSION__ = '0.32.2'
SOVERSION = '5'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.32.1/bindings/python-cffi/version.txt
new/notmuch-0.32.2/bindings/python-cffi/version.txt
--- old/notmuch-0.32.1/bindings/python-cffi/version.txt 2021-05-15
14:04:24.000000000 +0200
+++ new/notmuch-0.32.2/bindings/python-cffi/version.txt 2021-06-27
13:56:21.000000000 +0200
@@ -1 +1 @@
-0.32.1
+0.32.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.32.1/debian/changelog
new/notmuch-0.32.2/debian/changelog
--- old/notmuch-0.32.1/debian/changelog 2021-05-15 14:04:24.000000000 +0200
+++ new/notmuch-0.32.2/debian/changelog 2021-06-27 13:56:21.000000000 +0200
@@ -1,3 +1,11 @@
+notmuch (0.32.2-1) experimental; urgency=medium
+
+ * New upstream bugfix release
+ * Fix for memory leak in "notmuch new" introduced in 0.32
+ * Fix for bug from 2017 that can add duplicate thread-ids to messages.
+
+ -- David Bremner <brem...@debian.org> Sat, 26 Jun 2021 22:33:56 -0300
+
notmuch (0.32.1-1) experimental; urgency=medium
* New upstream bugfix release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.32.1/doc/conf.py
new/notmuch-0.32.2/doc/conf.py
--- old/notmuch-0.32.1/doc/conf.py 2021-05-15 14:04:24.000000000 +0200
+++ new/notmuch-0.32.2/doc/conf.py 2021-06-27 13:56:21.000000000 +0200
@@ -87,6 +87,8 @@
notmuch_authors = u'Carl Worth and many others'
+man_make_section_directory = False
+
man_pages = [
('man1/notmuch', 'notmuch',
u'thread-based email index, search, and tagging',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.32.1/doc/man1/notmuch-config.rst
new/notmuch-0.32.2/doc/man1/notmuch-config.rst
--- old/notmuch-0.32.1/doc/man1/notmuch-config.rst 2021-05-15
14:04:24.000000000 +0200
+++ new/notmuch-0.32.2/doc/man1/notmuch-config.rst 2021-06-27
13:56:21.000000000 +0200
@@ -74,10 +74,13 @@
`backups`.
**database.hook_dir**
-
Directory containing hooks run by notmuch commands. See
**notmuch-hooks(5)**.
+ History: this configuration value was introduced in notmuch 0.32.
+
+ Default: See HOOKS, below.
+
**user.name**
Your full name.
@@ -256,7 +259,7 @@
- ``${HOME}/.notmuch-config<profile>`` where ``<profile>`` is
``.$NOTMUCH_PROFILE`` or ""
-Hooks
+HOOKS
-----
If ``database.hook_dir`` is unset, notmuch tries (in order)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.32.1/doc/notmuch-emacs.rst
new/notmuch-0.32.2/doc/notmuch-emacs.rst
--- old/notmuch-0.32.1/doc/notmuch-emacs.rst 2021-05-15 14:04:24.000000000
+0200
+++ new/notmuch-0.32.2/doc/notmuch-emacs.rst 2021-06-27 13:56:21.000000000
+0200
@@ -100,7 +100,7 @@
The list of saved searches, including names, queries, and
additional per-query options.
-:index:`notmuch-saved-searches-sort-function`
+:index:`notmuch-saved-search-sort-function`
This variable controls how saved searches should be sorted. A value
of ``nil`` displays the saved searches in the order they are stored
in ???notmuch-saved-searches???.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.32.1/emacs/notmuch-maildir-fcc.el
new/notmuch-0.32.2/emacs/notmuch-maildir-fcc.el
--- old/notmuch-0.32.1/emacs/notmuch-maildir-fcc.el 2021-05-15
14:04:24.000000000 +0200
+++ new/notmuch-0.32.2/emacs/notmuch-maildir-fcc.el 2021-06-27
13:56:21.000000000 +0200
@@ -21,6 +21,8 @@
;;; Code:
+(require 'seq)
+
(require 'message)
(require 'notmuch-lib)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.32.1/lib/add-message.cc
new/notmuch-0.32.2/lib/add-message.cc
--- old/notmuch-0.32.1/lib/add-message.cc 2021-05-15 14:04:24.000000000
+0200
+++ new/notmuch-0.32.2/lib/add-message.cc 2021-06-27 13:56:21.000000000
+0200
@@ -407,14 +407,17 @@
_notmuch_database_link_message (notmuch_database_t *notmuch,
notmuch_message_t *message,
notmuch_message_file_t *message_file,
- bool is_ghost)
+ bool is_ghost,
+ bool is_new)
{
void *local = talloc_new (NULL);
notmuch_status_t status;
const char *thread_id = NULL;
/* Check if the message already had a thread ID */
- if (notmuch->features & NOTMUCH_FEATURE_GHOSTS) {
+ if (! is_new) {
+ thread_id = notmuch_message_get_thread_id (message);
+ } else if (notmuch->features & NOTMUCH_FEATURE_GHOSTS) {
if (is_ghost)
thread_id = notmuch_message_get_thread_id (message);
} else {
@@ -541,7 +544,7 @@
}
ret = _notmuch_database_link_message (notmuch, message,
- message_file, is_ghost);
+ message_file, is_ghost, is_new);
if (ret)
goto DONE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.32.1/lib/config.cc
new/notmuch-0.32.2/lib/config.cc
--- old/notmuch-0.32.1/lib/config.cc 2021-05-15 14:04:24.000000000 +0200
+++ new/notmuch-0.32.2/lib/config.cc 2021-06-27 13:56:21.000000000 +0200
@@ -318,7 +318,7 @@
const char *
notmuch_config_values_get (notmuch_config_values_t *values)
{
- return talloc_strndup (values, values->iterator, values->tok_len);
+ return talloc_strndup (values->children, values->iterator,
values->tok_len);
}
void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.32.1/performance-test/T00-new.sh
new/notmuch-0.32.2/performance-test/T00-new.sh
--- old/notmuch-0.32.1/performance-test/T00-new.sh 2021-05-15
14:04:24.000000000 +0200
+++ new/notmuch-0.32.2/performance-test/T00-new.sh 2021-06-27
13:56:21.000000000 +0200
@@ -5,16 +5,16 @@
. $(dirname "$0")/perf-test-lib.sh || exit 1
uncache_database
-
time_start
+manifest=$(mktemp manifestXXXXXX)
+find mail -type f ! -path 'mail/.notmuch/*' | sed -n '1~4 p' > $manifest
+xargs tar uf backup.tar < $manifest
+
for i in $(seq 2 6); do
time_run "notmuch new #$i" 'notmuch new'
done
-manifest=$(mktemp manifestXXXXXX)
-
-find mail -type f ! -path 'mail/.notmuch/*' | sed -n '1~4 p' > $manifest
# arithmetic context is to eat extra whitespace on e.g. some BSDs
count=$((`wc -l < $manifest`))
@@ -26,8 +26,6 @@
time_run "new ($count mv back)" 'notmuch new'
-xargs tar cf backup.tar < $manifest
-
perl -nle 'unlink $_; unlink $_.copy' $manifest
time_run "new ($count rm)" 'notmuch new'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.32.1/test/T357-index-decryption.sh
new/notmuch-0.32.2/test/T357-index-decryption.sh
--- old/notmuch-0.32.1/test/T357-index-decryption.sh 2021-05-15
14:04:24.000000000 +0200
+++ new/notmuch-0.32.2/test/T357-index-decryption.sh 2021-06-27
13:56:21.000000000 +0200
@@ -112,12 +112,10 @@
"$expected"
# try inserting it with decryption, should appear as a single copy
-# (note: i think thread id skips 4 because of duplicate message-id
-# insertion, above)
test_begin_subtest "message cleartext is present with insert --decrypt=true"
notmuch insert --folder=sent --decrypt=true <<<"$contents"
-output=$(notmuch search wumpus)
-expected='thread:0000000000000005 2000-01-01 [1/1] Notmuch Test Suite; test
encrypted message for cleartext index 002 (encrypted inbox unread)'
+output=$(notmuch search wumpus | notmuch_search_sanitize)
+expected='thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted
message for cleartext index 002 (encrypted inbox unread)'
test_expect_equal \
"$output" \
"$expected"
@@ -127,9 +125,9 @@
test_begin_subtest 'tagging all messages'
test_expect_success 'notmuch tag +blarney "encrypted message"'
test_begin_subtest "verify that tags have not changed"
-output=$(notmuch search tag:blarney)
-expected='thread:0000000000000001 2000-01-01 [1/1] Notmuch Test Suite; test
encrypted message for cleartext index 001 (blarney encrypted inbox)
-thread:0000000000000005 2000-01-01 [1/1] Notmuch Test Suite; test encrypted
message for cleartext index 002 (blarney encrypted inbox unread)'
+output=$(notmuch search tag:blarney | notmuch_search_sanitize)
+expected='thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted
message for cleartext index 001 (blarney encrypted inbox)
+thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for
cleartext index 002 (blarney encrypted inbox unread)'
test_expect_equal \
"$output" \
"$expected"
@@ -138,14 +136,14 @@
test_begin_subtest 'reindex old messages'
test_expect_success 'notmuch reindex --decrypt=true tag:encrypted and not
property:index.decryption=success'
test_begin_subtest "reindexed encrypted message, including cleartext"
-output=$(notmuch search wumpus)
+output=$(notmuch search wumpus | notmuch_search_sanitize)
test_expect_equal \
"$output" \
"$expected"
# and the same search, but by property ($expected is untouched):
test_begin_subtest "emacs search by property for both messages"
-output=$(notmuch search property:index.decryption=success)
+output=$(notmuch search property:index.decryption=success |
notmuch_search_sanitize)
test_expect_equal \
"$output" \
"$expected"
@@ -154,7 +152,7 @@
test_begin_subtest 'reindex in auto mode'
test_expect_success 'notmuch reindex tag:encrypted and
property:index.decryption=success'
test_begin_subtest "reindexed encrypted messages, should not have changed"
-output=$(notmuch search wumpus)
+output=$(notmuch search wumpus | notmuch_search_sanitize)
test_expect_equal \
"$output" \
"$expected"
@@ -188,9 +186,9 @@
# ensure that the tags remain even when we are dropping the cleartext.
test_begin_subtest "verify that tags remain without cleartext"
-output=$(notmuch search tag:blarney)
-expected='thread:0000000000000001 2000-01-01 [1/1] Notmuch Test Suite; test
encrypted message for cleartext index 001 (blarney encrypted inbox)
-thread:0000000000000005 2000-01-01 [1/1] Notmuch Test Suite; test encrypted
message for cleartext index 002 (blarney encrypted inbox unread)'
+output=$(notmuch search tag:blarney | notmuch_search_sanitize)
+expected='thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted
message for cleartext index 001 (blarney encrypted inbox)
+thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for
cleartext index 002 (blarney encrypted inbox unread)'
test_expect_equal \
"$output" \
"$expected"
@@ -199,7 +197,7 @@
test_expect_success "notmuch reindex --decrypt=nostash tag:blarney"
test_begin_subtest "Ensure that the indexed terms are present"
-output=$(notmuch search wumpus)
+output=$(notmuch search wumpus | notmuch_search_sanitize)
test_expect_equal \
"$output" \
"$expected"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.32.1/test/T670-duplicate-mid.sh
new/notmuch-0.32.2/test/T670-duplicate-mid.sh
--- old/notmuch-0.32.1/test/T670-duplicate-mid.sh 2021-05-15
14:04:24.000000000 +0200
+++ new/notmuch-0.32.2/test/T670-duplicate-mid.sh 2021-06-27
13:56:21.000000000 +0200
@@ -2,10 +2,25 @@
test_description="duplicate message ids"
. $(dirname "$0")/test-lib.sh || exit 1
+test_require_external_prereq xapian-delve
+
add_message '[id]="duplicate"' '[subject]="message 1" [filename]=copy1'
add_message '[id]="duplicate"' '[subject]="message 2" [filename]=copy2'
add_message '[id]="duplicate"' '[subject]="message 0" [filename]=copy0'
+
+test_begin_subtest 'at most 1 thread-id per xapian document'
+db=${MAIL_DIR}/.notmuch/xapian
+for doc in $(xapian-delve -1 -t '' "$db" | grep '^[1-9]'); do
+ xapian-delve -1 -r "$doc" "$db" | grep -c '^G'
+done > OUTPUT.raw
+sort -u < OUTPUT.raw > OUTPUT
+cat <<EOF > EXPECTED
+0
+1
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
test_begin_subtest 'search: first indexed subject preserved'
cat <<EOF > EXPECTED
thread:XXX 2001-01-05 [1/1(3)] Notmuch Test Suite; message 1 (inbox unread)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.32.1/test/test-lib.sh
new/notmuch-0.32.2/test/test-lib.sh
--- old/notmuch-0.32.1/test/test-lib.sh 2021-05-15 14:04:24.000000000 +0200
+++ new/notmuch-0.32.2/test/test-lib.sh 2021-06-27 13:56:21.000000000 +0200
@@ -136,6 +136,8 @@
add_gpgsm_home ()
{
+ test_require_external_prereq openssl
+
local fpr
[ -e "$GNUPGHOME/gpgsm.conf" ] && return
_gnupg_exit () { gpgconf --kill all 2>/dev/null || true; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.32.1/version.txt
new/notmuch-0.32.2/version.txt
--- old/notmuch-0.32.1/version.txt 2021-05-15 14:04:24.000000000 +0200
+++ new/notmuch-0.32.2/version.txt 2021-06-27 13:56:21.000000000 +0200
@@ -1 +1 @@
-0.32.1
+0.32.2
