CVS commit: pkgsrc/mail/notmuch

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Nov  2 10:15:06 UTC 2026

Modified Files:
        pkgsrc/mail/notmuch: distinfo
        pkgsrc/mail/notmuch/patches: patch-configure

Log Message:
notmuch: Avoid configure hangs with Apple clang-1700.0.13.5.


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/mail/notmuch/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/notmuch/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/notmuch/distinfo
diff -u pkgsrc/mail/notmuch/distinfo:1.72 pkgsrc/mail/notmuch/distinfo:1.73
--- pkgsrc/mail/notmuch/distinfo:1.72   Sat May 30 16:58:17 2026
+++ pkgsrc/mail/notmuch/distinfo        Mon Nov  2 10:15:05 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.72 2026/05/30 16:58:17 ryoon Exp $
+$NetBSD: distinfo,v 1.73 2026/11/02 10:15:05 jperkin Exp $
 
 BLAKE2s (notmuch-0.40.tar.xz) = 3636cf157c0bc398641b3ef4d91fa50efc53bf3442320db7c84885dadeea3c63
 SHA512 (notmuch-0.40.tar.xz) = 937c72c05b00520cc3dbc7db6282ad65a621c8e102fbcbac3c9d99061ae510741b13ef9cf5c6476ba8e7fa15a6905631159477a938d1369db6d9885780b90867
 Size (notmuch-0.40.tar.xz) = 815476 bytes
-SHA1 (patch-configure) = d5a2e96168d6198a7781f24af107eb999290d83e
+SHA1 (patch-configure) = 788f2a470d7d59188558962ff5e08553f121bfe9
 SHA1 (patch-emacs_Makefile.local) = 4a36a2c165852a098a45c8b99c8372d65d33b07c

Index: pkgsrc/mail/notmuch/patches/patch-configure
diff -u pkgsrc/mail/notmuch/patches/patch-configure:1.9 pkgsrc/mail/notmuch/patches/patch-configure:1.10
--- pkgsrc/mail/notmuch/patches/patch-configure:1.9     Sun Oct 15 07:33:48 2023
+++ pkgsrc/mail/notmuch/patches/patch-configure Mon Nov  2 10:15:06 2026
@@ -1,12 +1,31 @@
-$NetBSD: patch-configure,v 1.9 2023/10/15 07:33:48 ryoon Exp $
+$NetBSD: patch-configure,v 1.10 2026/11/02 10:15:06 jperkin Exp $
 
 * Select GnuPG binary
 * Don't let CDPATH affect the build
 * Ignore errors for gpgme tests, can be affected by running gpg-agent
+* Avoid sanitizer test hangs using Apple clang-1700.0.13.5.
 
---- configure.orig     2023-09-12 11:37:38.000000000 +0000
+--- configure.orig     2026-01-31 04:53:45.000000000 +0000
 +++ configure
-@@ -537,7 +537,7 @@ EOF
+@@ -373,7 +373,16 @@ dependencies are available:
+ EOF
+ 
+ errors=0
+-printf "int main(void){return 0;}\n" > minimal.c
++cat >minimal.c <<EOF
++#if defined(__apple_build_version__) && \
++    __apple_build_version__ >= 17000000 && \
++    __apple_build_version__ < 17000100
++# if __has_feature(address_sanitizer) || __has_feature(thread_sanitizer)
++#  error Sanitizer runtime hangs on newer macOS with this Apple Clang build
++# endif
++#endif
++int main(void){return 0;}
++EOF
+ 
+ printf "Sanity checking C compilation environment... "
+ test_cmdline="${CC} ${CFLAGS} ${CPPFLAGS} minimal.c ${LDFLAGS} -o minimal"
+@@ -537,7 +546,7 @@ EOF
        printf 'No.\nCould not make tempdir for testing session-key support.\n'
        errors=$((errors + 1))
      elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
@@ -15,7 +34,7 @@ $NetBSD: patch-configure,v 1.9 2023/10/1
           && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
           && [ $SESSION_KEY = 9:496A0B6D15A5E7BA762FB8E5FE6DEE421D4D9BBFCEAD1CDD0CCF636D07ADE621 ]
      then
-@@ -635,7 +635,6 @@ is later than 3.2.7, which should have f
+@@ -635,7 +644,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
@@ -23,7 +42,7 @@ $NetBSD: patch-configure,v 1.9 2023/10/1
            fi
        fi
        printf "Checking whether GMime emits email addresses with angle brackets... "
-@@ -703,7 +702,7 @@ EOF
+@@ -703,7 +711,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 \
@@ -32,7 +51,7 @@ $NetBSD: patch-configure,v 1.9 2023/10/1
            && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key
      then
        if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then
-@@ -1655,7 +1654,7 @@ EOF
+@@ -1655,7 +1663,7 @@ EOF
      if [ $WITH_PYTHON_DOCS = "1" ]; then
        echo "tags.add('WITH_PYTHON')"
      fi