From 78d565e89f6152b6ae0a93d02087b022ac9f78f6 Mon Sep 17 00:00:00 2001
From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Date: Tue, 1 Oct 2024 15:16:45 -0400
Subject: net-mail/notmuch: upgrade to 0.38.3

---
 net-mail/notmuch/files/notmuch-assume-modern-gmime.patch | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'net-mail/notmuch/files')

diff --git a/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch b/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch
index 5c9f86a..a138814 100644
--- a/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch
+++ b/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch
@@ -1,8 +1,6 @@
-diff --git a/configure b/configure
-index 5247e05a..097b2039 100755
 --- a/configure
 +++ b/configure
-@@ -490,230 +490,9 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
+@@ -502,230 +502,9 @@
      gmime_cflags=$(pkg-config --cflags gmime-3.0)
      gmime_ldflags=$(pkg-config --libs gmime-3.0)
  
@@ -41,9 +39,9 @@ index 5247e05a..097b2039 100755
 -	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 \
--	   && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
+-	   && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/openpgp4-secret-key.asc \
 -	   && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
--	   && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+-	   && [ $SESSION_KEY = 9:496A0B6D15A5E7BA762FB8E5FE6DEE421D4D9BBFCEAD1CDD0CCF636D07ADE621 ]
 -    then
 -	printf "OK.\n"
 -    else
@@ -57,8 +55,8 @@ index 5247e05a..097b2039 100755
 -Please try to rebuild your version of GMime against a more recent
 -version of GPGME (at least GPGME 1.8.0).
 -EOF
--	if command -v gpgme-config >/dev/null; then
--	    printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+-	if GPGME_VERS="$(pkg-config --modversion gpgme || gpgme-config --version)"; then
+-	    printf 'Your current GPGME development version is: %s\n' "$GPGME_VERS"
 -	else
 -	    printf 'You do not have the GPGME development libraries installed.\n'
 -	fi
@@ -186,7 +184,7 @@ index 5247e05a..097b2039 100755
 -    body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
 -    if (body == NULL) return !!	fprintf (stderr, "did not find a multipart/encrypted message\n");
 -
--    output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_NONE, "9:13607E4217515A70EC8DF9DBC16C5327B94577561D98AD1246FA8756659C7899", &result, &error);
+-    output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_NONE, "9:9E1CDF53BBF794EA34F894B5B68E1E56FB015EA69F81D2A5EAB7F96C7B65783E", &result, &error);
 -    if (error || output == NULL) return !! fprintf (stderr, "decrypt failed\n");
 -
 -    sig_list = g_mime_decrypt_result_get_signatures (result);
@@ -207,7 +205,7 @@ index 5247e05a..097b2039 100755
 -	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 \
--	    && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
+-	    && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/openpgp4-secret-key.asc \
 -	    && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key
 -    then
 -	if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then
-- 
cgit v1.2.3-70-g09d2