From: David Bremner <david@tethera.net>
Date: Sun, 20 Jun 2021 20:15:20 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: archive/debian/0.33_rc0-1~58
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=8dbd5deb8d3bbfda9554163c8d4cb2474c505c87

Merge branch 'release'
---

8dbd5deb8d3bbfda9554163c8d4cb2474c505c87
diff --cc NEWS
index 538ec168,979c4281..09456f60
--- a/NEWS
+++ b/NEWS
@@@ -1,18 -1,28 +1,43 @@@
 +Notmuch 0.33 (UNRELEASED)
 +=========================
 +
 +Emacs
 +-----
 +
 +`notmuch` no longer sets `mail-user-agent` on load. To restore the
 +previous behaviour of using notmuch to send mail by default, customize
 +`mail-user-agent` to `notmuch-user-agent`.
 +
 +Vim
 +---
 +
 +Respect excluded tags when showing a thread.
 +
+ Notmuch 0.32.2 (UNRELEASED)
+ ===========================
+ 
+ General
+ -------
+ 
+ Fix a bug from 2017 that can add duplicate thread-id terms to message
+ documents.
+ 
+ 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)
  ===========================
  
diff --cc test/test-lib.sh
index 23f7c8f8,862c6bc9..f83f7c6a
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@@ -134,7 -134,10 +134,9 @@@ add_gnupg_home () 
      printf '%s:6:\n' "$FINGERPRINT" | gpg --quiet --batch --no-tty --import-ownertrust
  }
  
 -add_gpgsm_home ()
 -{
 +add_gpgsm_home () {
+     test_require_external_prereq openssl
+ 
      local fpr
      [ -e "$GNUPGHOME/gpgsm.conf" ] && return
      _gnupg_exit () { gpgconf --kill all 2>/dev/null || true; }