diff --git a/.gitignore b/.gitignore index 6cb234d..1f908b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/icu4c-69_1-src.tgz -SOURCES/node-v16.6.2-stripped.tar.gz +SOURCES/node-v16.10.0-stripped.tar.gz diff --git a/.nodejs.metadata b/.nodejs.metadata index 3591b57..317c1d4 100644 --- a/.nodejs.metadata +++ b/.nodejs.metadata @@ -1,2 +1,2 @@ 620a71c84428758376baa0fb81a581c3daa866ce SOURCES/icu4c-69_1-src.tgz -aa694cdbe84fd952a0cdc09b3861332833a76bb3 SOURCES/node-v16.6.2-stripped.tar.gz +b671529a05191fbba08fc799af76d6d019480d64 SOURCES/node-v16.10.0-stripped.tar.gz diff --git a/SPECS/nodejs.spec b/SPECS/nodejs.spec index 82a100a..194c743 100644 --- a/SPECS/nodejs.spec +++ b/SPECS/nodejs.spec @@ -20,8 +20,8 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 16 -%global nodejs_minor 6 -%global nodejs_patch 2 +%global nodejs_minor 10 +%global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h %global nodejs_soversion 93 @@ -35,9 +35,9 @@ # Epoch is set to ensure clean upgrades from the old v8 package %global v8_epoch 2 %global v8_major 9 -%global v8_minor 2 -%global v8_build 230 -%global v8_patch 21 +%global v8_minor 3 +%global v8_build 345 +%global v8_patch 19 # V8 presently breaks ABI at least every x.y release while never bumping SONAME %global v8_abi %{v8_major}.%{v8_minor} %global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch} @@ -113,8 +113,8 @@ # npm - from deps/npm/package.json %global npm_epoch 1 %global npm_major 7 -%global npm_minor 20 -%global npm_patch 3 +%global npm_minor 24 +%global npm_patch 0 %global npm_version %{npm_major}.%{npm_minor}.%{npm_patch} # uvwasi - from deps/uvwasi/include/uvwasi.h @@ -135,6 +135,8 @@ # base npm version number is increasing. %global npm_release %{nodejs_epoch}.%{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}.%{nodejs_release} +# Node.js 16.9.1 and later comes with an experimental package management tool +%global corepack_version 0.9.0 Name: nodejs Epoch: %{nodejs_epoch} @@ -257,6 +259,7 @@ Provides: bundled(icu) = %{icu_version} # or there's no option to built it as a shared dependency, so we bundle them Provides: bundled(uvwasi) = %{uvwasi_version} Provides: bundled(histogram) = %{histogram_version} +Provides: bundled(corepack) = %{corepack_version} %if 0%{?fedora} # Make sure to pull in the appropriate packaging macros when building RPMs @@ -567,6 +570,11 @@ find %{buildroot}%{_prefix}/lib/node_modules/npm \ chmod 0775 %{buildroot}%{_prefix}/lib/node_modules/npm/node_modules/@npmcli/run-script/lib/node-gyp-bin/node-gyp chmod 0755 %{buildroot}%{_prefix}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js +# Corepack contains a number of executable"shims", including some for Windows +# PowerShell. Drop the executable bit for those so we don't pick up an +# automatic dependency on /usr/bin/pwsh that we cannot satisfy. +chmod -x %{buildroot}%{_prefix}/lib/node_modules/corepack/shims/*.ps1 + # Drop the NPM default configuration in place mkdir -p %{buildroot}%{_sysconfdir} cp %{SOURCE1} %{buildroot}%{_sysconfdir}/npmrc @@ -622,6 +630,10 @@ end %dir %{_datadir}/systemtap/tapset %{_datadir}/systemtap/tapset/node.stp +# corepack +%{_bindir}/corepack +%{_prefix}/lib/node_modules/corepack + %dir %{_usr}/lib/dtrace %{_usr}/lib/dtrace/node.d @@ -694,6 +706,10 @@ end %changelog +* Wed Sep 29 2021 Zuzana Svetlikova - 1:16.10.0-1 +- Rebase to 16.10.0, add corepack, fix PowerShell dependency +- Resolves: RHBZ#2000539, #2000548, #2000549, #2002177 + * Thu Aug 12 2021 Jan Staněk - 1:16.6.2-1 - Rebase to 16.6.2 Resolves: CVE-2021-22931 CVE-2021-22939 CVE-2021-22940 @@ -715,17 +731,17 @@ end - Rebuilt for RHEL 9 BETA for openssl 3.0 Related: rhbz#1971065 -* Tue Jun 01 2021 Zuzana Svetlikova - 1:16.3.0-1 - Resolves: RHBZ#1953491 - Rebase to 16.3.0 - includes https://github.com/nodejs/node/pull/38732 -* Thu May 20 2021 Zuzana Svetlikova - 1:16.2.0-1 - Resolves: RHBZ#1953491 - Rebase to 16.2.0 - includes https://github.com/nodejs/node/pull/38633 (FIPS for OpenSSL 3.0) -* Wed May 19 2021 Zuzana Svetlikova - 1:16.1.0-1 - Resolves: RHBZ#1953491 - Support for OpenSSL 3.0.0 - Rebase to v16.x @@ -738,7 +754,7 @@ end * Tue Mar 30 2021 Jonathan Wakely - 1:14.16.0-4 - Rebuilt for removed libstdc++ symbol (#1937698) -* Tue Mar 09 2021 Zuzana Svetlikova - 1:14.16.0-3 - Only require nodejs-packaging on Fedora - remove --debug-nghttp2 (#1930775) - always build with systemtap