From 15b4fc8fc98d073ba7d1b05743c0097e5774e431c24af497b73037937457cab3 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 24 Oct 2023 14:18:15 +0000 Subject: [PATCH 1/2] -------------------------------------------------------------------- - Add nodejs20-zlib-1.3.patch: Support zlib version with only major.minor versions, like zlib 1.3. ------------------------------------------------------------------ OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs20?expand=0&rev=45 --- nodejs20-zlib-1.3.patch | 13 +++++++++++++ nodejs20.changes | 8 +++++++- nodejs20.spec | 7 +++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 nodejs20-zlib-1.3.patch diff --git a/nodejs20-zlib-1.3.patch b/nodejs20-zlib-1.3.patch new file mode 100644 index 0000000..c1cf2d2 --- /dev/null +++ b/nodejs20-zlib-1.3.patch @@ -0,0 +1,13 @@ +Index: node-v20.8.1/test/parallel/test-process-versions.js +=================================================================== +--- node-v20.8.1.orig/test/parallel/test-process-versions.js ++++ node-v20.8.1/test/parallel/test-process-versions.js +@@ -61,7 +61,7 @@ assert.match(process.versions.brotli, co + assert.match(process.versions.llhttp, commonTemplate); + assert.match(process.versions.node, commonTemplate); + assert.match(process.versions.uv, commonTemplate); +-assert.match(process.versions.zlib, /^\d+(?:\.\d+){2,3}(?:-.*)?$/); ++assert.match(process.versions.zlib, /^\d+(?:\.\d+){1,3}(?:-.*)?$/); + + if (hasUndici) { + assert.match(process.versions.undici, commonTemplate); diff --git a/nodejs20.changes b/nodejs20.changes index 06ff18f..2c16dc7 100644 --- a/nodejs20.changes +++ b/nodejs20.changes @@ -1,4 +1,10 @@ -------------------------------------------------------------------- +-------------------------------------------------------------------- +Tue Oct 24 11:21:41 UTC 2023 - Dominique Leuenberger + +- Add nodejs20-zlib-1.3.patch: Support zlib version with only + major.minor versions, like zlib 1.3. + +------------------------------------------------------------------ Mon Oct 16 09:28:06 UTC 2023 - Adam Majer - 20.8.1 - Security fixes relase 20.8.1 diff --git a/nodejs20.spec b/nodejs20.spec index 42f1f07..bee5875 100644 --- a/nodejs20.spec +++ b/nodejs20.spec @@ -137,6 +137,7 @@ Source5: node-gyp_7.1.2.tar.xz Source10: update_npm_tarball.sh Source11: node_modules.tar.xz Source20: bash_output_helper.bash +Source21: wasm-fixtures.tar.gz ## Patches not distribution specific Patch1: cares_public_headers.patch @@ -172,6 +173,7 @@ Patch200: versioned.patch Patch305: qemu_timeouts_arches.patch Patch308: node-gyp-config.patch Patch309: gcc13.patch +Patch311: nodejs20-zlib-1.3.patch BuildRequires: pkg-config BuildRequires: fdupes @@ -677,6 +679,10 @@ echo "`grep node-v%{version}.tar.xz %{S:1} | head -n1 | cut -c1-64` %{S:0}" | s %setup -q -n node-%{version} %endif +%if %{node_version_number} <= 16 +tar zxf %{S:1} +%endif + %if %{node_version_number} <= 10 rm -r deps/npm/* pushd deps/npm @@ -728,6 +734,7 @@ popd %patch305 -p1 %patch309 -p1 +%patch311 -p1 %if %{node_version_number} == 12 # minimist security update - patch50 From 19b4cdb748d6a38239d49b2fa52491e713e8d4ef6fe30ae71246344543493b74 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 24 Oct 2023 14:36:29 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs20?expand=0&rev=46 --- nodejs20.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nodejs20.spec b/nodejs20.spec index bee5875..a85e631 100644 --- a/nodejs20.spec +++ b/nodejs20.spec @@ -137,7 +137,6 @@ Source5: node-gyp_7.1.2.tar.xz Source10: update_npm_tarball.sh Source11: node_modules.tar.xz Source20: bash_output_helper.bash -Source21: wasm-fixtures.tar.gz ## Patches not distribution specific Patch1: cares_public_headers.patch @@ -680,7 +679,7 @@ echo "`grep node-v%{version}.tar.xz %{S:1} | head -n1 | cut -c1-64` %{S:0}" | s %endif %if %{node_version_number} <= 16 -tar zxf %{S:1} +tar zxf %{S:12} %endif %if %{node_version_number} <= 10