From 79b6a9fbd873ad7ea95fd18b287a1b3b1262bdf6 Mon Sep 17 00:00:00 2001 From: Sandeep Karambelkar Date: Fri, 13 Feb 2026 12:07:36 +0530 Subject: [PATCH 1/3] Fix npm coexistence with respective nodejs versions (#15777) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> (cherry picked from commit 2b70c39e6e446ddd1da5ebf51a32a54586502dec) --- SPECS/nodejs24/nodejs24.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/SPECS/nodejs24/nodejs24.spec b/SPECS/nodejs24/nodejs24.spec index 4126af6a5a2..1cea594242d 100644 --- a/SPECS/nodejs24/nodejs24.spec +++ b/SPECS/nodejs24/nodejs24.spec @@ -87,7 +87,9 @@ package to save space if non-English locales are not needed. Summary: Node.js Package Manager Group: System Environment/Base Requires: %{name} = %{version}-%{release} -Provides: npm = %{npm_version}.%{version}-%{release} +Provides: nodejs24-npm = %{version}-%{release} +Obsoletes: nodejs24-npm < %{version}-%{release} +Conflicts: npm %description npm npm is a package manager for node.js. You can use it to install and publish @@ -123,7 +125,7 @@ python3 configure.py \ --openssl-use-def-ca-store \ --shared-cares -JOBS=4 make %{?_smp_mflags} V=0 +JOBS=%{_smp_build_ncpus} make %{?_smp_mflags} V=0 %install @@ -178,8 +180,14 @@ make cctest %{_prefix}/lib/node_modules/* %changelog +<<<<<<< HEAD * Tue Feb 03 2026 Azure Linux Security Servicing Account - 24.13.0-2 - Patch for CVE-2025-69418 +======= +* Tue Feb 10 2026 Sandeep Karambelkar - 24.13.0-2 +- Add conflicts for legacy npm package +- Update provided capability from npm to nodejs24-npm +>>>>>>> 2b70c39e6 (Fix npm coexistence with respective nodejs versions (#15777)) * Tue Dec 23 2025 Sandeep Karambelkar - 24.13.0-1 - Upgrade to 24.13.0 From 52729173bb9804e06858d9992e2128d4605964e9 Mon Sep 17 00:00:00 2001 From: CBL-Mariner-Bot <75509084+CBL-Mariner-Bot@users.noreply.github.com> Date: Thu, 12 Feb 2026 22:41:26 -0800 Subject: [PATCH 2/3] Conflicts resolved by Auto-Cherry Pick for SPECS/nodejs24/nodejs24.spec --- SPECS/nodejs24/nodejs24.spec | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/SPECS/nodejs24/nodejs24.spec b/SPECS/nodejs24/nodejs24.spec index 1cea594242d..92f01f0c49d 100644 --- a/SPECS/nodejs24/nodejs24.spec +++ b/SPECS/nodejs24/nodejs24.spec @@ -16,7 +16,7 @@ Name: nodejs24 # WARNINGS: MUST check and update the 'npm_version' macro for every version update of this package. # The version of NPM can be found inside the sources under 'deps/npm/package.json'. Version: 24.13.0 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD AND MIT AND Public Domain AND NAIST-2003 AND Artistic-2.0 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -180,15 +180,11 @@ make cctest %{_prefix}/lib/node_modules/* %changelog -<<<<<<< HEAD -* Tue Feb 03 2026 Azure Linux Security Servicing Account - 24.13.0-2 -- Patch for CVE-2025-69418 -======= * Tue Feb 10 2026 Sandeep Karambelkar - 24.13.0-2 - Add conflicts for legacy npm package - Update provided capability from npm to nodejs24-npm ->>>>>>> 2b70c39e6 (Fix npm coexistence with respective nodejs versions (#15777)) - +* Fri Feb 13 2026 Azure Linux Security Servicing Account - 24.13.0-3 +- Patch for CVE-2025-69418 * Tue Dec 23 2025 Sandeep Karambelkar - 24.13.0-1 - Upgrade to 24.13.0 - Add support for passing runtime internationalization data From c4d3d6d91d40816c6ef76d5dcd11bbf1b31ca9e7 Mon Sep 17 00:00:00 2001 From: jslobodzian Date: Fri, 13 Feb 2026 15:37:30 -0800 Subject: [PATCH 3/3] Add patch for CVE-2025-69418 in nodejs24.spec Added a patch for CVE-2025-69418 in the changelog. --- SPECS/nodejs24/nodejs24.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SPECS/nodejs24/nodejs24.spec b/SPECS/nodejs24/nodejs24.spec index 92f01f0c49d..569cd330891 100644 --- a/SPECS/nodejs24/nodejs24.spec +++ b/SPECS/nodejs24/nodejs24.spec @@ -180,11 +180,13 @@ make cctest %{_prefix}/lib/node_modules/* %changelog +* Fri Feb 13 2026 Azure Linux Security Servicing Account - 24.13.0-3 +- Patch for CVE-2025-69418 + * Tue Feb 10 2026 Sandeep Karambelkar - 24.13.0-2 - Add conflicts for legacy npm package - Update provided capability from npm to nodejs24-npm -* Fri Feb 13 2026 Azure Linux Security Servicing Account - 24.13.0-3 -- Patch for CVE-2025-69418 + * Tue Dec 23 2025 Sandeep Karambelkar - 24.13.0-1 - Upgrade to 24.13.0 - Add support for passing runtime internationalization data