import CS nodejs-20.19.1-1.module_el9_6+1223+a180c0b3

This commit is contained in:
eabdullin 2025-05-13 14:46:06 +00:00
parent 8c7562121a
commit 3f04eba8cd
5 changed files with 40 additions and 29 deletions

6
.gitignore vendored
View File

@ -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-12.tar.gz
SOURCES/wasi-sdk-20.tar.gz

View File

@ -1,6 +1,6 @@
bea4d977983331b0e1a981762f83e17d1de824cd SOURCES/cjs-module-lexer-1.4.1.tar.gz
da3614aa496c5f0fde12f7aa155f235b5e239f1b SOURCES/icu4c-75_1-src.tgz
5a70c55c407b1e281a894d93cfbbd9abde68ba3b SOURCES/node-v20.18.2-stripped.tar.gz
c7b056dc6fb73d0d15d69085dfa951df91d290f3 SOURCES/undici-6.21.1.tar.gz
327c9c409bcda11ac331186b5eabb27bb78df43e SOURCES/cjs-module-lexer-1.4.1.tar.gz
f7764341d196112573605881dbbf10e586d84841 SOURCES/icu4c-76_1-src.tgz
86617650fbe74b4fceff6314e88cee212f0e917a SOURCES/node-v20.19.1-stripped.tar.gz
097218619f01200e237b6b93d0ddcb10f34883d7 SOURCES/undici-6.21.2.tar.gz
5ea3a1deb65a52a36ceb41324da690f54b2a4805 SOURCES/wasi-sdk-12.tar.gz
da40abcb73a6dddafced6174d24ed49e414cda3c SOURCES/wasi-sdk-20.tar.gz

View File

@ -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 <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 <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

View File

@ -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 <midawson@redhat.com>
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

View File

@ -32,7 +32,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 2
%global baserelease 1
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
@ -43,8 +43,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
@ -68,7 +68,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
@ -80,13 +80,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}
@ -180,10 +180,10 @@ Source101: cjs-module-lexer-1.4.1.tar.gz
Source111: https://github.com/WebAssembly/wasi-sdk/archive/refs/tags/wasi-sdk-12.tar.gz
# Version: jq '.version' deps/undici/src/package.json
# Original: https://github.com/nodejs/undici/archive/v6.21.1/undici-v6.21.1.tar.gz
# Adjustments: rm -f undici-v6.21.0/lib/llhttp/llhttp*.wasm
# Original: https://github.com/nodejs/undici/archive/v6.21.2/undici-v6.21.2.tar.gz
# Adjustments: rm -f undici-v6.21.2/lib/llhttp/llhttp*.wasm
# wasi-sdk version can be found in lib/llhttp/wasm_build_env.txt
Source102: undici-6.21.1.tar.gz
Source102: undici-6.21.2.tar.gz
Source112: https://github.com/WebAssembly/wasi-sdk/archive/refs/tags/wasi-sdk-20.tar.gz
# Disable running gyp on bundled deps we don't use
@ -639,14 +639,24 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} \
%changelog
* Thu Apr 24 2025 Andrei Radchenko <aradchen@redhat.com> - 1:20.19.1-1
- Update to version 20.19.1
Resolves: RHEL-78764
* Tue Apr 15 2025 Jan Staněk <jstanek@redhat.com> - 1:20.18.2-3
- Update c-ares to 1.34.5 to address CVE-2025-31498
* Wed Mar 05 2025 Andrei Radchenko <aradchen@redhat.com> - 1:20.18.2-2
- Disable npm's update-notifier
Resolves: RHEL-81090
Resolves: RHEL-81078
* Wed Jan 29 2025 Andrei Radchenko <aradchen@redhat.com> - 1:20.18.2-1
- Update to version 20.18.2
Fixes: CVE-2025-23083 CVE-2025-23085 CVE-2025-22150
Resolves: RHEL-76536 RHEL-76364
Resolves: RHEL-76363 RHEL-76554 RHEL-76540
* Wed Dec 04 2024 Jan Staněk <jstanek@redhat.com> - 1:20.18.1-1
- Update to version 20.18.1
* Mon Sep 23 2024 Jan Staněk <jstanek@redhat.com> - 1:20.17.0-1
- Update to 20.17.0