notmuch: Update to 0.33.2.

Fix a build issue on SunOS (or likely any host that is already running a
gpg-agent which confuses the gpgme configure tests), and fix test target.

Notmuch 0.33.2 (2021-09-30)
===========================

Tests
-----

Improve reliability of T355-smime by changing gpgsm initialization.

3 files changed, 24 insertions, 15 deletions

diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index 3fe1ea5594c..02f967c7055 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.70 2021/09/13 06:58:02 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2021/09/30 13:18:17 jperkin Exp $
 
-DISTNAME=	notmuch-0.33.1
+DISTNAME=	notmuch-0.33.2
 CATEGORIES=	mail
 MASTER_SITES=	https://notmuchmail.org/releases/
 EXTRACT_SUFX=	.tar.xz
@@ -12,10 +12,10 @@ LICENSE=	gnu-gpl-v3
 
 HAS_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	bash gmake makeinfo pkg-config
+USE_TOOLS+=	bash gmake makeinfo perl:test pkg-config
 MAKE_FLAGS+=	PYTHON=${PYTHONBIN}
 INFO_FILES=	yes
-#TEST_TARGET=	check
+TEST_TARGET=	check
 
 PYTHON_FOR_BUILD_ONLY=	tool
 
@@ -45,7 +45,7 @@ SUBST_MESSAGE.gpg=	Select GnuPG command
 SUBST_FILES.gpg+=	configure
 SUBST_VARS.gpg=		GPGME_GPG
 
-LDFLAGS.SunOS+=	-lnsl
+LDFLAGS.SunOS+=	-lsocket -lnsl
 
 .include "../../lang/python/application.mk"
 BUILDLINK_API_DEPENDS.gmime3+=	gmime3>=3.0.3
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
index f9bc505c61b..b44ea42af74 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.56 2021/09/13 06:58:02 wiz Exp $
+$NetBSD: distinfo,v 1.57 2021/09/30 13:18:17 jperkin Exp $
 
-SHA1 (notmuch-0.33.1.tar.xz) = 297d797bfc5c036db98e94792826417b9a7a1125
-RMD160 (notmuch-0.33.1.tar.xz) = d3125188674a02d33d1e44909c827d24de1618e7
-SHA512 (notmuch-0.33.1.tar.xz) = 19c4ab0a05ebc7230631f554864cfa65fe37e9b3c1a20ed21cc090cda612b28042ea90e64cfe86a1d6157cd0510357da8c066b9146c045e61cb3e7836012a695
-Size (notmuch-0.33.1.tar.xz) = 730640 bytes
-SHA1 (patch-configure) = 63b15478d1f360b930ccdcef1bfc853f5d683499
+SHA1 (notmuch-0.33.2.tar.xz) = b5e5e30069bfc0e70084894e109ef3c95a280921
+RMD160 (notmuch-0.33.2.tar.xz) = 69f24862a333ef3ecf93b2bb55f2b7ddc7b7d4f7
+SHA512 (notmuch-0.33.2.tar.xz) = 15f4ecbd991df3a64c2b89aeb6bf7649e76ff2010f80120a15c10c9c5e913a90696ef6a760cbea24bbc9a3ca8cae18fada13d80e69c848cc142d355f2a513f5d
+Size (notmuch-0.33.2.tar.xz) = 733228 bytes
+SHA1 (patch-configure) = b99a3c51e1d4521489a927469398e90ac14a156f
 SHA1 (patch-emacs_Makefile.local) = 4a36a2c165852a098a45c8b99c8372d65d33b07c
diff --git a/mail/notmuch/patches/patch-configure b/mail/notmuch/patches/patch-configure
index 19a62097370..40758d22b4b 100644
--- a/mail/notmuch/patches/patch-configure
+++ b/mail/notmuch/patches/patch-configure
@@ -1,9 +1,10 @@
-$NetBSD: patch-configure,v 1.4 2021/06/23 18:34:33 schmonz Exp $
+$NetBSD: patch-configure,v 1.5 2021/09/30 13:18:17 jperkin Exp $
 
 * Select GnuPG binary
 * Don't let CDPATH affect the build
+* Ignore errors for gpgme tests, can be affected by running gpg-agent
 
---- configure.orig	2021-05-15 12:04:24.000000000 +0000
+--- configure.orig	2021-09-30 11:28:49.000000000 +0000
 +++ configure
 @@ -499,7 +499,7 @@ EOF
          printf 'No.\nCould not make tempdir for testing session-key support.\n'
@@ -14,7 +15,15 @@ $NetBSD: patch-configure,v 1.4 2021/06/23 18:34:33 schmonz Exp $
             && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
             && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
      then
-@@ -650,7 +650,7 @@ EOF
+@@ -591,7 +591,6 @@ is later than 3.2.7, which should have f
+ Please follow up on https://github.com/jstedfast/gmime/pull/90 with
+ more details.
+ EOF
+-                errors=$((errors + 1))
+             fi
+         fi
+     else
+@@ -650,7 +649,7 @@ EOF
          printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n'
          errors=$((errors + 1))
      elif ${CC} ${CFLAGS} ${gmime_cflags} _verify_sig_with_session_key.c ${gmime_ldflags} -o _verify_sig_with_session_key \
@@ -23,7 +32,7 @@ $NetBSD: patch-configure,v 1.4 2021/06/23 18:34:33 schmonz Exp $
              && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key
      then
          if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then
-@@ -1536,7 +1536,7 @@ EOF
+@@ -1536,7 +1535,7 @@ EOF
      if [ $WITH_PYTHON_DOCS = "1" ]; then
          echo "tags.add('WITH_PYTHON')"
      fi