pool/nodejs18
2
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 1061206 from devel:languages:nodejs

Browse Source 
- Again use openssl-3, if available.
- _constraints: reset aarch64 memory requirements back to original
  otherwise some unit tests can fail
- s390.patch: fix unit test on s390 with patched zlib

OBS-URL: https://build.opensuse.org/request/show/1061206
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nodejs18?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2023-01-27 09:15:57 +00:00 committed by Git OBS Bridge
commit 8a71360cf2
4 changed files with 55 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_constraints
View File

@ -16,9 +16,6 @@
<cpu>
<flag>asimdrdm</flag>
</cpu>
<physicalmemory>
<size unit="G">6</size>
</physicalmemory>
</hardware>
</overwrite>
<overwrite>

8
nodejs18.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Jan 25 12:01:18 UTC 2023 - Adam Majer <adam.majer@suse.de>
- Again use openssl-3, if available.
- _constraints: reset aarch64 memory requirements back to original
otherwise some unit tests can fail
- s390.patch: fix unit test on s390 with patched zlib
-------------------------------------------------------------------
Mon Jan 16 14:57:58 UTC 2023 - Adam Majer <adam.majer@suse.de>

27
nodejs18.spec
View File

@ -82,7 +82,7 @@ Release: 0
%define _libexecdir %{_exec_prefix}/lib
%endif
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 120500 || 0%{?fedora_version} >= 35
%if 0%{?suse_version} >= 1500 || 0%{?sle_version} >= 120400 || 0%{?fedora_version} >= 35
%bcond_with intree_openssl
%else
%bcond_without intree_openssl
@ -171,6 +171,7 @@ Patch133: rsa-pss-revert.patch
Patch200: versioned.patch
Patch305: qemu_timeouts_arches.patch
Patch307: s390.patch
BuildRequires: pkg-config
BuildRequires: fdupes
@ -264,10 +265,10 @@ BuildRequires: user(nobody)
BuildRequires: group(nobody)
%endif
# shared openssl
%if ! 0%{with intree_openssl}
BuildRequires: libopenssl-1_1-devel
#BuildRequires: (pkgconfig(openssl) >= %{openssl_req_ver} and pkgconfig(openssl) < 3.0)
BuildRequires: pkgconfig(openssl) >= %{openssl_req_ver}
# require patched openssl library on SLES for nodejs16
%if 0%{?suse_version} && "%{pkg_version openssl-1_1}" != "~~~"
@ -278,13 +279,19 @@ Requires: openssl-has-RSA_get0_pss_params
%endif
%if 0%{?suse_version}
#%if 0%{?suse_version} >= 1500
#iBuildRequires: openssl >= %{openssl_req_ver}
#%else
BuildRequires: openssl-1_1 >= %{openssl_req_ver}
#%endif
%if 0%{?suse_version} >= 1500
BuildRequires: openssl >= %{openssl_req_ver}
%else
BuildRequires: openssl-1_1 >= %{openssl_req_ver}
%endif
%if %{pkg_vcmp pkgconfig(openssl) > '3.0' }
BuildRequires: libopenssl3-hmac
%else
BuildRequires: libopenssl1_1-hmac
%endif
# /suse_version
%endif
@ -293,11 +300,14 @@ BuildRequires: openssl >= %{openssl_req_ver}
%endif
%else
# bundled openssl
%if %node_version_number <= 12 && 0%{?suse_version} == 1315 && 0%{?sle_version} < 120400
Provides: bundled(openssl) = 3.0.7
%else
BuildRequires: bundled_openssl_should_not_be_required
%endif
# /bundled openssl
%endif
%if ! 0%{with intree_cares}
@ -684,6 +694,7 @@ popd
%patch200 -p1
%patch305 -p1
%patch307 -p1
%if %{node_version_number} <= 12
# minimist security update - patch50

28
s390.patch Normal file
View File

@ -0,0 +1,28 @@
Index: node-v18.13.0/test/parallel/test-whatwg-webstreams-compression.js
===================================================================
--- node-v18.13.0.orig/test/parallel/test-whatwg-webstreams-compression.js
+++ node-v18.13.0/test/parallel/test-whatwg-webstreams-compression.js
@@ -20,11 +20,19 @@ async function test(format) {
const reader = gunzip.readable.getReader();
const writer = gzip.writable.getWriter();
+ let compressed_data = [];
+ const reader_function = ({ value, done }) => {
+ if (value)
+ compressed_data.push(value);
+ if (!done)
+ return reader.read().then(reader_function);
+ assert.strictEqual(dec.decode(Buffer.concat(compressed_data)), 'hello');
+ };
+ const reader_promise = reader.read().then(reader_function);
+
await Promise.all([
- reader.read().then(({ value, done }) => {
- assert.strictEqual(dec.decode(value), 'hello');
- }),
- reader.read().then(({ done }) => assert(done)),
+ reader_promise,
+ reader_promise.then(() => reader.read().then(({ done }) => assert(done))),
writer.write('hello'),
writer.close(),
]);