Received: by mail.netbsd.org (Postfix, from userid 605) id 33A3D84DA6; Tue, 2 Jul 2019 17:09:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B17F084D52 for ; Tue, 2 Jul 2019 17:09:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id WVIikfa10YTc for ; Tue, 2 Jul 2019 17:09:26 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 32A0584CE9 for ; Tue, 2 Jul 2019 17:09:26 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2BFB5FBF4; Tue, 2 Jul 2019 17:09:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_156208736616510" MIME-Version: 1.0 Date: Tue, 2 Jul 2019 17:09:26 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/lang/nodejs To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20190702170926.2BFB5FBF4@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. --_----------=_156208736616510 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Tue Jul 2 17:09:26 UTC 2019 Modified Files: pkgsrc/lang/nodejs: distinfo Added Files: pkgsrc/lang/nodejs/patches: patch-deps_openssl_openssl_crypto_rand_rand__unix.c Log Message: nodejs: Work around getentropy issue on SunOS. Noticed by Stefan Husch in joyent/pkgsrc#203. To generate a diff of this commit: cvs rdiff -u -r1.149 -r1.150 pkgsrc/lang/nodejs/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl_crypto_rand_rand__unix.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_156208736616510 Content-Disposition: inline Content-Length: 2395 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/nodejs/distinfo diff -u pkgsrc/lang/nodejs/distinfo:1.149 pkgsrc/lang/nodejs/distinfo:1.150 --- pkgsrc/lang/nodejs/distinfo:1.149 Fri May 31 20:52:00 2019 +++ pkgsrc/lang/nodejs/distinfo Tue Jul 2 17:09:25 2019 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.149 2019/05/31 20:52:00 adam Exp $ +$NetBSD: distinfo,v 1.150 2019/07/02 17:09:25 jperkin Exp $ SHA1 (node-v10.16.0.tar.gz) = 7e228646ef32c7eb4e509c220201366d6e86cc36 RMD160 (node-v10.16.0.tar.gz) = 7a5610db052012bff785a16a522703c458f725d5 @@ -18,6 +18,7 @@ SHA1 (patch-deps_openssl_openssl-cl__no_ SHA1 (patch-deps_openssl_openssl__asm.gypi) = b85e1f5a9f862d469afcb36ff6e1ad202bea704a SHA1 (patch-deps_openssl_openssl__no__asm.gypi) = b549ea34f51e26669a41a64da0db10e92f0d0a99 SHA1 (patch-deps_openssl_openssl_crypto_init.c) = e544fb218fd927a6d7097df3718c145750198555 +SHA1 (patch-deps_openssl_openssl_crypto_rand_rand__unix.c) = ba8d4602c3386801ad8d3c33c757c69ad3d25a34 SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3 SHA1 (patch-deps_uv_src_unix_netbsd.c) = 76b27ae86aa80582554ee824146ee7c42c33883b SHA1 (patch-deps_v8_src_arm_assembler-arm-inl.h) = 56a5d6539d31e19673ef61cc91f003109c69dc29 Added files: Index: pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl_crypto_rand_rand__unix.c diff -u /dev/null pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl_crypto_rand_rand__unix.c:1.1 --- /dev/null Tue Jul 2 17:09:26 2019 +++ pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl_crypto_rand_rand__unix.c Tue Jul 2 17:09:25 2019 @@ -0,0 +1,16 @@ +$NetBSD: patch-deps_openssl_openssl_crypto_rand_rand__unix.c,v 1.1 2019/07/02 17:09:25 jperkin Exp $ + +Don't try to automatically call getentropy(3C) on SunOS, it fails if +built on a platform that doesn't have it. + +--- deps/openssl/openssl/crypto/rand/rand_unix.c.orig 2019-05-28 21:32:16.000000000 +0000 ++++ deps/openssl/openssl/crypto/rand/rand_unix.c +@@ -301,7 +301,7 @@ static ssize_t syscall_random(void *buf, + * - Linux since 3.17 with glibc 2.25 + * - FreeBSD since 12.0 (1200061) + */ +-# if defined(__GNUC__) && __GNUC__>=2 && defined(__ELF__) && !defined(__hpux) ++# if defined(__GNUC__) && __GNUC__>=2 && defined(__ELF__) && !defined(__hpux) && !defined(__sun) + extern int getentropy(void *buffer, size_t length) __attribute__((weak)); + + if (getentropy != NULL) --_----------=_156208736616510--