Merge branch 'release'

diff --git a/Makefile.global b/Makefile.global
index 8477468dcdac8e703d49e0adb7f0eaac4c8b40ff..fe79121d018e0026716bf327e23536583c3e06a9 100644 (file)
--- a/Makefile.global
+++ b/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

diff --git a/Makefile.local b/Makefile.local
index fb12629420224d41ea981bbecd1007616f28727c..bbb8f0b61a3fab43819e906ad3a2a9b3195b65f2 100644 (file)
--- a/Makefile.local
+++ b/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)

diff --git a/NEWS b/NEWS
index 677c507dc6d90a84d5c7392dbd5b8537224a8dd7..6484567e548fa9616ecaae6c12a1c4cb6e44aab6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+Notmuch 0.31.3 (2020-12-25)
+===========================
+
+Bindings
+--------
+
+Fix for exclude tags in notmuch2 bindings.
+
+Build
+-----
+
+Portability update for T360-symbol-hiding
+
+Library
+-------
+
+Fix for memory error in notmuch_database_get_config_list
+
 Notmuch 0.31.2 (2020-11-08)
 ===========================
 

diff --git a/bindings/python-cffi/notmuch2/_database.py b/bindings/python-cffi/notmuch2/_database.py
index 5ab0f20a72644dfddb56b5d569292bab3f695258..868f4408cb18f2b00196d6314e1d4f3fe34ade5d 100644 (file)
--- a/bindings/python-cffi/notmuch2/_database.py
+++ b/bindings/python-cffi/notmuch2/_database.py
@@ -578,7 +578,7 @@ class Database(base.NotmuchObject):
         if exclude_tags is not None:
             for tag in exclude_tags:
                 if isinstance(tag, str):
-                    tag = str.encode('utf-8')
+                    tag = tag.encode('utf-8')
                 capi.lib.notmuch_query_add_tag_exclude(query_p, tag)
         return querymod.Query(self, query_p)
 

diff --git a/bindings/python-cffi/version.txt b/bindings/python-cffi/version.txt
index c415e1c6bd45692451d4c570dda3d8b450758d60..8239f42dc95eb45150a745d69bbe2ce77a632e4e 100644 (file)
--- a/bindings/python-cffi/version.txt
+++ b/bindings/python-cffi/version.txt
@@ -1 +1 @@
-0.31.2
+0.31.3

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 0d8fdd0472fd54ba397fe0ea5fe1f887eb563c4e..0be316c2404691e34ef0b6990530fde7c1187d32 100644 (file)
--- 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.2'
+__VERSION__ = '0.31.3'
 SOVERSION = '5'

diff --git a/debian/changelog b/debian/changelog
index 8c157bc02e126c4d85b5111f353ddd84b9c6ac68..0ddee4df9a5a5f1aa59f99cb9f93ef6ab60ed870 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+notmuch (0.31.3-1) unstable; urgency=medium
+
+  * New upstream bugfix release
+  * Second fix for T360, fix regression on ppc64el
+  * Fix for exclude tags in notmuch2 python bindings
+  * Fix for memory error in notmuch_database_get_config_list
+
+ -- David Bremner <bremner@debian.org>  Fri, 25 Dec 2020 11:48:37 -0400
+
 notmuch (0.31.2-5) unstable; urgency=medium
 
   * Use readelf instead of nm in T360, hopefully build in ppc64

diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index 3e6eefca8b61959bbfe187e48a21fdf6c1d04f06..55aa7de92e0336cf781811f5ffdc5275a9839155 100644 (file)
--- a/debian/patches/debian-changes
+++ b/debian/patches/debian-changes
@@ -3,28 +3,45 @@ 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.2.orig/doc/Makefile.local
-+++ notmuch-0.31.2/doc/Makefile.local
-@@ -43,7 +43,7 @@ INFO_INFO_FILES := $(INFO_TEXI_FILES:.te
-       rm -f $@ && gzip --no-name --stdout $^ > $@
- 
- ifeq ($(WITH_EMACS),1)
--$(DOCBUILDDIR)/.roff.stamp sphinx-html sphinx-texinfo: docstring.stamp
-+$(DOCBUILDDIR)/.roff.stamp $(DOCBUILDDIR)/.html.stamp $(DOCBUILDDIR)/.texi.stamp : docstring.stamp
+--- notmuch-0.31.3.orig/Makefile.global
++++ notmuch-0.31.3/Makefile.global
+@@ -36,7 +36,6 @@ endif
  endif
  
- sphinx-html: $(DOCBUILDDIR)/.html.stamp
---- notmuch-0.31.2.orig/test/T360-symbol-hiding.sh
-+++ notmuch-0.31.2/test/T360-symbol-hiding.sh
-@@ -26,8 +26,9 @@ test_begin_subtest 'checking output'
- test_expect_equal "$result" "$output"
+ UPSTREAM_TAG=$(subst ~,_,$(VERSION))
+-DEB_TAG=debian/$(UPSTREAM_TAG)-1
  
- test_begin_subtest 'comparing existing to exported symbols'
--nm -P $NOTMUCH_BUILDDIR/lib/libnotmuch.so | awk '$2 == "T" && $1 ~ "^notmuch" {print $1}' | sort | uniq > ACTUAL
--sed -n 's/^\(notmuch_[a-zA-Z0-9_]*\)[[:blank:]]*(.*/\1/p' $NOTMUCH_SRCDIR/lib/notmuch.h | sort | uniq > EXPORTED
-+readelf -Ws $NOTMUCH_BUILDDIR/lib/libnotmuch.so | \
-+    awk '$4 == "FUNC" && $5 == "GLOBAL" && $7 != "UND" {print $8}' | sort -u > ACTUAL
-+sed -n 's/^\(notmuch_[a-zA-Z0-9_]*\)[[:blank:]]*(.*/\1/p' $NOTMUCH_SRCDIR/lib/notmuch.h | sort -u > EXPORTED
- test_expect_equal_file EXPORTED ACTUAL
+ 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)
++===========================
  
- test_done
+ Bindings
+ --------

diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh
index 3f00dd383b87f664fe1abac8eb632b88485deb9a..729b9d720a2c9e53d853e9c6b3436a352367a2cc 100755 (executable)
--- a/test/T360-symbol-hiding.sh
+++ b/test/T360-symbol-hiding.sh
@@ -26,7 +26,7 @@ test_begin_subtest 'checking output'
 test_expect_equal "$result" "$output"
 
 test_begin_subtest 'comparing existing to exported symbols'
-readelf -Ws $NOTMUCH_BUILDDIR/lib/libnotmuch.so | \
+readelf -Ws $NOTMUCH_BUILDDIR/lib/libnotmuch.so | sed -e 's/\[[^]]*\]//' |\
     awk '$4 == "FUNC" && $5 == "GLOBAL" && $7 != "UND" {print $8}' | sort -u > ACTUAL
 sed -n 's/^\(notmuch_[a-zA-Z0-9_]*\)[[:blank:]]*(.*/\1/p' $NOTMUCH_SRCDIR/lib/notmuch.h | sort -u > EXPORTED
 test_expect_equal_file EXPORTED ACTUAL

diff --git a/version.txt b/version.txt
index c415e1c6bd45692451d4c570dda3d8b450758d60..8239f42dc95eb45150a745d69bbe2ce77a632e4e 100644 (file)
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.31.2
+0.31.3