Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] nodejs: update to 16.9.1
@ 2021-09-20 16:58 Dko1905
  2021-09-20 19:25 ` Dko1905
                   ` (16 more replies)
  0 siblings, 17 replies; 18+ messages in thread
From: Dko1905 @ 2021-09-20 16:58 UTC (permalink / raw)
  To: ml

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

There is a new 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: 3164 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/2] 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/2] 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"

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: nodejs: update to 16.9.1
  2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
@ 2021-09-20 19:25 ` Dko1905
  2021-09-20 20:09 ` [PR PATCH] [Updated] " Dko1905
                   ` (15 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Dko1905 @ 2021-09-20 19:25 UTC (permalink / raw)
  To: ml

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

New comment by Dko1905 on void-packages repository

https://github.com/void-linux/void-packages/pull/33037#issuecomment-923217017

Comment:
# Errors in build

The first two errors are timeout errors, no idea what went wrong, or how to fix them.
```
2021-09-20T18:18:34.5672091Z [00:58|%  14|+ 502|-   0]: release test-cluster-primary-kill
2021-09-20T18:18:34.5674805Z                                                             
2021-09-20T18:18:34.5676819Z === release test-cluster-primary-error ===
2021-09-20T18:18:34.5678982Z Path: parallel/test-cluster-primary-error
2021-09-20T18:18:34.5681684Z Command: out/Release/node /builddir/node-v16.9.1/test/parallel/test-cluster-primary-error.js
2021-09-20T18:18:34.5694440Z --- TIMEOUT ---
2021-09-20T18:18:34.5695159Z 
2021-09-20T18:18:34.5695706Z                                                             
2021-09-20T18:18:34.6550606Z [02:58|%  14|+ 502|-   1]: release test-cluster-process-disconnect
2021-09-20T18:18:34.6553094Z                                                                   
2021-09-20T18:18:34.6554996Z === release test-cluster-primary-kill ===
2021-09-20T18:18:34.6556037Z Path: parallel/test-cluster-primary-kill
2021-09-20T18:18:34.6557765Z Command: out/Release/node /builddir/node-v16.9.1/test/parallel/test-cluster-primary-kill.js
2021-09-20T18:18:34.6558797Z --- TIMEOUT ---
2021-09-20T18:18:34.6559093Z 
2021-09-20T18:18:34.6559483Z
```

And the last error is a service lookup, but it fails because `/etc/services` isn't a file in the chroot, as far as I know.
```
2021-09-20T18:19:39.4329419Z === release test-dns-lookupService-promises ===
2021-09-20T18:19:39.4330960Z Path: parallel/test-dns-lookupService-promises
2021-09-20T18:19:39.4332021Z node:internal/process/promises:246
2021-09-20T18:19:39.4333051Z           triggerUncaughtException(err, true /* fromPromise */);
2021-09-20T18:19:39.4333938Z           ^
2021-09-20T18:19:39.4334358Z 
2021-09-20T18:19:39.4335200Z AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:
2021-09-20T18:19:39.4336313Z 
2021-09-20T18:19:39.4337184Z '22' !== 'ssh'
2021-09-20T18:19:39.4338076Z 
2021-09-20T18:19:39.4339460Z     at /builddir/node-v16.9.1/test/parallel/test-dns-lookupService-promises.js:9:10
2021-09-20T18:19:39.4340971Z     at /builddir/node-v16.9.1/test/common/index.js:394:15 {
2021-09-20T18:19:39.4341847Z   generatedMessage: true,
2021-09-20T18:19:39.4342985Z   code: 'ERR_ASSERTION',
2021-09-20T18:19:39.4343842Z   actual: '22',
2021-09-20T18:19:39.4344632Z   expected: 'ssh',
2021-09-20T18:19:39.4345532Z   operator: 'strictEqual'
2021-09-20T18:19:39.4346175Z }
2021-09-20T18:19:39.4347592Z Command: out/Release/node /builddir/node-v16.9.1/test/parallel/test-dns-lookupService-promises.js
2021-09-20T18:19:39.4349448Z
```

Now I just need a way of ignoring them, any help would be nice.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] nodejs: update to 16.9.1
  2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
  2021-09-20 19:25 ` Dko1905
@ 2021-09-20 20:09 ` Dko1905
  2021-09-21  6:32 ` Dko1905
                   ` (14 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Dko1905 @ 2021-09-20 20:09 UTC (permalink / raw)
  To: ml

[-- 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: 4166 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/3] 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/3] 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/3] 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"

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: nodejs: update to 16.9.1
  2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
  2021-09-20 19:25 ` Dko1905
  2021-09-20 20:09 ` [PR PATCH] [Updated] " Dko1905
@ 2021-09-21  6:32 ` Dko1905
  2021-09-21 12:01 ` [PR PATCH] [Updated] " Dko1905
                   ` (13 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Dko1905 @ 2021-09-21  6:32 UTC (permalink / raw)
  To: ml

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

New comment by Dko1905 on void-packages repository

https://github.com/void-linux/void-packages/pull/33037#issuecomment-923681534

Comment:
I am now ignoring the `TIMEOUT` errors, I'll first try running it on my computer, and if it works, I'll push. 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] nodejs: update to 16.9.1
  2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
                   ` (2 preceding siblings ...)
  2021-09-21  6:32 ` Dko1905
@ 2021-09-21 12:01 ` Dko1905
  2021-09-21 12:59 ` Dko1905
                   ` (12 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Dko1905 @ 2021-09-21 12:01 UTC (permalink / raw)
  To: ml

[-- 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() {

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: nodejs: update to 16.9.1
  2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
                   ` (3 preceding siblings ...)
  2021-09-21 12:01 ` [PR PATCH] [Updated] " Dko1905
@ 2021-09-21 12:59 ` Dko1905
  2021-09-21 14:57 ` [PR REVIEW] " Johnnynator
                   ` (11 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Dko1905 @ 2021-09-21 12:59 UTC (permalink / raw)
  To: ml

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

New comment by Dko1905 on void-packages repository

https://github.com/void-linux/void-packages/pull/33037#issuecomment-923963752

Comment:
The tests now run fine on my computer.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] nodejs: update to 16.9.1
  2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
                   ` (4 preceding siblings ...)
  2021-09-21 12:59 ` Dko1905
@ 2021-09-21 14:57 ` Johnnynator
  2021-09-21 19:07 ` Dko1905
                   ` (10 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Johnnynator @ 2021-09-21 14:57 UTC (permalink / raw)
  To: ml

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/33037#discussion_r713128920

Comment:
Keep custom variables in a local function scope if possible (xbps-src doesn't always clean them up properly otherwise)

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: nodejs: update to 16.9.1
  2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
                   ` (5 preceding siblings ...)
  2021-09-21 14:57 ` [PR REVIEW] " Johnnynator
@ 2021-09-21 19:07 ` Dko1905
  2021-09-21 19:07 ` [PR REVIEW] " Dko1905
                   ` (9 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Dko1905 @ 2021-09-21 19:07 UTC (permalink / raw)
  To: ml

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

New comment by Dko1905 on void-packages repository

https://github.com/void-linux/void-packages/pull/33037#issuecomment-924302377

Comment:
The `COV_SKIP_TESTS` variable does not seem to work, the skipped tests are still run, and I can see in the logs that the `--skip-tests=` is empty in the Makefile.
<br/>
Snippet from log:
```
2021-09-21T14:45:17.1874570Z if [ ! -r node ] || [ ! -L node ]; then \
2021-09-21T14:45:17.1875203Z   ln -fs out/Release/node node; fi
2021-09-21T14:45:17.1903062Z /usr/bin/python3.9 tools/test.py -J --mode=release \
2021-09-21T14:45:17.1903517Z 	 \
2021-09-21T14:45:17.1903969Z 	--skip-tests= \
2021-09-21T14:45:17.1904315Z 	default \
2021-09-21T14:45:17.1904850Z 	addons js-native-api node-api
```

And I think you're right about llhttp breaking, if we merge 6.x.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] nodejs: update to 16.9.1
  2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
                   ` (6 preceding siblings ...)
  2021-09-21 19:07 ` Dko1905
@ 2021-09-21 19:07 ` Dko1905
  2021-09-21 19:07 ` Dko1905
                   ` (8 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Dko1905 @ 2021-09-21 19:07 UTC (permalink / raw)
  To: ml

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

New review comment by Dko1905 on void-packages repository

https://github.com/void-linux/void-packages/pull/33037#discussion_r713341107

Comment:
outdated

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] nodejs: update to 16.9.1
  2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
                   ` (7 preceding siblings ...)
  2021-09-21 19:07 ` [PR REVIEW] " Dko1905
@ 2021-09-21 19:07 ` Dko1905
  2021-09-21 19:13 ` Dko1905
                   ` (7 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Dko1905 @ 2021-09-21 19:07 UTC (permalink / raw)
  To: ml

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

New review comment by Dko1905 on void-packages repository

https://github.com/void-linux/void-packages/pull/33037#discussion_r713341276

Comment:
And does not work.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] nodejs: update to 16.9.1
  2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
                   ` (8 preceding siblings ...)
  2021-09-21 19:07 ` Dko1905
@ 2021-09-21 19:13 ` Dko1905
  2021-09-21 19:37 ` [PR PATCH] [Updated] " Dko1905
                   ` (6 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Dko1905 @ 2021-09-21 19:13 UTC (permalink / raw)
  To: ml

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

New review comment by Dko1905 on void-packages repository

https://github.com/void-linux/void-packages/pull/33037#discussion_r713341276

Comment:
And the variable does not work.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] nodejs: update to 16.9.1
  2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
                   ` (9 preceding siblings ...)
  2021-09-21 19:13 ` Dko1905
@ 2021-09-21 19:37 ` Dko1905
  2021-09-22  6:35 ` Dko1905
                   ` (5 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Dko1905 @ 2021-09-21 19:37 UTC (permalink / raw)
  To: ml

[-- 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: 4859 bytes --]

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

List of changes:

- Add iana-etc to checkdepends
The nodejs tests require `/etc/services` to be present, but it is not
present without iana-etc.

- Ignore tests that timeout in template
There is a new variable with the name "COV_SKIP_TESTS", which contains
a comma seperated list of ignored tests. The current list has tests that
are by default part of ignored tests, and the two tests that timeout.
The two tests probably timeout because of the slow execution environment.

- Statically link llhttp and http_parser
Removed "shared http_parser" option, because of conflicts with nodejs-lts.
---
 srcpkgs/nodejs/patches/shared-uv.patch | 17 ++---------------
 srcpkgs/nodejs/template                | 26 +++++++++-----------------
 2 files changed, 11 insertions(+), 32 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..5944ade4ca73 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,34 +1,31 @@
 # 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
 hostmakedepends="which pkg-config python3 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)"
+ $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)"
 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"
+ $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)"
+checkdepends="procps-ng iana-etc"
 short_desc="Evented I/O for V8 javascript"
 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"
+build_options="ssl libuv icu nghttp2 cares"
 desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"
 desc_option_nghttp2="Enable shared nghttp2"
 desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
+build_options_default="ssl libuv icu nghttp2 cares"
 
 replaces="iojs>=0"
 conflicts="nodejs-lts nodejs-lts-10"
@@ -82,18 +79,12 @@ do_configure() {
 	fi
 	./configure --prefix=/usr --shared-zlib \
 		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
 		$(vopt_if ssl --shared-openssl) \
 		$(vopt_if libuv --shared-libuv) \
 		$(vopt_if nghttp2 --shared-nghttp2) \
 		$(vopt_if cares --shared-cares) ${_args}
 }
 
-post_configure() {
-	# Fix linking against llhttp
-	sed 's/-lhttp_parser/& -lllhttp/' -i out/*.target.mk
-}
-
 do_build() {
 	if [ "$CROSS_BUILD" ]; then
 		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
@@ -103,7 +94,8 @@ do_build() {
 }
 
 do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+	local COV_SKIP_TESTS="core_line_numbers.js,testFinalizer.js,test_function/test.js,test-cluster-primary-error.js,test-cluster-primary-kill.js"
+	make COV_SKIP_TESTS="$COV_SKIP_TESTS" LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
 }
 
 do_install() {

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: nodejs: update to 16.9.1
  2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
                   ` (10 preceding siblings ...)
  2021-09-21 19:37 ` [PR PATCH] [Updated] " Dko1905
@ 2021-09-22  6:35 ` Dko1905
  2021-09-22  6:41 ` [PR PATCH] [Updated] " Dko1905
                   ` (4 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Dko1905 @ 2021-09-22  6:35 UTC (permalink / raw)
  To: ml

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

New comment by Dko1905 on void-packages repository

https://github.com/void-linux/void-packages/pull/33037#issuecomment-924628750

Comment:
I can see that I am wrong, the `COV_SKIP_TESTS` only applies when calculating test coverage. The correct variable would be `CI_SKIP_TESTS`.


^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] nodejs: update to 16.9.1
  2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
                   ` (11 preceding siblings ...)
  2021-09-22  6:35 ` Dko1905
@ 2021-09-22  6:41 ` Dko1905
  2021-09-22  6:41 ` Dko1905
                   ` (3 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Dko1905 @ 2021-09-22  6:41 UTC (permalink / raw)
  To: ml

[-- 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: 5789 bytes --]

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

List of changes:

- Add iana-etc to checkdepends
The nodejs tests require `/etc/services` to be present, but it is not
present without iana-etc.

- Ignore tests that timeout in template
There is a new variable with the name "COV_SKIP_TESTS", which contains
a comma seperated list of ignored tests. The current list has tests that
are by default part of ignored tests, and the two tests that timeout.
The two tests probably timeout because of the slow execution environment.

- Statically link llhttp and http_parser
Removed "shared http_parser" option, because of conflicts with nodejs-lts.
---
 srcpkgs/nodejs/patches/shared-uv.patch | 17 ++---------------
 srcpkgs/nodejs/template                | 26 +++++++++-----------------
 2 files changed, 11 insertions(+), 32 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..5944ade4ca73 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,34 +1,31 @@
 # 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
 hostmakedepends="which pkg-config python3 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)"
+ $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)"
 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"
+ $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)"
+checkdepends="procps-ng iana-etc"
 short_desc="Evented I/O for V8 javascript"
 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"
+build_options="ssl libuv icu nghttp2 cares"
 desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"
 desc_option_nghttp2="Enable shared nghttp2"
 desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
+build_options_default="ssl libuv icu nghttp2 cares"
 
 replaces="iojs>=0"
 conflicts="nodejs-lts nodejs-lts-10"
@@ -82,18 +79,12 @@ do_configure() {
 	fi
 	./configure --prefix=/usr --shared-zlib \
 		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
 		$(vopt_if ssl --shared-openssl) \
 		$(vopt_if libuv --shared-libuv) \
 		$(vopt_if nghttp2 --shared-nghttp2) \
 		$(vopt_if cares --shared-cares) ${_args}
 }
 
-post_configure() {
-	# Fix linking against llhttp
-	sed 's/-lhttp_parser/& -lllhttp/' -i out/*.target.mk
-}
-
 do_build() {
 	if [ "$CROSS_BUILD" ]; then
 		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
@@ -103,7 +94,8 @@ do_build() {
 }
 
 do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+	local COV_SKIP_TESTS="core_line_numbers.js,testFinalizer.js,test_function/test.js,test-cluster-primary-error.js,test-cluster-primary-kill.js"
+	make COV_SKIP_TESTS="$COV_SKIP_TESTS" LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
 }
 
 do_install() {

From 637b98368963f82945da84d509320f7e85c71be6 Mon Sep 17 00:00:00 2001
From: Daniel Florescu <df@z5.lt>
Date: Wed, 22 Sep 2021 08:33:52 +0200
Subject: [PATCH 2/2] nodejs: ignore tests that timeout

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

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 5944ade4ca73..4055f65beb58 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -94,8 +94,8 @@ do_build() {
 }
 
 do_check() {
-	local COV_SKIP_TESTS="core_line_numbers.js,testFinalizer.js,test_function/test.js,test-cluster-primary-error.js,test-cluster-primary-kill.js"
-	make COV_SKIP_TESTS="$COV_SKIP_TESTS" LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+	local CI_SKIP_TESTS="test-cluster-primary-error.js,test-cluster-primary-kill.js"
+	make CI_SKIP_TESTS="$CI_SKIP_TESTS" LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
 }
 
 do_install() {

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] nodejs: update to 16.9.1
  2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
                   ` (12 preceding siblings ...)
  2021-09-22  6:41 ` [PR PATCH] [Updated] " Dko1905
@ 2021-09-22  6:41 ` Dko1905
  2021-09-22  7:03 ` Dko1905
                   ` (2 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Dko1905 @ 2021-09-22  6:41 UTC (permalink / raw)
  To: ml

[-- 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: 4796 bytes --]

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

List of changes:

- Add iana-etc to checkdepends
The nodejs tests require `/etc/services` to be present, but it is not
present without iana-etc.

- Ignore tests that timeout in template
There is a new variable with the name "COV_SKIP_TESTS", which contains
a comma seperated list of ignored tests. The current list has tests that
are by default part of ignored tests, and the two tests that timeout.
The two tests probably timeout because of the slow execution environment.

- Statically link llhttp and http_parser
Removed "shared http_parser" option, because of conflicts with nodejs-lts.
---
 srcpkgs/nodejs/patches/shared-uv.patch | 17 ++---------------
 srcpkgs/nodejs/template                | 26 +++++++++-----------------
 2 files changed, 11 insertions(+), 32 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..4055f65beb58 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,34 +1,31 @@
 # 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
 hostmakedepends="which pkg-config python3 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)"
+ $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)"
 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"
+ $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)"
+checkdepends="procps-ng iana-etc"
 short_desc="Evented I/O for V8 javascript"
 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"
+build_options="ssl libuv icu nghttp2 cares"
 desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"
 desc_option_nghttp2="Enable shared nghttp2"
 desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
+build_options_default="ssl libuv icu nghttp2 cares"
 
 replaces="iojs>=0"
 conflicts="nodejs-lts nodejs-lts-10"
@@ -82,18 +79,12 @@ do_configure() {
 	fi
 	./configure --prefix=/usr --shared-zlib \
 		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
 		$(vopt_if ssl --shared-openssl) \
 		$(vopt_if libuv --shared-libuv) \
 		$(vopt_if nghttp2 --shared-nghttp2) \
 		$(vopt_if cares --shared-cares) ${_args}
 }
 
-post_configure() {
-	# Fix linking against llhttp
-	sed 's/-lhttp_parser/& -lllhttp/' -i out/*.target.mk
-}
-
 do_build() {
 	if [ "$CROSS_BUILD" ]; then
 		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
@@ -103,7 +94,8 @@ do_build() {
 }
 
 do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+	local CI_SKIP_TESTS="test-cluster-primary-error.js,test-cluster-primary-kill.js"
+	make CI_SKIP_TESTS="$CI_SKIP_TESTS" LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
 }
 
 do_install() {

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: nodejs: update to 16.9.1
  2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
                   ` (13 preceding siblings ...)
  2021-09-22  6:41 ` Dko1905
@ 2021-09-22  7:03 ` Dko1905
  2021-09-24  9:22 ` [PR PATCH] [Merged]: " Johnnynator
  2021-09-24 10:06 ` Dko1905
  16 siblings, 0 replies; 18+ messages in thread
From: Dko1905 @ 2021-09-22  7:03 UTC (permalink / raw)
  To: ml

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

New comment by Dko1905 on void-packages repository

https://github.com/void-linux/void-packages/pull/33037#issuecomment-924628750

Comment:
I can see that I am wrong, the `COV_SKIP_TESTS` only applies when calculating test coverage. The correct variable is `CI_SKIP_TESTS`.


^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Merged]: nodejs: update to 16.9.1
  2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
                   ` (14 preceding siblings ...)
  2021-09-22  7:03 ` Dko1905
@ 2021-09-24  9:22 ` Johnnynator
  2021-09-24 10:06 ` Dko1905
  16 siblings, 0 replies; 18+ messages in thread
From: Johnnynator @ 2021-09-24  9:22 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

nodejs: update to 16.9.1
https://github.com/void-linux/void-packages/pull/33037

Description:
<!-- 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.


^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: nodejs: update to 16.9.1
  2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
                   ` (15 preceding siblings ...)
  2021-09-24  9:22 ` [PR PATCH] [Merged]: " Johnnynator
@ 2021-09-24 10:06 ` Dko1905
  16 siblings, 0 replies; 18+ messages in thread
From: Dko1905 @ 2021-09-24 10:06 UTC (permalink / raw)
  To: ml

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

New comment by Dko1905 on void-packages repository

https://github.com/void-linux/void-packages/pull/33037#issuecomment-926507426

Comment:
Thank you, I look forward to future contributions.

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2021-09-24 10:06 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-20 16:58 [PR PATCH] nodejs: update to 16.9.1 Dko1905
2021-09-20 19:25 ` Dko1905
2021-09-20 20:09 ` [PR PATCH] [Updated] " Dko1905
2021-09-21  6:32 ` Dko1905
2021-09-21 12:01 ` [PR PATCH] [Updated] " Dko1905
2021-09-21 12:59 ` Dko1905
2021-09-21 14:57 ` [PR REVIEW] " Johnnynator
2021-09-21 19:07 ` Dko1905
2021-09-21 19:07 ` [PR REVIEW] " Dko1905
2021-09-21 19:07 ` Dko1905
2021-09-21 19:13 ` Dko1905
2021-09-21 19:37 ` [PR PATCH] [Updated] " Dko1905
2021-09-22  6:35 ` Dko1905
2021-09-22  6:41 ` [PR PATCH] [Updated] " Dko1905
2021-09-22  6:41 ` Dko1905
2021-09-22  7:03 ` Dko1905
2021-09-24  9:22 ` [PR PATCH] [Merged]: " Johnnynator
2021-09-24 10:06 ` Dko1905

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).