* [PR PATCH] Use system libuv in nodejs and nodejs-lts
@ 2021-04-26 14:49 digitalagedragon
2021-04-26 15:17 ` [PR PATCH] [Updated] " digitalagedragon
` (27 more replies)
0 siblings, 28 replies; 29+ messages in thread
From: digitalagedragon @ 2021-04-26 14:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1820 bytes --]
There is a new pull request by digitalagedragon against master on the void-packages repository
https://github.com/digitalagedragon/void-packages 29034-nodejs-system-libraries
https://github.com/void-linux/void-packages/pull/30516
Use system libuv in nodejs and nodejs-lts
<!-- 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?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
This addresses part of #29034. I've verified that it causes the `node` binary to depend on `libuv.so` and that it doesn't cause any (additional) test failures on my machine.
<!--
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.)
- [ ] 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/30516.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-29034-nodejs-system-libraries-30516.patch --]
[-- Type: text/x-diff, Size: 3442 bytes --]
From 06410b655878fe8825f10da90b9cc34a5e05ccf9 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:25:46 -0700
Subject: [PATCH 1/2] nodejs: use system libuv
See https://github.com/void-linux/void-packages/issues/29034.
`shared-uv.patch` has been in the repo for a while but was slightly
broken.
---
srcpkgs/nodejs/{ => patches}/shared-uv.patch | 2 +-
srcpkgs/nodejs/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename srcpkgs/nodejs/{ => patches}/shared-uv.patch (97%)
diff --git a/srcpkgs/nodejs/shared-uv.patch b/srcpkgs/nodejs/patches/shared-uv.patch
similarity index 97%
rename from srcpkgs/nodejs/shared-uv.patch
rename to srcpkgs/nodejs/patches/shared-uv.patch
index 128e3a5ce06e..3e609a6c49a5 100644
--- a/srcpkgs/nodejs/shared-uv.patch
+++ b/srcpkgs/nodejs/patches/shared-uv.patch
@@ -16,7 +16,7 @@
}],
+ [ '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 450b59bbc7d0..bcfaaa73ac4c 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs'
pkgname=nodejs
version=14.16.0
-revision=1
+revision=2
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
From 222b25551a493a75b589f5c1dfc055fa8beb4c39 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:59:58 -0700
Subject: [PATCH 2/2] nodejs-lts: use system libuv
See 06410b655878fe8825f10da90b9cc34a5e05ccf9 and https://github.com/void-linux/void-packages/issues/29034.
---
srcpkgs/nodejs-lts/patches/shared-uv.patch | 25 ++++++++++++++++++++++
srcpkgs/nodejs-lts/template | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nodejs-lts/patches/shared-uv.patch
diff --git a/srcpkgs/nodejs-lts/patches/shared-uv.patch b/srcpkgs/nodejs-lts/patches/shared-uv.patch
new file mode 100644
index 000000000000..3e609a6c49a5
--- /dev/null
+++ b/srcpkgs/nodejs-lts/patches/shared-uv.patch
@@ -0,0 +1,25 @@
+--- deps/uvwasi/uvwasi.gyp.orig
++++ 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',
+ ],
+ }],
++ [ 'node_shared_libuv=="false"', {
++ 'dependencies': [ '../uv/uv.gyp:libuv' ],
++ }],
++ [ 'node_shared_libuv=="true"', {
++ 'libraries': [ '-luv' ],
++ }]
+ ],
+ }
+ ]
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index f9326d337555..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
version=12.21.0
-revision=1
+revision=2
wrksrc="node-v${version}"
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="pkg-config python libatomic-devel zlib-devel which
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] Use system libuv in nodejs and nodejs-lts
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
@ 2021-04-26 15:17 ` digitalagedragon
2021-04-26 15:25 ` [PR REVIEW] Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l ericonr
` (26 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: digitalagedragon @ 2021-04-26 15:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1825 bytes --]
There is an updated pull request by digitalagedragon against master on the void-packages repository
https://github.com/digitalagedragon/void-packages 29034-nodejs-system-libraries
https://github.com/void-linux/void-packages/pull/30516
Use system libuv in nodejs and nodejs-lts
<!-- 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?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
This addresses part of #29034. I've verified that it causes the `node` binary to depend on `libuv.so` and that it doesn't cause any (additional) test failures on my machine.
<!--
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.)
- [ ] 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/30516.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-29034-nodejs-system-libraries-30516.patch --]
[-- Type: text/x-diff, Size: 5464 bytes --]
From 06410b655878fe8825f10da90b9cc34a5e05ccf9 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:25:46 -0700
Subject: [PATCH 1/3] nodejs: use system libuv
See https://github.com/void-linux/void-packages/issues/29034.
`shared-uv.patch` has been in the repo for a while but was slightly
broken.
---
srcpkgs/nodejs/{ => patches}/shared-uv.patch | 2 +-
srcpkgs/nodejs/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename srcpkgs/nodejs/{ => patches}/shared-uv.patch (97%)
diff --git a/srcpkgs/nodejs/shared-uv.patch b/srcpkgs/nodejs/patches/shared-uv.patch
similarity index 97%
rename from srcpkgs/nodejs/shared-uv.patch
rename to srcpkgs/nodejs/patches/shared-uv.patch
index 128e3a5ce06e..3e609a6c49a5 100644
--- a/srcpkgs/nodejs/shared-uv.patch
+++ b/srcpkgs/nodejs/patches/shared-uv.patch
@@ -16,7 +16,7 @@
}],
+ [ '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 450b59bbc7d0..bcfaaa73ac4c 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs'
pkgname=nodejs
version=14.16.0
-revision=1
+revision=2
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
From 222b25551a493a75b589f5c1dfc055fa8beb4c39 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:59:58 -0700
Subject: [PATCH 2/3] nodejs-lts: use system libuv
See 06410b655878fe8825f10da90b9cc34a5e05ccf9 and https://github.com/void-linux/void-packages/issues/29034.
---
srcpkgs/nodejs-lts/patches/shared-uv.patch | 25 ++++++++++++++++++++++
srcpkgs/nodejs-lts/template | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nodejs-lts/patches/shared-uv.patch
diff --git a/srcpkgs/nodejs-lts/patches/shared-uv.patch b/srcpkgs/nodejs-lts/patches/shared-uv.patch
new file mode 100644
index 000000000000..3e609a6c49a5
--- /dev/null
+++ b/srcpkgs/nodejs-lts/patches/shared-uv.patch
@@ -0,0 +1,25 @@
+--- deps/uvwasi/uvwasi.gyp.orig
++++ 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',
+ ],
+ }],
++ [ 'node_shared_libuv=="false"', {
++ 'dependencies': [ '../uv/uv.gyp:libuv' ],
++ }],
++ [ 'node_shared_libuv=="true"', {
++ 'libraries': [ '-luv' ],
++ }]
+ ],
+ }
+ ]
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index f9326d337555..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
version=12.21.0
-revision=1
+revision=2
wrksrc="node-v${version}"
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="pkg-config python libatomic-devel zlib-devel which
From 529efb82fc4f9b1e9f9a41215d88b411fb436d89 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Mon, 26 Apr 2021 06:31:01 -0700
Subject: [PATCH 3/3] nodejs-lts-10: fix build for targets without native
atomic8
patches/ppc32.patch used "host_arch" instead of "target_arch" to check
whether to link against -latomic, and didn't include 32-bit ARM in the
list of targets that might need it. This addresses build failures on
armv6l as well as some lesser-used architectures.
---
srcpkgs/nodejs-lts-10/patches/ppc32.patch | 2 +-
srcpkgs/nodejs-lts-10/template | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
index 343eff585123..da8b6b7c7cf4 100644
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -15,7 +15,7 @@
'msvs_disabled_warnings!': [4244],
'conditions': [
-+ [ 'host_arch=="mips" or host_arch=="mipsel" or host_arch=="ppc"', {
++ [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
+ 'link_settings': {
+ 'libraries': [ '-latomic' ],
+ },
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 3944d359c673..2279e49a586d 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs-lts-10'
pkgname=nodejs-lts-10
version=10.24.0
-revision=1
+revision=2
wrksrc="node-v${version}"
hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
$(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
@@ -37,9 +37,7 @@ if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
nocross="host and target must have the same pointer size"
fi
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
-fi
+makedepends+=" libatomic-devel"
if [ "$XBPS_NO_ATOMIC8" ]; then
hostmakedepends+=" libatomic-devel"
fi
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
2021-04-26 15:17 ` [PR PATCH] [Updated] " digitalagedragon
2021-04-26 15:25 ` [PR REVIEW] Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l ericonr
@ 2021-04-26 15:25 ` ericonr
2021-04-26 15:26 ` ericonr
` (24 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: ericonr @ 2021-04-26 15:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#discussion_r620403941
Comment:
Given that this now covers arm, I think you should change the file name.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
2021-04-26 15:17 ` [PR PATCH] [Updated] " digitalagedragon
@ 2021-04-26 15:25 ` ericonr
2021-04-26 15:25 ` ericonr
` (25 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: ericonr @ 2021-04-26 15:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#discussion_r620404088
Comment:
Missing the comment I suggested.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (2 preceding siblings ...)
2021-04-26 15:25 ` ericonr
@ 2021-04-26 15:26 ` ericonr
2021-04-26 15:26 ` digitalagedragon
` (23 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: ericonr @ 2021-04-26 15:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#discussion_r620405066
Comment:
You should probably just add it to the initial `makedepends` list.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (3 preceding siblings ...)
2021-04-26 15:26 ` ericonr
@ 2021-04-26 15:26 ` digitalagedragon
2021-04-26 15:27 ` digitalagedragon
` (22 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: digitalagedragon @ 2021-04-26 15:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
New review comment by digitalagedragon on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#discussion_r620405160
Comment:
Oh, you meant in the template itself.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (4 preceding siblings ...)
2021-04-26 15:26 ` digitalagedragon
@ 2021-04-26 15:27 ` digitalagedragon
2021-04-26 15:30 ` digitalagedragon
` (21 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: digitalagedragon @ 2021-04-26 15:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 249 bytes --]
New review comment by digitalagedragon on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#discussion_r620406123
Comment:
Yeah `node` and `node-lts` just have it in `makedepends` for all architectures. I'll do that.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (5 preceding siblings ...)
2021-04-26 15:27 ` digitalagedragon
@ 2021-04-26 15:30 ` digitalagedragon
2021-04-26 15:38 ` [PR REVIEW] " digitalagedragon
` (20 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: digitalagedragon @ 2021-04-26 15:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 254 bytes --]
New comment by digitalagedragon on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#issuecomment-826932904
Comment:
@ericonr what should I do about the lint failure on `nodejs-lts-10`? It was like that when I got here...
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (6 preceding siblings ...)
2021-04-26 15:30 ` digitalagedragon
@ 2021-04-26 15:38 ` digitalagedragon
2021-04-26 15:43 ` [PR PATCH] [Updated] " digitalagedragon
` (19 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: digitalagedragon @ 2021-04-26 15:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 268 bytes --]
New review comment by digitalagedragon on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#discussion_r620415127
Comment:
I'll just split that part into its own patch because the other bits of the file are definitely `ppc32`-specific.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (7 preceding siblings ...)
2021-04-26 15:38 ` [PR REVIEW] " digitalagedragon
@ 2021-04-26 15:43 ` digitalagedragon
2021-04-26 16:27 ` Johnnynator
` (18 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: digitalagedragon @ 2021-04-26 15:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2316 bytes --]
There is an updated pull request by digitalagedragon against master on the void-packages repository
https://github.com/digitalagedragon/void-packages 29034-nodejs-system-libraries
https://github.com/void-linux/void-packages/pull/30516
Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
<!-- 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?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
This addresses #29034. I've verified that the libuv changes cause the `node` binary to depend on `libuv.so` and that it doesn't cause any (additional) test failures on my machine, and I've checked that `nodejs-lts-10` at least compiles on armv6l (don't have any test hardware).
The changes to `nodejs-lts-10` will link with `-latomic` on any `arm` architecture, not just ones where `XBPS_TARGET_NO_ATOMIC8` is set, but I did check and the resulting binary doesn't depend on libatomic on (say) armv7l where it's not needed. I think this is the best I can do without finding a way to pass `XBPS_TARGET_NO_ATOMIC8` into node-gyp.
<!--
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.)
- [ ] 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/30516.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-29034-nodejs-system-libraries-30516.patch --]
[-- Type: text/x-diff, Size: 7835 bytes --]
From 06410b655878fe8825f10da90b9cc34a5e05ccf9 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:25:46 -0700
Subject: [PATCH 1/3] nodejs: use system libuv
See https://github.com/void-linux/void-packages/issues/29034.
`shared-uv.patch` has been in the repo for a while but was slightly
broken.
---
srcpkgs/nodejs/{ => patches}/shared-uv.patch | 2 +-
srcpkgs/nodejs/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename srcpkgs/nodejs/{ => patches}/shared-uv.patch (97%)
diff --git a/srcpkgs/nodejs/shared-uv.patch b/srcpkgs/nodejs/patches/shared-uv.patch
similarity index 97%
rename from srcpkgs/nodejs/shared-uv.patch
rename to srcpkgs/nodejs/patches/shared-uv.patch
index 128e3a5ce06e..3e609a6c49a5 100644
--- a/srcpkgs/nodejs/shared-uv.patch
+++ b/srcpkgs/nodejs/patches/shared-uv.patch
@@ -16,7 +16,7 @@
}],
+ [ '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 450b59bbc7d0..bcfaaa73ac4c 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs'
pkgname=nodejs
version=14.16.0
-revision=1
+revision=2
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
From 222b25551a493a75b589f5c1dfc055fa8beb4c39 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:59:58 -0700
Subject: [PATCH 2/3] nodejs-lts: use system libuv
See 06410b655878fe8825f10da90b9cc34a5e05ccf9 and https://github.com/void-linux/void-packages/issues/29034.
---
srcpkgs/nodejs-lts/patches/shared-uv.patch | 25 ++++++++++++++++++++++
srcpkgs/nodejs-lts/template | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nodejs-lts/patches/shared-uv.patch
diff --git a/srcpkgs/nodejs-lts/patches/shared-uv.patch b/srcpkgs/nodejs-lts/patches/shared-uv.patch
new file mode 100644
index 000000000000..3e609a6c49a5
--- /dev/null
+++ b/srcpkgs/nodejs-lts/patches/shared-uv.patch
@@ -0,0 +1,25 @@
+--- deps/uvwasi/uvwasi.gyp.orig
++++ 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',
+ ],
+ }],
++ [ 'node_shared_libuv=="false"', {
++ 'dependencies': [ '../uv/uv.gyp:libuv' ],
++ }],
++ [ 'node_shared_libuv=="true"', {
++ 'libraries': [ '-luv' ],
++ }]
+ ],
+ }
+ ]
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index f9326d337555..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
version=12.21.0
-revision=1
+revision=2
wrksrc="node-v${version}"
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="pkg-config python libatomic-devel zlib-devel which
From cbcc97c0db6f012203d8a100c43af04f9477c35c Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Mon, 26 Apr 2021 06:31:01 -0700
Subject: [PATCH 3/3] nodejs-lts-10: fix build for targets without native
atomic8
patches/ppc32.patch used "host_arch" instead of "target_arch" to check
whether to link against -latomic, and didn't include 32-bit ARM in the
list of targets that might need it. This addresses build failures on
armv6l as well as some lesser-used architectures.
Additionally, libatomic-devel is now included in makedepends for all
architectures (not just when `XBPS_TARGET_NO_ATOMIC8` is set) because
the build system can't tell the difference between armv6l and
armv7l. This matches how it's done for `nodejs{,-lts}` and doesn't
cause the armv7l build to actually depend on libatomic at runtime.
---
srcpkgs/nodejs-lts-10/patches/atomic8.patch | 14 ++++++++++++++
srcpkgs/nodejs-lts-10/patches/ppc32.patch | 14 --------------
srcpkgs/nodejs-lts-10/template | 19 +++++++------------
3 files changed, 21 insertions(+), 26 deletions(-)
create mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
new file mode 100644
index 000000000000..023cfad01239
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
@@ -0,0 +1,14 @@
+--- node.gyp
++++ node.gyp
+@@ -479,6 +479,11 @@
+ 'msvs_disabled_warnings!': [4244],
+
+ 'conditions': [
++ [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
++ 'link_settings': {
++ 'libraries': [ '-latomic' ],
++ },
++ }],
+ [ 'node_code_cache_path!=""', {
+ 'sources': [ '<(node_code_cache_path)' ]
+ }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
index 343eff585123..4650b285c363 100644
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -9,20 +9,6 @@
'__x86_64__' : 'x64',
'__s390__' : 's390',
'__s390x__' : 's390x',
---- node.gyp
-+++ node.gyp
-@@ -479,6 +479,11 @@
- 'msvs_disabled_warnings!': [4244],
-
- 'conditions': [
-+ [ 'host_arch=="mips" or host_arch=="mipsel" or host_arch=="ppc"', {
-+ 'link_settings': {
-+ 'libraries': [ '-latomic' ],
-+ },
-+ }],
- [ 'node_code_cache_path!=""', {
- 'sources': [ '<(node_code_cache_path)' ]
- }, {
--- deps/v8/src/libsampler/sampler.cc
+++ deps/v8/src/libsampler/sampler.cc
@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 3944d359c673..f6fffa2d4cf0 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,14 +1,16 @@
# Template file for 'nodejs-lts-10'
pkgname=nodejs-lts-10
version=10.24.0
-revision=1
+revision=2
wrksrc="node-v${version}"
-hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+# libatomic-devel moved into here for #29034 - atomic8.patch will pull in -latomic
+# even for some architectures not covered by XBPS_TARGET_NO_ATOMIC8.
+hostmakedepends="libatomic-devel pkg-config python zlib-devel which
+ $(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)"
-makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+makedepends="libatomic-devel zlib-devel python-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)"
checkdepends="procps-ng"
@@ -37,13 +39,6 @@ if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
nocross="host and target must have the same pointer size"
fi
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
-fi
-if [ "$XBPS_NO_ATOMIC8" ]; then
- hostmakedepends+=" libatomic-devel"
-fi
-
CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (8 preceding siblings ...)
2021-04-26 15:43 ` [PR PATCH] [Updated] " digitalagedragon
@ 2021-04-26 16:27 ` Johnnynator
2021-04-26 16:48 ` [PR PATCH] [Updated] " digitalagedragon
` (17 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Johnnynator @ 2021-04-26 16:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#issuecomment-826977330
Comment:
> what should I do about the lint failure on `nodejs-lts-10`? It was like that when I got here...
Fix them. So set `python_version=3` and remove that trailing whitespace in line 8.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (9 preceding siblings ...)
2021-04-26 16:27 ` Johnnynator
@ 2021-04-26 16:48 ` digitalagedragon
2021-04-26 16:49 ` digitalagedragon
` (16 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: digitalagedragon @ 2021-04-26 16:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2316 bytes --]
There is an updated pull request by digitalagedragon against master on the void-packages repository
https://github.com/digitalagedragon/void-packages 29034-nodejs-system-libraries
https://github.com/void-linux/void-packages/pull/30516
Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
<!-- 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?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
This addresses #29034. I've verified that the libuv changes cause the `node` binary to depend on `libuv.so` and that it doesn't cause any (additional) test failures on my machine, and I've checked that `nodejs-lts-10` at least compiles on armv6l (don't have any test hardware).
The changes to `nodejs-lts-10` will link with `-latomic` on any `arm` architecture, not just ones where `XBPS_TARGET_NO_ATOMIC8` is set, but I did check and the resulting binary doesn't depend on libatomic on (say) armv7l where it's not needed. I think this is the best I can do without finding a way to pass `XBPS_TARGET_NO_ATOMIC8` into node-gyp.
<!--
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.)
- [ ] 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/30516.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-29034-nodejs-system-libraries-30516.patch --]
[-- Type: text/x-diff, Size: 8201 bytes --]
From 06410b655878fe8825f10da90b9cc34a5e05ccf9 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:25:46 -0700
Subject: [PATCH 1/3] nodejs: use system libuv
See https://github.com/void-linux/void-packages/issues/29034.
`shared-uv.patch` has been in the repo for a while but was slightly
broken.
---
srcpkgs/nodejs/{ => patches}/shared-uv.patch | 2 +-
srcpkgs/nodejs/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename srcpkgs/nodejs/{ => patches}/shared-uv.patch (97%)
diff --git a/srcpkgs/nodejs/shared-uv.patch b/srcpkgs/nodejs/patches/shared-uv.patch
similarity index 97%
rename from srcpkgs/nodejs/shared-uv.patch
rename to srcpkgs/nodejs/patches/shared-uv.patch
index 128e3a5ce06e..3e609a6c49a5 100644
--- a/srcpkgs/nodejs/shared-uv.patch
+++ b/srcpkgs/nodejs/patches/shared-uv.patch
@@ -16,7 +16,7 @@
}],
+ [ '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 450b59bbc7d0..bcfaaa73ac4c 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs'
pkgname=nodejs
version=14.16.0
-revision=1
+revision=2
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
From 222b25551a493a75b589f5c1dfc055fa8beb4c39 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:59:58 -0700
Subject: [PATCH 2/3] nodejs-lts: use system libuv
See 06410b655878fe8825f10da90b9cc34a5e05ccf9 and https://github.com/void-linux/void-packages/issues/29034.
---
srcpkgs/nodejs-lts/patches/shared-uv.patch | 25 ++++++++++++++++++++++
srcpkgs/nodejs-lts/template | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nodejs-lts/patches/shared-uv.patch
diff --git a/srcpkgs/nodejs-lts/patches/shared-uv.patch b/srcpkgs/nodejs-lts/patches/shared-uv.patch
new file mode 100644
index 000000000000..3e609a6c49a5
--- /dev/null
+++ b/srcpkgs/nodejs-lts/patches/shared-uv.patch
@@ -0,0 +1,25 @@
+--- deps/uvwasi/uvwasi.gyp.orig
++++ 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',
+ ],
+ }],
++ [ 'node_shared_libuv=="false"', {
++ 'dependencies': [ '../uv/uv.gyp:libuv' ],
++ }],
++ [ 'node_shared_libuv=="true"', {
++ 'libraries': [ '-luv' ],
++ }]
+ ],
+ }
+ ]
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index f9326d337555..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
version=12.21.0
-revision=1
+revision=2
wrksrc="node-v${version}"
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="pkg-config python libatomic-devel zlib-devel which
From ba2d9af447cb8a686424dd33d67d138fdedd54c7 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Mon, 26 Apr 2021 06:31:01 -0700
Subject: [PATCH 3/3] nodejs-lts-10: fix build for targets without native
atomic8
patches/ppc32.patch used "host_arch" instead of "target_arch" to check
whether to link against -latomic, and didn't include 32-bit ARM in the
list of targets that might need it. This addresses build failures on
armv6l as well as some lesser-used architectures.
Additionally, libatomic-devel is now included in makedepends for all
architectures (not just when `XBPS_TARGET_NO_ATOMIC8` is set) because
the build system can't tell the difference between armv6l and
armv7l. This matches how it's done for `nodejs{,-lts}` and doesn't
cause the armv7l build to actually depend on libatomic at runtime.
---
srcpkgs/nodejs-lts-10/patches/atomic8.patch | 14 ++++++++++++++
srcpkgs/nodejs-lts-10/patches/ppc32.patch | 14 --------------
srcpkgs/nodejs-lts-10/template | 21 ++++++++-------------
3 files changed, 22 insertions(+), 27 deletions(-)
create mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
new file mode 100644
index 000000000000..023cfad01239
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
@@ -0,0 +1,14 @@
+--- node.gyp
++++ node.gyp
+@@ -479,6 +479,11 @@
+ 'msvs_disabled_warnings!': [4244],
+
+ 'conditions': [
++ [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
++ 'link_settings': {
++ 'libraries': [ '-latomic' ],
++ },
++ }],
+ [ 'node_code_cache_path!=""', {
+ 'sources': [ '<(node_code_cache_path)' ]
+ }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
index 343eff585123..4650b285c363 100644
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -9,20 +9,6 @@
'__x86_64__' : 'x64',
'__s390__' : 's390',
'__s390x__' : 's390x',
---- node.gyp
-+++ node.gyp
-@@ -479,6 +479,11 @@
- 'msvs_disabled_warnings!': [4244],
-
- 'conditions': [
-+ [ 'host_arch=="mips" or host_arch=="mipsel" or host_arch=="ppc"', {
-+ 'link_settings': {
-+ 'libraries': [ '-latomic' ],
-+ },
-+ }],
- [ 'node_code_cache_path!=""', {
- 'sources': [ '<(node_code_cache_path)' ]
- }, {
--- deps/v8/src/libsampler/sampler.cc
+++ deps/v8/src/libsampler/sampler.cc
@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 3944d359c673..e9be94fcd393 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,14 +1,16 @@
# Template file for 'nodejs-lts-10'
pkgname=nodejs-lts-10
version=10.24.0
-revision=1
+revision=2
wrksrc="node-v${version}"
-hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+# libatomic-devel moved into here for #29034 - atomic8.patch will pull in -latomic
+# even for some architectures not covered by XBPS_TARGET_NO_ATOMIC8.
+hostmakedepends="libatomic-devel pkg-config python zlib-devel which
+ $(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)"
-makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+makedepends="libatomic-devel zlib-devel python-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)"
checkdepends="procps-ng"
@@ -18,7 +20,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=2 #unverified
+python_version=3
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared openssl"
@@ -37,13 +39,6 @@ if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
nocross="host and target must have the same pointer size"
fi
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
-fi
-if [ "$XBPS_NO_ATOMIC8" ]; then
- hostmakedepends+=" libatomic-devel"
-fi
-
CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (10 preceding siblings ...)
2021-04-26 16:48 ` [PR PATCH] [Updated] " digitalagedragon
@ 2021-04-26 16:49 ` digitalagedragon
2021-04-27 14:27 ` digitalagedragon
` (15 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: digitalagedragon @ 2021-04-26 16:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 283 bytes --]
New comment by digitalagedragon on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#issuecomment-826991757
Comment:
That should fix the lint issues. I just wasn't sure whether messing with `python_version` would break anything (it doesn't appear to)
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (11 preceding siblings ...)
2021-04-26 16:49 ` digitalagedragon
@ 2021-04-27 14:27 ` digitalagedragon
2021-04-27 15:06 ` digitalagedragon
` (14 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: digitalagedragon @ 2021-04-27 14:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 464 bytes --]
New comment by digitalagedragon on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#issuecomment-827649786
Comment:
What fresh hell is this... I can get `parallel/test-http-transfer-encoding-smuggling` to fail on my machine (even on the package in `master`, which I guess is good because that should have _nothing_ to do with this changeset), but the other 3 or 4 test failures don't reproduce. I guess I'll try to debug that one?
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (12 preceding siblings ...)
2021-04-27 14:27 ` digitalagedragon
@ 2021-04-27 15:06 ` digitalagedragon
2021-04-27 15:37 ` ericonr
` (13 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: digitalagedragon @ 2021-04-27 15:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 865 bytes --]
New comment by digitalagedragon on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#issuecomment-827681235
Comment:
a-ha. This is a test for CVE-2020-8287, which was fixed in nodejs 10.23.1 by updating their vendored `http-parser` to the latest dev commit, but we're using system `http-parser` which is still at its latest official release.
`nodejs` and `nodejs-lts` use `llhttp` instead, so they don't have this failure (though they do have _other_ HTTP-related failures on my box, probably because `llhttp` and `http-parser` aren't quite compatible enough).
If this was just for `nodejs-lts-10` I would have half a mind to say "well the release is EOL in [literally 3 days](https://nodejs.org/en/about/releases/) so whatever" but there are half a dozen things that use `http-parser` so it probably makes sense to update it.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (13 preceding siblings ...)
2021-04-27 15:06 ` digitalagedragon
@ 2021-04-27 15:37 ` ericonr
2021-04-27 15:47 ` digitalagedragon
` (12 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: ericonr @ 2021-04-27 15:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#issuecomment-827705843
Comment:
Given https://github.com/nodejs/http-parser/commit/ec8b5ee63f0e51191ea43bb0c6eac7bfbff3141d, I think it's fair to update it to a git snapshot (and fix the homepage).
That said, I will look into removing `nodejs-lts-10`, if possible; we have a few packages which depend on it at build time >.>
Do go ahead with this PR, though, since the removal, if it happens, will be separate, and in the meantime we should fix the package.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (14 preceding siblings ...)
2021-04-27 15:37 ` ericonr
@ 2021-04-27 15:47 ` digitalagedragon
2021-04-27 17:15 ` digitalagedragon
` (11 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: digitalagedragon @ 2021-04-27 15:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 582 bytes --]
New comment by digitalagedragon on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#issuecomment-827712911
Comment:
Oh, even better: updating to the latest snapshot doesn't fix it, because the problem was actually solved in [this nodejs commit](https://github.com/nodejs/node/commit/fc70ce08f5818a286fb5899a1bc3aff5965a745e) from after `http-parser` stopped being maintained, so there will have to be a patch too...
Do you have an example of a template that's building from a git snapshot already, just so I can make sure everything looks right?
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (15 preceding siblings ...)
2021-04-27 15:47 ` digitalagedragon
@ 2021-04-27 17:15 ` digitalagedragon
2021-04-27 17:22 ` ericonr
` (10 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: digitalagedragon @ 2021-04-27 17:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
New comment by digitalagedragon on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#issuecomment-827772920
Comment:
(specifically, what would the version number situation look like here?)
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (16 preceding siblings ...)
2021-04-27 17:15 ` digitalagedragon
@ 2021-04-27 17:22 ` ericonr
2021-04-27 17:27 ` digitalagedragon
` (9 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: ericonr @ 2021-04-27 17:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 399 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#issuecomment-827777291
Comment:
I would do something like `$current_version.$date_of_last_commit` where date is written as `YYYYMMDD`
That said, I'm trying to find out what version of the library debian and others are using, we might be able to find a properly patched version out there.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (17 preceding siblings ...)
2021-04-27 17:22 ` ericonr
@ 2021-04-27 17:27 ` digitalagedragon
2021-04-27 17:45 ` ericonr
` (8 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: digitalagedragon @ 2021-04-27 17:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 358 bytes --]
New comment by digitalagedragon on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#issuecomment-827780948
Comment:
It doesn't look like fedora, arch, or debian include the CVE-2020-8287 patch. fedora and arch are using upstream 2.9.4 directly, and debian does have their own repo for it but they haven't included the patch.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (18 preceding siblings ...)
2021-04-27 17:27 ` digitalagedragon
@ 2021-04-27 17:45 ` ericonr
2021-04-27 17:48 ` ericonr
` (7 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: ericonr @ 2021-04-27 17:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 296 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#issuecomment-827792479
Comment:
Including this one patch should be little work, so we can go with that, IMO. And try to look into replacing `http-parser` in other packages for the future.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (19 preceding siblings ...)
2021-04-27 17:45 ` ericonr
@ 2021-04-27 17:48 ` ericonr
2021-04-27 17:50 ` [PR PATCH] [Updated] " digitalagedragon
` (6 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: ericonr @ 2021-04-27 17:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 325 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#issuecomment-827792479
Comment:
Including this one patch should be little work, so we can go with that, IMO. And try to look into replacing `http-parser` in other packages for the future (can open an issue for this).
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (20 preceding siblings ...)
2021-04-27 17:48 ` ericonr
@ 2021-04-27 17:50 ` digitalagedragon
2021-04-27 18:03 ` digitalagedragon
` (5 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: digitalagedragon @ 2021-04-27 17:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2316 bytes --]
There is an updated pull request by digitalagedragon against master on the void-packages repository
https://github.com/digitalagedragon/void-packages 29034-nodejs-system-libraries
https://github.com/void-linux/void-packages/pull/30516
Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
<!-- 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?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
This addresses #29034. I've verified that the libuv changes cause the `node` binary to depend on `libuv.so` and that it doesn't cause any (additional) test failures on my machine, and I've checked that `nodejs-lts-10` at least compiles on armv6l (don't have any test hardware).
The changes to `nodejs-lts-10` will link with `-latomic` on any `arm` architecture, not just ones where `XBPS_TARGET_NO_ATOMIC8` is set, but I did check and the resulting binary doesn't depend on libatomic on (say) armv7l where it's not needed. I think this is the best I can do without finding a way to pass `XBPS_TARGET_NO_ATOMIC8` into node-gyp.
<!--
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.)
- [ ] 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/30516.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-29034-nodejs-system-libraries-30516.patch --]
[-- Type: text/x-diff, Size: 11812 bytes --]
From 06410b655878fe8825f10da90b9cc34a5e05ccf9 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:25:46 -0700
Subject: [PATCH 1/4] nodejs: use system libuv
See https://github.com/void-linux/void-packages/issues/29034.
`shared-uv.patch` has been in the repo for a while but was slightly
broken.
---
srcpkgs/nodejs/{ => patches}/shared-uv.patch | 2 +-
srcpkgs/nodejs/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename srcpkgs/nodejs/{ => patches}/shared-uv.patch (97%)
diff --git a/srcpkgs/nodejs/shared-uv.patch b/srcpkgs/nodejs/patches/shared-uv.patch
similarity index 97%
rename from srcpkgs/nodejs/shared-uv.patch
rename to srcpkgs/nodejs/patches/shared-uv.patch
index 128e3a5ce06e..3e609a6c49a5 100644
--- a/srcpkgs/nodejs/shared-uv.patch
+++ b/srcpkgs/nodejs/patches/shared-uv.patch
@@ -16,7 +16,7 @@
}],
+ [ '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 450b59bbc7d0..bcfaaa73ac4c 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs'
pkgname=nodejs
version=14.16.0
-revision=1
+revision=2
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
From 222b25551a493a75b589f5c1dfc055fa8beb4c39 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:59:58 -0700
Subject: [PATCH 2/4] nodejs-lts: use system libuv
See 06410b655878fe8825f10da90b9cc34a5e05ccf9 and https://github.com/void-linux/void-packages/issues/29034.
---
srcpkgs/nodejs-lts/patches/shared-uv.patch | 25 ++++++++++++++++++++++
srcpkgs/nodejs-lts/template | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nodejs-lts/patches/shared-uv.patch
diff --git a/srcpkgs/nodejs-lts/patches/shared-uv.patch b/srcpkgs/nodejs-lts/patches/shared-uv.patch
new file mode 100644
index 000000000000..3e609a6c49a5
--- /dev/null
+++ b/srcpkgs/nodejs-lts/patches/shared-uv.patch
@@ -0,0 +1,25 @@
+--- deps/uvwasi/uvwasi.gyp.orig
++++ 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',
+ ],
+ }],
++ [ 'node_shared_libuv=="false"', {
++ 'dependencies': [ '../uv/uv.gyp:libuv' ],
++ }],
++ [ 'node_shared_libuv=="true"', {
++ 'libraries': [ '-luv' ],
++ }]
+ ],
+ }
+ ]
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index f9326d337555..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
version=12.21.0
-revision=1
+revision=2
wrksrc="node-v${version}"
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="pkg-config python libatomic-devel zlib-devel which
From ba2d9af447cb8a686424dd33d67d138fdedd54c7 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Mon, 26 Apr 2021 06:31:01 -0700
Subject: [PATCH 3/4] nodejs-lts-10: fix build for targets without native
atomic8
patches/ppc32.patch used "host_arch" instead of "target_arch" to check
whether to link against -latomic, and didn't include 32-bit ARM in the
list of targets that might need it. This addresses build failures on
armv6l as well as some lesser-used architectures.
Additionally, libatomic-devel is now included in makedepends for all
architectures (not just when `XBPS_TARGET_NO_ATOMIC8` is set) because
the build system can't tell the difference between armv6l and
armv7l. This matches how it's done for `nodejs{,-lts}` and doesn't
cause the armv7l build to actually depend on libatomic at runtime.
---
srcpkgs/nodejs-lts-10/patches/atomic8.patch | 14 ++++++++++++++
srcpkgs/nodejs-lts-10/patches/ppc32.patch | 14 --------------
srcpkgs/nodejs-lts-10/template | 21 ++++++++-------------
3 files changed, 22 insertions(+), 27 deletions(-)
create mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
new file mode 100644
index 000000000000..023cfad01239
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
@@ -0,0 +1,14 @@
+--- node.gyp
++++ node.gyp
+@@ -479,6 +479,11 @@
+ 'msvs_disabled_warnings!': [4244],
+
+ 'conditions': [
++ [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
++ 'link_settings': {
++ 'libraries': [ '-latomic' ],
++ },
++ }],
+ [ 'node_code_cache_path!=""', {
+ 'sources': [ '<(node_code_cache_path)' ]
+ }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
index 343eff585123..4650b285c363 100644
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -9,20 +9,6 @@
'__x86_64__' : 'x64',
'__s390__' : 's390',
'__s390x__' : 's390x',
---- node.gyp
-+++ node.gyp
-@@ -479,6 +479,11 @@
- 'msvs_disabled_warnings!': [4244],
-
- 'conditions': [
-+ [ 'host_arch=="mips" or host_arch=="mipsel" or host_arch=="ppc"', {
-+ 'link_settings': {
-+ 'libraries': [ '-latomic' ],
-+ },
-+ }],
- [ 'node_code_cache_path!=""', {
- 'sources': [ '<(node_code_cache_path)' ]
- }, {
--- deps/v8/src/libsampler/sampler.cc
+++ deps/v8/src/libsampler/sampler.cc
@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 3944d359c673..e9be94fcd393 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,14 +1,16 @@
# Template file for 'nodejs-lts-10'
pkgname=nodejs-lts-10
version=10.24.0
-revision=1
+revision=2
wrksrc="node-v${version}"
-hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+# libatomic-devel moved into here for #29034 - atomic8.patch will pull in -latomic
+# even for some architectures not covered by XBPS_TARGET_NO_ATOMIC8.
+hostmakedepends="libatomic-devel pkg-config python zlib-devel which
+ $(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)"
-makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+makedepends="libatomic-devel zlib-devel python-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)"
checkdepends="procps-ng"
@@ -18,7 +20,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=2 #unverified
+python_version=3
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared openssl"
@@ -37,13 +39,6 @@ if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
nocross="host and target must have the same pointer size"
fi
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
-fi
-if [ "$XBPS_NO_ATOMIC8" ]; then
- hostmakedepends+=" libatomic-devel"
-fi
-
CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
From 8243734099c1acaaddcc7fd3d8b1e99657c4eb79 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Tue, 27 Apr 2021 09:03:00 -0700
Subject: [PATCH 4/4] http-parser: update to 2.9.4.20201223
This is a pseudo-version to integrate upstream changes that haven't
been given a version number, as well as a patch from nodejs to fix
CVE-2020-8287.
---
.../http-parser/patches/cve_2020_8287.patch | 52 +++++++++++++++++++
srcpkgs/http-parser/template | 12 +++--
2 files changed, 60 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/http-parser/patches/cve_2020_8287.patch
diff --git a/srcpkgs/http-parser/patches/cve_2020_8287.patch b/srcpkgs/http-parser/patches/cve_2020_8287.patch
new file mode 100644
index 000000000000..09b6b5f6ee47
--- /dev/null
+++ b/srcpkgs/http-parser/patches/cve_2020_8287.patch
@@ -0,0 +1,52 @@
+--- http_parser.c
++++ http_parser.c
+@@ -1344,6 +1344,13 @@ size_t http_parser_execute (http_parser *parser,
+ } else if (parser->index == sizeof(TRANSFER_ENCODING)-2) {
+ parser->header_state = h_transfer_encoding;
+ parser->uses_transfer_encoding = 1;
++
++ /* Multiple `Transfer-Encoding` headers should be treated as
++ * one, but with values separate by a comma.
++ *
++ * See: https://tools.ietf.org/html/rfc7230#section-3.2.2
++ */
++ parser->flags &= ~F_CHUNKED;
+ }
+ break;
+
+--- test.c
++++ test.c
+@@ -2154,6 +2154,32 @@ const struct message responses[] =
+ ,.body= "2\r\nOK\r\n0\r\n\r\n"
+ ,.num_chunks_complete= 0
+ }
++#define HTTP_200_DUPLICATE_TE_NOT_LAST_CHUNKED 30
++, {.name= "HTTP 200 response with `chunked` and duplicate Transfer-Encoding"
++ ,.type= HTTP_RESPONSE
++ ,.raw= "HTTP/1.1 200 OK\r\n"
++ "Transfer-Encoding: chunked\r\n"
++ "Transfer-Encoding: identity\r\n"
++ "\r\n"
++ "2\r\n"
++ "OK\r\n"
++ "0\r\n"
++ "\r\n"
++ ,.should_keep_alive= FALSE
++ ,.message_complete_on_eof= TRUE
++ ,.http_major= 1
++ ,.http_minor= 1
++ ,.status_code= 200
++ ,.response_status= "OK"
++ ,.content_length= -1
++ ,.num_headers= 2
++ ,.headers=
++ { { "Transfer-Encoding", "chunked" }
++ , { "Transfer-Encoding", "identity" }
++ }
++ ,.body= "2\r\nOK\r\n0\r\n\r\n"
++ ,.num_chunks_complete= 0
++ }
+ };
+
+ /* strnlen() is a POSIX.2008 addition. Can't rely on it being available so
+
diff --git a/srcpkgs/http-parser/template b/srcpkgs/http-parser/template
index 9a9e4a626dd2..e8402ce55525 100644
--- a/srcpkgs/http-parser/template
+++ b/srcpkgs/http-parser/template
@@ -1,15 +1,19 @@
# Template file for 'http-parser'
pkgname=http-parser
-version=2.9.4
+# 2.9.4, plus upstream commits through ec8b5ee, plus fc70ce0 from nodejs/node
+# needed to fix CVE-2020-8287 and fix a test in nodejs-lts-10
+version=2.9.4.20201223
revision=1
+_githash=ec8b5ee63f0e51191ea43bb0c6eac7bfbff3141d
+wrksrc="${pkgname}-${_githash}"
build_style=gnu-makefile
make_build_target=library
short_desc="HTTP request/response parser for c"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
-homepage="https://github.com/joyent/http-parser"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=467b9e30fd0979ee301065e70f637d525c28193449e1b13fbcb1b1fab3ad224f
+homepage="https://github.com/nodejs/http-parser"
+distfiles="${homepage}/archive/${_githash}.tar.gz"
+checksum=765a21444322ea2476ca1e3cfeb74d280eeb37f4713cf52d2bf398dabf6e4128
pre_install() {
vmkdir usr/lib/pkgconfig
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (21 preceding siblings ...)
2021-04-27 17:50 ` [PR PATCH] [Updated] " digitalagedragon
@ 2021-04-27 18:03 ` digitalagedragon
2021-04-27 19:12 ` digitalagedragon
` (4 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: digitalagedragon @ 2021-04-27 18:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2316 bytes --]
There is an updated pull request by digitalagedragon against master on the void-packages repository
https://github.com/digitalagedragon/void-packages 29034-nodejs-system-libraries
https://github.com/void-linux/void-packages/pull/30516
Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
<!-- 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?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
This addresses #29034. I've verified that the libuv changes cause the `node` binary to depend on `libuv.so` and that it doesn't cause any (additional) test failures on my machine, and I've checked that `nodejs-lts-10` at least compiles on armv6l (don't have any test hardware).
The changes to `nodejs-lts-10` will link with `-latomic` on any `arm` architecture, not just ones where `XBPS_TARGET_NO_ATOMIC8` is set, but I did check and the resulting binary doesn't depend on libatomic on (say) armv7l where it's not needed. I think this is the best I can do without finding a way to pass `XBPS_TARGET_NO_ATOMIC8` into node-gyp.
<!--
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.)
- [ ] 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/30516.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-29034-nodejs-system-libraries-30516.patch --]
[-- Type: text/x-diff, Size: 11812 bytes --]
From 06410b655878fe8825f10da90b9cc34a5e05ccf9 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:25:46 -0700
Subject: [PATCH 1/4] nodejs: use system libuv
See https://github.com/void-linux/void-packages/issues/29034.
`shared-uv.patch` has been in the repo for a while but was slightly
broken.
---
srcpkgs/nodejs/{ => patches}/shared-uv.patch | 2 +-
srcpkgs/nodejs/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename srcpkgs/nodejs/{ => patches}/shared-uv.patch (97%)
diff --git a/srcpkgs/nodejs/shared-uv.patch b/srcpkgs/nodejs/patches/shared-uv.patch
similarity index 97%
rename from srcpkgs/nodejs/shared-uv.patch
rename to srcpkgs/nodejs/patches/shared-uv.patch
index 128e3a5ce06e..3e609a6c49a5 100644
--- a/srcpkgs/nodejs/shared-uv.patch
+++ b/srcpkgs/nodejs/patches/shared-uv.patch
@@ -16,7 +16,7 @@
}],
+ [ '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 450b59bbc7d0..bcfaaa73ac4c 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs'
pkgname=nodejs
version=14.16.0
-revision=1
+revision=2
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
From 222b25551a493a75b589f5c1dfc055fa8beb4c39 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:59:58 -0700
Subject: [PATCH 2/4] nodejs-lts: use system libuv
See 06410b655878fe8825f10da90b9cc34a5e05ccf9 and https://github.com/void-linux/void-packages/issues/29034.
---
srcpkgs/nodejs-lts/patches/shared-uv.patch | 25 ++++++++++++++++++++++
srcpkgs/nodejs-lts/template | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nodejs-lts/patches/shared-uv.patch
diff --git a/srcpkgs/nodejs-lts/patches/shared-uv.patch b/srcpkgs/nodejs-lts/patches/shared-uv.patch
new file mode 100644
index 000000000000..3e609a6c49a5
--- /dev/null
+++ b/srcpkgs/nodejs-lts/patches/shared-uv.patch
@@ -0,0 +1,25 @@
+--- deps/uvwasi/uvwasi.gyp.orig
++++ 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',
+ ],
+ }],
++ [ 'node_shared_libuv=="false"', {
++ 'dependencies': [ '../uv/uv.gyp:libuv' ],
++ }],
++ [ 'node_shared_libuv=="true"', {
++ 'libraries': [ '-luv' ],
++ }]
+ ],
+ }
+ ]
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index f9326d337555..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
version=12.21.0
-revision=1
+revision=2
wrksrc="node-v${version}"
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="pkg-config python libatomic-devel zlib-devel which
From ba2d9af447cb8a686424dd33d67d138fdedd54c7 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Mon, 26 Apr 2021 06:31:01 -0700
Subject: [PATCH 3/4] nodejs-lts-10: fix build for targets without native
atomic8
patches/ppc32.patch used "host_arch" instead of "target_arch" to check
whether to link against -latomic, and didn't include 32-bit ARM in the
list of targets that might need it. This addresses build failures on
armv6l as well as some lesser-used architectures.
Additionally, libatomic-devel is now included in makedepends for all
architectures (not just when `XBPS_TARGET_NO_ATOMIC8` is set) because
the build system can't tell the difference between armv6l and
armv7l. This matches how it's done for `nodejs{,-lts}` and doesn't
cause the armv7l build to actually depend on libatomic at runtime.
---
srcpkgs/nodejs-lts-10/patches/atomic8.patch | 14 ++++++++++++++
srcpkgs/nodejs-lts-10/patches/ppc32.patch | 14 --------------
srcpkgs/nodejs-lts-10/template | 21 ++++++++-------------
3 files changed, 22 insertions(+), 27 deletions(-)
create mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
new file mode 100644
index 000000000000..023cfad01239
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
@@ -0,0 +1,14 @@
+--- node.gyp
++++ node.gyp
+@@ -479,6 +479,11 @@
+ 'msvs_disabled_warnings!': [4244],
+
+ 'conditions': [
++ [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
++ 'link_settings': {
++ 'libraries': [ '-latomic' ],
++ },
++ }],
+ [ 'node_code_cache_path!=""', {
+ 'sources': [ '<(node_code_cache_path)' ]
+ }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
index 343eff585123..4650b285c363 100644
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -9,20 +9,6 @@
'__x86_64__' : 'x64',
'__s390__' : 's390',
'__s390x__' : 's390x',
---- node.gyp
-+++ node.gyp
-@@ -479,6 +479,11 @@
- 'msvs_disabled_warnings!': [4244],
-
- 'conditions': [
-+ [ 'host_arch=="mips" or host_arch=="mipsel" or host_arch=="ppc"', {
-+ 'link_settings': {
-+ 'libraries': [ '-latomic' ],
-+ },
-+ }],
- [ 'node_code_cache_path!=""', {
- 'sources': [ '<(node_code_cache_path)' ]
- }, {
--- deps/v8/src/libsampler/sampler.cc
+++ deps/v8/src/libsampler/sampler.cc
@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 3944d359c673..e9be94fcd393 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,14 +1,16 @@
# Template file for 'nodejs-lts-10'
pkgname=nodejs-lts-10
version=10.24.0
-revision=1
+revision=2
wrksrc="node-v${version}"
-hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+# libatomic-devel moved into here for #29034 - atomic8.patch will pull in -latomic
+# even for some architectures not covered by XBPS_TARGET_NO_ATOMIC8.
+hostmakedepends="libatomic-devel pkg-config python zlib-devel which
+ $(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)"
-makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+makedepends="libatomic-devel zlib-devel python-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)"
checkdepends="procps-ng"
@@ -18,7 +20,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=2 #unverified
+python_version=3
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared openssl"
@@ -37,13 +39,6 @@ if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
nocross="host and target must have the same pointer size"
fi
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
-fi
-if [ "$XBPS_NO_ATOMIC8" ]; then
- hostmakedepends+=" libatomic-devel"
-fi
-
CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
From 82e169687ae3cfac81a2c6a61a324fe6ec3c9aac Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Tue, 27 Apr 2021 11:03:36 -0700
Subject: [PATCH 4/4] http-parser: update to 2.9.4.20201223
This is a pseudo-version to integrate upstream changes that haven't
been given a version number, as well as a patch from nodejs to fix
CVE-2020-8287.
---
.../http-parser/patches/cve_2020_8287.patch | 52 +++++++++++++++++++
srcpkgs/http-parser/template | 12 +++--
2 files changed, 60 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/http-parser/patches/cve_2020_8287.patch
diff --git a/srcpkgs/http-parser/patches/cve_2020_8287.patch b/srcpkgs/http-parser/patches/cve_2020_8287.patch
new file mode 100644
index 000000000000..09b6b5f6ee47
--- /dev/null
+++ b/srcpkgs/http-parser/patches/cve_2020_8287.patch
@@ -0,0 +1,52 @@
+--- http_parser.c
++++ http_parser.c
+@@ -1344,6 +1344,13 @@ size_t http_parser_execute (http_parser *parser,
+ } else if (parser->index == sizeof(TRANSFER_ENCODING)-2) {
+ parser->header_state = h_transfer_encoding;
+ parser->uses_transfer_encoding = 1;
++
++ /* Multiple `Transfer-Encoding` headers should be treated as
++ * one, but with values separate by a comma.
++ *
++ * See: https://tools.ietf.org/html/rfc7230#section-3.2.2
++ */
++ parser->flags &= ~F_CHUNKED;
+ }
+ break;
+
+--- test.c
++++ test.c
+@@ -2154,6 +2154,32 @@ const struct message responses[] =
+ ,.body= "2\r\nOK\r\n0\r\n\r\n"
+ ,.num_chunks_complete= 0
+ }
++#define HTTP_200_DUPLICATE_TE_NOT_LAST_CHUNKED 30
++, {.name= "HTTP 200 response with `chunked` and duplicate Transfer-Encoding"
++ ,.type= HTTP_RESPONSE
++ ,.raw= "HTTP/1.1 200 OK\r\n"
++ "Transfer-Encoding: chunked\r\n"
++ "Transfer-Encoding: identity\r\n"
++ "\r\n"
++ "2\r\n"
++ "OK\r\n"
++ "0\r\n"
++ "\r\n"
++ ,.should_keep_alive= FALSE
++ ,.message_complete_on_eof= TRUE
++ ,.http_major= 1
++ ,.http_minor= 1
++ ,.status_code= 200
++ ,.response_status= "OK"
++ ,.content_length= -1
++ ,.num_headers= 2
++ ,.headers=
++ { { "Transfer-Encoding", "chunked" }
++ , { "Transfer-Encoding", "identity" }
++ }
++ ,.body= "2\r\nOK\r\n0\r\n\r\n"
++ ,.num_chunks_complete= 0
++ }
+ };
+
+ /* strnlen() is a POSIX.2008 addition. Can't rely on it being available so
+
diff --git a/srcpkgs/http-parser/template b/srcpkgs/http-parser/template
index 9a9e4a626dd2..e8402ce55525 100644
--- a/srcpkgs/http-parser/template
+++ b/srcpkgs/http-parser/template
@@ -1,15 +1,19 @@
# Template file for 'http-parser'
pkgname=http-parser
-version=2.9.4
+# 2.9.4, plus upstream commits through ec8b5ee, plus fc70ce0 from nodejs/node
+# needed to fix CVE-2020-8287 and fix a test in nodejs-lts-10
+version=2.9.4.20201223
revision=1
+_githash=ec8b5ee63f0e51191ea43bb0c6eac7bfbff3141d
+wrksrc="${pkgname}-${_githash}"
build_style=gnu-makefile
make_build_target=library
short_desc="HTTP request/response parser for c"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
-homepage="https://github.com/joyent/http-parser"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=467b9e30fd0979ee301065e70f637d525c28193449e1b13fbcb1b1fab3ad224f
+homepage="https://github.com/nodejs/http-parser"
+distfiles="${homepage}/archive/${_githash}.tar.gz"
+checksum=765a21444322ea2476ca1e3cfeb74d280eeb37f4713cf52d2bf398dabf6e4128
pre_install() {
vmkdir usr/lib/pkgconfig
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (22 preceding siblings ...)
2021-04-27 18:03 ` digitalagedragon
@ 2021-04-27 19:12 ` digitalagedragon
2021-04-27 21:38 ` ericonr
` (3 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: digitalagedragon @ 2021-04-27 19:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New comment by digitalagedragon on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#issuecomment-827851499
Comment:
Definitely agree with replacing `http-parser` elsewhere.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (23 preceding siblings ...)
2021-04-27 19:12 ` digitalagedragon
@ 2021-04-27 21:38 ` ericonr
2021-04-28 12:06 ` [PR PATCH] [Updated] " ericonr
` (2 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: ericonr @ 2021-04-27 21:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 216 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#issuecomment-827948189
Comment:
For reference, the debian version https://git.in-ulm.de/cbiedl/http-parser/
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (24 preceding siblings ...)
2021-04-27 21:38 ` ericonr
@ 2021-04-28 12:06 ` ericonr
2021-04-28 12:32 ` ericonr
2021-04-28 12:32 ` [PR PATCH] [Merged]: " ericonr
27 siblings, 0 replies; 29+ messages in thread
From: ericonr @ 2021-04-28 12:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2307 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/digitalagedragon/void-packages 29034-nodejs-system-libraries
https://github.com/void-linux/void-packages/pull/30516
Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
<!-- 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?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
This addresses #29034. I've verified that the libuv changes cause the `node` binary to depend on `libuv.so` and that it doesn't cause any (additional) test failures on my machine, and I've checked that `nodejs-lts-10` at least compiles on armv6l (don't have any test hardware).
The changes to `nodejs-lts-10` will link with `-latomic` on any `arm` architecture, not just ones where `XBPS_TARGET_NO_ATOMIC8` is set, but I did check and the resulting binary doesn't depend on libatomic on (say) armv7l where it's not needed. I think this is the best I can do without finding a way to pass `XBPS_TARGET_NO_ATOMIC8` into node-gyp.
<!--
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.)
- [ ] 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/30516.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-29034-nodejs-system-libraries-30516.patch --]
[-- Type: text/x-diff, Size: 11838 bytes --]
From bdf57dd0d3146adea7be592112e7c1d207a5a17c Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:25:46 -0700
Subject: [PATCH 1/4] nodejs: use system libuv
See https://github.com/void-linux/void-packages/issues/29034.
`shared-uv.patch` has been in the repo for a while but was slightly
broken.
---
srcpkgs/nodejs/{ => patches}/shared-uv.patch | 2 +-
srcpkgs/nodejs/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename srcpkgs/nodejs/{ => patches}/shared-uv.patch (97%)
diff --git a/srcpkgs/nodejs/shared-uv.patch b/srcpkgs/nodejs/patches/shared-uv.patch
similarity index 97%
rename from srcpkgs/nodejs/shared-uv.patch
rename to srcpkgs/nodejs/patches/shared-uv.patch
index 128e3a5ce06e..3e609a6c49a5 100644
--- a/srcpkgs/nodejs/shared-uv.patch
+++ b/srcpkgs/nodejs/patches/shared-uv.patch
@@ -16,7 +16,7 @@
}],
+ [ '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 450b59bbc7d0..bcfaaa73ac4c 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs'
pkgname=nodejs
version=14.16.0
-revision=1
+revision=2
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
From 6124c3c900b2c3735d064454d1b6eee8e64077aa Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:59:58 -0700
Subject: [PATCH 2/4] nodejs-lts: use system libuv
See 06410b655878fe8825f10da90b9cc34a5e05ccf9 and https://github.com/void-linux/void-packages/issues/29034.
---
srcpkgs/nodejs-lts/patches/shared-uv.patch | 25 ++++++++++++++++++++++
srcpkgs/nodejs-lts/template | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nodejs-lts/patches/shared-uv.patch
diff --git a/srcpkgs/nodejs-lts/patches/shared-uv.patch b/srcpkgs/nodejs-lts/patches/shared-uv.patch
new file mode 100644
index 000000000000..3e609a6c49a5
--- /dev/null
+++ b/srcpkgs/nodejs-lts/patches/shared-uv.patch
@@ -0,0 +1,25 @@
+--- deps/uvwasi/uvwasi.gyp.orig
++++ 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',
+ ],
+ }],
++ [ 'node_shared_libuv=="false"', {
++ 'dependencies': [ '../uv/uv.gyp:libuv' ],
++ }],
++ [ 'node_shared_libuv=="true"', {
++ 'libraries': [ '-luv' ],
++ }]
+ ],
+ }
+ ]
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index f9326d337555..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
version=12.21.0
-revision=1
+revision=2
wrksrc="node-v${version}"
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="pkg-config python libatomic-devel zlib-devel which
From 2972057ba203376d6792294f54e7dfe205ae929a Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Mon, 26 Apr 2021 06:31:01 -0700
Subject: [PATCH 3/4] nodejs-lts-10: fix build for targets without native
atomic8
patches/ppc32.patch used "host_arch" instead of "target_arch" to check
whether to link against -latomic, and didn't include 32-bit ARM in the
list of targets that might need it. This addresses build failures on
armv6l as well as some lesser-used architectures.
Additionally, libatomic-devel is now included in makedepends for all
architectures (not just when `XBPS_TARGET_NO_ATOMIC8` is set) because
the build system can't tell the difference between armv6l and
armv7l. This matches how it's done for `nodejs{,-lts}` and doesn't
cause the armv7l build to actually depend on libatomic at runtime.
---
srcpkgs/nodejs-lts-10/patches/atomic8.patch | 14 ++++++++++++++
srcpkgs/nodejs-lts-10/patches/ppc32.patch | 14 --------------
srcpkgs/nodejs-lts-10/template | 21 ++++++++-------------
3 files changed, 22 insertions(+), 27 deletions(-)
create mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
new file mode 100644
index 000000000000..023cfad01239
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
@@ -0,0 +1,14 @@
+--- node.gyp
++++ node.gyp
+@@ -479,6 +479,11 @@
+ 'msvs_disabled_warnings!': [4244],
+
+ 'conditions': [
++ [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
++ 'link_settings': {
++ 'libraries': [ '-latomic' ],
++ },
++ }],
+ [ 'node_code_cache_path!=""', {
+ 'sources': [ '<(node_code_cache_path)' ]
+ }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
index 343eff585123..4650b285c363 100644
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -9,20 +9,6 @@
'__x86_64__' : 'x64',
'__s390__' : 's390',
'__s390x__' : 's390x',
---- node.gyp
-+++ node.gyp
-@@ -479,6 +479,11 @@
- 'msvs_disabled_warnings!': [4244],
-
- 'conditions': [
-+ [ 'host_arch=="mips" or host_arch=="mipsel" or host_arch=="ppc"', {
-+ 'link_settings': {
-+ 'libraries': [ '-latomic' ],
-+ },
-+ }],
- [ 'node_code_cache_path!=""', {
- 'sources': [ '<(node_code_cache_path)' ]
- }, {
--- deps/v8/src/libsampler/sampler.cc
+++ deps/v8/src/libsampler/sampler.cc
@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 3944d359c673..300667cb9782 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,14 +1,16 @@
# Template file for 'nodejs-lts-10'
pkgname=nodejs-lts-10
version=10.24.0
-revision=1
+revision=2
wrksrc="node-v${version}"
-hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+# atomic8.patch will pull in -latomic even for some architectures
+# not covered by XBPS_TARGET_NO_ATOMIC8.
+hostmakedepends="pkg-config python which zlib-devel libatomic-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)"
-makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+makedepends="libatomic-devel zlib-devel python-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)"
checkdepends="procps-ng"
@@ -18,7 +20,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=2 #unverified
+python_version=3
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared openssl"
@@ -37,13 +39,6 @@ if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
nocross="host and target must have the same pointer size"
fi
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
-fi
-if [ "$XBPS_NO_ATOMIC8" ]; then
- hostmakedepends+=" libatomic-devel"
-fi
-
CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
From e02aeaf6dec2f1502cfcec3fa2e6ac9512b0a709 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Tue, 27 Apr 2021 11:03:36 -0700
Subject: [PATCH 4/4] http-parser: update to 2.9.4.20201223
This is a pseudo-version to integrate upstream changes that haven't
been given a version number, as well as a patch from nodejs to fix
CVE-2020-8287.
---
.../http-parser/patches/cve_2020_8287.patch | 56 +++++++++++++++++++
srcpkgs/http-parser/template | 11 ++--
2 files changed, 63 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/http-parser/patches/cve_2020_8287.patch
diff --git a/srcpkgs/http-parser/patches/cve_2020_8287.patch b/srcpkgs/http-parser/patches/cve_2020_8287.patch
new file mode 100644
index 000000000000..aa67b87b3744
--- /dev/null
+++ b/srcpkgs/http-parser/patches/cve_2020_8287.patch
@@ -0,0 +1,56 @@
+Upstream: no
+Patch from NodeJS's vendored version:
+https://github.com/nodejs/node/commit/fc70ce08f5818a286fb5899a1bc3aff5965a745e
+
+--- http_parser.c
++++ http_parser.c
+@@ -1344,6 +1344,13 @@ size_t http_parser_execute (http_parser *parser,
+ } else if (parser->index == sizeof(TRANSFER_ENCODING)-2) {
+ parser->header_state = h_transfer_encoding;
+ parser->uses_transfer_encoding = 1;
++
++ /* Multiple `Transfer-Encoding` headers should be treated as
++ * one, but with values separate by a comma.
++ *
++ * See: https://tools.ietf.org/html/rfc7230#section-3.2.2
++ */
++ parser->flags &= ~F_CHUNKED;
+ }
+ break;
+
+--- test.c
++++ test.c
+@@ -2154,6 +2154,32 @@ const struct message responses[] =
+ ,.body= "2\r\nOK\r\n0\r\n\r\n"
+ ,.num_chunks_complete= 0
+ }
++#define HTTP_200_DUPLICATE_TE_NOT_LAST_CHUNKED 30
++, {.name= "HTTP 200 response with `chunked` and duplicate Transfer-Encoding"
++ ,.type= HTTP_RESPONSE
++ ,.raw= "HTTP/1.1 200 OK\r\n"
++ "Transfer-Encoding: chunked\r\n"
++ "Transfer-Encoding: identity\r\n"
++ "\r\n"
++ "2\r\n"
++ "OK\r\n"
++ "0\r\n"
++ "\r\n"
++ ,.should_keep_alive= FALSE
++ ,.message_complete_on_eof= TRUE
++ ,.http_major= 1
++ ,.http_minor= 1
++ ,.status_code= 200
++ ,.response_status= "OK"
++ ,.content_length= -1
++ ,.num_headers= 2
++ ,.headers=
++ { { "Transfer-Encoding", "chunked" }
++ , { "Transfer-Encoding", "identity" }
++ }
++ ,.body= "2\r\nOK\r\n0\r\n\r\n"
++ ,.num_chunks_complete= 0
++ }
+ };
+
+ /* strnlen() is a POSIX.2008 addition. Can't rely on it being available so
+
diff --git a/srcpkgs/http-parser/template b/srcpkgs/http-parser/template
index 9a9e4a626dd2..a372064d4a79 100644
--- a/srcpkgs/http-parser/template
+++ b/srcpkgs/http-parser/template
@@ -1,15 +1,18 @@
# Template file for 'http-parser'
pkgname=http-parser
-version=2.9.4
+# 2.9.4, plus upstream commits through ec8b5ee, plus fc70ce0 from nodejs/node
+version=2.9.4.20201223
revision=1
+_githash=ec8b5ee63f0e51191ea43bb0c6eac7bfbff3141d
+wrksrc="${pkgname}-${_githash}"
build_style=gnu-makefile
make_build_target=library
short_desc="HTTP request/response parser for c"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
-homepage="https://github.com/joyent/http-parser"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=467b9e30fd0979ee301065e70f637d525c28193449e1b13fbcb1b1fab3ad224f
+homepage="https://github.com/nodejs/http-parser"
+distfiles="${homepage}/archive/${_githash}.tar.gz"
+checksum=765a21444322ea2476ca1e3cfeb74d280eeb37f4713cf52d2bf398dabf6e4128
pre_install() {
vmkdir usr/lib/pkgconfig
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (25 preceding siblings ...)
2021-04-28 12:06 ` [PR PATCH] [Updated] " ericonr
@ 2021-04-28 12:32 ` ericonr
2021-04-28 12:32 ` [PR PATCH] [Merged]: " ericonr
27 siblings, 0 replies; 29+ messages in thread
From: ericonr @ 2021-04-28 12:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30516#issuecomment-828416516
Comment:
I pushed some nits to the actual templates. Thanks!
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Merged]: Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
` (26 preceding siblings ...)
2021-04-28 12:32 ` ericonr
@ 2021-04-28 12:32 ` ericonr
27 siblings, 0 replies; 29+ messages in thread
From: ericonr @ 2021-04-28 12:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2120 bytes --]
There's a merged pull request on the void-packages repository
Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l
https://github.com/void-linux/void-packages/pull/30516
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?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
This addresses #29034. I've verified that the libuv changes cause the `node` binary to depend on `libuv.so` and that it doesn't cause any (additional) test failures on my machine, and I've checked that `nodejs-lts-10` at least compiles on armv6l (don't have any test hardware).
The changes to `nodejs-lts-10` will link with `-latomic` on any `arm` architecture, not just ones where `XBPS_TARGET_NO_ATOMIC8` is set, but I did check and the resulting binary doesn't depend on libatomic on (say) armv7l where it's not needed. I think this is the best I can do without finding a way to pass `XBPS_TARGET_NO_ATOMIC8` into node-gyp.
<!--
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.)
- [ ] 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
-->
^ permalink raw reply [flat|nested] 29+ messages in thread
end of thread, other threads:[~2021-04-28 12:32 UTC | newest]
Thread overview: 29+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-26 14:49 [PR PATCH] Use system libuv in nodejs and nodejs-lts digitalagedragon
2021-04-26 15:17 ` [PR PATCH] [Updated] " digitalagedragon
2021-04-26 15:25 ` [PR REVIEW] Use system libuv in nodejs and nodejs-lts, fix nodejs-lts-10 build on armv6l ericonr
2021-04-26 15:25 ` ericonr
2021-04-26 15:26 ` ericonr
2021-04-26 15:26 ` digitalagedragon
2021-04-26 15:27 ` digitalagedragon
2021-04-26 15:30 ` digitalagedragon
2021-04-26 15:38 ` [PR REVIEW] " digitalagedragon
2021-04-26 15:43 ` [PR PATCH] [Updated] " digitalagedragon
2021-04-26 16:27 ` Johnnynator
2021-04-26 16:48 ` [PR PATCH] [Updated] " digitalagedragon
2021-04-26 16:49 ` digitalagedragon
2021-04-27 14:27 ` digitalagedragon
2021-04-27 15:06 ` digitalagedragon
2021-04-27 15:37 ` ericonr
2021-04-27 15:47 ` digitalagedragon
2021-04-27 17:15 ` digitalagedragon
2021-04-27 17:22 ` ericonr
2021-04-27 17:27 ` digitalagedragon
2021-04-27 17:45 ` ericonr
2021-04-27 17:48 ` ericonr
2021-04-27 17:50 ` [PR PATCH] [Updated] " digitalagedragon
2021-04-27 18:03 ` digitalagedragon
2021-04-27 19:12 ` digitalagedragon
2021-04-27 21:38 ` ericonr
2021-04-28 12:06 ` [PR PATCH] [Updated] " ericonr
2021-04-28 12:32 ` ericonr
2021-04-28 12:32 ` [PR PATCH] [Merged]: " ericonr
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).