Hello community,
here is the log from the commit of package notmuch for openSUSE:Factory checked
in at 2020-11-17 21:22:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/notmuch (Old)
and /work/SRC/openSUSE:Factory/.notmuch.new.24930 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "notmuch"
Tue Nov 17 21:22:05 2020 rev:29 rq:847079 version:0.31.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/notmuch/notmuch.changes 2020-09-08
22:50:40.851614313 +0200
+++ /work/SRC/openSUSE:Factory/.notmuch.new.24930/notmuch.changes
2020-11-17 21:22:25.193188685 +0100
@@ -1,0 +2,31 @@
+Mon Nov 9 08:33:41 UTC 2020 - Dan Čermák <dcer...@suse.com>
+
+- New upstream release 0.31.2
+
+ What's new in notmuch 0.31.2
+ =========================
+
+ Build
+ -----
+
+ Catch one more occurence of "version" in the build system, which
+ caused the file to be regenerated in the release tarball.
+
+
+ What's new in notmuch 0.31.1
+ =========================
+
+ Library
+ -------
+
+ Fix a memory initialization bug in notmuch_database_get_config_list.
+
+ Build
+ -----
+
+ Rename file 'version' to 'version.txt'. The old file name conflicted
+ with a C++ header for some compilers.
+
+ Replace use of coreutils `realpath` in configure.
+
+-------------------------------------------------------------------
Old:
----
notmuch-0.31.tar.xz
notmuch-0.31.tar.xz.asc
New:
----
notmuch-0.31.2.tar.xz
notmuch-0.31.2.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ notmuch.spec ++++++
--- /var/tmp/diff_new_pack.1zh4mA/_old 2020-11-17 21:22:27.949192847 +0100
+++ /var/tmp/diff_new_pack.1zh4mA/_new 2020-11-17 21:22:27.949192847 +0100
@@ -18,7 +18,7 @@
%define libversion 5
Name: notmuch
-Version: 0.31
+Version: 0.31.2
Release: 0
Summary: The mail indexer
License: GPL-3.0-or-later
@@ -55,6 +55,7 @@
%if %{with tests}
BuildRequires: dtach
BuildRequires: gdb
+BuildRequires: gnu_parallel
BuildRequires: libgcrypt-cavs
BuildRequires: man
BuildRequires: valgrind-devel
++++++ notmuch-0.31.tar.xz -> notmuch-0.31.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.31/Makefile.global
new/notmuch-0.31.2/Makefile.global
--- old/notmuch-0.31/Makefile.global 2020-09-06 02:50:03.000000000 +0200
+++ new/notmuch-0.31.2/Makefile.global 2020-11-08 18:33:08.000000000 +0100
@@ -17,7 +17,7 @@
DATE:=$(shell date +%F)
endif
-VERSION:=$(shell cat ${srcdir}/version)
+VERSION:=$(shell cat ${srcdir}/version.txt)
ELPA_VERSION:=$(subst ~,_,$(VERSION))
ifeq ($(filter release release-message pre-release
update-versions,$(MAKECMDGOALS)),)
ifeq ($(IS_GIT),yes)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.31/Makefile.local
new/notmuch-0.31.2/Makefile.local
--- old/notmuch-0.31/Makefile.local 2020-09-06 02:50:03.000000000 +0200
+++ new/notmuch-0.31.2/Makefile.local 2020-11-08 18:33:08.000000000 +0100
@@ -19,7 +19,7 @@
# Depend (also) on the file 'version'. In case of ifeq ($(IS_GIT),yes)
# this file may already have been updated.
-version.stamp: $(srcdir)/version
+version.stamp: $(srcdir)/version.txt
echo $(VERSION) > $@
$(TAR_FILE):
@@ -30,12 +30,12 @@
echo "Warning: No signed tag for $(VERSION)"; \
fi ; \
git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ $$ref >
$(TAR_FILE).tmp
- echo $(VERSION) > version.tmp
+ echo $(VERSION) > version.txt.tmp
ct=`git --no-pager log -1 --pretty=format:%ct $$ref` ; \
tar --owner root --group root --append -f $(TAR_FILE).tmp \
--transform s_^_$(PACKAGE)-$(VERSION)/_ \
- --transform 's_.tmp$$__' --mtime=@$$ct version.tmp
- rm version.tmp
+ --transform 's_.tmp$$__' --mtime=@$$ct version.txt.tmp
+ rm version.txt.tmp
xz -C sha256 -9 < $(TAR_FILE).tmp > $(TAR_FILE)
@echo "Source is ready for release in $(TAR_FILE)"
@@ -54,7 +54,7 @@
sed -i -e "s/^__VERSION__[[:blank:]]*=.*$$/__VERSION__ =
\'${VERSION}\'/" \
-e "s/^SOVERSION[[:blank:]]*=.*$$/SOVERSION =
\'${LIBNOTMUCH_VERSION_MAJOR}\'/" \
${PV_FILE}
- cp version bindings/python-cffi
+ cp version.txt bindings/python-cffi
# We invoke make recursively only to force ordering of our phony
# targets in the case of parallel invocation of make (-j).
@@ -64,9 +64,10 @@
# are part of the release and need to take the version from the
# version file).
.PHONY: release
-release: verify-source-tree-and-version sphinx-html
+release: verify-source-tree-and-version
$(MAKE) VERSION=$(VERSION) verify-newer
$(MAKE) VERSION=$(VERSION) clean
+ $(MAKE) VERSION=$(VERSION) sphinx-html
$(MAKE) VERSION=$(VERSION) test
git tag -s -m "$(PACKAGE) $(VERSION) release" $(UPSTREAM_TAG)
$(MAKE) VERSION=$(VERSION) $(SHA256_FILE) $(DETACHED_SIG_FILE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.31/NEWS new/notmuch-0.31.2/NEWS
--- old/notmuch-0.31/NEWS 2020-09-06 02:50:03.000000000 +0200
+++ new/notmuch-0.31.2/NEWS 2020-11-08 18:33:08.000000000 +0100
@@ -1,3 +1,28 @@
+Notmuch 0.31.2 (2020-11-08)
+===========================
+
+Build
+-----
+
+Catch one more occurence of "version" in the build system, which
+caused the file to be regenerated in the release tarball.
+
+Notmuch 0.31.1 (2020-11-08)
+===========================
+
+Library
+-------
+
+Fix a memory initialization bug in notmuch_database_get_config_list.
+
+Build
+-----
+
+Rename file 'version' to 'version.txt'. The old file name conflicted
+with a C++ header for some compilers.
+
+Replace use of coreutils `realpath` in configure.
+
Notmuch 0.31 (2020-09-05)
=========================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.31/bindings/python/notmuch/version.py
new/notmuch-0.31.2/bindings/python/notmuch/version.py
--- old/notmuch-0.31/bindings/python/notmuch/version.py 2020-09-06
02:50:03.000000000 +0200
+++ new/notmuch-0.31.2/bindings/python/notmuch/version.py 2020-11-08
18:33:08.000000000 +0100
@@ -1,3 +1,3 @@
# this file should be kept in sync with ../../../version
-__VERSION__ = '0.31'
+__VERSION__ = '0.31.2'
SOVERSION = '5'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.31/bindings/python-cffi/setup.py
new/notmuch-0.31.2/bindings/python-cffi/setup.py
--- old/notmuch-0.31/bindings/python-cffi/setup.py 2020-09-06
02:50:03.000000000 +0200
+++ new/notmuch-0.31.2/bindings/python-cffi/setup.py 2020-11-08
18:33:08.000000000 +0100
@@ -1,6 +1,6 @@
import setuptools
-with open('version') as fp:
+with open('version.txt') as fp:
VERSION = fp.read().strip()
setuptools.setup(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.31/bindings/python-cffi/version
new/notmuch-0.31.2/bindings/python-cffi/version
--- old/notmuch-0.31/bindings/python-cffi/version 2020-09-06
02:50:03.000000000 +0200
+++ new/notmuch-0.31.2/bindings/python-cffi/version 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-0.31
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.31/bindings/python-cffi/version.txt
new/notmuch-0.31.2/bindings/python-cffi/version.txt
--- old/notmuch-0.31/bindings/python-cffi/version.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/notmuch-0.31.2/bindings/python-cffi/version.txt 2020-11-08
18:33:08.000000000 +0100
@@ -0,0 +1 @@
+0.31.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.31/configure new/notmuch-0.31.2/configure
--- old/notmuch-0.31/configure 2020-09-06 02:50:03.000000000 +0200
+++ new/notmuch-0.31.2/configure 2020-11-08 18:33:08.000000000 +0100
@@ -1536,7 +1536,7 @@
if [ $WITH_PYTHON_DOCS = "1" ]; then
echo "tags.add('WITH_PYTHON')"
fi
- printf "rsti_dir = '%s'\n" $(realpath emacs)
+ printf "rsti_dir = '%s'\n" "$(cd emacs && pwd -P)"
} > sphinx.config
# Finally, after everything configured, inform the user how to continue.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.31/debian/changelog
new/notmuch-0.31.2/debian/changelog
--- old/notmuch-0.31/debian/changelog 2020-09-06 02:50:03.000000000 +0200
+++ new/notmuch-0.31.2/debian/changelog 2020-11-08 18:33:08.000000000 +0100
@@ -1,3 +1,17 @@
+notmuch (0.31.2-1) unstable; urgency=medium
+
+ * Delete stray "version" file in upstream source
+
+ -- David Bremner <brem...@debian.org> Sun, 08 Nov 2020 11:32:45 -0400
+
+notmuch (0.31.1-1) unstable; urgency=medium
+
+ * New upstream bugfix release.
+ - Portability / C++20 fixes
+ - Fix initialization bug in library config handling.
+
+ -- David Bremner <brem...@debian.org> Sun, 08 Nov 2020 07:48:22 -0400
+
notmuch (0.31-1) unstable; urgency=medium
* New upstream release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.31/devel/release-checks.sh
new/notmuch-0.31.2/devel/release-checks.sh
--- old/notmuch-0.31/devel/release-checks.sh 2020-09-06 02:50:03.000000000
+0200
+++ new/notmuch-0.31.2/devel/release-checks.sh 2020-11-08 18:33:08.000000000
+0100
@@ -29,7 +29,7 @@
emsgs="${emsgs:+$emsgs\n} $1"
}
-for f in ./version debian/changelog NEWS "$PV_FILE"
+for f in ./version.txt debian/changelog NEWS "$PV_FILE"
do
if [ ! -f "$f" ]; then append_emsg "File '$f' is missing"
elif [ ! -r "$f" ]; then append_emsg "File '$f' is unreadable"
@@ -53,7 +53,7 @@
else
echo "Reading './version' file failed (surprisingly!)"
exit 1
-fi < ./version
+fi < ./version.txt
readonly VERSION
@@ -109,7 +109,7 @@
fi
echo -n "Checking that python bindings version is $VERSION... "
-py_version=`python -c "with open('$PV_FILE') as vf: exec(vf.read());
print(__VERSION__)"`
+py_version=`python3 -c "with open('$PV_FILE') as vf: exec(vf.read());
print(__VERSION__)"`
if [ "$py_version" = "$VERSION" ]
then
echo Yes.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.31/doc/conf.py
new/notmuch-0.31.2/doc/conf.py
--- old/notmuch-0.31/doc/conf.py 2020-09-06 02:50:03.000000000 +0200
+++ new/notmuch-0.31.2/doc/conf.py 2020-11-08 18:33:08.000000000 +0100
@@ -19,7 +19,7 @@
location = os.path.dirname(__file__)
for pathdir in ['.', '..']:
- version_file = os.path.join(location,pathdir,'version')
+ version_file = os.path.join(location,pathdir,'version.txt')
if os.path.exists(version_file):
with open(version_file,'r') as infile:
version=infile.read().replace('\n','')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.31/emacs/notmuch-mua.el
new/notmuch-0.31.2/emacs/notmuch-mua.el
--- old/notmuch-0.31/emacs/notmuch-mua.el 2020-09-06 02:50:03.000000000
+0200
+++ new/notmuch-0.31.2/emacs/notmuch-mua.el 2020-11-08 18:33:08.000000000
+0100
@@ -40,7 +40,7 @@
;;
-(defcustom notmuch-mua-send-hook '(notmuch-mua-message-send-hook)
+(defcustom notmuch-mua-send-hook nil
"Hook run before sending messages."
:type 'hook
:group 'notmuch-send
@@ -601,11 +601,6 @@
(interactive)
(message-kill-buffer))
-(defun notmuch-mua-message-send-hook ()
- "The default function used for `notmuch-mua-send-hook', this
-simply runs the corresponding `message-mode' hook functions."
- (run-hooks 'message-send-hook))
-
;;
(define-mail-user-agent 'notmuch-user-agent
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.31/emacs/rstdoc.el
new/notmuch-0.31.2/emacs/rstdoc.el
--- old/notmuch-0.31/emacs/rstdoc.el 2020-09-06 02:50:03.000000000 +0200
+++ new/notmuch-0.31.2/emacs/rstdoc.el 2020-11-08 18:33:08.000000000 +0100
@@ -40,6 +40,7 @@
"Write docstrings from IN-FILE to OUT-FILE."
(load-file in-file)
(let* ((definitions (cdr (assoc (expand-file-name in-file) load-history)))
+ (text-quoting-style 'grave)
(doc-hash (make-hash-table :test 'eq)))
(mapc
(lambda (elt)
@@ -65,11 +66,14 @@
(insert "\n"))
(defvar rst--escape-alist
- '(("\\\\='" . "\\\\'")
- ("\\([^\\]\\)'" . "\\1`")
- ("^[[:space:]\t]*$" . "|br|")
- ("^[[:space:]\t]" . "|indent| "))
- "List of (regex . replacement) pairs.")
+ '( ("\\\\='" . "\001")
+ ("`\\([^\n`']*\\)[`']" . "\002\\1\002") ;; good enough for now...
+ ("`" . "\\\\`")
+ ("\001" . "'")
+ ("\002" . "`")
+ ("^[[:space:]]*$" . "|br|")
+ ("^[[:space:]]" . "|indent| "))
+ "list of (regex . replacement) pairs")
(defun rstdoc--rst-quote-string (str)
(with-temp-buffer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.31/lib/config.cc
new/notmuch-0.31.2/lib/config.cc
--- old/notmuch-0.31/lib/config.cc 2020-09-06 02:50:03.000000000 +0200
+++ new/notmuch-0.31.2/lib/config.cc 2020-11-08 18:33:08.000000000 +0100
@@ -113,7 +113,6 @@
goto DONE;
}
- talloc_set_destructor (list, _notmuch_config_list_destroy);
list->notmuch = notmuch;
list->current_key = NULL;
list->current_val = NULL;
@@ -122,6 +121,7 @@
new(&(list->iterator)) Xapian::TermIterator
(notmuch->xapian_db->metadata_keys_begin
(CONFIG_PREFIX +
(prefix ? prefix : "")));
+ talloc_set_destructor (list, _notmuch_config_list_destroy);
} catch (const Xapian::Error &error) {
_notmuch_database_log (notmuch, "A Xapian exception occurred getting
metadata iterator: %s.\n",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.31/test/T070-insert.sh
new/notmuch-0.31.2/test/T070-insert.sh
--- old/notmuch-0.31/test/T070-insert.sh 2020-09-06 02:50:03.000000000
+0200
+++ new/notmuch-0.31.2/test/T070-insert.sh 2020-11-08 18:33:08.000000000
+0100
@@ -222,24 +222,24 @@
test_begin_subtest "Insert message, create invalid subfolder"
gen_insert_msg
-test_expect_code 1 "notmuch insert --folder=../G --create-folder
$gen_msg_filename"
+test_expect_code 1 "notmuch insert --folder=../G --create-folder <
$gen_msg_filename"
OLDCONFIG=$(notmuch config get new.tags)
test_begin_subtest "Empty tags in new.tags are forbidden"
notmuch config set new.tags "foo;;bar"
gen_insert_msg
-output=$(notmuch insert $gen_msg_filename 2>&1)
+output=$(notmuch insert < $gen_msg_filename 2>&1)
test_expect_equal "$output" "Error: tag '' in new.tags: empty tag forbidden"
test_begin_subtest "Tags starting with '-' in new.tags are forbidden"
notmuch config set new.tags "-foo;bar"
gen_insert_msg
-output=$(notmuch insert $gen_msg_filename 2>&1)
+output=$(notmuch insert < $gen_msg_filename 2>&1)
test_expect_equal "$output" "Error: tag '-foo' in new.tags: tag starting with
'-' forbidden"
test_begin_subtest "Invalid tags set exit code"
-test_expect_code 1 "notmuch insert $gen_msg_filename 2>&1"
+test_expect_code 1 "notmuch insert < $gen_msg_filename 2>&1"
notmuch config set new.tags $OLDCONFIG
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.31/version new/notmuch-0.31.2/version
--- old/notmuch-0.31/version 2020-09-06 02:50:03.000000000 +0200
+++ new/notmuch-0.31.2/version 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-0.31
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notmuch-0.31/version.txt
new/notmuch-0.31.2/version.txt
--- old/notmuch-0.31/version.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/notmuch-0.31.2/version.txt 2020-11-08 18:33:08.000000000 +0100
@@ -0,0 +1 @@
+0.31.2
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
