From a19d2b0d2b8c666d0a3641dc2e7e1b4e73b7c2bd Mon Sep 17 00:00:00 2001
From: David Bremner <david@tethera.net>
Date: Tue, 8 Jun 2021 16:39:10 -0300
Subject: [PATCH 1/4] test: check openssl prequisite for add_gpgsm_home
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a fix for the test failures reported by Dan Čermák [1].

It is more robust to check for the prerequisite inside the function
that uses it, rather than in every test file that calls the function.

[1]: id:87k0n4fqgm.fsf@tethera.net
---
 test/test-lib.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 4c9f2a21..862c6bc9 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -136,6 +136,8 @@ add_gnupg_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; }

From dda50ede050caa8aef5dda68d41b30b6c213c67d Mon Sep 17 00:00:00 2001
From: David Bremner <david@tethera.net>
Date: Tue, 8 Jun 2021 20:12:33 -0300
Subject: [PATCH 2/4] emacs: require seq for seq-some

Although the function dates from 2015, the autoload is newer. In
particular [1] it is not found in Emacs 25.3.

[1]: id:874ke85tqx.fsf@cgc-instruments.com
---
 emacs/notmuch-maildir-fcc.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
index ae8f5140..c715532b 100644
--- a/emacs/notmuch-maildir-fcc.el
+++ b/emacs/notmuch-maildir-fcc.el
@@ -21,6 +21,8 @@
 
 ;;; Code:
 
+(require 'seq)
+
 (require 'message)
 
 (require 'notmuch-lib)

From ce0fa835d30ba2ec94f3cf3cef450090ed7e69e7 Mon Sep 17 00:00:00 2001
From: David Bremner <david@tethera.net>
Date: Sun, 20 Jun 2021 16:41:03 -0300
Subject: [PATCH 3/4] NEWS: start NEWS for 0.32.2

---
 NEWS | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/NEWS b/NEWS
index 4bb4779e..a47fd4e9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,28 @@
+Notmuch 0.32.2 (UNRELASED)
+==========================
+
+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)
 ===========================
 

From 86818626b3294f5b144e74181baf37f0b2d30578 Mon Sep 17 00:00:00 2001
From: David Bremner <david@tethera.net>
Date: Sun, 20 Jun 2021 16:59:30 -0300
Subject: [PATCH 4/4] NEWS: fix typo

Oops. Apparently our release checks do not check the spelling of
UNRELEASED (although Tomi's wiki conversion script does).
---
 NEWS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index a47fd4e9..979c4281 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
-Notmuch 0.32.2 (UNRELASED)
-==========================
+Notmuch 0.32.2 (UNRELEASED)
+===========================
 
 General
 -------