autogits/nodejs21
SHA256
2
0
Fork 1
forked from pool/nodejs21
Code Pull Requests 1 Activity

- Update to 21.7.1

Browse Source 
* revert "test_runner: do not invoke after hook when test is empty"
  * lib: return directly if udp socket close before lookup
- Changes in 21.7.0
  * util.styleText(format, text): This function returns a
    formatted text considering the format passed.
  * support for multi-line values for .env file
  * sea: support embedding assets
  * vm: support using the default loader to handle dynamic import()
  * crypto: implement crypto.hash()
  * http2: add h2 compat support for appendHeader
- versioned.patch, nodejs-libpath.patch: refreshed
- c-ares-fixes.patch: upstreamed, removed

- Add libalternative config for corepack

OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs21?expand=0&rev=21
This commit is contained in:
Adam Majer 2024-04-02 14:32:44 +00:00 committed by Git OBS Bridge
parent 3dd84fa6f5
commit b1b1d9718b
9 changed files with 259 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
SHASUMS256.txt
View File

@ -1,41 +1,41 @@
e06dff53a5e2a88caff9735c076165a6a53f4c45960a8887410684e1fea6c7cb node-v21.6.2-aix-ppc64.tar.gz cba4d1d6c05684edeb88f06351c61c3acdb3d8d6df46b9dcd8ca89af847268e5 node-v21.7.1-aix-ppc64.tar.gz
c7fa8788001eaac4bb250a84f6b3a918ebaa8016111ece95d59b513cf4a394dc node-v21.6.2-arm64.msi d21f34e3864d93a8491591002e67a704a8a8ac5f9035d9da890327f884edd1c6 node-v21.7.1-arm64.msi
120c8205654c640865864dc464389b3ffe6d7ebe310dffdbe3fd8718a512e14f node-v21.6.2-darwin-arm64.tar.gz 0a4dde483479dcf272f3d4d7afb509c3d45cf7a1ea451ce108f434dad4fa43e4 node-v21.7.1-darwin-arm64.tar.gz
f8aa996b4e7700069892bc9ff28ddef3b3b3c8c952b929d1b148c943995970e3 node-v21.6.2-darwin-arm64.tar.xz 20b26630c1c6d2c3db9815fca135931bdbe2b5c1c228a3f1f6a9ed6dde91ef76 node-v21.7.1-darwin-arm64.tar.xz
0f75d9b46b986100c6faeec040ee46adf4981eb6abb5dd63e7a6ca4868d280f4 node-v21.6.2-darwin-x64.tar.gz a406f4fbe68ff33319d513fa645aa7b9508c2cb65299f0a2de1757c2a6333c85 node-v21.7.1-darwin-x64.tar.gz
5944de39bc7b8af229b0024d583ced7c76cee194ee9068a07d67372a606c5105 node-v21.6.2-darwin-x64.tar.xz 9212f90b3aaaadaf38fe32639e12ceee3c82380b50cc67402f660a9daecb7e87 node-v21.7.1-darwin-x64.tar.xz
55d9a03dcfce682583eb5e7eec15f32ae95b28b6e805f31688b22a7bd71581b1 node-v21.6.2-headers.tar.gz deb71c9d4698eb835ff748671d5f04b2e0c7f53e0de457d4ee9f926ab9d285d9 node-v21.7.1-headers.tar.gz
976500ffa659108fa2eb30daae2f1b96a34a97b2caa1db30802ac56edc2b237a node-v21.6.2-headers.tar.xz c33217484a2f8a3aa556a4c46144757031d1a8955867e004a3db6996b67c3415 node-v21.7.1-headers.tar.xz
b8431985c53cc14e02cddf4c128d043c62af19023f908ebcdc1c6a683ee995f3 node-v21.6.2-linux-arm64.tar.gz 466647785722c5b9b9f2e430e11645e16f1d112b303b0ffdf2d5fa0eb95e647c node-v21.7.1-linux-arm64.tar.gz
2606765f95262bcebb323e56a39b3be8db89863fbd83e06d2b5a08e41dc78f29 node-v21.6.2-linux-arm64.tar.xz d384c843621ccb80f1367fdff85d4e3870bc934ffe37ed48eb320ebebba8ddbb node-v21.7.1-linux-arm64.tar.xz
d6127be538ae57447fd40bac6ea124ad71cfd5a50b9343b781830cc92bc1a0c2 node-v21.6.2-linux-armv7l.tar.gz 75a2787505079e972fe91d9507be0a13be2a7cf009db7a520a725bc280225704 node-v21.7.1-linux-armv7l.tar.gz
ae33085c3d635f9488f47c56ee90fdf0dc9c1d0a520cfbe281c5b08d69e64da0 node-v21.6.2-linux-armv7l.tar.xz e375b24d57c8126d58ae31b807c91df6532c52e3441e22d2b3cde5116553c8fb node-v21.7.1-linux-armv7l.tar.xz
2e265d86f9d20ba223d65ceadc0589b156439a5521cd9da6e34de5460a0d2195 node-v21.6.2-linux-ppc64le.tar.gz 5c70f1b4d960130751334c064e5b164c3366900baf8d3ee2a11d8c444ba9c84f node-v21.7.1-linux-ppc64le.tar.gz
b951f52db17b75a7bff0a2da2cefca3ba1e4dd7368b2b1280f39fcbecde0555c node-v21.6.2-linux-ppc64le.tar.xz 28b98d0ec62937bd0769327272615683caabef5c0a5112bd19b9b02d9332e732 node-v21.7.1-linux-ppc64le.tar.xz
7cba8c2b2338aaa05f5dec5d953d61cdf5219881a7c8d420f215e920a33c06fa node-v21.6.2-linux-s390x.tar.gz 6bf591654202c04037ee24de8c3940aff0b54d7449b9c13850f204a9bee11bce node-v21.7.1-linux-s390x.tar.gz
167bb0595478bae4c46b2248cae16890d24c2a9c92de7d0e27f9d1cafcad21ba node-v21.6.2-linux-s390x.tar.xz 30d5f6eeb3b94ff150d0fc2c07527cd70c8a1ff0384b3ef191663ffe66cb4934 node-v21.7.1-linux-s390x.tar.xz
d4504dcbcd1a9ded42d86bc20a7e72d6d631e49dcf3f9c849c3b51b12f3f4544 node-v21.6.2-linux-x64.tar.gz c7b15146aed968b781c235b6a8f67608be559c4615de9526a9851ae28660cc09 node-v21.7.1-linux-x64.tar.gz
593dd28f5c78d797e76b730937b95fcdfc594f053a8756b1d0860a4555bed58e node-v21.6.2-linux-x64.tar.xz cb25d7a4aa57d15f280ce45cd72f95e9d2020702b7ca75c7fe632444f7c0452c node-v21.7.1-linux-x64.tar.xz
a0cdada31786f6ff1f82e8fd91bda23cd4f615a56acd3c9605cd468b60b8437a node-v21.6.2-win-arm64.7z 3a8ecf4f887cbe37a1c7a1b720ed259c9e5cdb3648986a148a02211b4a77c6fa node-v21.7.1.pkg
a201948e5f0df6de6c4b42dbcb42d7a10d3cb5b6dbb7a40e3f4244644d3b3d1a node-v21.6.2-win-arm64.zip 0ba90deb3e4de7c4665cdaabafe2c50d48c6b47e44863bb557ae1b7f01112f40 node-v21.7.1.tar.gz
d450d170009d272c98765af3abf2bbc2903c1c08856f9e3730be03cc9d9b2bc5 node-v21.6.2-win-x64.7z 1272b6e129d564dbde17527b844210b971c20a70ae729268186b7cb9d990a64b node-v21.7.1.tar.xz
99bac3a930bd487e53c5a35b3e2f5ec102053316d7eb89f93273d916d57353a2 node-v21.6.2-win-x64.zip 6ae0f60b24443708b4673b856c66827c2361957c01ee0c9628281486f0191615 node-v21.7.1-win-arm64.7z
44dee171378d7ac9967e772a8f114be5fdf59a163f65ec5faa7411c8be3bc961 node-v21.6.2-win-x86.7z c8931f7130c38e175aa55dfbe4235b20af033ec59d174f4dabf8809b79abe0d5 node-v21.7.1-win-arm64.zip
1701b32ba5315c794c2a64ef4a71e93ad2a6c109acf5b577d628413a7dc5cd04 node-v21.6.2-win-x86.zip 7c55e73c25e491a22e302e3919dd58145030a2f14bc6e9b2fed0a45c7dd6f867 node-v21.7.1-win-x64.7z
e081647df79c833e9d62e7edff5e9e01dbd5b78417dff6ef149e6384e8327bcf node-v21.6.2-x64.msi debff16a17e92d084dc19b98b21be35b15d9627befab1c8311b4ff946bf51773 node-v21.7.1-win-x64.zip
12960661f83a1618adf57e84eddcd1886edec452d74f27318efde8b92a25c91a node-v21.6.2-x86.msi a64136c1aeafb096e8461c304c18eaa910d81f75e1ead5155a5548f4e3733a9b node-v21.7.1-win-x86.7z
6b5d7153dffec20487cbcb81d5ebaf97e6678eb463337e8429ba4e7b60754505 node-v21.6.2.pkg 5db22af240445b0afadadedac497c8b57960f6d27828bb03040be90dfe7561f6 node-v21.7.1-win-x86.zip
9020fb36ec7e04f5032944c8422c2004350e9bfcd5e835ac3c90b74981c1f3e0 node-v21.6.2.tar.gz e6354ee73967ce6b2ae401edb1d54adaedb321123308e2af1dec71a497e73eaa node-v21.7.1-x64.msi
191294d445d1e6800359acc8174529b1e18e102147dc5f596030d3dce96931e5 node-v21.6.2.tar.xz 8673470064c13f491e594b4f4522eba504fc9082db728eed9ba43987b88de69b node-v21.7.1-x86.msi
ae7ccd1298e8871e61c1223a929ff482fa43d29aa284118798f01a73e40b2b29 win-arm64/node.exe 00d60e58adb4884085675d48064426c0745799169c79e553e1523ffe88f26fd4 win-arm64/node.exe
cf6082f3ffb45335d41566805c7b844082f36042fa7dc2dc6aecdc3ce0e7c79a win-arm64/node.lib b068c2ffb9fa47420d55d44bb24ae42211007bbc34426cf68a663b34f8187a41 win-arm64/node.lib
8cb47e9ebda0efb8578382db82001308bcb2de95e0275e0bca3ff4f03de140b1 win-arm64/node_pdb.7z 600be209fe1a2a4693eef98393cea9ab3bbc3f08b974ad004cf0aaa944ed2488 win-arm64/node_pdb.7z
cdb3d760f9aca9578135c25f299b382e074bfcb56b2d321acf278a0a76ec2eb4 win-arm64/node_pdb.zip 53273a368d2079975617d3a5566c5006ee25af68e58408b7cd0842e342acac17 win-arm64/node_pdb.zip
3f06d98986b4ddf7e9d258936bb7b8907c44c6e9a29c645a5aca04e5a26c0b53 win-x64/node.exe 39908c8a16f867e5a2e9666ba8089dd497c4fa48a8008bed9d52cd78181944b2 win-x64/node.exe
cacf06da3d7f04d0a0a5a901bfbdbaf0950cc5f73febf7b2f451b27c7f6265b1 win-x64/node.lib 96d09c2055c2f252122c86b65d2aabd5f90b1a075844f24bf8bcdbab05baf53e win-x64/node.lib
077739fded97d02d026db839aca840622c34b7e584efe294d40fc8d1bd9dc19a win-x64/node_pdb.7z 1f4ece18dbfb3ea96f242f1ca94b309c1e56a50bc6138c33c842d45b198abc7f win-x64/node_pdb.7z
54c3a6fea6f832716bfe5d918a56ca1767ae89163729c34d866c2623c0a90edf win-x64/node_pdb.zip 73f6d43a1678df35720662d9052a0a80321c9e92e9c87ef7dc9d70da31197fe9 win-x64/node_pdb.zip
0aaa0f4635253afe9660f64a862786db555961ecc7217b68fa120817c0c56a00 win-x86/node.exe 1f8c02748de3c6aefe7f40939db330ec03afe95fff23bbe12ba93fa9f0c180bc win-x86/node.exe
ca6545afa230d2abdbf8ba19065f77b727bde72dfa253c466d876d0b3a7ea4ee win-x86/node.lib 19f86a492bf3b2a2854ebf0d05734afd9866348fc6474ed5b8c53c62ec9b7aa2 win-x86/node.lib
cf24de1e7157ac4bac77fccb255fe295e8639a349d5c9f8726fe3e6b5ccf8afc win-x86/node_pdb.7z 316254a7e269bcdcc37bb831b280c59f565745be01294b4024b8aef19507fe0b win-x86/node_pdb.7z
99f2345e0e737fbd7f8d94b4118d9dc820ebc198823de29324e1f1754f84c9e0 win-x86/node_pdb.zip 36186f7fa5b9eb53ed12945b9506d91c487e0fc78b27267c949f609f0e36803e win-x86/node_pdb.zip

BIN
SHASUMS256.txt.sig
View File

Binary file not shown.

46
c-ares-fixes.patch
View File

@ -1,46 +0,0 @@
Index: node-v21.4.0/test/parallel/test-dns-resolveany-bad-ancount.js
===================================================================
--- node-v21.4.0.orig/test/parallel/test-dns-resolveany-bad-ancount.js
+++ node-v21.4.0/test/parallel/test-dns-resolveany-bad-ancount.js
@@ -7,6 +7,8 @@ const dgram = require('dgram');
const dnsPromises = dns.promises;
const server = dgram.createSocket('udp4');
+const resolver = new dns.Resolver({ timeout: 100, tries: 1 });
+const resolverPromises = new dnsPromises.Resolver({ timeout: 100, tries: 1 });
server.on('message', common.mustCall((msg, { address, port }) => {
const parsed = dnstools.parseDNSPacket(msg);
@@ -18,16 +20,20 @@ server.on('message', common.mustCall((ms
questions: parsed.questions,
answers: { type: 'A', address: '1.2.3.4', ttl: 123, domain },
});
- // Overwrite the # of answers with 2, which is incorrect.
+ // Overwrite the # of answers with 2, which is incorrect. The response is
+ // discarded in c-ares >= 1.21.0. This is the reason why a small timeout is
+ // used in the `Resolver` constructor. See
+ // https://github.com/nodejs/node/pull/50743#issue-1994909204
buf.writeUInt16LE(2, 6);
server.send(buf, port, address);
}, 2));
server.bind(0, common.mustCall(async () => {
const address = server.address();
- dns.setServers([`127.0.0.1:${address.port}`]);
+ resolver.setServers([`127.0.0.1:${address.port}`]);
+ resolverPromises.setServers([`127.0.0.1:${address.port}`]);
- dnsPromises.resolveAny('example.org')
+ resolverPromises.resolveAny('example.org')
.then(common.mustNotCall())
.catch(common.expectsError({
// May return EBADRESP or ETIMEOUT
@@ -36,7 +42,7 @@ server.bind(0, common.mustCall(async ()
hostname: 'example.org'
}));
- dns.resolveAny('example.org', common.mustCall((err) => {
+ resolver.resolveAny('example.org', common.mustCall((err) => {
assert.notStrictEqual(err.code, 'SUCCESS');
assert.strictEqual(err.syscall, 'queryAny');
assert.strictEqual(err.hostname, 'example.org');

3
node-v21.6.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:191294d445d1e6800359acc8174529b1e18e102147dc5f596030d3dce96931e5
size 42668368

3
node-v21.7.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1272b6e129d564dbde17527b844210b971c20a70ae729268186b7cb9d990a64b
size 42519836

44
nodejs-libpath.patch
View File

@ -1,16 +1,16 @@
Index: node-v18.9.0/tools/install.py Index: node-v21.7.1/tools/install.py
=================================================================== ===================================================================
--- node-v18.9.0.orig/tools/install.py --- node-v21.7.1.orig/tools/install.py
+++ node-v18.9.0/tools/install.py +++ node-v21.7.1/tools/install.py
@@ -7,6 +7,7 @@ import errno @@ -6,6 +6,7 @@ import errno
import os import os
import shutil import shutil
import sys import sys
+from distutils import sysconfig +from distutils import sysconfig
import re import re
# set at init time def abspath(*args):
@@ -66,6 +67,10 @@ def try_copy(path, dst): @@ -66,6 +67,10 @@ def try_copy(options, path, dest):
try_unlink(target_path) # prevent ETXTBSY errors try_unlink(target_path) # prevent ETXTBSY errors
return shutil.copy2(source_path, target_path) return shutil.copy2(source_path, target_path)
@ -18,32 +18,32 @@ Index: node-v18.9.0/tools/install.py
+ libdir_fq = sysconfig.get_config_var("LIBDIR") + libdir_fq = sysconfig.get_config_var("LIBDIR")
+ return re.sub("^" + re.escape(node_prefix + "/"), "", libdir_fq) + return re.sub("^" + re.escape(node_prefix + "/"), "", libdir_fq)
+ +
def try_remove(path, dst): def try_remove(options, path, dest):
source_path, target_path = mkpaths(path, dst) source_path, target_path = mkpaths(options, path, dest)
print('removing %s' % target_path) if not options.silent:
@@ -81,7 +86,7 @@ def uninstall(paths, dst): @@ -82,7 +87,7 @@ def uninstall(options, paths, dest):
try_remove(path, dst) try_remove(options, path, dest)
def package_files(action, name, bins): def package_files(options, action, name, bins):
- target_path = 'lib/node_modules/' + name + '/' - target_path = os.path.join('lib/node_modules', name)
+ target_path = libdir() + '/node_modules/' + name + '/' + target_path = os.path.join(libdir(), 'node_modules', name)
# don't install npm if the target path is a symlink, it probably means # don't install npm if the target path is a symlink, it probably means
# that a dev version of npm is installed there # that a dev version of npm is installed there
@@ -101,7 +106,7 @@ def package_files(action, name, bins): @@ -103,7 +108,7 @@ def package_files(options, action, name,
if action == uninstall: if action == uninstall:
action([link_path], 'bin/' + bin_name) action(options, [link_path], os.path.join('bin', bin_name))
elif action == install: elif action == install:
- try_symlink('../lib/node_modules/' + name + '/' + bin_target, link_path) - try_symlink(options, os.path.join('../lib/node_modules', name, bin_target), link_path)
+ try_symlink('../' + libdir() + '/node_modules/' + name + '/' + bin_target, link_path) + try_symlink(options, os.path.join('..', libdir(), 'node_modules', name, bin_target), link_path)
else: else:
assert 0 # unhandled action type assert 0 # unhandled action type
Index: node-v18.9.0/lib/internal/modules/cjs/loader.js Index: node-v21.7.1/lib/internal/modules/cjs/loader.js
=================================================================== ===================================================================
--- node-v18.9.0.orig/lib/internal/modules/cjs/loader.js --- node-v21.7.1.orig/lib/internal/modules/cjs/loader.js
+++ node-v18.9.0/lib/internal/modules/cjs/loader.js +++ node-v21.7.1/lib/internal/modules/cjs/loader.js
@@ -1254,7 +1254,7 @@ Module._initPaths = function() { @@ -1528,7 +1528,7 @@ Module._initPaths = function() {
path.resolve(process.execPath, '..') : path.resolve(process.execPath, '..') :
path.resolve(process.execPath, '..', '..'); path.resolve(process.execPath, '..', '..');

23
nodejs21.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Tue Apr 2 13:54:32 UTC 2024 - Adam Majer <adam.majer@suse.de>
- Update to 21.7.1
* revert "test_runner: do not invoke after hook when test is empty"
* lib: return directly if udp socket close before lookup
- Changes in 21.7.0
* util.styleText(format, text): This function returns a
formatted text considering the format passed.
* support for multi-line values for .env file
* sea: support embedding assets
* vm: support using the default loader to handle dynamic import()
* crypto: implement crypto.hash()
* http2: add h2 compat support for appendHeader
- versioned.patch, nodejs-libpath.patch: refreshed
- c-ares-fixes.patch: upstreamed, removed
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 16 15:37:23 UTC 2024 - Adam Majer <adam.majer@suse.de> Fri Feb 16 15:37:23 UTC 2024 - Adam Majer <adam.majer@suse.de>
@ -25,6 +44,10 @@ Mon Feb 12 14:51:32 UTC 2024 - Adam Majer <adam.majer@suse.de>
* Support configurable snapshot through --build-snapshot-config flag * Support configurable snapshot through --build-snapshot-config flag
- fix_ci_tests.patch: refreshed - fix_ci_tests.patch: refreshed
-------------------------------------------------------------------
Sat Jan 27 10:09:34 UTC 2024 - xtex <xtexchooser@duck.com>
- Add libalternative config for corepack
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 8 15:02:53 UTC 2024 - Adam Majer <adam.majer@suse.de> Mon Jan 8 15:02:53 UTC 2024 - Adam Majer <adam.majer@suse.de>

147
nodejs21.spec
View File

@ -31,7 +31,7 @@
%endif %endif
Name: nodejs21 Name: nodejs21
Version: 21.6.2 Version: 21.7.1
Release: 0 Release: 0
# Double DWZ memory limits # Double DWZ memory limits
@ -177,7 +177,6 @@ Patch200: versioned.patch
Patch305: qemu_timeouts_arches.patch Patch305: qemu_timeouts_arches.patch
Patch308: node-gyp-config.patch Patch308: node-gyp-config.patch
Patch309: gcc13.patch Patch309: gcc13.patch
Patch311: c-ares-fixes.patch
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: fdupes BuildRequires: fdupes
@ -309,19 +308,19 @@ BuildRequires: bundled_openssl_should_not_be_required
%if ! 0%{with intree_cares} %if ! 0%{with intree_cares}
BuildRequires: pkgconfig(libcares) >= 1.17.0 BuildRequires: pkgconfig(libcares) >= 1.17.0
%else %else
Provides: bundled(libcares2) = 1.20.1 Provides: bundled(libcares2) = 1.27.0
%endif %endif
%if ! 0%{with intree_icu} %if ! 0%{with intree_icu}
BuildRequires: pkgconfig(icu-i18n) >= 71 BuildRequires: pkgconfig(icu-i18n) >= 71
%else %else
Provides: bundled(icu) = 74.1 Provides: bundled(icu) = 74.2
%endif %endif
%if ! 0%{with intree_nghttp2} %if ! 0%{with intree_nghttp2}
BuildRequires: libnghttp2-devel >= 1.41.0 BuildRequires: libnghttp2-devel >= 1.41.0
%else %else
Provides: bundled(nghttp2) = 1.58.0 Provides: bundled(nghttp2) = 1.60.0
%endif %endif
%if 0%{with valgrind_tests} %if 0%{with valgrind_tests}
@ -370,7 +369,7 @@ ExclusiveArch: not_buildable
%endif %endif
%endif %endif
Provides: bundled(uvwasi) = 0.0.19 Provides: bundled(uvwasi) = 0.0.20
Provides: bundled(libuv) = 1.48.0 Provides: bundled(libuv) = 1.48.0
Provides: bundled(v8) = 11.8.172.17 Provides: bundled(v8) = 11.8.172.17
%if %{with intree_brotli} %if %{with intree_brotli}
@ -381,20 +380,20 @@ BuildRequires: pkgconfig(libbrotlidec)
Provides: bundled(llhttp) = 9.1.3 Provides: bundled(llhttp) = 9.1.3
Provides: bundled(ngtcp2) = 0.8.1 Provides: bundled(ngtcp2) = 1.3.0
Provides: bundled(base64) = 0.5.1 Provides: bundled(base64) = 0.5.2
Provides: bundled(simdutf) = 4.0.8 Provides: bundled(simdutf) = 4.0.8
Provides: bundled(simdjson) = 3.6.3 Provides: bundled(simdjson) = 3.7.0
# bundled url-ada parser, not ada # bundled url-ada parser, not ada
Provides: bundled(ada) = 2.7.4 Provides: bundled(ada) = 2.7.6
Provides: bundled(node-@fastify/busboy) = 2.1.0 Provides: bundled(node-@fastify/busboy) = 2.1.0
Provides: bundled(node-acorn) = 8.11.3 Provides: bundled(node-acorn) = 8.11.3
Provides: bundled(node-acorn-walk) = 8.3.1 Provides: bundled(node-acorn-walk) = 8.3.2
Provides: bundled(node-cjs-module-lexer) = 1.2.2 Provides: bundled(node-cjs-module-lexer) = 1.2.2
Provides: bundled(node-corepack) = 0.24.0 Provides: bundled(node-corepack) = 0.25.2
Provides: bundled(node-minimatch) = 9.0.3 Provides: bundled(node-minimatch) = 9.0.3
Provides: bundled(node-undici) = 5.28.3 Provides: bundled(node-undici) = 6.6.2
%description %description
Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js
@ -423,7 +422,7 @@ Requires: nodejs-common
Requires: nodejs21 = %{version} Requires: nodejs21 = %{version}
Provides: nodejs-npm = %{version} Provides: nodejs-npm = %{version}
Obsoletes: nodejs-npm < 4.0.0 Obsoletes: nodejs-npm < 4.0.0
Provides: npm(npm) = 10.2.4 Provides: npm(npm) = 10.5.0
Provides: npm = %{version} Provides: npm = %{version}
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
%if %{node_version_number} >= 10 %if %{node_version_number} >= 10
@ -432,7 +431,6 @@ Requires: group(nobody)
%endif %endif
%endif %endif
Provides: bundled(node-abbrev) = 2.0.0 Provides: bundled(node-abbrev) = 2.0.0
Provides: bundled(node-abort-controller) = 3.0.0
Provides: bundled(node-agent-base) = 7.1.0 Provides: bundled(node-agent-base) = 7.1.0
Provides: bundled(node-aggregate-error) = 3.1.0 Provides: bundled(node-aggregate-error) = 3.1.0
Provides: bundled(node-ansi-regex) = 5.0.1 Provides: bundled(node-ansi-regex) = 5.0.1
@ -441,15 +439,13 @@ Provides: bundled(node-ansi-styles) = 4.3.0
Provides: bundled(node-ansi-styles) = 6.2.1 Provides: bundled(node-ansi-styles) = 6.2.1
Provides: bundled(node-aproba) = 2.0.0 Provides: bundled(node-aproba) = 2.0.0
Provides: bundled(node-archy) = 1.0.0 Provides: bundled(node-archy) = 1.0.0
Provides: bundled(node-are-we-there-yet) = 4.0.1 Provides: bundled(node-are-we-there-yet) = 4.0.2
Provides: bundled(node-balanced-match) = 1.0.2 Provides: bundled(node-balanced-match) = 1.0.2
Provides: bundled(node-base64-js) = 1.5.1
Provides: bundled(node-bin-links) = 4.0.3 Provides: bundled(node-bin-links) = 4.0.3
Provides: bundled(node-binary-extensions) = 2.2.0 Provides: bundled(node-binary-extensions) = 2.2.0
Provides: bundled(node-brace-expansion) = 2.0.1 Provides: bundled(node-brace-expansion) = 2.0.1
Provides: bundled(node-buffer) = 6.0.3
Provides: bundled(node-builtins) = 5.0.1 Provides: bundled(node-builtins) = 5.0.1
Provides: bundled(node-cacache) = 18.0.0 Provides: bundled(node-cacache) = 18.0.2
Provides: bundled(node-chalk) = 5.3.0 Provides: bundled(node-chalk) = 5.3.0
Provides: bundled(node-chownr) = 2.0.0 Provides: bundled(node-chownr) = 2.0.0
Provides: bundled(node-ci-info) = 4.0.0 Provides: bundled(node-ci-info) = 4.0.0
@ -469,16 +465,13 @@ Provides: bundled(node-cross-spawn) = 7.0.3
Provides: bundled(node-cssesc) = 3.0.0 Provides: bundled(node-cssesc) = 3.0.0
Provides: bundled(node-debug) = 4.3.4 Provides: bundled(node-debug) = 4.3.4
Provides: bundled(node-defaults) = 1.0.4 Provides: bundled(node-defaults) = 1.0.4
Provides: bundled(node-delegates) = 1.0.0 Provides: bundled(node-diff) = 5.2.0
Provides: bundled(node-diff) = 5.1.0
Provides: bundled(node-eastasianwidth) = 0.2.0 Provides: bundled(node-eastasianwidth) = 0.2.0
Provides: bundled(node-emoji-regex) = 8.0.0 Provides: bundled(node-emoji-regex) = 8.0.0
Provides: bundled(node-emoji-regex) = 9.2.2 Provides: bundled(node-emoji-regex) = 9.2.2
Provides: bundled(node-encoding) = 0.1.13 Provides: bundled(node-encoding) = 0.1.13
Provides: bundled(node-env-paths) = 2.2.1 Provides: bundled(node-env-paths) = 2.2.1
Provides: bundled(node-err-code) = 2.0.3 Provides: bundled(node-err-code) = 2.0.3
Provides: bundled(node-event-target-shim) = 5.0.1
Provides: bundled(node-events) = 3.3.0
Provides: bundled(node-exponential-backoff) = 3.1.1 Provides: bundled(node-exponential-backoff) = 3.1.1
Provides: bundled(node-fastest-levenshtein) = 1.0.16 Provides: bundled(node-fastest-levenshtein) = 1.0.16
Provides: bundled(node-foreground-child) = 3.1.1 Provides: bundled(node-foreground-child) = 3.1.1
@ -489,19 +482,18 @@ Provides: bundled(node-gauge) = 5.0.1
Provides: bundled(node-glob) = 10.3.10 Provides: bundled(node-glob) = 10.3.10
Provides: bundled(node-graceful-fs) = 4.2.11 Provides: bundled(node-graceful-fs) = 4.2.11
Provides: bundled(node-has-unicode) = 2.0.1 Provides: bundled(node-has-unicode) = 2.0.1
Provides: bundled(node-hasown) = 2.0.0 Provides: bundled(node-hasown) = 2.0.1
Provides: bundled(node-hosted-git-info) = 7.0.1 Provides: bundled(node-hosted-git-info) = 7.0.1
Provides: bundled(node-http-cache-semantics) = 4.1.1 Provides: bundled(node-http-cache-semantics) = 4.1.1
Provides: bundled(node-http-proxy-agent) = 7.0.0 Provides: bundled(node-http-proxy-agent) = 7.0.2
Provides: bundled(node-https-proxy-agent) = 7.0.2 Provides: bundled(node-https-proxy-agent) = 7.0.4
Provides: bundled(node-iconv-lite) = 0.6.3 Provides: bundled(node-iconv-lite) = 0.6.3
Provides: bundled(node-ieee754) = 1.2.1 Provides: bundled(node-ignore-walk) = 6.0.4
Provides: bundled(node-ignore-walk) = 6.0.3
Provides: bundled(node-imurmurhash) = 0.1.4 Provides: bundled(node-imurmurhash) = 0.1.4
Provides: bundled(node-indent-string) = 4.0.0 Provides: bundled(node-indent-string) = 4.0.0
Provides: bundled(node-ini) = 4.1.1 Provides: bundled(node-ini) = 4.1.1
Provides: bundled(node-init-package-json) = 6.0.0 Provides: bundled(node-init-package-json) = 6.0.0
Provides: bundled(node-ip) = 2.0.0 Provides: bundled(node-ip-address) = 9.0.5
Provides: bundled(node-ip-regex) = 5.0.0 Provides: bundled(node-ip-regex) = 5.0.0
Provides: bundled(node-is-cidr) = 5.0.3 Provides: bundled(node-is-cidr) = 5.0.3
Provides: bundled(node-is-core-module) = 2.13.1 Provides: bundled(node-is-core-module) = 2.13.1
@ -510,30 +502,31 @@ Provides: bundled(node-is-lambda) = 1.0.1
Provides: bundled(node-isexe) = 2.0.0 Provides: bundled(node-isexe) = 2.0.0
Provides: bundled(node-isexe) = 3.1.1 Provides: bundled(node-isexe) = 3.1.1
Provides: bundled(node-jackspeak) = 2.3.6 Provides: bundled(node-jackspeak) = 2.3.6
Provides: bundled(node-json-parse-even-better-errors) = 3.0.0 Provides: bundled(node-jsbn) = 1.1.0
Provides: bundled(node-json-parse-even-better-errors) = 3.0.1
Provides: bundled(node-json-stringify-nice) = 1.1.4 Provides: bundled(node-json-stringify-nice) = 1.1.4
Provides: bundled(node-jsonparse) = 1.3.1 Provides: bundled(node-jsonparse) = 1.3.1
Provides: bundled(node-just-diff) = 6.0.2 Provides: bundled(node-just-diff) = 6.0.2
Provides: bundled(node-just-diff-apply) = 5.5.0 Provides: bundled(node-just-diff-apply) = 5.5.0
Provides: bundled(node-libnpmaccess) = 8.0.1 Provides: bundled(node-libnpmaccess) = 8.0.2
Provides: bundled(node-libnpmdiff) = 6.0.3 Provides: bundled(node-libnpmdiff) = 6.0.7
Provides: bundled(node-libnpmexec) = 7.0.4 Provides: bundled(node-libnpmexec) = 7.0.8
Provides: bundled(node-libnpmfund) = 5.0.1 Provides: bundled(node-libnpmfund) = 5.0.5
Provides: bundled(node-libnpmhook) = 10.0.0 Provides: bundled(node-libnpmhook) = 10.0.1
Provides: bundled(node-libnpmorg) = 6.0.1 Provides: bundled(node-libnpmorg) = 6.0.2
Provides: bundled(node-libnpmpack) = 6.0.3 Provides: bundled(node-libnpmpack) = 6.0.7
Provides: bundled(node-libnpmpublish) = 9.0.2 Provides: bundled(node-libnpmpublish) = 9.0.4
Provides: bundled(node-libnpmsearch) = 7.0.0 Provides: bundled(node-libnpmsearch) = 7.0.1
Provides: bundled(node-libnpmteam) = 6.0.0 Provides: bundled(node-libnpmteam) = 6.0.1
Provides: bundled(node-libnpmversion) = 5.0.1 Provides: bundled(node-libnpmversion) = 5.0.2
Provides: bundled(node-lru-cache) = 10.0.2 Provides: bundled(node-lru-cache) = 10.2.0
Provides: bundled(node-lru-cache) = 6.0.0 Provides: bundled(node-lru-cache) = 6.0.0
Provides: bundled(node-make-fetch-happen) = 13.0.0 Provides: bundled(node-make-fetch-happen) = 13.0.0
Provides: bundled(node-minimatch) = 9.0.3 Provides: bundled(node-minimatch) = 9.0.3
Provides: bundled(node-minipass) = 3.3.6 Provides: bundled(node-minipass) = 3.3.6
Provides: bundled(node-minipass) = 5.0.0 Provides: bundled(node-minipass) = 5.0.0
Provides: bundled(node-minipass) = 7.0.4 Provides: bundled(node-minipass) = 7.0.4
Provides: bundled(node-minipass-collect) = 1.0.2 Provides: bundled(node-minipass-collect) = 2.0.1
Provides: bundled(node-minipass-fetch) = 3.0.4 Provides: bundled(node-minipass-fetch) = 3.0.4
Provides: bundled(node-minipass-flush) = 1.0.5 Provides: bundled(node-minipass-flush) = 1.0.5
Provides: bundled(node-minipass-json-stream) = 1.0.1 Provides: bundled(node-minipass-json-stream) = 1.0.1
@ -553,22 +546,21 @@ Provides: bundled(node-npm-bundled) = 3.0.0
Provides: bundled(node-npm-install-checks) = 6.3.0 Provides: bundled(node-npm-install-checks) = 6.3.0
Provides: bundled(node-npm-normalize-package-bin) = 3.0.1 Provides: bundled(node-npm-normalize-package-bin) = 3.0.1
Provides: bundled(node-npm-package-arg) = 11.0.1 Provides: bundled(node-npm-package-arg) = 11.0.1
Provides: bundled(node-npm-packlist) = 8.0.0 Provides: bundled(node-npm-packlist) = 8.0.2
Provides: bundled(node-npm-pick-manifest) = 9.0.0 Provides: bundled(node-npm-pick-manifest) = 9.0.0
Provides: bundled(node-npm-profile) = 9.0.0 Provides: bundled(node-npm-profile) = 9.0.0
Provides: bundled(node-npm-registry-fetch) = 16.1.0 Provides: bundled(node-npm-registry-fetch) = 16.1.0
Provides: bundled(node-npm-user-validate) = 2.0.0 Provides: bundled(node-npm-user-validate) = 2.0.0
Provides: bundled(node-npmlog) = 7.0.1 Provides: bundled(node-npmlog) = 7.0.1
Provides: bundled(node-p-map) = 4.0.0 Provides: bundled(node-p-map) = 4.0.0
Provides: bundled(node-pacote) = 17.0.4 Provides: bundled(node-pacote) = 17.0.6
Provides: bundled(node-parse-conflict-json) = 3.0.1 Provides: bundled(node-parse-conflict-json) = 3.0.1
Provides: bundled(node-path-key) = 3.1.1 Provides: bundled(node-path-key) = 3.1.1
Provides: bundled(node-path-scurry) = 1.10.1 Provides: bundled(node-path-scurry) = 1.10.1
Provides: bundled(node-postcss-selector-parser) = 6.0.13 Provides: bundled(node-postcss-selector-parser) = 6.0.15
Provides: bundled(node-proc-log) = 3.0.0 Provides: bundled(node-proc-log) = 3.0.0
Provides: bundled(node-process) = 0.11.10
Provides: bundled(node-promise-all-reject-late) = 1.0.1 Provides: bundled(node-promise-all-reject-late) = 1.0.1
Provides: bundled(node-promise-call-limit) = 1.0.2 Provides: bundled(node-promise-call-limit) = 3.0.1
Provides: bundled(node-promise-inflight) = 1.0.1 Provides: bundled(node-promise-inflight) = 1.0.1
Provides: bundled(node-promise-retry) = 2.0.1 Provides: bundled(node-promise-retry) = 2.0.1
Provides: bundled(node-promzard) = 1.0.0 Provides: bundled(node-promzard) = 1.0.0
@ -577,25 +569,23 @@ Provides: bundled(node-read) = 2.1.0
Provides: bundled(node-read-cmd-shim) = 4.0.0 Provides: bundled(node-read-cmd-shim) = 4.0.0
Provides: bundled(node-read-package-json) = 7.0.0 Provides: bundled(node-read-package-json) = 7.0.0
Provides: bundled(node-read-package-json-fast) = 3.0.2 Provides: bundled(node-read-package-json-fast) = 3.0.2
Provides: bundled(node-readable-stream) = 4.4.2
Provides: bundled(node-retry) = 0.12.0 Provides: bundled(node-retry) = 0.12.0
Provides: bundled(node-safe-buffer) = 5.2.1
Provides: bundled(node-safer-buffer) = 2.1.2 Provides: bundled(node-safer-buffer) = 2.1.2
Provides: bundled(node-semver) = 7.5.4 Provides: bundled(node-semver) = 7.6.0
Provides: bundled(node-set-blocking) = 2.0.0 Provides: bundled(node-set-blocking) = 2.0.0
Provides: bundled(node-shebang-command) = 2.0.0 Provides: bundled(node-shebang-command) = 2.0.0
Provides: bundled(node-shebang-regex) = 3.0.0 Provides: bundled(node-shebang-regex) = 3.0.0
Provides: bundled(node-signal-exit) = 4.1.0 Provides: bundled(node-signal-exit) = 4.1.0
Provides: bundled(node-sigstore) = 2.1.0 Provides: bundled(node-sigstore) = 2.2.2
Provides: bundled(node-smart-buffer) = 4.2.0 Provides: bundled(node-smart-buffer) = 4.2.0
Provides: bundled(node-socks) = 2.7.1 Provides: bundled(node-socks) = 2.8.0
Provides: bundled(node-socks-proxy-agent) = 8.0.2 Provides: bundled(node-socks-proxy-agent) = 8.0.2
Provides: bundled(node-spdx-correct) = 3.2.0 Provides: bundled(node-spdx-correct) = 3.2.0
Provides: bundled(node-spdx-exceptions) = 2.3.0 Provides: bundled(node-spdx-exceptions) = 2.5.0
Provides: bundled(node-spdx-expression-parse) = 3.0.1 Provides: bundled(node-spdx-expression-parse) = 3.0.1
Provides: bundled(node-spdx-license-ids) = 3.0.16 Provides: bundled(node-spdx-license-ids) = 3.0.17
Provides: bundled(node-sprintf-js) = 1.1.3
Provides: bundled(node-ssri) = 10.0.5 Provides: bundled(node-ssri) = 10.0.5
Provides: bundled(node-string_decoder) = 1.3.0
Provides: bundled(node-string-width) = 4.2.3 Provides: bundled(node-string-width) = 4.2.3
Provides: bundled(node-string-width) = 5.1.2 Provides: bundled(node-string-width) = 5.1.2
Provides: bundled(node-strip-ansi) = 6.0.1 Provides: bundled(node-strip-ansi) = 6.0.1
@ -605,7 +595,7 @@ Provides: bundled(node-tar) = 6.2.0
Provides: bundled(node-text-table) = 0.2.0 Provides: bundled(node-text-table) = 0.2.0
Provides: bundled(node-tiny-relative-date) = 1.3.0 Provides: bundled(node-tiny-relative-date) = 1.3.0
Provides: bundled(node-treeverse) = 3.0.0 Provides: bundled(node-treeverse) = 3.0.0
Provides: bundled(node-tuf-js) = 2.1.0 Provides: bundled(node-tuf-js) = 2.2.0
Provides: bundled(node-unique-filename) = 3.0.0 Provides: bundled(node-unique-filename) = 3.0.0
Provides: bundled(node-unique-slug) = 4.0.0 Provides: bundled(node-unique-slug) = 4.0.0
Provides: bundled(node-util-deprecate) = 1.0.2 Provides: bundled(node-util-deprecate) = 1.0.2
@ -711,7 +701,6 @@ popd
%patch305 -p1 %patch305 -p1
%patch309 -p1 %patch309 -p1
%patch311 -p1
%if %{node_version_number} == 12 %if %{node_version_number} == 12
# minimist security update - patch50 # minimist security update - patch50
@ -898,6 +887,12 @@ ln -s -f npx-default %{buildroot}%{_sysconfdir}/alternatives/npx-default
ln -s -f npx.1%{ext_man} %{buildroot}%{_sysconfdir}/alternatives/npx.1%{ext_man} ln -s -f npx.1%{ext_man} %{buildroot}%{_sysconfdir}/alternatives/npx.1%{ext_man}
ln -s %{_sysconfdir}/alternatives/npx-default %{buildroot}%{_bindir}/npx-default ln -s %{_sysconfdir}/alternatives/npx-default %{buildroot}%{_bindir}/npx-default
ln -s %{_sysconfdir}/alternatives/npx.1%{ext_man} %{buildroot}%{_mandir}/man1/npx.1%{ext_man} ln -s %{_sysconfdir}/alternatives/npx.1%{ext_man} %{buildroot}%{_mandir}/man1/npx.1%{ext_man}
%if %{node_version_number} >= 14
ln -s -f corepack-default %{buildroot}%{_sysconfdir}/alternatives/corepack-default
ln -s -f corepack.1%{ext_man} %{buildroot}%{_sysconfdir}/alternatives/corepack.1%{ext_man}
ln -s %{_sysconfdir}/alternatives/corepack-default %{buildroot}%{_bindir}/corepack-default
ln -s %{_sysconfdir}/alternatives/corepack.1%{ext_man} %{buildroot}%{_mandir}/man1/corepack.1%{ext_man}
%endif
%endif %endif
# libalternatives - can always ship # libalternatives - can always ship
@ -916,6 +911,13 @@ binary=%{_bindir}/npx%{node_version_number}
man=npx%{node_version_number}.1 man=npx%{node_version_number}.1
group=npm,npx group=npm,npx
EOF EOF
%if %{node_version_number} >= 14
mkdir -p %{buildroot}%{_datadir}/libalternatives/corepack;
cat > %{buildroot}%{_datadir}/libalternatives/corepack/%{node_version_number}.conf <<EOF
binary=%{_bindir}/corepack%{node_version_number}
man=corepack%{node_version_number}.1
EOF
%endif
# We need to own license directory on old versions of SLE # We need to own license directory on old versions of SLE
%if 0%{?suse_version} < 1500 %if 0%{?suse_version} < 1500
@ -1061,6 +1063,12 @@ make test-ci
%defattr(-, root, root) %defattr(-, root, root)
%{_bindir}/corepack%{node_version_number} %{_bindir}/corepack%{node_version_number}
%{_libdir}/node_modules/corepack%{node_version_number} %{_libdir}/node_modules/corepack%{node_version_number}
%if ! %{with libalternatives}
%ghost %{_bindir}/corepack-default
%ghost %{_mandir}/man1/corepack.1%{ext_man}
%ghost %{_sysconfdir}/alternatives/corepack-default
%ghost %{_sysconfdir}/alternatives/corepack.1%{ext_man}
%endif
%endif %endif
%files devel %files devel
@ -1085,6 +1093,11 @@ update-alternatives --remove node-default %{_bindir}/node%{node_version_number}
update-alternatives --remove npm-default %{_bindir}/npm%{node_version_number} update-alternatives --remove npm-default %{_bindir}/npm%{node_version_number}
update-alternatives --remove npx-default %{_bindir}/npx%{node_version_number} update-alternatives --remove npx-default %{_bindir}/npx%{node_version_number}
%if %{node_version_number} >= 14
%post -n corepack%{node_version_number}
update-alternatives --remove corepack-default %{_bindir}/corepack%{node_version_number}
%endif
%else %else
%pre %pre
# remove files that are no longer owned but provided by update-alternatives # remove files that are no longer owned but provided by update-alternatives
@ -1124,6 +1137,24 @@ if [ ! -f %{_bindir}/npx%{node_version_number} ] ; then
update-alternatives --remove npx-default %{_bindir}/npx%{node_version_number} update-alternatives --remove npx-default %{_bindir}/npx%{node_version_number}
fi fi
%if %{node_version_number} >= 14
%pre -n corepack%{node_version_number}
# remove files that are no longer owned but provided by update-alternatives
if ! [ -L %{_mandir}/man1/corepack.1%{ext_man} ]; then
rm -f %{_mandir}/man1/corepack.1%{ext_man}
fi
%post -n corepack%{node_version_number}
update-alternatives \
--install %{_bindir}/corepack-default corepack-default %{_bindir}/corepack%{node_version_number} %{node_version_number} \
--slave %{_mandir}/man1/corepack.1%{ext_man} corepack.1%{ext_man} %{_mandir}/man1/corepack%{node_version_number}.1%{ext_man}
%postun -n corepack%{node_version_number}
if [ ! -f %{_bindir}/corepack%{node_version_number} ] ; then
update-alternatives --remove corepack-default %{_bindir}/corepack%{node_version_number}
fi
%endif
%endif %endif
%changelog %changelog

162
versioned.patch
View File

@ -8,75 +8,75 @@ management via update_alternatives.
This is also important for generation of binary This is also important for generation of binary
modules for multiple versions of NodeJS modules for multiple versions of NodeJS
Index: node-v21.1.0/Makefile Index: node-v21.7.1/Makefile
=================================================================== ===================================================================
--- node-v21.1.0.orig/Makefile --- node-v21.7.1.orig/Makefile
+++ node-v21.1.0/Makefile +++ node-v21.7.1/Makefile
@@ -76,7 +76,7 @@ BUILDTYPE_LOWER := $(shell echo $(BUILDT @@ -76,7 +76,7 @@ BUILDTYPE_LOWER := $(shell echo $(BUILDT
EXEEXT := $(shell $(PYTHON) -c \ EXEEXT := $(shell $(PYTHON) -c \
"import sys; print('.exe' if sys.platform == 'win32' else '')") "import sys; print('.exe' if sys.platform == 'win32' else '')")
-NODE_EXE = node$(EXEEXT) -NODE_EXE = node$(EXEEXT)
+NODE_EXE = node21$(EXEEXT) +NODE_EXE = node21$(EXEEXT)
NODE ?= ./$(NODE_EXE) # Use $(PWD) so we can cd to anywhere before calling this
NODE ?= "$(PWD)/$(NODE_EXE)"
NODE_G_EXE = node_g$(EXEEXT) NODE_G_EXE = node_g$(EXEEXT)
NPM ?= ./deps/npm/bin/npm-cli.js Index: node-v21.7.1/tools/install.py
Index: node-v21.1.0/tools/install.py
=================================================================== ===================================================================
--- node-v21.1.0.orig/tools/install.py --- node-v21.7.1.orig/tools/install.py
+++ node-v21.1.0/tools/install.py +++ node-v21.7.1/tools/install.py
@@ -86,7 +86,7 @@ def uninstall(paths, dst): @@ -87,7 +87,7 @@ def uninstall(options, paths, dest):
try_remove(path, dst) try_remove(options, path, dest)
def package_files(action, name, bins): def package_files(options, action, name, bins):
- target_path = libdir() + '/node_modules/' + name + '/' - target_path = os.path.join(libdir(), 'node_modules', name)
+ target_path = libdir() + '/node_modules/' + name + '21/' + target_path = os.path.join(libdir(), 'node_modules', name + '21')
# don't install npm if the target path is a symlink, it probably means # don't install npm if the target path is a symlink, it probably means
# that a dev version of npm is installed there # that a dev version of npm is installed there
@@ -106,19 +106,19 @@ def package_files(action, name, bins): @@ -108,19 +108,19 @@ def package_files(options, action, name,
if action == uninstall: if action == uninstall:
action([link_path], 'bin/' + bin_name) action(options, [link_path], os.path.join('bin', bin_name))
elif action == install: elif action == install:
- try_symlink('../' + libdir() + '/node_modules/' + name + '/' + bin_target, link_path) - try_symlink(options, os.path.join('..', libdir(), 'node_modules', name, bin_target), link_path)
+ try_symlink('../' + libdir() + '/node_modules/' + name + '21/' + bin_target, link_path) + try_symlink(options, os.path.join('..', libdir(), 'node_modules', name + 21, bin_target), link_path)
else: else:
assert 0 # unhandled action type assert 0 # unhandled action type
def npm_files(action): def npm_files(options, action):
package_files(action, 'npm', { package_files(options, action, 'npm', {
- 'npm': 'bin/npm-cli.js', - 'npm': 'bin/npm-cli.js',
- 'npx': 'bin/npx-cli.js', - 'npx': 'bin/npx-cli.js',
+ 'npm21': 'bin/npm-cli.js', + 'npm21': 'bin/npm-cli.js',
+ 'npx21': 'bin/npx-cli.js', + 'npx21': 'bin/npx-cli.js',
}) })
def corepack_files(action): def corepack_files(options, action):
package_files(action, 'corepack', { package_files(options, action, 'corepack', {
- 'corepack': 'dist/corepack.js', - 'corepack': 'dist/corepack.js',
+ 'corepack21': 'dist/corepack.js', + 'corepack21': 'dist/corepack.js',
# Not the default just yet: # Not the default just yet:
# 'yarn': 'dist/yarn.js', # 'yarn': 'dist/yarn.js',
# 'yarnpkg': 'dist/yarn.js', # 'yarnpkg': 'dist/yarn.js',
@@ -147,7 +147,7 @@ def subdir_files(path, dest, action): @@ -149,7 +149,7 @@ def subdir_files(options, path, dest, ac
action(options, files_in_path, subdir + os.path.sep)
def files(action): def files(options, action):
is_windows = sys.platform == 'win32' - node_bin = 'node'
- output_file = 'node' + node_bin = 'node21'
+ output_file = 'node21' if options.is_win:
output_prefix = 'out/Release/' node_bin += '.exe'
action(options, [os.path.join(options.build_dir, node_bin)], os.path.join('bin', node_bin))
if is_windows: @@ -190,7 +190,7 @@ def files(options, action):
@@ -189,7 +189,7 @@ def files(action):
if 'freebsd' in sys.platform or 'openbsd' in sys.platform: if 'freebsd' in sys.platform or 'openbsd' in sys.platform:
action(['doc/node.1'], 'man/man1/') action(options, ['doc/node.1'], 'man/man1/')
else: else:
- action(['doc/node.1'], 'share/man/man1/') - action(options, ['doc/node.1'], 'share/man/man1/')
+ action(['doc/node.1'], 'share/man/man1/node21.1') + action(options, ['doc/node.1'], 'share/man/man1/node21.1')
if 'true' == variables.get('node_install_npm'): if 'true' == options.variables.get('node_install_npm'):
npm_files(action) npm_files(options, action)
@@ -325,28 +325,28 @@ def headers(action): @@ -333,28 +333,28 @@ def headers(options, action):
'src/node_buffer.h', 'src/node_buffer.h',
'src/node_object_wrap.h', 'src/node_object_wrap.h',
'src/node_version.h', 'src/node_version.h',
@ -85,27 +85,27 @@ Index: node-v21.1.0/tools/install.py
# Add the expfile that is created on AIX # Add the expfile that is created on AIX
if sys.platform.startswith('aix') or sys.platform == "os400": if sys.platform.startswith('aix') or sys.platform == "os400":
- action(['out/Release/node.exp'], 'include/node/') - action(options, ['out/Release/node.exp'], 'include/node/')
+ action(['out/Release/node.exp'], 'include/node21/') + action(options, ['out/Release/node.exp'], 'include/node21/')
- subdir_files('deps/v8/include', 'include/node/', wanted_v8_headers) - subdir_files(options, os.path.join(options.v8_dir, 'include'), 'include/node/', wanted_v8_headers)
+ subdir_files('deps/v8/include', 'include/node21/', wanted_v8_headers) + subdir_files(options, os.path.join(options.v8_dir, 'include'), 'include/node21/', wanted_v8_headers)
if 'false' == variables.get('node_shared_libuv'): if 'false' == options.variables.get('node_shared_libuv'):
- subdir_files('deps/uv/include', 'include/node/', action) - subdir_files(options, 'deps/uv/include', 'include/node/', action)
+ subdir_files('deps/uv/include', 'include/node21/', action) + subdir_files(options, 'deps/uv/include', 'include/node21/', action)
if 'true' == variables.get('node_use_openssl') and \ if 'true' == options.variables.get('node_use_openssl') and \
'false' == variables.get('node_shared_openssl'): 'false' == options.variables.get('node_shared_openssl'):
- subdir_files('deps/openssl/openssl/include/openssl', 'include/node/openssl/', action) - subdir_files(options, 'deps/openssl/openssl/include/openssl', 'include/node/openssl/', action)
- subdir_files('deps/openssl/config/archs', 'include/node/openssl/archs', action) - subdir_files(options, 'deps/openssl/config/archs', 'include/node/openssl/archs', action)
- subdir_files('deps/openssl/config', 'include/node/openssl', action) - subdir_files(options, 'deps/openssl/config', 'include/node/openssl', action)
+ subdir_files('deps/openssl/openssl/include/openssl', 'include/node21/openssl/', action) + subdir_files(options, 'deps/openssl/openssl/include/openssl', 'include/node21/openssl/', action)
+ subdir_files('deps/openssl/config/archs', 'include/node21/openssl/archs', action) + subdir_files(options, 'deps/openssl/config/archs', 'include/node21/openssl/archs', action)
+ subdir_files('deps/openssl/config', 'include/node21/openssl', action) + subdir_files(options, 'deps/openssl/config', 'include/node21/openssl', action)
if 'false' == variables.get('node_shared_zlib'): if 'false' == options.variables.get('node_shared_zlib'):
action([ action(options, [
'deps/zlib/zconf.h', 'deps/zlib/zconf.h',
'deps/zlib/zlib.h', 'deps/zlib/zlib.h',
- ], 'include/node/') - ], 'include/node/')
@ -113,10 +113,10 @@ Index: node-v21.1.0/tools/install.py
if sys.platform == 'zos': if sys.platform == 'zos':
zoslibinc = os.environ.get('ZOSLIB_INCLUDES') zoslibinc = os.environ.get('ZOSLIB_INCLUDES')
Index: node-v21.1.0/doc/node.1 Index: node-v21.7.1/doc/node.1
=================================================================== ===================================================================
--- node-v21.1.0.orig/doc/node.1 --- node-v21.7.1.orig/doc/node.1
+++ node-v21.1.0/doc/node.1 +++ node-v21.7.1/doc/node.1
@@ -31,24 +31,24 @@ @@ -31,24 +31,24 @@
.Dt NODE 1 .Dt NODE 1
. .
@ -146,10 +146,10 @@ Index: node-v21.1.0/doc/node.1
.Op Fl -v8-options .Op Fl -v8-options
. .
.\"====================================================================== .\"======================================================================
Index: node-v21.1.0/src/node_main.cc Index: node-v21.7.1/src/node_main.cc
=================================================================== ===================================================================
--- node-v21.1.0.orig/src/node_main.cc --- node-v21.7.1.orig/src/node_main.cc
+++ node-v21.1.0/src/node_main.cc +++ node-v21.7.1/src/node_main.cc
@@ -94,6 +94,7 @@ int wmain(int argc, wchar_t* wargv[]) { @@ -94,6 +94,7 @@ int wmain(int argc, wchar_t* wargv[]) {
// UNIX // UNIX
@ -158,11 +158,11 @@ Index: node-v21.1.0/src/node_main.cc
return node::Start(argc, argv); return node::Start(argc, argv);
} }
#endif #endif
Index: node-v21.1.0/tools/test.py Index: node-v21.7.1/tools/test.py
=================================================================== ===================================================================
--- node-v21.1.0.orig/tools/test.py --- node-v21.7.1.orig/tools/test.py
+++ node-v21.1.0/tools/test.py +++ node-v21.7.1/tools/test.py
@@ -953,7 +953,7 @@ class Context(object): @@ -954,7 +954,7 @@ class Context(object):
if self.vm is not None: if self.vm is not None:
return self.vm return self.vm
if arch == 'none': if arch == 'none':
@ -171,10 +171,10 @@ Index: node-v21.1.0/tools/test.py
else: else:
name = 'out/%s.%s/node' % (arch, mode) name = 'out/%s.%s/node' % (arch, mode)
Index: node-v21.1.0/node.gyp Index: node-v21.7.1/node.gyp
=================================================================== ===================================================================
--- node-v21.1.0.orig/node.gyp --- node-v21.7.1.orig/node.gyp
+++ node-v21.1.0/node.gyp +++ node-v21.7.1/node.gyp
@@ -24,8 +24,8 @@ @@ -24,8 +24,8 @@
'node_shared_openssl%': 'false', 'node_shared_openssl%': 'false',
'node_v8_options%': '', 'node_v8_options%': '',
@ -186,10 +186,10 @@ Index: node-v21.1.0/node.gyp
'node_intermediate_lib_type%': 'static_library', 'node_intermediate_lib_type%': 'static_library',
'node_builtin_modules_path%': '', 'node_builtin_modules_path%': '',
'linked_module_files': [ 'linked_module_files': [
Index: node-v21.1.0/test/fixtures/errors/promise_unhandled_warn_with_error.snapshot Index: node-v21.7.1/test/fixtures/errors/promise_unhandled_warn_with_error.snapshot
=================================================================== ===================================================================
--- node-v21.1.0.orig/test/fixtures/errors/promise_unhandled_warn_with_error.snapshot --- node-v21.7.1.orig/test/fixtures/errors/promise_unhandled_warn_with_error.snapshot
+++ node-v21.1.0/test/fixtures/errors/promise_unhandled_warn_with_error.snapshot +++ node-v21.7.1/test/fixtures/errors/promise_unhandled_warn_with_error.snapshot
@@ -6,5 +6,5 @@ @@ -6,5 +6,5 @@
at * at *
at * at *
@ -197,10 +197,10 @@ Index: node-v21.1.0/test/fixtures/errors/promise_unhandled_warn_with_error.snaps
-(Use `node --trace-warnings ...` to show where the warning was created) -(Use `node --trace-warnings ...` to show where the warning was created)
+(Use `node21 --trace-warnings ...` to show where the warning was created) +(Use `node21 --trace-warnings ...` to show where the warning was created)
(node:*) UnhandledPromiseRejectionWarning: Unhandled promise rejection. This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). To terminate the node process on unhandled promise rejection, use the CLI flag `--unhandled-rejections=strict` (see https:*nodejs.org*api*cli.html#cli_unhandled_rejections_mode). (rejection id: 1) (node:*) UnhandledPromiseRejectionWarning: Unhandled promise rejection. This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). To terminate the node process on unhandled promise rejection, use the CLI flag `--unhandled-rejections=strict` (see https:*nodejs.org*api*cli.html#cli_unhandled_rejections_mode). (rejection id: 1)
Index: node-v21.1.0/test/parallel/test-snapshot-warning.js Index: node-v21.7.1/test/parallel/test-snapshot-warning.js
=================================================================== ===================================================================
--- node-v21.1.0.orig/test/parallel/test-snapshot-warning.js --- node-v21.7.1.orig/test/parallel/test-snapshot-warning.js
+++ node-v21.1.0/test/parallel/test-snapshot-warning.js +++ node-v21.7.1/test/parallel/test-snapshot-warning.js
@@ -60,7 +60,7 @@ tmpdir.refresh(); @@ -60,7 +60,7 @@ tmpdir.refresh();
stderr(output) { stderr(output) {
let match = output.match(/Warning: test warning/g); let match = output.match(/Warning: test warning/g);
@ -236,10 +236,10 @@ Index: node-v21.1.0/test/parallel/test-snapshot-warning.js
+ match = warnings2.match(/Use `node21 --trace-warnings/g); + match = warnings2.match(/Use `node21 --trace-warnings/g);
assert.strictEqual(match.length, 1); assert.strictEqual(match.length, 1);
} }
Index: node-v21.1.0/test/fixtures/errors/throw_error_with_getter_throw.snapshot Index: node-v21.7.1/test/fixtures/errors/throw_error_with_getter_throw.snapshot
=================================================================== ===================================================================
--- node-v21.1.0.orig/test/fixtures/errors/throw_error_with_getter_throw.snapshot --- node-v21.7.1.orig/test/fixtures/errors/throw_error_with_getter_throw.snapshot
+++ node-v21.1.0/test/fixtures/errors/throw_error_with_getter_throw.snapshot +++ node-v21.7.1/test/fixtures/errors/throw_error_with_getter_throw.snapshot
@@ -3,6 +3,6 @@ @@ -3,6 +3,6 @@
throw { * eslint-disable-line no-throw-literal throw { * eslint-disable-line no-throw-literal
^ ^
@ -248,10 +248,10 @@ Index: node-v21.1.0/test/fixtures/errors/throw_error_with_getter_throw.snapshot
+(Use `node21 --trace-uncaught ...` to show where the exception was thrown) +(Use `node21 --trace-uncaught ...` to show where the exception was thrown)
Node.js * Node.js *
Index: node-v21.1.0/test/fixtures/errors/throw_undefined.snapshot Index: node-v21.7.1/test/fixtures/errors/throw_undefined.snapshot
=================================================================== ===================================================================
--- node-v21.1.0.orig/test/fixtures/errors/throw_undefined.snapshot --- node-v21.7.1.orig/test/fixtures/errors/throw_undefined.snapshot
+++ node-v21.1.0/test/fixtures/errors/throw_undefined.snapshot +++ node-v21.7.1/test/fixtures/errors/throw_undefined.snapshot
@@ -3,6 +3,6 @@ @@ -3,6 +3,6 @@
throw undefined; throw undefined;
^ ^
@ -260,10 +260,10 @@ Index: node-v21.1.0/test/fixtures/errors/throw_undefined.snapshot
+(Use `node21 --trace-uncaught ...` to show where the exception was thrown) +(Use `node21 --trace-uncaught ...` to show where the exception was thrown)
Node.js * Node.js *
Index: node-v21.1.0/test/fixtures/errors/throw_null.snapshot Index: node-v21.7.1/test/fixtures/errors/throw_null.snapshot
=================================================================== ===================================================================
--- node-v21.1.0.orig/test/fixtures/errors/throw_null.snapshot --- node-v21.7.1.orig/test/fixtures/errors/throw_null.snapshot
+++ node-v21.1.0/test/fixtures/errors/throw_null.snapshot +++ node-v21.7.1/test/fixtures/errors/throw_null.snapshot
@@ -3,6 +3,6 @@ @@ -3,6 +3,6 @@
throw null; throw null;
^ ^