From 8c1f637c706483577a22c8d4f2d06d5f041c9093 Mon Sep 17 00:00:00 2001 From: TROUVERIE Joachim Date: Fri, 4 Mar 2022 17:59:30 +0100 Subject: [PATCH] notmuch: update to 0.35. --- ...mime-session-key-extraction-support-.patch | 43 +++++++------- ...mime-x509-certificate-validity-check.patch | 56 +++++++++---------- ...-gmime-verify-with-session-key-check.patch | 39 +++++++------ srcpkgs/notmuch/template | 10 ++-- 4 files changed, 72 insertions(+), 76 deletions(-) diff --git a/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch b/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch index 581c6be155..b6445729af 100644 --- a/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch +++ b/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch @@ -17,13 +17,13 @@ Signed-off-by: Đoàn Trần Công Danh 1 file changed, 58 deletions(-) diff --git a/configure b/configure -index 7dae745c..99b0c328 100755 +index 36f3f606..1bf2097d 100755 --- a/configure +++ b/configure -@@ -467,65 +467,7 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then - +@@ -492,65 +492,7 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then + printf "Checking for GMime session key extraction support... " - + - cat > _check_session_keys.c < -#include @@ -54,16 +54,16 @@ index 7dae745c..99b0c328 100755 -} -EOF - if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then -- printf 'No.\nCould not make tempdir for testing session-key support.\n' -- errors=$((errors + 1)) +- 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 \ -- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \ -- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ] +- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \ +- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \ +- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ] - then - printf "OK.\n" + printf "OK.\n" - else -- cat </dev/null; then -- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)" -- else -- printf 'You do not have the GPGME development libraries installed.\n' -- fi -- errors=$((errors + 1)) +- if command -v gpgme-config >/dev/null; then +- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)" +- else +- printf 'You do not have the GPGME development libraries installed.\n' +- fi +- errors=$((errors + 1)) - fi - if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then -- rm -rf "$TEMP_GPG" +- rm -rf "$TEMP_GPG" - fi - + # see https://github.com/jstedfast/gmime/pull/90 # should be fixed in GMime in 3.2.7, but some distros might patch --- -2.28.0.rc2.21.g5c06d60fc5 - +-- +2.35.1 diff --git a/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch b/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch index 49b5b3a079..c7e5addc07 100644 --- a/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch +++ b/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch @@ -11,18 +11,17 @@ The problem has been fixed with gmime 3.2.7 already. Signed-off-by: Đoàn Trần Công Danh --- - configure | 70 ------------------------------------------------------- - 1 file changed, 70 deletions(-) + configure | 69 ------------------------------------------------------- + 1 file changed, 69 deletions(-) diff --git a/configure b/configure -index 99b0c328..ef602d10 100755 +index 36f3f606..fd23aa67 100755 --- a/configure +++ b/configure -@@ -472,78 +472,8 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then - # see https://github.com/jstedfast/gmime/pull/90 +@@ -556,77 +556,8 @@ EOF # should be fixed in GMime in 3.2.7, but some distros might patch printf "Checking for GMime X.509 certificate validity... " -- + - cat > _check_x509_validity.c < -#include @@ -63,40 +62,39 @@ index 99b0c328..ef602d10 100755 -} -EOF - if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then -- printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n' -- errors=$((errors + 1)) +- printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n' +- errors=$((errors + 1)) - elif ${CC} ${CFLAGS} ${gmime_cflags} _check_x509_validity.c ${gmime_ldflags} -o _check_x509_validity \ -- && echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \ -- && echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \ -- && GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt +- && echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \ +- && echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \ +- && GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt - then -- if GNUPGHOME=${TEMP_GPG} ./_check_x509_validity; then - gmime_x509_cert_validity=1 - printf "Yes.\n" -- else -- gmime_x509_cert_validity=0 -- printf "No.\n" -- if pkg-config --exists "gmime-3.0 >= 3.2.7"; then -- cat <= 3.2.7"; then +- cat < 1 file changed, 66 deletions(-) diff --git a/configure b/configure -index ef602d10..204d46d9 100755 +index 36f3f606..cd99bf4a 100755 --- a/configure +++ b/configure -@@ -478,74 +478,8 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then +@@ -631,74 +631,8 @@ EOF # see https://dev.gnupg.org/T3464 # there are problems verifying signatures when decrypting with session keys with GPGME 1.13.0 and 1.13.1 printf "Checking signature verification when decrypting using session keys... " @@ -67,35 +67,34 @@ index ef602d10..204d46d9 100755 -} -EOF - if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then -- printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n' -- errors=$((errors + 1)) +- 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 \ -- && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key +- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \ +- && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key - then -- if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then - gmime_verify_with_session_key=1 - printf "Yes.\n" -- else -- gmime_verify_with_session_key=0 -- printf "No.\n" -- cat <=3.2.7" checkdepends="python3-pytest mdocml dtach gdb tar xz xapian-core openssl" short_desc="Thread-based email index, search, and tagging" -maintainer="Jan S. " +maintainer="Joachim T. " license="GPL-3.0-or-later" homepage="https://notmuchmail.org" distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz https://notmuchmail.org/releases/test-databases/database-v1.tar.xz" -checksum="8e0a7eb8ff2e6011ef48b2bf11d79b9c4bb74511cfe2987758b64898c2a2ded7 +checksum="a831c414c4f20a6cae3a580793c855102d3295080f000eb3832b77226a40ac39 4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2" skip_extraction="database-v1.tar.xz" replaces="notmuch-emacs>=0" @@ -56,7 +56,7 @@ do_check() { # we don't ship python-cffi NOTMUCH_SKIP_TESTS+=" libconfig python-cffi" if [ $(id -u) = 0 ]; then - NOTMUCH_SKIP_TESTS+=" new.36 tagging.25" + NOTMUCH_SKIP_TESTS+=" new.36 new.39 tagging.25" fi export NOTMUCH_SKIP_TESTS make test