[pkgsrc/trunk]: pkgsrc/security/p5-Crypt-Curve25519 p5-Crypt-Curve25519: work...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/30dde4498745
branches:  trunk
changeset: 425539:30dde4498745
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Mar 22 13:15:13 2020 +0000

description:
p5-Crypt-Curve25519: work around namespace conflict

diffstat:

 security/p5-Crypt-Curve25519/distinfo                             |   4 ++-
 security/p5-Crypt-Curve25519/patches/patch-curve25519-donna-c64.c |  15 ++++++++++
 security/p5-Crypt-Curve25519/patches/patch-curve25519-donna.c     |  15 ++++++++++
 3 files changed, 33 insertions(+), 1 deletions(-)

diffs (51 lines):

diff -r ed32a613553f -r 30dde4498745 security/p5-Crypt-Curve25519/distinfo
--- a/security/p5-Crypt-Curve25519/distinfo     Sun Mar 22 13:04:11 2020 +0000
+++ b/security/p5-Crypt-Curve25519/distinfo     Sun Mar 22 13:15:13 2020 +0000
@@ -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
diff -r ed32a613553f -r 30dde4498745 security/p5-Crypt-Curve25519/patches/patch-curve25519-donna-c64.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/p5-Crypt-Curve25519/patches/patch-curve25519-donna-c64.c Sun Mar 22 13:15:13 2020 +0000
@@ -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];
diff -r ed32a613553f -r 30dde4498745 security/p5-Crypt-Curve25519/patches/patch-curve25519-donna.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/p5-Crypt-Curve25519/patches/patch-curve25519-donna.c     Sun Mar 22 13:15:13 2020 +0000
@@ -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];