Received: by mail.netbsd.org (Postfix, from userid 605) id 461ED84D28; Wed, 23 Jun 2021 18:34:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8092984CE2 for ; Wed, 23 Jun 2021 18:34:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id PhOSigTyqPUD for ; Wed, 23 Jun 2021 18:34:34 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id E8C9584C86 for ; Wed, 23 Jun 2021 18:34:33 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DC653FA95; Wed, 23 Jun 2021 18:34:33 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_162447327315980" MIME-Version: 1.0 Date: Wed, 23 Jun 2021 18:34:33 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/mail/notmuch To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20210623183433.DC653FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_162447327315980 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Wed Jun 23 18:34:33 UTC 2021 Modified Files: pkgsrc/mail/notmuch: distinfo pkgsrc/mail/notmuch/patches: patch-configure Log Message: Don't let CDPATH affect the build. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 pkgsrc/mail/notmuch/distinfo cvs rdiff -u -r1.3 -r1.4 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. --_----------=_162447327315980 Content-Disposition: inline Content-Length: 2998 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/notmuch/distinfo diff -u pkgsrc/mail/notmuch/distinfo:1.51 pkgsrc/mail/notmuch/distinfo:1.52 --- pkgsrc/mail/notmuch/distinfo:1.51 Mon May 17 16:09:19 2021 +++ pkgsrc/mail/notmuch/distinfo Wed Jun 23 18:34:33 2021 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.51 2021/05/17 16:09:19 ryoon Exp $ +$NetBSD: distinfo,v 1.52 2021/06/23 18:34:33 schmonz Exp $ SHA1 (notmuch-0.32.1.tar.xz) = 8f5209719f27dce21fc493dad59204624a9055f6 RMD160 (notmuch-0.32.1.tar.xz) = eebf6bca560e8866e5b2332a816d1f8de4264c8f SHA512 (notmuch-0.32.1.tar.xz) = c561658919a3c19bfe282e28a5c95db5d58030f044307fdfcaee02d3bf6fc15c9ae9d6d9d8a948c9e6f9b54f563dc82cde757a26a7d7c33eb976b3cfe7ce8c36 Size (notmuch-0.32.1.tar.xz) = 725196 bytes -SHA1 (patch-configure) = 540b17f70befb7eced5f0a0361c3232a71cc48a1 +SHA1 (patch-configure) = 63b15478d1f360b930ccdcef1bfc853f5d683499 SHA1 (patch-emacs_Makefile.local) = 4a36a2c165852a098a45c8b99c8372d65d33b07c Index: pkgsrc/mail/notmuch/patches/patch-configure diff -u pkgsrc/mail/notmuch/patches/patch-configure:1.3 pkgsrc/mail/notmuch/patches/patch-configure:1.4 --- pkgsrc/mail/notmuch/patches/patch-configure:1.3 Sun Jul 12 01:48:36 2020 +++ pkgsrc/mail/notmuch/patches/patch-configure Wed Jun 23 18:34:33 2021 @@ -1,10 +1,11 @@ -$NetBSD: patch-configure,v 1.3 2020/07/12 01:48:36 ryoon Exp $ +$NetBSD: patch-configure,v 1.4 2021/06/23 18:34:33 schmonz Exp $ * Select GnuPG binary +* Don't let CDPATH affect the build ---- configure.orig 2020-07-11 01:25:04.000000000 +0000 +--- configure.orig 2021-05-15 12:04:24.000000000 +0000 +++ configure -@@ -518,7 +518,7 @@ EOF +@@ -499,7 +499,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 \ @@ -13,7 +14,7 @@ $NetBSD: patch-configure,v 1.3 2020/07/1 && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \ && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ] then -@@ -669,7 +669,7 @@ EOF +@@ -650,7 +650,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 \ @@ -22,3 +23,12 @@ $NetBSD: patch-configure,v 1.3 2020/07/1 && 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 + if [ $WITH_PYTHON_DOCS = "1" ]; then + echo "tags.add('WITH_PYTHON')" + fi +- printf "rsti_dir = '%s'\n" "$(cd emacs && pwd -P)" ++ printf "rsti_dir = '%s'\n" "$(unset CDPATH && cd emacs && pwd -P)" + } > sphinx.config + + # Finally, after everything configured, inform the user how to continue. --_----------=_162447327315980--