From: David Bremner Date: Thu, 18 Feb 2021 12:47:53 +0000 (-0400) Subject: Merge tag '0.31.4' X-Git-Tag: 0.32_rc0~75 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=4c79a2dabe38ac72eb9eb21620f2ffca5f1885c6;hp=7061e41cd0ed7a37dab83687697a692a53c5a66f Merge tag '0.31.4' notmuch 0.31.4 release --- diff --git a/NEWS b/NEWS index 6484567e..6e88ebd9 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,16 @@ +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) =========================== diff --git a/bindings/python-cffi/version.txt b/bindings/python-cffi/version.txt index 8239f42d..a8a02172 100644 --- a/bindings/python-cffi/version.txt +++ b/bindings/python-cffi/version.txt @@ -1 +1 @@ -0.31.3 +0.31.4 diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index 0be316c2..6f6372ab 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.31.3' +__VERSION__ = '0.31.4' SOVERSION = '5' diff --git a/debian/changelog b/debian/changelog index 222b06f4..ec3de63d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 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 --git a/debian/patches/debian-changes b/debian/patches/debian-changes deleted file mode 100644 index 55aa7de9..00000000 --- a/debian/patches/debian-changes +++ /dev/null @@ -1,47 +0,0 @@ -This is an autogenerated patch header for a single-debian-patch file. The -delta against upstream is either kept as a single patch, or maintained -in some VCS, and exported as a single patch instead of more manageable -atomic patches. - ---- notmuch-0.31.3.orig/Makefile.global -+++ notmuch-0.31.3/Makefile.global -@@ -36,7 +36,6 @@ endif - endif - - UPSTREAM_TAG=$(subst ~,_,$(VERSION)) --DEB_TAG=debian/$(UPSTREAM_TAG)-1 - - RELEASE_HOST=notmuchmail.org - RELEASE_DIR=/srv/notmuchmail.org/www/releases ---- notmuch-0.31.3.orig/Makefile.local -+++ notmuch-0.31.3/Makefile.local -@@ -73,12 +73,11 @@ release: verify-source-tree-and-version - $(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 @@ pre-release: - $(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) ---- notmuch-0.31.3.orig/NEWS -+++ notmuch-0.31.3/NEWS -@@ -1,4 +1,5 @@ - Notmuch 0.31.3 (2020-12-25) -+=========================== - - Bindings - -------- diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 7bb82529..00000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -debian-changes diff --git a/doc/conf.py b/doc/conf.py index 11bed51d..1a5c217b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -14,7 +14,7 @@ master_doc = 'index' # 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 --git a/lib/notmuch-private.h b/lib/notmuch-private.h index 2f5ccd6a..750a242c 100644 --- a/lib/notmuch-private.h +++ b/lib/notmuch-private.h @@ -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 @@ -47,14 +53,6 @@ NOTMUCH_BEGIN_DECLS #include -#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 --git a/test/T568-lib-thread.sh b/test/T568-lib-thread.sh index ac13d986..088e66dd 100755 --- a/test/T568-lib-thread.sh +++ b/test/T568-lib-thread.sh @@ -8,6 +8,11 @@ add_email_corpus 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 @@ int main (int argc, char** argv) 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 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} printf("%d\n%s\n", thread != NULL, id2); } EOF +thread_num=${THREAD#thread:} cat < EXPECTED == stdout == 1 -0000000000000009 +${thread_num} == stderr == EOF test_expect_equal_file EXPECTED OUTPUT diff --git a/version.txt b/version.txt index 8239f42d..a8a02172 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.31.3 +0.31.4