nodejs10: updated to 10.22.1

Version 10.22.1 'Dubnium' (LTS)

Notable changes
This is a security release.

Vulnerabilities fixed:
CVE-2020-8252: fs.realpath.native on may cause buffer overflow (Medium).

Version 10.22.0 'Dubnium' (LTS)

Notable changes
deps:
* upgrade npm to 6.14.6
* upgrade openssl sources to 1.1.1g
n-api:
* add napi_detach_arraybuffer

5 files changed, 19 insertions, 59 deletions

diff --git a/lang/nodejs10/Makefile b/lang/nodejs10/Makefile
index b289237a465..689f05b3dc5 100644
--- a/lang/nodejs10/Makefile
+++ b/lang/nodejs10/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2020/06/18 04:58:24 gutteridge Exp $
+# $NetBSD: Makefile,v 1.15 2020/10/02 12:23:53 adam Exp $
 
-DISTNAME=	node-v10.21.0
+DISTNAME=	node-v10.22.1
 
 USE_LANGUAGES=	c gnu++14
 
diff --git a/lang/nodejs10/distinfo b/lang/nodejs10/distinfo
index 4cb0dd0a18f..8580ee46c51 100644
--- a/lang/nodejs10/distinfo
+++ b/lang/nodejs10/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.7 2020/06/03 09:25:38 adam Exp $
+$NetBSD: distinfo,v 1.8 2020/10/02 12:23:53 adam Exp $
 
-SHA1 (node-v10.21.0.tar.gz) = bdb36bf43b52f2ce2f02753d3c9154c761dfea4b
-RMD160 (node-v10.21.0.tar.gz) = 82e6d8c6a1f5d36d7c6bfd9d931cc3c3561fec5d
-SHA512 (node-v10.21.0.tar.gz) = ebd2871d29e2fadf9f743e0cc73e76b7357d0b3834ea40746f6d71664ae0ec0a33c05bf82cb0ef9ae6f5cb5bcdd735e59481e15a5c67367603f5f2089faf1dea
-Size (node-v10.21.0.tar.gz) = 47193648 bytes
+SHA1 (node-v10.22.1.tar.gz) = a7e9e80a8f17190b2e0996f3535c0ac959d397e2
+RMD160 (node-v10.22.1.tar.gz) = 55db18669bab1506c05a031c6f5363cc1be49dcb
+SHA512 (node-v10.22.1.tar.gz) = c95ee4fbed9060562a52c018436d013da2218bc1aed4b1ea280adb4043e6e6487e4d8007d126173b06ab6c66bf3edae383e515f5b7bc73a7587cc793b9ab40b6
+Size (node-v10.22.1.tar.gz) = 46546924 bytes
 SHA1 (patch-common.gypi) = de37949f38d9bd39a18b59d59ec74e528bd323ac
-SHA1 (patch-configure.py) = 0d5c5fb3b4f2618c15f96080b590baf6bde66391
 SHA1 (patch-deps_cares_cares.gyp) = 22b44f2ac59963f694dfe4f4585e08960b3dec32
 SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3
 SHA1 (patch-deps_v8_src_arm_assembler-arm-inl.h) = 56a5d6539d31e19673ef61cc91f003109c69dc29
@@ -19,11 +18,10 @@ SHA1 (patch-deps_v8_src_base_platform_semaphore.cc) = aa84bf1dbaac5808529f6b0150
 SHA1 (patch-deps_v8_src_compiler_types.h) = 711cc94535200374104c3cd1f0fbbd00994701a6
 SHA1 (patch-deps_v8_src_globals.h) = 6695a381000844ad9837bdbc3edbe9040ec4d5ff
 SHA1 (patch-deps_v8_src_log-utils.h) = 765e4e4af2cb11e38c033174ac92fbb6ee1fd480
-SHA1 (patch-deps_v8_src_torque_ast-generator.cc) = 34b6c9b0036e91d22b2625e85d052bba6e3531a5
 SHA1 (patch-deps_v8_tools_run-llprof.sh) = 39aa3faf77492ef8dd35b411b7b0e4605b469af3
 SHA1 (patch-node.gypi) = 4a104dba6c22702211009bc60a6be6f87554e2fa
 SHA1 (patch-src_cares__wrap.cc) = a26a162f130468cbc0650a33b27b71377d273704
-SHA1 (patch-src_inspector__agent.cc) = 6066c01b671a1d416440b073a7a21fdf22eef926
+SHA1 (patch-src_inspector__agent.cc) = 223e92bc8a5f4f6117c1f1275d0f82b5191e768b
 SHA1 (patch-src_node__postmortem__metadata.cc) = 9938482d724ad6636af5dc3fa719ec26ed8539ff
 SHA1 (patch-tools_gyp_pylib_gyp_common.py) = 8d76b78e46b0ba2fef08294872e17a068d595f32
 SHA1 (patch-tools_gyp_pylib_gyp_generator_make.py) = be3cc1aaa85c3d59b6f2758df813cb5ad8d8f74e
diff --git a/lang/nodejs10/patches/patch-configure.py b/lang/nodejs10/patches/patch-configure.py
deleted file mode 100644
index 0912a329ac9..00000000000
--- a/lang/nodejs10/patches/patch-configure.py
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-configure.py,v 1.3 2020/01/24 18:57:09 adam Exp $
-
-Support Clang/LLVM 10+
-https://github.com/nodejs/node/issues/29536
-
---- configure.py.orig	2020-01-09 20:45:57.000000000 +0000
-+++ configure.py
-@@ -705,7 +705,7 @@ def get_nasm_version(asm):
- 
- def get_llvm_version(cc):
-   return get_version_helper(
--    cc, r"(^(?:FreeBSD )?clang version|based on LLVM) ([3-9]\.[0-9]+)")
-+    cc, r"(^(?:FreeBSD )?clang version|based on LLVM) ((\d{2}|[3-9])\.[0-9]+)")
- 
- def get_xcode_version(cc):
-   return get_version_helper(
diff --git a/lang/nodejs10/patches/patch-deps_v8_src_torque_ast-generator.cc b/lang/nodejs10/patches/patch-deps_v8_src_torque_ast-generator.cc
deleted file mode 100644
index 0fb03c54498..00000000000
--- a/lang/nodejs10/patches/patch-deps_v8_src_torque_ast-generator.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-deps_v8_src_torque_ast-generator.cc,v 1.1 2020/05/30 20:44:39 joerg Exp $
-
---- deps/v8/src/torque/ast-generator.cc.orig	2020-05-28 00:01:38.832602482 +0000
-+++ deps/v8/src/torque/ast-generator.cc
-@@ -120,7 +120,7 @@ Statement* AstGenerator::GetOptionalHelp
- 
- antlrcpp::Any AstGenerator::visitParameterList(
-     TorqueParser::ParameterListContext* context) {
--  ParameterList result{{}, {}, context->VARARGS(), {}};
-+  ParameterList result{{}, {}, context->VARARGS() != nullptr, {}};
-   if (context->VARARGS()) {
-     result.arguments_variable = context->IDENTIFIER()->getSymbol()->getText();
-   }
-@@ -141,7 +141,7 @@ antlrcpp::Any AstGenerator::visitTypeLis
- 
- antlrcpp::Any AstGenerator::visitTypeListMaybeVarArgs(
-     TorqueParser::TypeListMaybeVarArgsContext* context) {
--  ParameterList result{{}, {}, context->VARARGS(), {}};
-+  ParameterList result{{}, {}, context->VARARGS() != nullptr, {}};
-   result.types.reserve(context->type().size());
-   for (auto* type : context->type()) {
-     result.types.push_back(GetType(type));
diff --git a/lang/nodejs10/patches/patch-src_inspector__agent.cc b/lang/nodejs10/patches/patch-src_inspector__agent.cc
index 4aa4c639a48..6958ecb377b 100644
--- a/lang/nodejs10/patches/patch-src_inspector__agent.cc
+++ b/lang/nodejs10/patches/patch-src_inspector__agent.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-src_inspector__agent.cc,v 1.1 2019/12/09 20:05:40 adam Exp $
+$NetBSD: patch-src_inspector__agent.cc,v 1.2 2020/10/02 12:23:54 adam Exp $
 
---- src/inspector_agent.cc.orig	2017-05-30 17:32:13.000000000 +0000
+--- src/inspector_agent.cc.orig	2020-09-15 13:25:39.000000000 +0000
 +++ src/inspector_agent.cc
-@@ -96,7 +96,7 @@ static int RegisterDebugSignalHandler()
-   // Don't shrink the thread's stack on FreeBSD.  Said platform decided to
-   // follow the pthreads specification to the letter rather than in spirit:
-   // https://lists.freebsd.org/pipermail/freebsd-current/2014-March/048885.html
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) 
-   CHECK_EQ(0, pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN));
- #endif  // __FreeBSD__
-   CHECK_EQ(0, pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED));
+@@ -102,7 +102,7 @@ static int StartDebugSignalHandler() {
+   CHECK_EQ(0, uv_sem_init(&start_io_thread_semaphore, 0));
+   pthread_attr_t attr;
+   CHECK_EQ(0, pthread_attr_init(&attr));
+-#if defined(PTHREAD_STACK_MIN) && !defined(__FreeBSD__)
++#if defined(PTHREAD_STACK_MIN) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+   // PTHREAD_STACK_MIN is 2 KB with musl libc, which is too small to safely
+   // receive signals. PTHREAD_STACK_MIN + MINSIGSTKSZ is 8 KB on arm64, which
+   // is the musl architecture with the biggest MINSIGSTKSZ so let's use that