From e7b641b935157401a62352c7744f902d2c68b6e8 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 7 Oct 2025 07:17:10 +0000 Subject: [PATCH] import UBI nodejs-20.19.5-1.module+el8.10.0+23521+490ebfde --- .gitignore | 6 ++--- .nodejs.metadata | 6 ++--- ...1-Disable-running-gyp-on-shared-deps.patch | 16 +----------- SPECS/nodejs.spec | 25 +++++++++++-------- 4 files changed, 22 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 30d8798..c92bad7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -SOURCES/cjs-module-lexer-1.4.1.tar.gz -SOURCES/icu4c-76_1-src.tgz -SOURCES/node-v20.19.2-stripped.tar.gz +SOURCES/cjs-module-lexer-2.1.0.tar.gz +SOURCES/icu4c-77_1-src.tgz +SOURCES/node-v20.19.5-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 bd8f6b3..196eaa1 100644 --- a/.nodejs.metadata +++ b/.nodejs.metadata @@ -1,6 +1,6 @@ -327c9c409bcda11ac331186b5eabb27bb78df43e SOURCES/cjs-module-lexer-1.4.1.tar.gz -f7764341d196112573605881dbbf10e586d84841 SOURCES/icu4c-76_1-src.tgz -6f455cb29e9506bc6a5434d3374401a272b75a89 SOURCES/node-v20.19.2-stripped.tar.gz +8520269d877efc090486264bcdc2e08746ee8150 SOURCES/cjs-module-lexer-2.1.0.tar.gz +3039d3833f6359bc5f01da8f8640da5a8fcfbd3e SOURCES/icu4c-77_1-src.tgz +b4007b241ad39ef06cb851e95338a75dc67a6a7f SOURCES/node-v20.19.5-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 c506733..ef36c5c 100644 --- a/SOURCES/0001-Disable-running-gyp-on-shared-deps.patch +++ b/SOURCES/0001-Disable-running-gyp-on-shared-deps.patch @@ -5,23 +5,9 @@ Subject: [PATCH] Disable running gyp on shared deps Signed-off-by: rpm-build --- - Makefile | 2 +- node.gyp | 17 ----------------- - 2 files changed, 1 insertion(+), 18 deletions(-) + 1 files changed, 18 deletions(-) -diff --git a/Makefile b/Makefile -index 8e09820..fdd951b 100644 ---- a/Makefile -+++ b/Makefile -@@ -171,7 +171,7 @@ with-code-cache test-code-cache: - $(warning '$@' target is a noop) - - out/Makefile: config.gypi common.gypi node.gyp \ -- deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \ -+ deps/llhttp/llhttp.gyp \ - deps/simdutf/simdutf.gyp deps/ada/ada.gyp \ - 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 33bc7d9..a216c41 100644 --- a/node.gyp diff --git a/SPECS/nodejs.spec b/SPECS/nodejs.spec index 1d7d7c1..b5f4f0a 100644 --- a/SPECS/nodejs.spec +++ b/SPECS/nodejs.spec @@ -45,7 +45,7 @@ %global nodejs_epoch 1 %global nodejs_major 20 %global nodejs_minor 19 -%global nodejs_patch 2 +%global nodejs_patch 5 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h %global nodejs_soversion 115 @@ -73,7 +73,7 @@ %global c_ares_version 1.34.5 # llhttp - from deps/llhttp/include/llhttp.h -%global llhttp_version 9.2.1 +%global llhttp_version 9.3.0 # libuv - from deps/uv/include/uv/version.h %global libuv_version 1.46.0 @@ -88,7 +88,7 @@ %global ngtcp2_version 1.1.0 # ICU - from tools/icu/current_ver.dep -%global icu_major 76 +%global icu_major 77 %global icu_minor 1 %global icu_version %{icu_major}.%{icu_minor} @@ -107,7 +107,7 @@ %endif # simduft from deps/simdutf/simdutf.h -%global simduft_version 6.0.3 +%global simduft_version 6.4.2 # ada from deps/ada/ada.h %global ada_version 2.9.2 @@ -133,7 +133,7 @@ # Node.js 16.9.1 and later comes with an experimental package management tool # corepack - from deps/corepack/package.json -%global corepack_version 0.31.0 +%global corepack_version 0.33.0 # uvwasi - from deps/uvwasi/include/uvwasi.h %global uvwasi_version 0.0.21 @@ -173,10 +173,10 @@ Source8: npmrc.builtin.in # Note: These sources would also include pre-compiled WASM blobs… so they are adjusted not to. # Recipes for creating these blobs are included in the sources. -# Version: jq '.version' deps/cjs-module-lexer/package.json -# Original: https://github.com/nodejs/cjs-module-lexer/archive/refs/tags/1.4.1.tar.gz -# Adjustments: rm -f cjs-module-lexer-1.4.1/lib/lexer.wasm -Source101: cjs-module-lexer-1.4.1.tar.gz +# Version: jq '.version' deps/cjs-module-lexer/src/package.json +# Original: https://github.com/nodejs/cjs-module-lexer/archive/refs/tags/2.1.0.tar.gz +# Adjustments: rm -f cjs-module-lexer-2.1.0/lib/lexer.wasm +Source101: cjs-module-lexer-2.1.0.tar.gz # The WASM blob was made using wasi-sdk v11; compiler libraries are linked in. # Version source (cjs-module-lexer tarball): Makefile Source102: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-11/wasi-sdk-wasi-sdk-11.tar.gz @@ -448,7 +448,8 @@ export LDFLAGS="%{build_ldflags}" --with-icu-default-data-dir=%{icudatadir} \ %{!?with_corepack:--without-corepack} \ --openssl-use-def-ca-store \ - --openssl-default-cipher-list=PROFILE=SYSTEM + --openssl-default-cipher-list=PROFILE=SYSTEM \ + --use-prefix-to-find-headers %if %{?with_debug} == 1 # Setting BUILDTYPE=Debug builds both release and debug binaries @@ -676,6 +677,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} \ %changelog +* Thu Sep 04 2025 Tomas Juhasz - 1:20.19.5-1 + - Update to version 20.19.5 + Resolves: RHEL-100423 + * Thu May 15 2025 Tomas Juhasz - 1:20.19.2-1 - Update to version 20.19.2 Fixes: CVE-2025-23166