From c159acc850872e46b96052ca6178f94ffd3589e7 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 17 Feb 2025 18:44:20 +0000 Subject: [PATCH] import UBI nodejs-22.13.1-1.module+el8.10.0+22759+46b58560 --- .gitignore | 14 +++--- .nodejs.metadata | 14 +++--- ...-deps-ncrypto-include-openssl-rand.h.patch | 25 ----------- SPECS/nodejs.spec | 44 ++++++++++--------- 4 files changed, 38 insertions(+), 59 deletions(-) delete mode 100644 SOURCES/0002-deps-ncrypto-include-openssl-rand.h.patch diff --git a/.gitignore b/.gitignore index 2ccd23f..35a2ab0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ -SOURCES/cjs-module-lexer-1.2.2.tar.gz -SOURCES/icu4c-75_1-data-bin-b.zip -SOURCES/icu4c-75_1-data-bin-l.zip -SOURCES/node-v22.11.0-stripped.tar.gz -SOURCES/undici-6.19.2.tar.gz -SOURCES/wasi-sdk-wasi-sdk-11.tar.gz -SOURCES/wasi-sdk-wasi-sdk-16.tar.gz +SOURCES/cjs-module-lexer-1.4.1.tar.gz +SOURCES/icu4c-76_1-data-bin-b.zip +SOURCES/icu4c-76_1-data-bin-l.zip +SOURCES/node-v22.13.1-stripped.tar.gz +SOURCES/undici-6.21.1.tar.gz +SOURCES/wasi-sdk-wasi-sdk-12.tar.gz +SOURCES/wasi-sdk-wasi-sdk-20.tar.gz diff --git a/.nodejs.metadata b/.nodejs.metadata index e570f3c..750ee37 100644 --- a/.nodejs.metadata +++ b/.nodejs.metadata @@ -1,7 +1,7 @@ -164f7f39841415284b0280a648c43bd7ea1615ac SOURCES/cjs-module-lexer-1.2.2.tar.gz -6c7291d88272d84fdadf1395166acd40dd12f623 SOURCES/icu4c-75_1-data-bin-b.zip -ef164aa671780d004e304b4c789b05450e912304 SOURCES/icu4c-75_1-data-bin-l.zip -17c2b64411adb2127c23324dfceaf52c076e1ab8 SOURCES/node-v22.11.0-stripped.tar.gz -0653ac16ef498878fffefea0fa1f7e870cdfc249 SOURCES/undici-6.19.2.tar.gz -8979d177dd62e3b167a6fd7dc7185adb0128c439 SOURCES/wasi-sdk-wasi-sdk-11.tar.gz -fbe01909bf0e8260fcc3696ec37c9f731b5e356a SOURCES/wasi-sdk-wasi-sdk-16.tar.gz +ee05ddd8abd0b77a04fb6655e89e223364c2a58c SOURCES/cjs-module-lexer-1.4.1.tar.gz +d1c5586e6733b5c4790d05a76d47ad159ff31e9b SOURCES/icu4c-76_1-data-bin-b.zip +547c6ffcb7833b1a14abd6114e0a1722144d410a SOURCES/icu4c-76_1-data-bin-l.zip +0fe25f1d0a7694ff8a30e6eb5d3ddc5c8236b7f1 SOURCES/node-v22.13.1-stripped.tar.gz +177f681b644cd32885dd7bf124292f97a043eafe SOURCES/undici-6.21.1.tar.gz +5ea3a1deb65a52a36ceb41324da690f54b2a4805 SOURCES/wasi-sdk-wasi-sdk-12.tar.gz +da40abcb73a6dddafced6174d24ed49e414cda3c SOURCES/wasi-sdk-wasi-sdk-20.tar.gz diff --git a/SOURCES/0002-deps-ncrypto-include-openssl-rand.h.patch b/SOURCES/0002-deps-ncrypto-include-openssl-rand.h.patch deleted file mode 100644 index c6667fb..0000000 --- a/SOURCES/0002-deps-ncrypto-include-openssl-rand.h.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e79552fdbebb411b8a6f7bc323525f463c1ee7ad Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Wed, 30 Oct 2024 15:48:59 +0100 -Subject: [PATCH] deps(ncrypto): include - -Signed-off-by: rpm-build ---- - deps/ncrypto/ncrypto.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/deps/ncrypto/ncrypto.cc b/deps/ncrypto/ncrypto.cc -index 457bd2f..a38b4a2 100644 ---- a/deps/ncrypto/ncrypto.cc -+++ b/deps/ncrypto/ncrypto.cc -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - #include - #include - #if OPENSSL_VERSION_MAJOR >= 3 --- -2.47.0 - diff --git a/SPECS/nodejs.spec b/SPECS/nodejs.spec index 9abbd4e..b9f8778 100644 --- a/SPECS/nodejs.spec +++ b/SPECS/nodejs.spec @@ -78,8 +78,8 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 22 -%global nodejs_minor 11 -%global nodejs_patch 0 +%global nodejs_minor 13 +%global nodejs_patch 1 # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h %global nodejs_soversion 127 %global nodejs_abi %{nodejs_soversion} @@ -106,25 +106,25 @@ # 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.4 # llhttp - from deps/llhttp/include/llhttp.h %global llhttp_version 9.2.1 # libuv - from deps/uv/include/uv/version.h -%global libuv_version 1.48.0 +%global libuv_version 1.49.2 # nghttp2 - from deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h -%global nghttp2_version 1.63.0 +%global nghttp2_version 1.64.0 # nghttp3 - from deps/ngtcp2/nghttp3/lib/includes/nghttp3/version.h -%global nghttp3_version 0.7.0 +%global nghttp3_version 1.6.0 # ngtcp2 from deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h -%global ngtcp2_version 1.3.0 +%global ngtcp2_version 1.9.1 # 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} @@ -133,7 +133,7 @@ # " this line just fixes syntax highlighting for vim that is confused by the above and continues literal # simdutf from deps/simdutf/simdutf.h -%global simdutf_version 5.5.0 +%global simdutf_version 5.6.4 # OpenSSL minimum version %global openssl11_minimum 1:1.1.1 @@ -146,7 +146,7 @@ # npm - from deps/npm/package.json %global npm_epoch 1 -%global npm_version 10.9.0 +%global npm_version 10.9.2 # In order to avoid needing to keep incrementing the release version for the # main package forever, we will just construct one for npm that is guaranteed @@ -163,7 +163,7 @@ %global histogram_version 0.11.8 # sqlite - from deps/sqlite/sqlite3.h -%global sqlite_version 3.46.1 +%global sqlite_version 3.47.2 Name: nodejs @@ -200,24 +200,23 @@ Source103: v8.pc.in # 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.2.2.tar.gz -# Adjustments: rm -f cjs-module-lexer-1.2.2/lib/lexer.wasm -Source201: cjs-module-lexer-1.2.2.tar.gz +# 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 +Source201: cjs-module-lexer-1.4.1.tar.gz # The WASM blob was made using wasi-sdk v11; compiler libraries are linked in. # Version source (cjs-module-lexer tarball): Makefile -Source202: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-11/wasi-sdk-wasi-sdk-11.tar.gz +Source202: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-12/wasi-sdk-wasi-sdk-12.tar.gz # Version: jq '.version' deps/undici/src/package.json -# Original: https://github.com/nodejs/undici/archive/refs/tags/v6.19.2.tar.gz -# Adjustments: rm -f undici-6.19.2/lib/llhttp/llhttp*.wasm* -Source211: undici-6.19.2.tar.gz +# 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* +Source211: undici-6.21.1.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 -Source212: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-16/wasi-sdk-wasi-sdk-16.tar.gz +Source212: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-20/wasi-sdk-wasi-sdk-20.tar.gz Patch1: 0001-Remove-unused-OpenSSL-config.patch -Patch2: 0002-deps-ncrypto-include-openssl-rand.h.patch %global pkgname nodejs @@ -949,6 +948,11 @@ end %changelog +* Thu Jan 30 2025 Jan Staněk - 22.13.1-1 +- Upgrade to version 22.13.1 + Fixes CVE-2025-23083 CVE-2025-23085 CVE-2025-22150 + Resolves: RHEL-76362 RHEL-76897 + * Thu Nov 14 2024 Jarek Prokop - 22.11.0-1 - Upgrade to nodejs 22.11.0. Resolves: RHEL-35991