CVS commit: pkgsrc/lang/nodejs

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat Mar 23 11:15:18 UTC 2019

Modified Files:
        pkgsrc/lang/nodejs: Makefile distinfo
Added Files:
        pkgsrc/lang/nodejs/patches: patch-deps_openssl_openssl_crypto_init.c

Log Message:
nodejs: fix SIGABRT on NetBSD/i386 8.0 by pulling upstream PR #21848.

Also apply similar ifdefs for NetBSD as FreeBSD and OpenBSD.
Now nodejs binary won't fail during lang/npm and www/firefox builds
on NetBSD/i386 8.0.

Bump PKGREVISION.

No particular comments on pkgsrc-bug@:
 http://mail-index.netbsd.org/pkgsrc-bugs/2019/03/19/msg066102.html
Should close PR pkg/53497, PR pkg/53758, PR pkg/53792, and PR pkg/53794.


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 pkgsrc/lang/nodejs/Makefile
cvs rdiff -u -r1.147 -r1.148 pkgsrc/lang/nodejs/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl_crypto_init.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/nodejs/Makefile
diff -u pkgsrc/lang/nodejs/Makefile:1.157 pkgsrc/lang/nodejs/Makefile:1.158
--- pkgsrc/lang/nodejs/Makefile:1.157   Thu Mar  7 08:47:45 2019
+++ pkgsrc/lang/nodejs/Makefile Sat Mar 23 11:15:18 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.157 2019/03/07 08:47:45 adam Exp $
+# $NetBSD: Makefile,v 1.158 2019/03/23 11:15:18 tsutsui Exp $
 
 DISTNAME=      node-v10.15.3
+PKGREVISION=   1
 
 USE_LANGUAGES= c gnu++14
 

Index: pkgsrc/lang/nodejs/distinfo
diff -u pkgsrc/lang/nodejs/distinfo:1.147 pkgsrc/lang/nodejs/distinfo:1.148
--- pkgsrc/lang/nodejs/distinfo:1.147   Thu Mar  7 08:47:45 2019
+++ pkgsrc/lang/nodejs/distinfo Sat Mar 23 11:15:18 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.147 2019/03/07 08:47:45 adam Exp $
+$NetBSD: distinfo,v 1.148 2019/03/23 11:15:18 tsutsui Exp $
 
 SHA1 (node-v10.15.3.tar.gz) = b64774eea1a877829d6882b92dd86af8d3459498
 RMD160 (node-v10.15.3.tar.gz) = bcba4edaed0f63bfb0b0e5228724fbac70424dad
@@ -17,6 +17,7 @@ SHA1 (patch-deps_openssl_openssl-cl__asm
 SHA1 (patch-deps_openssl_openssl-cl__no__asm.gypi) = 73368f336dbe500e45f0ba6bbb7656416a27b294
 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) = c21b30ff15f0442208b6da457f2ab3cc487d0a59
 SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3
 SHA1 (patch-deps_uv_src_unix_netbsd.c) = c19ff4024f828018364793d9dea013c991cfb93f
 SHA1 (patch-deps_v8_src_arm_assembler-arm-inl.h) = 56a5d6539d31e19673ef61cc91f003109c69dc29

Added files:

Index: pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl_crypto_init.c
diff -u /dev/null pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl_crypto_init.c:1.1
--- /dev/null   Sat Mar 23 11:15:18 2019
+++ pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl_crypto_init.c Sat Mar 23 11:15:18 2019
@@ -0,0 +1,45 @@
+$NetBSD: patch-deps_openssl_openssl_crypto_init.c,v 1.1 2019/03/23 11:15:18 tsutsui Exp $
+
+- pull fix from https://github.com/nodejs/node/pull/21848/commits/9868d403221bc9d566cb88a37510a182b7fbad3b
+- apply similar ifdefs for NetBSD as FreeBSD and OpenBSD
+
+--- deps/openssl/openssl/crypto/init.c.orig    2019-03-05 15:16:27.000000000 +0000
++++ deps/openssl/openssl/crypto/init.c
+@@ -121,7 +121,8 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_cr
+ #ifdef OPENSSL_INIT_DEBUG
+     fprintf(stderr, "OPENSSL_INIT: ossl_init_load_crypto_nodelete()\n");
+ #endif
+-#if !defined(OPENSSL_NO_DSO) && !defined(OPENSSL_USE_NODELETE)
++#if defined(OPENSSL_NO_STATIC_ENGINE) && \
++    !defined(OPENSSL_NO_DSO) && !defined(OPENSSL_USE_NODELETE)
+ # ifdef DSO_WIN32
+     {
+         HMODULE handle = NULL;
+@@ -285,7 +286,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_
+     return 1;
+ }
+ # if !defined(OPENSSL_NO_HW) && \
+-    (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))
++    (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(HAVE_CRYPTODEV))
+ static CRYPTO_ONCE engine_cryptodev = CRYPTO_ONCE_STATIC_INIT;
+ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_cryptodev)
+ {
+@@ -616,7 +617,7 @@ int OPENSSL_init_crypto(uint64_t opts, c
+             && !RUN_ONCE(&engine_openssl, ossl_init_engine_openssl))
+         return 0;
+ # if !defined(OPENSSL_NO_HW) && \
+-    (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))
++    (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(HAVE_CRYPTODEV))
+     if ((opts & OPENSSL_INIT_ENGINE_CRYPTODEV)
+             && !RUN_ONCE(&engine_cryptodev, ossl_init_engine_cryptodev))
+         return 0;
+@@ -666,7 +667,8 @@ int OPENSSL_atexit(void (*handler)(void)
+ {
+     OPENSSL_INIT_STOP *newhand;
+ 
+-#if !defined(OPENSSL_NO_DSO) && !defined(OPENSSL_USE_NODELETE)
++#if defined(OPENSSL_NO_STATIC_ENGINE) && \
++    !defined(OPENSSL_NO_DSO) && !defined(OPENSSL_USE_NODELETE)
+     {
+         union {
+             void *sym;