Bug#983064: unblock: notmuch/0.31.4-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Please unblock package notmuch
[ Reason ]
There is two improvements in 0.31.4-1 that would be nice for
bullseye. The first is a fix for a flaky test that causes failures
about 15% of the time for parallel builds. The second fixes a build
failure against glib 2.67 (currently in experimental).
[ Impact ]
The test related build failures generate failures generate false
positives during archive rebuilds. They could potentially cause issues
for binNMUs, although that hasn't been an issue in practice. The
incompatibility with glib 2.67 is mostly hypothetical at this point.
[ Tests ]
I've done 80+ rebuilds on 60 hardware threads / 30 cores without
triggering the test failure.
I also built a few times against glib 2.67 in an sid/experimental chroot.
[ Risks ]
Both sets of changes are (textually) trivial. Notmuch is not quite a
leaf package, but the number of dependencies is relatively small.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
unblock notmuch/0.31.4-1
- -- System Information:
Debian Release: bullseye/sid
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.10.0-2-amd64 (SMP w/8 CPU threads)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8), LANGUAGE=en_CA:en
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEkiyHYXwaY0SiY6fqA0U5G1WqFSEFAmAu0gsACgkQA0U5G1Wq
FSHc/hAAof5a6L+xF/v/O9HEpTeKI2mSGwxQpsrce3qna56dS3ochLvHJ1F0PBTZ
/JZ1ka+OmqJ/txcITQjHWgBVSdb5ulUJuVxBljVt4Ysos7V468isd1pqBX33W3Jy
qUBrqpqclZ6S3uyof6KUAshrG5Exj5gm379PW+DoHouaujeJysXA5FNj+R2PavB2
DIupBLPaHFEhiYtFHJj4Zvk5dULVctrlhYE8vo1hrS3GEJg1F9Sbrp7K8Wy//fB7
93qMP7hIG63S77TZ7PXTB88dLXuszVzwXirc1jIF0OemLnDXgIvpC4I2VKKR3+I+
NYYhjhxJoD/w6MtjJElTmS0CU6LRqcy+Cw4ErMUDwNdxIxie7tVaiCvlrYYBEL6C
ALlXCNyLrnBzx1XLQofGRX/m9sNxcEqHBwaaHoRuegmyRbxEW36r+O91K1uLQIlH
taWYthp7UX9dcdo6QogWHdMVTOKpdwFAGWBtHXjbwwYahJdPzOHhG/hgsdVEH4EN
HTxC7R4tcoqUbdwIvHvcTwAUGX2Dy/gV3ThCLanG6dbrZccTAv3SpfQjbn68TAtq
r9kHfh+J4R+tohu4zlIrxoksPyKlAp2J06BhWfDnf0Guu/vWu+4ich+5LOjGv5rp
eDD81pANU3bjehfotY83kcaz5mShnKq3YcGTB8S7eCsYn+n7NcA=
=Q+wV
-----END PGP SIGNATURE-----
diff -Nru --exclude debian-changes notmuch-0.31.3/bindings/python/notmuch/version.py notmuch-0.31.4/bindings/python/notmuch/version.py
--- notmuch-0.31.3/bindings/python/notmuch/version.py 2020-12-25 12:21:05.000000000 -0400
+++ notmuch-0.31.4/bindings/python/notmuch/version.py 2021-02-18 07:55:28.000000000 -0400
@@ -1,3 +1,3 @@
# this file should be kept in sync with ../../../version
-__VERSION__ = '0.31.3'
+__VERSION__ = '0.31.4'
SOVERSION = '5'
diff -Nru --exclude debian-changes notmuch-0.31.3/bindings/python-cffi/version.txt notmuch-0.31.4/bindings/python-cffi/version.txt
--- notmuch-0.31.3/bindings/python-cffi/version.txt 2020-12-25 12:21:05.000000000 -0400
+++ notmuch-0.31.4/bindings/python-cffi/version.txt 2021-02-18 07:55:28.000000000 -0400
@@ -1 +1 @@
-0.31.3
+0.31.4
diff -Nru --exclude debian-changes notmuch-0.31.3/debian/changelog notmuch-0.31.4/debian/changelog
--- notmuch-0.31.3/debian/changelog 2020-12-26 15:14:07.000000000 -0400
+++ notmuch-0.31.4/debian/changelog 2021-02-18 07:23:00.000000000 -0400
@@ -1,3 +1,11 @@
+notmuch (0.31.4-1) unstable; urgency=medium
+
+ * New upstream bugfix release
+ - Fix include bug triggered by glib 2.67
+ - Fix race condition in T568-lib-thread
+
+ -- David Bremner <bremner@debian.org> Thu, 18 Feb 2021 07:23:00 -0400
+
notmuch (0.31.3-2) unstable; urgency=medium
* Don't install gdb on hppa (skip gdb based tests)
diff -Nru --exclude debian-changes notmuch-0.31.3/debian/patches/series notmuch-0.31.4/debian/patches/series
--- notmuch-0.31.3/debian/patches/series 2020-12-26 15:14:07.000000000 -0400
+++ notmuch-0.31.4/debian/patches/series 1969-12-31 20:00:00.000000000 -0400
@@ -1 +0,0 @@
-debian-changes
diff -Nru --exclude debian-changes notmuch-0.31.3/doc/conf.py notmuch-0.31.4/doc/conf.py
--- notmuch-0.31.3/doc/conf.py 2020-12-25 12:21:05.000000000 -0400
+++ notmuch-0.31.4/doc/conf.py 2021-02-18 07:55:28.000000000 -0400
@@ -14,7 +14,7 @@
# General information about the project.
project = u'notmuch'
-copyright = u'2009-2020, Carl Worth and many others'
+copyright = u'2009-2021, Carl Worth and many others'
location = os.path.dirname(__file__)
diff -Nru --exclude debian-changes notmuch-0.31.3/lib/notmuch-private.h notmuch-0.31.4/lib/notmuch-private.h
--- notmuch-0.31.3/lib/notmuch-private.h 2020-12-25 12:21:05.000000000 -0400
+++ notmuch-0.31.4/lib/notmuch-private.h 2021-02-18 07:55:28.000000000 -0400
@@ -31,6 +31,12 @@
#include "notmuch.h"
+#include "xutil.h"
+#include "error_util.h"
+#include "string-util.h"
+#include "crypto.h"
+#include "repair.h"
+
NOTMUCH_BEGIN_DECLS
#include <stdlib.h>
@@ -47,14 +53,6 @@
#include <talloc.h>
-#include "gmime-extra.h"
-
-#include "xutil.h"
-#include "error_util.h"
-#include "string-util.h"
-#include "crypto.h"
-#include "repair.h"
-
#ifdef DEBUG
# define DEBUG_DATABASE_SANITY 1
# define DEBUG_THREADING 1
diff -Nru --exclude debian-changes notmuch-0.31.3/Makefile.global notmuch-0.31.4/Makefile.global
--- notmuch-0.31.3/Makefile.global 2020-12-25 12:21:05.000000000 -0400
+++ notmuch-0.31.4/Makefile.global 2021-02-18 07:55:28.000000000 -0400
@@ -36,7 +36,6 @@
endif
UPSTREAM_TAG=$(subst ~,_,$(VERSION))
-DEB_TAG=debian/$(UPSTREAM_TAG)-1
RELEASE_HOST=notmuchmail.org
RELEASE_DIR=/srv/notmuchmail.org/www/releases
diff -Nru --exclude debian-changes notmuch-0.31.3/Makefile.local notmuch-0.31.4/Makefile.local
--- notmuch-0.31.3/Makefile.local 2020-12-25 12:21:05.000000000 -0400
+++ notmuch-0.31.4/Makefile.local 2021-02-18 07:55:28.000000000 -0400
@@ -73,12 +73,11 @@
$(MAKE) VERSION=$(VERSION) $(SHA256_FILE) $(DETACHED_SIG_FILE)
ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
- git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
mkdir -p releases
mv $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) releases
$(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
ifeq ($(REALLY_UPLOAD),yes)
- git push origin $(VERSION) $(DEB_TAG) release pristine-tar
+ git push origin $(VERSION) release pristine-tar
cd releases && scp $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(TAR_FILE)"
rsync --verbose --delete --recursive doc/_build/html/ $(RELEASE_HOST):$(DOC_DIR)
@@ -90,7 +89,6 @@
$(MAKE) VERSION=$(VERSION) clean
$(MAKE) VERSION=$(VERSION) test
git tag -s -m "$(PACKAGE) $(VERSION) release" $(UPSTREAM_TAG)
- git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
$(MAKE) VERSION=$(VERSION) $(SHA256_FILE) $(DETACHED_SIG_FILE)
ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
diff -Nru --exclude debian-changes notmuch-0.31.3/NEWS notmuch-0.31.4/NEWS
--- notmuch-0.31.3/NEWS 2020-12-25 12:21:05.000000000 -0400
+++ notmuch-0.31.4/NEWS 2021-02-18 07:55:28.000000000 -0400
@@ -1,4 +1,18 @@
+Notmuch 0.31.4 (2021-02-18)
+===========================
+
+Library
+-------
+
+Fix include bug triggered by glib 2.67.
+
+Test
+----
+
+Fix race condition in T568-lib-thread.
+
Notmuch 0.31.3 (2020-12-25)
+===========================
Bindings
--------
diff -Nru --exclude debian-changes notmuch-0.31.3/test/T568-lib-thread.sh notmuch-0.31.4/test/T568-lib-thread.sh
--- notmuch-0.31.3/test/T568-lib-thread.sh 2020-12-25 12:21:05.000000000 -0400
+++ notmuch-0.31.4/test/T568-lib-thread.sh 2021-02-18 07:55:28.000000000 -0400
@@ -8,6 +8,11 @@
test_begin_subtest "building database"
test_expect_success "NOTMUCH_NEW"
+test_begin_subtest "finding thread"
+THREAD=$(notmuch search --output=threads id:20091117190054.GU3165@dottiness.seas.harvard.edu)
+count=$(notmuch count $THREAD)
+test_expect_equal "$count" "7"
+
cat <<'EOF' > c_tail
if (stat) {
const char *stat_str = notmuch_database_status_string (db);
@@ -30,7 +35,7 @@
notmuch_thread_t *thread = NULL;
notmuch_threads_t *threads = NULL;
notmuch_query_t *query = NULL;
- const char *id = "thread:0000000000000009";
+ const char *id = "${THREAD}";
stat = notmuch_database_open_verbose (argv[1], NOTMUCH_DATABASE_MODE_READ_WRITE, &db, &msg);
if (stat != NOTMUCH_STATUS_SUCCESS) {
@@ -52,10 +57,11 @@
printf("%d\n%s\n", thread != NULL, id2);
}
EOF
+thread_num=${THREAD#thread:}
cat <<EOF > EXPECTED
== stdout ==
1
-0000000000000009
+${thread_num}
== stderr ==
EOF
test_expect_equal_file EXPECTED OUTPUT
diff -Nru --exclude debian-changes notmuch-0.31.3/version.txt notmuch-0.31.4/version.txt
--- notmuch-0.31.3/version.txt 2020-12-25 12:21:05.000000000 -0400
+++ notmuch-0.31.4/version.txt 2021-02-18 07:55:28.000000000 -0400
@@ -1 +1 @@
-0.31.3
+0.31.4
Reply to: