From 52f3967b11bebb2f441c9fd685835406b2ff0a9f Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 5 May 2025 12:18:07 +0000 Subject: [PATCH] import UBI nodejs-20.19.1-1.module+el8.10.0+23054+5431297f --- .gitignore | 6 ++--- .nodejs.metadata | 6 ++--- ...1-Disable-running-gyp-on-shared-deps.patch | 12 ++++----- SOURCES/0002-Disable-FIPS-options.patch | 11 ++++---- SPECS/nodejs.spec | 25 ++++++++++++------- 5 files changed, 34 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 8efe97b..ee20d0a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ SOURCES/cjs-module-lexer-1.4.1.tar.gz -SOURCES/icu4c-75_1-src.tgz -SOURCES/node-v20.18.2-stripped.tar.gz -SOURCES/undici-6.21.1.tar.gz +SOURCES/icu4c-76_1-src.tgz +SOURCES/node-v20.19.1-stripped.tar.gz +SOURCES/undici-6.21.2.tar.gz SOURCES/wasi-sdk-wasi-sdk-11.tar.gz SOURCES/wasi-sdk-wasi-sdk-16.tar.gz diff --git a/.nodejs.metadata b/.nodejs.metadata index 4325ec7..8160b4e 100644 --- a/.nodejs.metadata +++ b/.nodejs.metadata @@ -1,6 +1,6 @@ 327c9c409bcda11ac331186b5eabb27bb78df43e SOURCES/cjs-module-lexer-1.4.1.tar.gz -da3614aa496c5f0fde12f7aa155f235b5e239f1b SOURCES/icu4c-75_1-src.tgz -8a59e2e4fa6c81ac10f6f42a5e6245bfd882efa2 SOURCES/node-v20.18.2-stripped.tar.gz -5ab2874f1e7786485cb5f8239b5f6a977a5aa8f5 SOURCES/undici-6.21.1.tar.gz +f7764341d196112573605881dbbf10e586d84841 SOURCES/icu4c-76_1-src.tgz +86617650fbe74b4fceff6314e88cee212f0e917a SOURCES/node-v20.19.1-stripped.tar.gz +d97e6978c03859c4d8a2bad236cd9e9060ae6ae2 SOURCES/undici-6.21.2.tar.gz 8979d177dd62e3b167a6fd7dc7185adb0128c439 SOURCES/wasi-sdk-wasi-sdk-11.tar.gz fbe01909bf0e8260fcc3696ec37c9f731b5e356a SOURCES/wasi-sdk-wasi-sdk-16.tar.gz diff --git a/SOURCES/0001-Disable-running-gyp-on-shared-deps.patch b/SOURCES/0001-Disable-running-gyp-on-shared-deps.patch index 39eb75f..c506733 100644 --- a/SOURCES/0001-Disable-running-gyp-on-shared-deps.patch +++ b/SOURCES/0001-Disable-running-gyp-on-shared-deps.patch @@ -1,4 +1,4 @@ -From 2da7f25d9311bdea702b4b435830c02ce78b3ab9 Mon Sep 17 00:00:00 2001 +From 6167666f43da361b2a1eda0a14d42c5b8cb9ae0d Mon Sep 17 00:00:00 2001 From: rpm-build Date: Tue, 30 May 2023 13:12:35 +0200 Subject: [PATCH] Disable running gyp on shared deps @@ -10,10 +10,10 @@ Signed-off-by: rpm-build 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/Makefile b/Makefile -index 7bd80d0..c43a50f 100644 +index 8e09820..fdd951b 100644 --- a/Makefile +++ b/Makefile -@@ -169,7 +169,7 @@ with-code-cache test-code-cache: +@@ -171,7 +171,7 @@ with-code-cache test-code-cache: $(warning '$@' target is a noop) out/Makefile: config.gypi common.gypi node.gyp \ @@ -23,10 +23,10 @@ index 7bd80d0..c43a50f 100644 tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \ tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp diff --git a/node.gyp b/node.gyp -index 4aac640..aa0ba88 100644 +index 33bc7d9..a216c41 100644 --- a/node.gyp +++ b/node.gyp -@@ -775,23 +775,6 @@ +@@ -797,23 +797,6 @@ ], }, ], @@ -51,5 +51,5 @@ index 4aac640..aa0ba88 100644 ], }, # node_core_target_name -- -2.44.0 +2.49.0 diff --git a/SOURCES/0002-Disable-FIPS-options.patch b/SOURCES/0002-Disable-FIPS-options.patch index 31b0634..3799810 100644 --- a/SOURCES/0002-Disable-FIPS-options.patch +++ b/SOURCES/0002-Disable-FIPS-options.patch @@ -1,4 +1,4 @@ -From 4caaf9c19d3c058f5b89ecd9fc721ee49370651a Mon Sep 17 00:00:00 2001 +From 9ce5049040b915f8274fef3e6a8d7b3833eda6b0 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Fri, 23 Feb 2024 13:43:56 +0100 Subject: [PATCH] Disable FIPS options @@ -50,8 +50,9 @@ index 1216f3a..fbfcb26 100644 if (val) return; throw new ERR_CRYPTO_FIPS_FORCED(); diff --git a/lib/internal/errors.js b/lib/internal/errors.js ---- a/lib/internal/errors.js.patch0002 2024-08-07 15:29:09.366357433 +0200 -+++ b/lib/internal/errors.js 2024-08-07 15:29:14.392366591 +0200 +index c03e285..77830fa 100644 +--- a/lib/internal/errors.js ++++ b/lib/internal/errors.js @@ -1112,6 +1112,12 @@ module.exports = { // // Note: Node.js specific errors must begin with the prefix ERR_ @@ -66,7 +67,7 @@ diff --git a/lib/internal/errors.js b/lib/internal/errors.js function(msg, permission = '', resource = '') { this.permission = permission; diff --git a/src/crypto/crypto_util.cc b/src/crypto/crypto_util.cc -index 5734d8f..ef9d1b1 100644 +index 990638e..51bd1d7 100644 --- a/src/crypto/crypto_util.cc +++ b/src/crypto/crypto_util.cc @@ -121,6 +121,8 @@ bool ProcessFipsOptions() { @@ -79,5 +80,5 @@ index 5734d8f..ef9d1b1 100644 OSSL_PROVIDER* fips_provider = OSSL_PROVIDER_load(nullptr, "fips"); if (fips_provider == nullptr) -- -2.44.0 +2.49.0 diff --git a/SPECS/nodejs.spec b/SPECS/nodejs.spec index f70552a..7a2b6dd 100644 --- a/SPECS/nodejs.spec +++ b/SPECS/nodejs.spec @@ -33,7 +33,7 @@ # This is used by both the nodejs package and the npm subpackage that # has a separate version - the name is special so that rpmdev-bumpspec # will bump this rather than adding .1 to the end. -%global baserelease 3 +%global baserelease 1 %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -44,8 +44,8 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 20 -%global nodejs_minor 18 -%global nodejs_patch 2 +%global nodejs_minor 19 +%global nodejs_patch 1 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h %global nodejs_soversion 115 @@ -70,7 +70,7 @@ # c-ares - from deps/cares/include/ares_version.h # https://github.com/nodejs/node/pull/9332 -%global c_ares_version 1.33.1 +%global c_ares_version 1.34.5 # llhttp - from deps/llhttp/include/llhttp.h %global llhttp_version 8.1.2 @@ -82,13 +82,13 @@ %global nghttp2_version 1.61.0 # nghttp3 - from deps/ngtcp2/nghttp3/lib/includes/nghttp3/version.h -%global nghttp3_version 0.7.0 +%global nghttp3_version 0.11.8 # ngtcp2 from deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h %global ngtcp2_version 1.1.0 # ICU - from tools/icu/current_ver.dep -%global icu_major 75 +%global icu_major 76 %global icu_minor 1 %global icu_version %{icu_major}.%{icu_minor} @@ -182,10 +182,10 @@ Source101: cjs-module-lexer-1.4.1.tar.gz Source102: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-11/wasi-sdk-wasi-sdk-11.tar.gz # Version: jq '.version' deps/undici/src/package.json -# Original: https://github.com/nodejs/undici/archive/refs/tags/v6.21.1.tar.gz -# Adjustments: rm -f undici-6.21.1/lib/llhttp/llhttp*.wasm +# Original: https://github.com/nodejs/undici/archive/refs/tags/v6.21.2.tar.gz +# Adjustments: rm -f undici-6.21.2/lib/llhttp/llhttp*.wasm # wasi-sdk version can be found in lib/llhttp/wasm_build_env.txt -Source111: undici-6.21.1.tar.gz +Source111: undici-6.21.2.tar.gz # The WASM blob was made using wasi-sdk v16; compiler libraries are linked in. # Version source: deps/undici/src/lib/llhttp/wasm_build_env.txt # Also check (undici tarball): lib/llhttp/wasm_build_env.txt @@ -667,6 +667,13 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} \ %changelog +* Thu Apr 24 2025 Andrei Radchenko - 1:20.19.1-1 +- Update to version 20.19.1 + Resolves: RHEL-78763 + +* Tue Apr 15 2025 Andrei Radchenko - 1:20.18.2-4 +- Update c-ares to 1.34.5 to address CVE-2025-31498 + * Thu Mar 20 2025 Andrei Radchenko - 1:20.18.2-3 - Remove obsolete lua pretransaction script from spec file Resolves: RHEL-81125