CVS commit: pkgsrc/lang/nodejs

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jan  8 22:30:38 UTC 2020

Modified Files:
        pkgsrc/lang/nodejs: Makefile distinfo
        pkgsrc/lang/nodejs/patches: patch-common.gypi
            patch-deps_v8_src_base_platform_platform-freebsd.cc
            patch-tools_gyp_pylib_gyp_common.py

Log Message:
nodejs: updated to 13.6.0

Version 13.6.0 (Current):

Notable Changes
* assert:
  - Implement assert.match() and assert.doesNotMatch()
* events:
  - Add EventEmitter.on to async iterate over events
  - Allow monitoring error events
* fs:
  - Allow overriding fs for streams
* perf_hooks:
  - Move perf_hooks out of experimental
* repl:
  - Implement ZSH-like reverse-i-search
* tls:
  - Add PSK (pre-shared key) support


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 pkgsrc/lang/nodejs/Makefile
cvs rdiff -u -r1.158 -r1.159 pkgsrc/lang/nodejs/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/nodejs/patches/patch-common.gypi
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-freebsd.cc
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/lang/nodejs/patches/patch-tools_gyp_pylib_gyp_common.py

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.167 pkgsrc/lang/nodejs/Makefile:1.168
--- pkgsrc/lang/nodejs/Makefile:1.167   Sun Dec 29 15:38:04 2019
+++ pkgsrc/lang/nodejs/Makefile Wed Jan  8 22:30:38 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.167 2019/12/29 15:38:04 adam Exp $
+# $NetBSD: Makefile,v 1.168 2020/01/08 22:30:38 adam Exp $
 
-DISTNAME=      node-v13.5.0
+DISTNAME=      node-v13.6.0
 
 USE_LANGUAGES= c gnu++14
 

Index: pkgsrc/lang/nodejs/distinfo
diff -u pkgsrc/lang/nodejs/distinfo:1.158 pkgsrc/lang/nodejs/distinfo:1.159
--- pkgsrc/lang/nodejs/distinfo:1.158   Mon Jan  6 23:06:44 2020
+++ pkgsrc/lang/nodejs/distinfo Wed Jan  8 22:30:38 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.158 2020/01/06 23:06:44 tnn Exp $
+$NetBSD: distinfo,v 1.159 2020/01/08 22:30:38 adam Exp $
 
-SHA1 (node-v13.5.0.tar.gz) = 85d2c121afe7a4377bceff78e82c08581b90cbde
-RMD160 (node-v13.5.0.tar.gz) = 81f2a5dc215db3bf117e2dc8d5a7c41bb447c0b2
-SHA512 (node-v13.5.0.tar.gz) = 8a1d4e41266323c818e17638758d7175c2180eff479288bc517eebe44a7c309caf31f156a68b878ece1c64f13d353008879c00ccdd6ab285ec199c84e9729636
-Size (node-v13.5.0.tar.gz) = 61217361 bytes
-SHA1 (patch-common.gypi) = de37949f38d9bd39a18b59d59ec74e528bd323ac
+SHA1 (node-v13.6.0.tar.gz) = b235a4688f47daa7514f8815e06c5bd98907f7aa
+RMD160 (node-v13.6.0.tar.gz) = cc833714241b8c1c8e4a44d146be16c43e07887a
+SHA512 (node-v13.6.0.tar.gz) = ae62836822f66f406717dee238bf4311a6870fd602afa20f38a4c2d7b7b115acea46ed11ce0d9232761899d44660b594c50f6a2e83daeb3dac2c35557affc279
+Size (node-v13.6.0.tar.gz) = 61177693 bytes
+SHA1 (patch-common.gypi) = f0bd2962bf7c8466db24b35a35154897ecad6316
 SHA1 (patch-deps_cares_cares.gyp) = 22b44f2ac59963f694dfe4f4585e08960b3dec32
 SHA1 (patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi) = 12c91ca27ced24cabd714902fad9c9eb0ba40f9b
 SHA1 (patch-deps_openssl_config_bn__conf__asm.h) = a4cf4f0771c96fb09a00b76b25d35000d65ef92f
@@ -21,7 +21,7 @@ SHA1 (patch-deps_openssl_openssl_crypto_
 SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3
 SHA1 (patch-deps_uv_src_unix_netbsd.c) = 76b27ae86aa80582554ee824146ee7c42c33883b
 SHA1 (patch-deps_v8_src_base_atomicops.h) = d1ef20a3fee1d188687bd76836ada6f2c8e0787f
-SHA1 (patch-deps_v8_src_base_platform_platform-freebsd.cc) = 427c7712fc1c2872fc48e593f7ab491c69ee44e3
+SHA1 (patch-deps_v8_src_base_platform_platform-freebsd.cc) = b47025f33d2991275bbcd15dbabb28900afab0e1
 SHA1 (patch-deps_v8_src_base_platform_platform-openbsd.cc) = 5e593879dbab095f99e82593272a0de91043f9a8
 SHA1 (patch-deps_v8_src_base_platform_platform-posix.cc) = 0d80cc6587af9220832de112834e9f50242f819f
 SHA1 (patch-deps_v8_src_base_platform_semaphore.cc) = 802a95f1b1d131e0d85c1f99c659cc68b31ba2f6
@@ -33,7 +33,7 @@ SHA1 (patch-node.gypi) = 4a104dba6c22702
 SHA1 (patch-src_cares__wrap.cc) = a26a162f130468cbc0650a33b27b71377d273704
 SHA1 (patch-src_inspector__agent.cc) = 2ec2a7be459648700488096f467a4ae6af5a9d91
 SHA1 (patch-src_node__postmortem__metadata.cc) = 9938482d724ad6636af5dc3fa719ec26ed8539ff
-SHA1 (patch-tools_gyp_pylib_gyp_common.py) = 8d76b78e46b0ba2fef08294872e17a068d595f32
+SHA1 (patch-tools_gyp_pylib_gyp_common.py) = bee542fb268000fca1709429e5e3053fcfb085d1
 SHA1 (patch-tools_gyp_pylib_gyp_generator_make.py) = be3cc1aaa85c3d59b6f2758df813cb5ad8d8f74e
 SHA1 (patch-tools_gyp_pylib_gyp_xcode__emulation.py) = 15937c419f3226ab280c7bcd5d726773cb5add57
 SHA1 (patch-tools_install.py) = 8058eb63387971b97a1c3573d1875befeb873e77

Index: pkgsrc/lang/nodejs/patches/patch-common.gypi
diff -u pkgsrc/lang/nodejs/patches/patch-common.gypi:1.7 pkgsrc/lang/nodejs/patches/patch-common.gypi:1.8
--- pkgsrc/lang/nodejs/patches/patch-common.gypi:1.7    Thu May  3 21:19:16 2018
+++ pkgsrc/lang/nodejs/patches/patch-common.gypi        Wed Jan  8 22:30:38 2020
@@ -1,10 +1,10 @@
-$NetBSD: patch-common.gypi,v 1.7 2018/05/03 21:19:16 fhajny Exp $
+$NetBSD: patch-common.gypi,v 1.8 2020/01/08 22:30:38 adam Exp $
 
 Add support for NetBSD.
 
---- common.gypi.orig   2018-04-24 14:41:15.000000000 +0000
+--- common.gypi.orig   2020-01-07 22:07:48.000000000 +0000
 +++ common.gypi
-@@ -315,11 +315,11 @@
+@@ -326,11 +326,11 @@
            'BUILDING_UV_SHARED=1',
          ],
        }],
@@ -17,4 +17,4 @@ Add support for NetBSD.
 +      [ 'OS in "linux freebsd openbsd netbsd netbsd solaris android aix cloudabi"', {
          'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
          'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++1y' ],
-         'ldflags': [ '-rdynamic' ],
+         'defines': [ '__STDC_FORMAT_MACROS' ],

Index: pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-freebsd.cc
diff -u pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-freebsd.cc:1.2 pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-freebsd.cc:1.3
--- pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-freebsd.cc:1.2  Thu May  3 21:19:16 2018
+++ pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-freebsd.cc      Wed Jan  8 22:30:38 2020
@@ -1,30 +1,31 @@
-$NetBSD: patch-deps_v8_src_base_platform_platform-freebsd.cc,v 1.2 2018/05/03 21:19:16 fhajny Exp $
+$NetBSD: patch-deps_v8_src_base_platform_platform-freebsd.cc,v 1.3 2020/01/08 22:30:38 adam Exp $
 
 Overlapping variables, taken from https://github.com/joyent/node/issues/9175
 
---- deps/v8/src/base/platform/platform-freebsd.cc.orig 2018-04-24 14:41:24.000000000 +0000
+--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2020-01-07 22:07:49.000000000 +0000
 +++ deps/v8/src/base/platform/platform-freebsd.cc
-@@ -45,10 +45,10 @@ static unsigned StringToLong(char* buffe
+@@ -47,7 +47,7 @@ static unsigned StringToLong(char* buffe
  }
  
  std::vector<OS::SharedLibraryAddress> OS::GetSharedLibraryAddresses() {
 -  std::vector<SharedLibraryAddress> result;
 +  std::vector<SharedLibraryAddress> address_result;
-   static const int MAP_LENGTH = 1024;
-   int fd = open("/proc/self/maps", O_RDONLY);
--  if (fd < 0) return result;
-+  if (fd < 0) return address_result;
-   while (true) {
-     char addr_buffer[11];
-     addr_buffer[0] = '0';
-@@ -78,10 +78,10 @@ std::vector<OS::SharedLibraryAddress> OS
-     // There may be no filename in this line.  Skip to next.
-     if (start_of_path == nullptr) continue;
-     buffer[bytes_read] = 0;
--    result.push_back(SharedLibraryAddress(start_of_path, start, end));
-+    address_result.push_back(SharedLibraryAddress(start_of_path, start, end));
+   int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_VMMAP, getpid()};
+   size_t miblen = sizeof(mib) / sizeof(mib[0]);
+   size_t buffer_size;
+@@ -80,7 +80,7 @@ std::vector<OS::SharedLibraryAddress> OS
+           } else {
+             lib_name = std::string(path);
+           }
+-          result.push_back(SharedLibraryAddress(
++          address_result.push_back(SharedLibraryAddress(
+               lib_name, reinterpret_cast<uintptr_t>(map->kve_start),
+               reinterpret_cast<uintptr_t>(map->kve_end)));
+         }
+@@ -89,7 +89,7 @@ std::vector<OS::SharedLibraryAddress> OS
+       }
+     }
    }
-   close(fd);
 -  return result;
 +  return address_result;
  }

Index: pkgsrc/lang/nodejs/patches/patch-tools_gyp_pylib_gyp_common.py
diff -u pkgsrc/lang/nodejs/patches/patch-tools_gyp_pylib_gyp_common.py:1.3 pkgsrc/lang/nodejs/patches/patch-tools_gyp_pylib_gyp_common.py:1.4
--- pkgsrc/lang/nodejs/patches/patch-tools_gyp_pylib_gyp_common.py:1.3  Thu Jan 10 13:02:21 2019
+++ pkgsrc/lang/nodejs/patches/patch-tools_gyp_pylib_gyp_common.py      Wed Jan  8 22:30:38 2020
@@ -1,6 +1,7 @@
-$NetBSD: patch-tools_gyp_pylib_gyp_common.py,v 1.3 2019/01/10 13:02:21 ryoon Exp $
+$NetBSD: patch-tools_gyp_pylib_gyp_common.py,v 1.4 2020/01/08 22:30:38 adam Exp $
 
 Add support for DragonFly.
+
 --- tools/gyp/pylib/gyp/common.py.orig 2017-05-03 02:00:16.000000000 +0000
 +++ tools/gyp/pylib/gyp/common.py
 @@ -427,6 +427,8 @@ def GetFlavor(params):