Received: by mail.netbsd.org (Postfix, from userid 605) id 5F6C684E4E; Sun, 22 Mar 2020 13:15:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DB0FD84DDC for ; Sun, 22 Mar 2020 13:15:14 +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 vVK9HeeMarV5 for ; Sun, 22 Mar 2020 13:15:14 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5280984D25 for ; Sun, 22 Mar 2020 13:15:14 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4AA95FB27; Sun, 22 Mar 2020 13:15:14 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1584882914221020" MIME-Version: 1.0 Date: Sun, 22 Mar 2020 13:15:14 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/security/p5-Crypt-Curve25519 To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20200322131514.4AA95FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1584882914221020 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Sun Mar 22 13:15:14 UTC 2020 Modified Files: pkgsrc/security/p5-Crypt-Curve25519: distinfo Added Files: pkgsrc/security/p5-Crypt-Curve25519/patches: patch-curve25519-donna-c64.c patch-curve25519-donna.c Log Message: p5-Crypt-Curve25519: work around namespace conflict To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/p5-Crypt-Curve25519/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/security/p5-Crypt-Curve25519/patches/patch-curve25519-donna-c64.c \ pkgsrc/security/p5-Crypt-Curve25519/patches/patch-curve25519-donna.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1584882914221020 Content-Disposition: inline Content-Length: 2955 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/p5-Crypt-Curve25519/distinfo diff -u pkgsrc/security/p5-Crypt-Curve25519/distinfo:1.1 pkgsrc/security/p5-Crypt-Curve25519/distinfo:1.2 --- pkgsrc/security/p5-Crypt-Curve25519/distinfo:1.1 Wed Aug 23 13:46:12 2017 +++ pkgsrc/security/p5-Crypt-Curve25519/distinfo Sun Mar 22 13:15:13 2020 @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.1 2017/08/23 13:46:12 he Exp $ +$NetBSD: distinfo,v 1.2 2020/03/22 13:15:13 tnn Exp $ SHA1 (Crypt-Curve25519-0.06.tar.gz) = 5c3e217f6260f83c1a5cce33c2b63ae4954a85e1 RMD160 (Crypt-Curve25519-0.06.tar.gz) = 5c4ec052c338d798d41d1e12e76ca1c482896cf6 SHA512 (Crypt-Curve25519-0.06.tar.gz) = e5d351c36c9f60e1b55f45bf9fa871fddf949bd5c0a20b4d065e1eb2d4e24ba43807289591eda854fca28b5909fd6af1b0fc9ede63efbeeaf6e011e7382a4e1d Size (Crypt-Curve25519-0.06.tar.gz) = 27835 bytes +SHA1 (patch-curve25519-donna-c64.c) = bc15215560043b3f88016677c8f5d85b483a0b64 +SHA1 (patch-curve25519-donna.c) = d6a7a9f03ff64f0f9fe0e0d5ee36d4974b1c021c Added files: Index: pkgsrc/security/p5-Crypt-Curve25519/patches/patch-curve25519-donna-c64.c diff -u /dev/null pkgsrc/security/p5-Crypt-Curve25519/patches/patch-curve25519-donna-c64.c:1.1 --- /dev/null Sun Mar 22 13:15:14 2020 +++ pkgsrc/security/p5-Crypt-Curve25519/patches/patch-curve25519-donna-c64.c Sun Mar 22 13:15:14 2020 @@ -0,0 +1,15 @@ +$NetBSD: patch-curve25519-donna-c64.c,v 1.1 2020/03/22 13:15:14 tnn Exp $ + +/usr/include/x86_64-linux-gnu/bits/mathcalls-narrow.h:30:20: note: previous declaration of 'fmul' was here + 30 | __MATHCALL_NARROW (__MATHCALL_NAME (mul), __MATHCALL_REDIR_NAME (mul), 2); + +--- curve25519-donna-c64.c.orig 2017-04-05 23:25:50.000000000 +0000 ++++ curve25519-donna-c64.c +@@ -95,6 +95,7 @@ fscalar_product(felem output, const fele + * Assumes that in[i] < 2**55 and likewise for in2. + * On return, output[i] < 2**52 + */ ++#define fmul my_fmul + static inline void force_inline + fmul(felem output, const felem in2, const felem in) { + uint128_t t[5]; Index: pkgsrc/security/p5-Crypt-Curve25519/patches/patch-curve25519-donna.c diff -u /dev/null pkgsrc/security/p5-Crypt-Curve25519/patches/patch-curve25519-donna.c:1.1 --- /dev/null Sun Mar 22 13:15:14 2020 +++ pkgsrc/security/p5-Crypt-Curve25519/patches/patch-curve25519-donna.c Sun Mar 22 13:15:14 2020 @@ -0,0 +1,15 @@ +$NetBSD: patch-curve25519-donna.c,v 1.1 2020/03/22 13:15:14 tnn Exp $ + +/usr/include/x86_64-linux-gnu/bits/mathcalls-narrow.h:30:20: note: previous declaration of 'fmul' was here + 30 | __MATHCALL_NARROW (__MATHCALL_NAME (mul), __MATHCALL_REDIR_NAME (mul), 2); + +--- curve25519-donna.c.orig 2017-04-05 23:25:50.000000000 +0000 ++++ curve25519-donna.c +@@ -324,6 +324,7 @@ static void freduce_coefficients(limb *o + * output must be distinct to both inputs. The output is reduced degree and + * reduced coefficient. + */ ++#define fmul my_fmul + static void + fmul(limb *output, const limb *in, const limb *in2) { + limb t[19]; --_----------=_1584882914221020--