Re: [PR PATCH] [Updated] nodejs: update to 16.9.1

[Dko1905 <Dko1905@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1625 bytes --]

There is an updated pull request by Dko1905 against master on the void-packages repository

https://github.com/Dko1905/void-packages nodejs_16.9.1
https://github.com/void-linux/void-packages/pull/33037

nodejs: update to 16.9.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

This pr includes #33036.


A patch file from https://github.com/void-linux/void-packages/pull/33037.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs_16.9.1-33037.patch --]
[-- Type: text/x-diff, Size: 5464 bytes --]

From dbc3d598eb550147f77a6d4efdeb871d56796540 Mon Sep 17 00:00:00 2001
From: Daniel Florescu <df@z5.lt>
Date: Mon, 20 Sep 2021 17:46:51 +0200
Subject: [PATCH 1/4] llhttp: update to 6.0.5

---
 srcpkgs/llhttp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index c36e6e4f4f45..1d0607d3f672 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -4,7 +4,7 @@
 # or at least a revbump in the same pull request since they work in-sync.
 
 pkgname=llhttp
-version=2.2.1
+version=6.0.5
 revision=1
 wrksrc="llhttp-release-v${version}"
 build_style=gnu-makefile
@@ -15,7 +15,7 @@ homepage="https://llhttp.org/"
 # _always_ use releases. Those have the C code generated, otherwise
 # we'd have a dep loop nodejs<->llhttp
 distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=3e3de5bd2bef95fa431952e5e6766eab1c64f881c9f8474fe159a00431354469
+checksum=28d5bc494d379228cd7a9af32dfc518fc9e6c5ad56838cafb63e8062bee06bda
 
 post_extract() {
 	# No need to pull in gyp for such a simple Makefile...

From 0e99a7b26904a5cf8d855bd23760e601ac83ec84 Mon Sep 17 00:00:00 2001
From: Daniel Florescu <df@z5.lt>
Date: Mon, 20 Sep 2021 18:09:17 +0200
Subject: [PATCH 2/4] nodejs: update to 16.9.1

---
 srcpkgs/nodejs/patches/shared-uv.patch | 17 ++---------------
 srcpkgs/nodejs/template                |  4 ++--
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/nodejs/patches/shared-uv.patch b/srcpkgs/nodejs/patches/shared-uv.patch
index 01e95f15b477..47a167b43958 100644
--- a/srcpkgs/nodejs/patches/shared-uv.patch
+++ b/srcpkgs/nodejs/patches/shared-uv.patch
@@ -1,22 +1,9 @@
 --- a/deps/uvwasi/uvwasi.gyp
 +++ b/deps/uvwasi/uvwasi.gyp
-@@ -18,9 +18,6 @@
-         'src/wasi_rights.c',
-         'src/wasi_serdes.c',
-       ],
--      'dependencies': [
--        '../uv/uv.gyp:libuv',
--      ],
-       'direct_dependent_settings': {
-         'include_dirs': ['include']
-       },
-@@ -31,6 +28,12 @@
-             '_POSIX_C_SOURCE=200112',
+@@ -33,6 +33,9 @@
+             '../uv/uv.gyp:libuv',
            ],
          }],
-+        [ 'node_shared_libuv=="false"', {
-+          'dependencies': [ '../uv/uv.gyp:libuv' ],
-+        }],
 +        [ 'node_shared_libuv=="true"', {
 +          'libraries': [ '-luv' ],
 +        }]
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 33642aad846c..d7222e55d368 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,6 +1,6 @@
 # Template file for 'nodejs'
 pkgname=nodejs
-version=14.17.6
+version=16.9.1
 revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=@c5d6fc4c970ab1db16d279e4e53cf71f4abf4a1be9598dd0ecd6a2e0d433506a
+checksum=2cfab037d84550556999af6328e9b657842d9b183e6be2a4995c87d2c49e9d03
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"

From 901c723bde758560291605fb601a8eff12d954f0 Mon Sep 17 00:00:00 2001
From: Daniel Florescu <df@z5.lt>
Date: Mon, 20 Sep 2021 22:08:30 +0200
Subject: [PATCH 3/4] nodejs: Add iana-etc to checkdepends

The nodejs tests require `/etc/services` to be present, but it is not
present without iana-etc.
---
 srcpkgs/nodejs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index d7222e55d368..af5a73c1a49a 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -12,7 +12,7 @@ makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
  $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
-checkdepends="procps-ng"
+checkdepends="procps-ng iana-etc"
 short_desc="Evented I/O for V8 javascript"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 6549ff3ffaedcd1fdff53f3eb1442aa59f47a24d Mon Sep 17 00:00:00 2001
From: Daniel Florescu <df@z5.lt>
Date: Tue, 21 Sep 2021 13:19:29 +0200
Subject: [PATCH 4/4] nodejs: Ignore tests that timeout in template

I've a new variable with the name "COV_SKIP_TESTS", which contains
a comma seperated list of ignored tests. The current list has tests are
by default part of ignored tests, and the two tests that time out. The
two tests probably timeout because of a slow execution environment.
---
 srcpkgs/nodejs/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index af5a73c1a49a..12e9e3377d1f 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -50,6 +50,7 @@ esac
 
 CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+COV_SKIP_TESTS="core_line_numbers.js,testFinalizer.js,test_function/test.js,test-cluster-primary-error.js,test-cluster-primary-kill.js"
 
 post_patch() {
 	# XXX Drop after c-ares 1.17.3 has been released.
@@ -103,7 +104,7 @@ do_build() {
 }
 
 do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+	make COV_SKIP_TESTS="$COV_SKIP_TESTS" LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
 }
 
 do_install() {