From c4d0774e7e998fc577f573dc24b191a163ff8bfe4909c0d1950bf0d4b6c587e5 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 19 Sep 2023 15:37:59 +0000 Subject: [PATCH] - Update to 20.7.0: * src: support multiple --env-file declarations * deps: upgrade npm to 10.1.0 * doc: move and rename loaders section * lib: add api to detect whether source-maps are enabled * src,permission: add multiple allow-fs-* flags * test_runner: expose location of tests - z13.patch: upstreamed - Update to 20.6.1: * f0ff63fbc32ea55f3d92c5c89fdb91ec47786859.patch: removed, upstreamed OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs20?expand=0&rev=36 --- SHASUMS256.txt | 82 ++++++++-------- SHASUMS256.txt.sig | Bin 119 -> 566 bytes ...63fbc32ea55f3d92c5c89fdb91ec47786859.patch | 63 ------------ node-v20.6.0.tar.xz | 3 - node-v20.7.0.tar.xz | 3 + nodejs.keyring | Bin 58457 -> 61373 bytes nodejs20.changes | 19 ++++ nodejs20.spec | 83 ++++++++-------- z13.patch | 90 ------------------ 9 files changed, 106 insertions(+), 237 deletions(-) delete mode 100644 f0ff63fbc32ea55f3d92c5c89fdb91ec47786859.patch delete mode 100644 node-v20.6.0.tar.xz create mode 100644 node-v20.7.0.tar.xz delete mode 100644 z13.patch diff --git a/SHASUMS256.txt b/SHASUMS256.txt index 037924a..1d96c37 100644 --- a/SHASUMS256.txt +++ b/SHASUMS256.txt @@ -1,41 +1,41 @@ -43d20b2df127e320281c195eeb9ba770dd531e504af98ab67adf79dddd727149 node-v20.6.0-aix-ppc64.tar.gz -806f15916a0d2b64ecc1c217b2fd7b7b16af26e501cfcdd207d829597886fdac node-v20.6.0-arm64.msi -1ed71ea4ef5985f11b65c3961875ad91223c201f2042c00568a82fe7020a5cea node-v20.6.0-darwin-arm64.tar.gz -365ecd255024014655af07bd169cd5d78c50db3d9da1074ece2535229726419d node-v20.6.0-darwin-arm64.tar.xz -16657f07cbe8c3d5589d70104ef51955c04abf249ea83b1109f924444ed828aa node-v20.6.0-darwin-x64.tar.gz -ab4a291e1f5c32ce3550bc0b8ee10f97c90fd9d7b33e3afa5100ea9cbb7d4a25 node-v20.6.0-darwin-x64.tar.xz -cd1f25c4b540d908bb7ad8b982bb0fde7a012afe103b4a60cd664429f623528b node-v20.6.0-headers.tar.gz -49307fd306b5b4b2b780c5082e1baeebb931b0ce69f787fd0776d3fb4b5cde32 node-v20.6.0-headers.tar.xz -b68ae1ca9bd7387223c5d30a9d355e66ef4595bfe26ef6e9ae29824bc9abf25b node-v20.6.0-linux-arm64.tar.gz -675c54b1ad4947836ec146f2be37202b5ac2c6e511ba5d9066e52e3da6a2a419 node-v20.6.0-linux-arm64.tar.xz -d78725b390f27d25cd1b50d860752c70205728bb35cb97cf409efb786cbb4d46 node-v20.6.0-linux-armv7l.tar.gz -4b48e418ce4d2e24cd53d2adc70fc86e5eebf08bda0884ce81d019d6739d85d0 node-v20.6.0-linux-armv7l.tar.xz -a832ab3c23d9e606419242e2a79e6cdcad87c73942faa1d65eb91d4ae44f22dd node-v20.6.0-linux-ppc64le.tar.gz -1787d08ab4b2564de759657211191c8582c63fbbddfcb6085b682059b666f055 node-v20.6.0-linux-ppc64le.tar.xz -675d0f59f4530904afbde277fab7e69d8f73da82169e76e9884b25fb00995007 node-v20.6.0-linux-s390x.tar.gz -d2857f92cda010df123b4aae6bb5b73221c6ab75e1cf7cdd3d13baa1dbb66ee7 node-v20.6.0-linux-s390x.tar.xz -fc14b089783e7fcaefd01bb7afc0561fac55e1950d56a6b33891a93cb8007b17 node-v20.6.0-linux-x64.tar.gz -365a7b4eed12bf88011d048ddd668573daef981e048ec860b28d5ebb3587be6c node-v20.6.0-linux-x64.tar.xz -b894458cb0e6d55085452907be62c457d7b1971e57e8c96e6fb04caa69bed4b1 node-v20.6.0.pkg -407ec4bb44fb297662878a0976980624dcd010a481425c5af5da9d507cdcfe5e node-v20.6.0.tar.gz -9efb5cba7a8f4b18d38b0d7d37a9b30ded73390c84e380cf4de89a9d30a7d6fa node-v20.6.0.tar.xz -f94d4ae3c610a4d725a99d7b3b3c18d21b7541b167932fc4970284bfb11627d4 node-v20.6.0-win-arm64.7z -db25daf6fc7c304ee80c7c9bca3a7e068d3c2d43b9ff98baf286a2cb38e1cf2e node-v20.6.0-win-arm64.zip -1fd7bfde6b93657c79e7caac26c529f1b91068989dc1fe2e0deb8445d8c0078b node-v20.6.0-win-x64.7z -afaffd4e90528f8344f1c908a6945efac995a63e3fe22d4338f34579851272f8 node-v20.6.0-win-x64.zip -219ae8968d662d549503903410a7d3679762f18cc4b6646ecaadae6f707b56fa node-v20.6.0-win-x86.7z -b87b12da87ec129a34d337da8c71074486b62276738000aeea28d597971e2f9b node-v20.6.0-win-x86.zip -00976cb508275d85204505c953c9f0736feeeed8ace0a90077671ec9e2154fce node-v20.6.0-x64.msi -b586b72eb2824810fae0961538a40fa063fda4c099273957f6cf53447bcb101c node-v20.6.0-x86.msi -2b35274429d786525f863606b01dcbf093cc78fa87189dd2af502fecdad6e309 win-arm64/node.exe -deb027ded744371657811cfe52e774881ea928d36779924af84aa9a7a31104d2 win-arm64/node.lib -269961ed85a6f81fdc93a5d86392654ce6f1b9ee4e4a814a235e2866d8f4318b win-arm64/node_pdb.7z -4acdb1bb467d828df04ce92d4ffd310d918d03c2f3291571a13bbcfc55e4cd5d win-arm64/node_pdb.zip -f6cd17a7128e192fdea94f21d64e9b93163537a0ee2408cdbda50e342f0dc7bf win-x64/node.exe -d275cfc4d637d2feaf4c39e1a5f5cd84f5b474fa713c15013e940c329feed13b win-x64/node.lib -e1b84c82ce26c58590a1e6aaea01eee4387e18720f65dd4c4336b0ed44e16321 win-x64/node_pdb.7z -4fe6e51fc5eae8166b9952e5f62c4e758db5fa207bc54c6a5cf77ec399d6ae25 win-x64/node_pdb.zip -16641aadb5c91ad924b70bece53c03457ae2578dac05494ed1c7c3abf29d22e4 win-x86/node.exe -a0738dec64427ae73eeb1d036081652c1c0223a679a63e0459c2af667f284f58 win-x86/node.lib -f7bee53613b75e3bf9d68a42c0c70e34bca8de5ed619b763d1634940750c25a2 win-x86/node_pdb.7z -e6b6d54f744865ae61f1d1ea0a4553c4af625da7fe3b293974a26acca9aecf06 win-x86/node_pdb.zip +55851cc966ec46863c4089292203982b60db9d38ca5444fc7bde65ae0c6519f7 node-v20.7.0-aix-ppc64.tar.gz +9dfff77ac5d976b9ea34657627e2e120415114284685d9cb6d98b6f1836ca2d9 node-v20.7.0-arm64.msi +08aa09792f30a86e8904e334ba6d348ad73e926b5e441ed9abcdcbea651dc926 node-v20.7.0-darwin-arm64.tar.gz +829d24016e42da0f593df9f21f08c465a7650c724ed2d5825c5ea945c7bf7a64 node-v20.7.0-darwin-arm64.tar.xz +ceeba829f44e7573949f2ce2ad5def27f1d6daa55f2860bea82964851fae01bc node-v20.7.0-darwin-x64.tar.gz +ece47b2fc7e715bbbb5a81a8190bfa9798fe42d2388aa2ea496d55bb58998e7a node-v20.7.0-darwin-x64.tar.xz +ff305725acafef65c63be1490491572211c53d885397a2e61611fc2f26e8da3d node-v20.7.0-headers.tar.gz +13354725d88b5e6f4380132d68d6d60e320e090bf042533cf66fec4ef425690e node-v20.7.0-headers.tar.xz +98a1ad20c1e81870467a891b050db85deb06d912c8f286a303681876d2eea5f0 node-v20.7.0-linux-arm64.tar.gz +c97b51decb0f4a3e8e5bd8cbc6ff43ae4782f2b8b6e3c2b513b77b8f97fffcc5 node-v20.7.0-linux-arm64.tar.xz +9713fb1d0db62aba1afcc84630659eb99bfe92d396412cc0e339a5f6e955edeb node-v20.7.0-linux-armv7l.tar.gz +4cec5c930e9a85bac3c6c0ddfcc08a475d754d6dca66b6bf319ce2ccf334c216 node-v20.7.0-linux-armv7l.tar.xz +5661c71b2c1430c282626eff1328550c327a9eb6fbef8976d333dde40a68e5be node-v20.7.0-linux-ppc64le.tar.gz +21c5b774795bd368b9e67b8f1834ca573252a10e500da57226cfef35063b0f47 node-v20.7.0-linux-ppc64le.tar.xz +a53cdf019bfb32180442cd6cd710e7a13f4d7ea4d6e6b902f85d3f7362f45660 node-v20.7.0-linux-s390x.tar.gz +c2c015b941dddb56c5943057729497db2cf323f4cc4ef363bd4e0150fb5c8b37 node-v20.7.0-linux-s390x.tar.xz +034bbec28da7b729aea531000a56b37076e94e44aa5dfa346a1d1a89025915a8 node-v20.7.0-linux-x64.tar.gz +a4251c24c6bf6d3bdee4521ca294bc0897a6c466137e02caa2521af5d456f55e node-v20.7.0-linux-x64.tar.xz +69f17930765208dad0c6518e3e59e1353a69dabb3843db983212463c59a7421f node-v20.7.0.pkg +07b85b65f844dc29ac5038c11b6e34a0997f1744d1487de0ab9a94743e5c12ad node-v20.7.0.tar.gz +3fcfdcd05c461517480596596674df85b35cfce597dd0ae33f5416fc4df12bea node-v20.7.0.tar.xz +539b6eb02ec6f0354976623f0a166021fa744d96c7cb9c52fd885d0962d0e739 node-v20.7.0-win-arm64.7z +e424b3fab740291411a619351d0f8119b08d4d5ca9266864f9cc25d1cac36f38 node-v20.7.0-win-arm64.zip +b3e5cbf8e247c75f9ddd235d49cfe40f25dde65bdd0eec4cefbca2805d80376b node-v20.7.0-win-x64.7z +2b1a117e63f0602bad1e9e31679932b64e9b130a96dc2feb0c367ca816c5a5cb node-v20.7.0-win-x64.zip +d6a3c63a5ae71374c144a33c418ab96be497b08df0e9f51861a78127db03aeb5 node-v20.7.0-win-x86.7z +fba8b0e044ca41f2cda029552a517f01238ad5160f9ae2229d750042168e48f9 node-v20.7.0-win-x86.zip +a7df245847842a88a27360d6c39d2671056e148be637aa4d6ce980d2e97a6af0 node-v20.7.0-x64.msi +84a595328279a7c535de9a76ead4c899a79d06c306623b3d02bf8e54805cea78 node-v20.7.0-x86.msi +e1d9b7d8d64230037ef90ef2f75fc471ffbbad794a283095258bf7dcb52d97d9 win-arm64/node.exe +8d7afedea6c02b7741661394ee47a2cc9ddf590db86a365ed0b2f7e276420ba6 win-arm64/node.lib +f463f26c2d5f0a80787d4de3b866459fd2d8170cedacbe1c57ffd973a73498e4 win-arm64/node_pdb.7z +09dd4e8e645902363901ce953b5cc320cd6bc9adfe5a061a65dd782259982e1b win-arm64/node_pdb.zip +7128b7a6e4eb4d5efc9ebd62f72bf76edc4e34effdccfb1c6b399638521495d1 win-x64/node.exe +25642cbb2248fc4b514384ad7af0ae4345c25952eaae8c46bebbcc5217b8a279 win-x64/node.lib +c6d0456de2323ca43454f54ea65c988aa91935259a5b8a119285215cd32ee708 win-x64/node_pdb.7z +5b60467c71343e0689c058a5cc58b14b97b2d6979eac13ac03edddc912efba5b win-x64/node_pdb.zip +b309bf77214f5168175a9e965f60b77acb3086f9c0516a85e4a8f3266d0b2fc8 win-x86/node.exe +875c47dfc80dcf728665c37e21daced784a05d58538f90124f89829fc62c4966 win-x86/node.lib +8ba2903ef9238849bdd34e800efa967c790c7f844a9c195c07eb2d3a0a800d3b win-x86/node_pdb.7z +8f68cac1cbe49bcd64416c8ad425368e292ab1ea34f233452f3645e4a3943849 win-x86/node_pdb.zip diff --git a/SHASUMS256.txt.sig b/SHASUMS256.txt.sig index d6338eafb485bfe9459ac6842e59b1110c3f22ac839a4fdcc988537a36fcd511..884972005d97eafa6b9a4d18a325f1c777884bb4e3ed48a15dc9e31f20d79a19 100644 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+t0yQxFQ$`=`k@=hi%|9>R2bFjQ0%Zu7djJXv5CqLX zFWv{0c+SiZ{y#(EG+FK{)P7zJF8{qWbUb1dc;}Sy%N>VnsldM z|I))z{R<=^Prd@$CiUMp6QWO|ZppZi?XFdnw(f7WW_kBP_3KAP6D#JCvxC+KP3wM0 z%I;!KeH$&$>D#ivgQnIr0mVztot!Njw4Ss93^;IQo9)f^K;l($4b(CBs<#T=jV4D( zF`Sn0hfo?`>D+x;MAxhYqv2-o!Os&#ozeXel-57JPp_ZuHypsavWbWy6tsybi4N-W zO#OFHb?=LoXY2aHiQx42hAWIoRd*^w-tCPagZixAL$OMcQB$@1g6i(w@^aJoDI=_o z9m5ghD>ChJF5V^~HxPXwbb(eVcogS$aC91@|AT+R1AGUc3g4QDkU2?|<4IRN==i4k zW7W(ooDeFe0EV;U`;w%oc1{}S2f#+WE_2kyE)b_EfqtSwD{zXl0^3ilM3 z?70BtFdL6ynSaMOiHu2YC(gm8l}@v<1VqKvy#cJcCgd9ccM12-yg3%0_1Qsb6qcfe EA)n|S`2YX_ literal 119 zcmeAuWnmEGV2~A4WVu_ZA6b0tUeFPv)3=US?O(uq`_pz-rj&1%=NY&-1z;kdS26te zmA@h5H^Wz?a)wpcbAzpylvGmsjqNsSoYb!nyDN0@5+g(B&l(r=t$Rc~q9+{Re87+S Vg2in=V>8q5>ks>B?mhRL7XSi*HJAVZ diff --git a/f0ff63fbc32ea55f3d92c5c89fdb91ec47786859.patch b/f0ff63fbc32ea55f3d92c5c89fdb91ec47786859.patch deleted file mode 100644 index 29468b6..0000000 --- a/f0ff63fbc32ea55f3d92c5c89fdb91ec47786859.patch +++ /dev/null @@ -1,63 +0,0 @@ -From f0ff63fbc32ea55f3d92c5c89fdb91ec47786859 Mon Sep 17 00:00:00 2001 -From: Antoine du Hamel -Date: Tue, 5 Sep 2023 16:19:10 +0200 -Subject: [PATCH] esm: fix loading of CJS modules from ESM - ---- - lib/internal/modules/esm/translators.js | 3 ++- - test/es-module/test-esm-recursive-cjs-dependencies.mjs | 7 +++++++ - test/fixtures/recursive-a.cjs | 6 ++++++ - test/fixtures/recursive-b.cjs | 3 +++ - 4 files changed, 18 insertions(+), 1 deletion(-) - create mode 100644 test/es-module/test-esm-recursive-cjs-dependencies.mjs - create mode 100644 test/fixtures/recursive-a.cjs - create mode 100644 test/fixtures/recursive-b.cjs - -diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js -index c0125cd84c37c..80228e895fafc 100644 ---- a/lib/internal/modules/esm/translators.js -+++ b/lib/internal/modules/esm/translators.js -@@ -279,7 +279,8 @@ translators.set('commonjs', async function commonjsStrategy(url, source, - // obtained by calling the monkey-patchable CJS loader. - const cjsLoader = source == null ? (module, source, url, filename) => { - try { -- module.load(filename); -+ assert(module === CJSModule._cache[filename]); -+ CJSModule._load(filename); - } catch (err) { - enrichCJSError(err, source, url); - throw err; -diff --git a/test/es-module/test-esm-recursive-cjs-dependencies.mjs b/test/es-module/test-esm-recursive-cjs-dependencies.mjs -new file mode 100644 -index 0000000000000..d75f0fae95df6 ---- /dev/null -+++ b/test/es-module/test-esm-recursive-cjs-dependencies.mjs -@@ -0,0 +1,7 @@ -+import '../common/index.mjs'; -+import { strictEqual } from 'node:assert'; -+ -+import '../fixtures/recursive-a.cjs'; -+ -+strictEqual(global.counter, 1); -+delete global.counter; -diff --git a/test/fixtures/recursive-a.cjs b/test/fixtures/recursive-a.cjs -new file mode 100644 -index 0000000000000..a60c0a635ddf6 ---- /dev/null -+++ b/test/fixtures/recursive-a.cjs -@@ -0,0 +1,6 @@ -+'use strict'; -+ -+global.counter ??= 0; -+global.counter++; -+ -+require('./recursive-b.cjs'); -diff --git a/test/fixtures/recursive-b.cjs b/test/fixtures/recursive-b.cjs -new file mode 100644 -index 0000000000000..e9f0b5d0701b6 ---- /dev/null -+++ b/test/fixtures/recursive-b.cjs -@@ -0,0 +1,3 @@ -+'use strict'; -+ -+require('./recursive-a.cjs'); diff --git a/node-v20.6.0.tar.xz b/node-v20.6.0.tar.xz deleted file mode 100644 index e8cc455..0000000 --- a/node-v20.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9efb5cba7a8f4b18d38b0d7d37a9b30ded73390c84e380cf4de89a9d30a7d6fa -size 41787960 diff --git a/node-v20.7.0.tar.xz b/node-v20.7.0.tar.xz new file mode 100644 index 0000000..5172066 --- /dev/null +++ b/node-v20.7.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fcfdcd05c461517480596596674df85b35cfce597dd0ae33f5416fc4df12bea +size 41824232 diff --git a/nodejs.keyring b/nodejs.keyring index 716fe6a0508ecdc95d63d4bc91aa593b7fd0865abdc82862ae1efb2954b9d037..8b64aa834f37b2e440970d48b5b7616ee8ec62dcaf89cada91add0afc6c33c31 100644 GIT binary patch delta 2890 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 Q_g6R3=&r{a{rgP+0n$ihGXMYp delta 9 QcmdmcpZVqq<_(cg02*rrF#rGn diff --git a/nodejs20.changes b/nodejs20.changes index a732a52..af98bed 100644 --- a/nodejs20.changes +++ b/nodejs20.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Sep 19 14:40:13 UTC 2023 - Adam Majer - 20.7.0 + +- Update to 20.7.0: + * src: support multiple --env-file declarations + * deps: upgrade npm to 10.1.0 + * doc: move and rename loaders section + * lib: add api to detect whether source-maps are enabled + * src,permission: add multiple allow-fs-* flags + * test_runner: expose location of tests + +- z13.patch: upstreamed + +------------------------------------------------------------------- +Mon Sep 18 10:08:42 UTC 2023 - Adam Majer + +- Update to 20.6.1: + * f0ff63fbc32ea55f3d92c5c89fdb91ec47786859.patch: removed, upstreamed + ------------------------------------------------------------------- Fri Sep 8 10:46:20 UTC 2023 - Adam Majer diff --git a/nodejs20.spec b/nodejs20.spec index 8a8a6ef..8f98661 100644 --- a/nodejs20.spec +++ b/nodejs20.spec @@ -31,7 +31,7 @@ %endif Name: nodejs20 -Version: 20.6.0 +Version: 20.7.0 Release: 0 # Double DWZ memory limits @@ -172,8 +172,6 @@ Patch200: versioned.patch Patch305: qemu_timeouts_arches.patch Patch308: node-gyp-config.patch Patch309: gcc13.patch -Patch311: z13.patch -Patch312: f0ff63fbc32ea55f3d92c5c89fdb91ec47786859.patch BuildRequires: pkg-config BuildRequires: fdupes @@ -421,7 +419,7 @@ Requires: nodejs-common Requires: nodejs20 = %{version} Provides: nodejs-npm = %{version} Obsoletes: nodejs-npm < 4.0.0 -Provides: npm(npm) = 9.8.1 +Provides: npm(npm) = 10.1.0 Provides: npm = %{version} %if 0%{?suse_version} >= 1500 %if %{node_version_number} >= 10 @@ -433,7 +431,8 @@ Provides: bundled(node-abbrev) = 1.1.1 Provides: bundled(node-abbrev) = 2.0.0 Provides: bundled(node-abort-controller) = 3.0.0 Provides: bundled(node-agent-base) = 6.0.2 -Provides: bundled(node-agentkeepalive) = 4.3.0 +Provides: bundled(node-agent-base) = 7.1.0 +Provides: bundled(node-agentkeepalive) = 4.5.0 Provides: bundled(node-aggregate-error) = 3.1.0 Provides: bundled(node-ansi-regex) = 5.0.1 Provides: bundled(node-ansi-regex) = 6.0.1 @@ -451,7 +450,8 @@ Provides: bundled(node-brace-expansion) = 1.1.11 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-cacache) = 17.1.3 +Provides: bundled(node-cacache) = 17.1.4 +Provides: bundled(node-cacache) = 18.0.0 Provides: bundled(node-chalk) = 5.3.0 Provides: bundled(node-chownr) = 2.0.0 Provides: bundled(node-ci-info) = 3.8.0 @@ -473,7 +473,6 @@ Provides: bundled(node-cssesc) = 3.0.0 Provides: bundled(node-debug) = 4.3.4 Provides: bundled(node-defaults) = 1.0.4 Provides: bundled(node-delegates) = 1.0.0 -Provides: bundled(node-depd) = 2.0.0 Provides: bundled(node-diff) = 5.1.0 Provides: bundled(node-eastasianwidth) = 0.2.0 Provides: bundled(node-emoji-regex) = 8.0.0 @@ -487,20 +486,22 @@ Provides: bundled(node-exponential-backoff) = 3.1.1 Provides: bundled(node-fastest-levenshtein) = 1.0.16 Provides: bundled(node-foreground-child) = 3.1.1 Provides: bundled(node-fs-minipass) = 2.1.0 -Provides: bundled(node-fs-minipass) = 3.0.2 +Provides: bundled(node-fs-minipass) = 3.0.3 Provides: bundled(node-fs.realpath) = 1.0.0 Provides: bundled(node-function-bind) = 1.1.1 Provides: bundled(node-gauge) = 4.0.4 Provides: bundled(node-gauge) = 5.0.1 -Provides: bundled(node-glob) = 10.2.7 +Provides: bundled(node-glob) = 10.3.3 Provides: bundled(node-glob) = 7.2.3 Provides: bundled(node-graceful-fs) = 4.2.11 Provides: bundled(node-has) = 1.0.3 Provides: bundled(node-has-unicode) = 2.0.1 -Provides: bundled(node-hosted-git-info) = 6.1.1 +Provides: bundled(node-hosted-git-info) = 7.0.0 Provides: bundled(node-http-cache-semantics) = 4.1.1 Provides: bundled(node-http-proxy-agent) = 5.0.0 +Provides: bundled(node-http-proxy-agent) = 7.0.0 Provides: bundled(node-https-proxy-agent) = 5.0.1 +Provides: bundled(node-https-proxy-agent) = 7.0.1 Provides: bundled(node-humanize-ms) = 1.2.1 Provides: bundled(node-iconv-lite) = 0.6.3 Provides: bundled(node-ieee754) = 1.2.1 @@ -510,7 +511,7 @@ Provides: bundled(node-indent-string) = 4.0.0 Provides: bundled(node-inflight) = 1.0.6 Provides: bundled(node-inherits) = 2.0.4 Provides: bundled(node-ini) = 4.1.1 -Provides: bundled(node-init-package-json) = 5.0.0 +Provides: bundled(node-init-package-json) = 6.0.0 Provides: bundled(node-ip) = 2.0.0 Provides: bundled(node-ip-regex) = 4.3.0 Provides: bundled(node-is-cidr) = 4.0.2 @@ -518,33 +519,36 @@ Provides: bundled(node-is-core-module) = 2.12.1 Provides: bundled(node-is-fullwidth-code-point) = 3.0.0 Provides: bundled(node-is-lambda) = 1.0.1 Provides: bundled(node-isexe) = 2.0.0 +Provides: bundled(node-isexe) = 3.1.1 Provides: bundled(node-jackspeak) = 2.2.1 Provides: bundled(node-json-parse-even-better-errors) = 3.0.0 Provides: bundled(node-json-stringify-nice) = 1.1.4 Provides: bundled(node-jsonparse) = 1.3.1 Provides: bundled(node-just-diff) = 6.0.2 Provides: bundled(node-just-diff-apply) = 5.5.0 -Provides: bundled(node-libnpmaccess) = 7.0.2 -Provides: bundled(node-libnpmdiff) = 5.0.19 -Provides: bundled(node-libnpmexec) = 6.0.3 -Provides: bundled(node-libnpmfund) = 4.0.19 -Provides: bundled(node-libnpmhook) = 9.0.3 -Provides: bundled(node-libnpmorg) = 5.0.4 -Provides: bundled(node-libnpmpack) = 5.0.19 -Provides: bundled(node-libnpmpublish) = 7.5.0 -Provides: bundled(node-libnpmsearch) = 6.0.2 -Provides: bundled(node-libnpmteam) = 5.0.3 -Provides: bundled(node-libnpmversion) = 4.0.2 +Provides: bundled(node-libnpmaccess) = 8.0.0 +Provides: bundled(node-libnpmdiff) = 6.0.1 +Provides: bundled(node-libnpmexec) = 7.0.1 +Provides: bundled(node-libnpmfund) = 4.1.1 +Provides: bundled(node-libnpmhook) = 10.0.0 +Provides: bundled(node-libnpmorg) = 6.0.0 +Provides: bundled(node-libnpmpack) = 6.0.1 +Provides: bundled(node-libnpmpublish) = 9.0.0 +Provides: bundled(node-libnpmsearch) = 7.0.0 +Provides: bundled(node-libnpmteam) = 6.0.0 +Provides: bundled(node-libnpmversion) = 5.0.0 +Provides: bundled(node-lru-cache) = 10.0.1 Provides: bundled(node-lru-cache) = 6.0.0 Provides: bundled(node-lru-cache) = 7.18.3 -Provides: bundled(node-lru-cache) = 9.1.1 Provides: bundled(node-make-fetch-happen) = 11.1.1 +Provides: bundled(node-make-fetch-happen) = 13.0.0 Provides: bundled(node-minimatch) = 3.1.2 Provides: bundled(node-minimatch) = 9.0.3 Provides: bundled(node-minipass) = 3.3.6 Provides: bundled(node-minipass) = 5.0.0 +Provides: bundled(node-minipass) = 7.0.3 Provides: bundled(node-minipass-collect) = 1.0.2 -Provides: bundled(node-minipass-fetch) = 3.0.3 +Provides: bundled(node-minipass-fetch) = 3.0.4 Provides: bundled(node-minipass-flush) = 1.0.5 Provides: bundled(node-minipass-json-stream) = 1.0.1 Provides: bundled(node-minipass-pipeline) = 1.2.4 @@ -558,26 +562,26 @@ Provides: bundled(node-negotiator) = 0.6.3 Provides: bundled(node-node-gyp) = 9.4.0 Provides: bundled(node-nopt) = 6.0.0 Provides: bundled(node-nopt) = 7.2.0 -Provides: bundled(node-normalize-package-data) = 5.0.0 +Provides: bundled(node-normalize-package-data) = 6.0.0 Provides: bundled(node-npm-audit-report) = 5.0.0 Provides: bundled(node-npm-bundled) = 3.0.0 -Provides: bundled(node-npm-install-checks) = 6.1.1 +Provides: bundled(node-npm-install-checks) = 6.2.0 Provides: bundled(node-npm-normalize-package-bin) = 3.0.1 -Provides: bundled(node-npm-package-arg) = 10.1.0 -Provides: bundled(node-npm-packlist) = 7.0.4 -Provides: bundled(node-npm-pick-manifest) = 8.0.1 -Provides: bundled(node-npm-profile) = 7.0.1 -Provides: bundled(node-npm-registry-fetch) = 14.0.5 +Provides: bundled(node-npm-package-arg) = 11.0.0 +Provides: bundled(node-npm-packlist) = 8.0.0 +Provides: bundled(node-npm-pick-manifest) = 9.0.0 +Provides: bundled(node-npm-profile) = 9.0.0 +Provides: bundled(node-npm-registry-fetch) = 16.0.0 Provides: bundled(node-npm-user-validate) = 2.0.0 Provides: bundled(node-npmlog) = 6.0.2 Provides: bundled(node-npmlog) = 7.0.1 Provides: bundled(node-once) = 1.4.0 Provides: bundled(node-p-map) = 4.0.0 -Provides: bundled(node-pacote) = 15.2.0 +Provides: bundled(node-pacote) = 17.0.4 Provides: bundled(node-parse-conflict-json) = 3.0.1 Provides: bundled(node-path-is-absolute) = 1.0.1 Provides: bundled(node-path-key) = 3.1.1 -Provides: bundled(node-path-scurry) = 1.9.2 +Provides: bundled(node-path-scurry) = 1.10.1 Provides: bundled(node-postcss-selector-parser) = 6.0.13 Provides: bundled(node-proc-log) = 3.0.0 Provides: bundled(node-process) = 0.11.10 @@ -589,7 +593,7 @@ Provides: bundled(node-promzard) = 1.0.0 Provides: bundled(node-qrcode-terminal) = 0.12.0 Provides: bundled(node-read) = 2.1.0 Provides: bundled(node-read-cmd-shim) = 4.0.0 -Provides: bundled(node-read-package-json) = 6.0.4 +Provides: bundled(node-read-package-json) = 7.0.0 Provides: bundled(node-read-package-json-fast) = 3.0.2 Provides: bundled(node-readable-stream) = 3.6.2 Provides: bundled(node-readable-stream) = 4.4.0 @@ -603,15 +607,16 @@ Provides: bundled(node-shebang-command) = 2.0.0 Provides: bundled(node-shebang-regex) = 3.0.0 Provides: bundled(node-signal-exit) = 3.0.7 Provides: bundled(node-signal-exit) = 4.0.2 -Provides: bundled(node-sigstore) = 1.7.0 +Provides: bundled(node-sigstore) = 2.1.0 Provides: bundled(node-smart-buffer) = 4.2.0 Provides: bundled(node-socks) = 2.7.1 Provides: bundled(node-socks-proxy-agent) = 7.0.0 +Provides: bundled(node-socks-proxy-agent) = 8.0.1 Provides: bundled(node-spdx-correct) = 3.2.0 Provides: bundled(node-spdx-exceptions) = 2.3.0 Provides: bundled(node-spdx-expression-parse) = 3.0.1 Provides: bundled(node-spdx-license-ids) = 3.0.13 -Provides: bundled(node-ssri) = 10.0.4 +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) = 5.1.2 @@ -622,7 +627,7 @@ Provides: bundled(node-tar) = 6.1.15 Provides: bundled(node-text-table) = 0.2.0 Provides: bundled(node-tiny-relative-date) = 1.3.0 Provides: bundled(node-treeverse) = 3.0.0 -Provides: bundled(node-tuf-js) = 1.1.7 +Provides: bundled(node-tuf-js) = 2.1.0 Provides: bundled(node-unique-filename) = 3.0.0 Provides: bundled(node-unique-slug) = 4.0.0 Provides: bundled(node-util-deprecate) = 1.0.2 @@ -631,7 +636,7 @@ Provides: bundled(node-validate-npm-package-name) = 5.0.0 Provides: bundled(node-walk-up-path) = 3.0.1 Provides: bundled(node-wcwidth) = 1.0.1 Provides: bundled(node-which) = 2.0.2 -Provides: bundled(node-which) = 3.0.1 +Provides: bundled(node-which) = 4.0.0 Provides: bundled(node-wide-align) = 1.1.5 Provides: bundled(node-wrap-ansi) = 7.0.0 Provides: bundled(node-wrap-ansi) = 8.1.0 @@ -722,8 +727,6 @@ popd %patch305 -p1 %patch309 -p1 -%patch311 -p1 -%patch312 -p1 %if %{node_version_number} == 12 # minimist security update - patch50 diff --git a/z13.patch b/z13.patch deleted file mode 100644 index b4cbe49..0000000 --- a/z13.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 540a17bcd30abc3f14d1e1b0ef81a23fde0ca18d Mon Sep 17 00:00:00 2001 -From: Milad Fa -Date: Wed, 10 May 2023 19:40:36 +0000 -Subject: [PATCH] Fix usage of MulHighS64 on <= z13 - -Change-Id: If7ac06eef57cc3db059c2640b77c80de3b16fced -https://chromium-review.googlesource.com/c/v8/v8/+/4521297 - ---- - -Index: node-v20.1.0/deps/v8/src/compiler/backend/s390/code-generator-s390.cc -=================================================================== ---- node-v20.1.0.orig/deps/v8/src/compiler/backend/s390/code-generator-s390.cc -+++ node-v20.1.0/deps/v8/src/compiler/backend/s390/code-generator-s390.cc -@@ -1699,15 +1699,18 @@ CodeGenerator::CodeGenResult CodeGenerat - case kS390_Mul64WithOverflow: { - Register dst = i.OutputRegister(), src1 = i.InputRegister(0), - src2 = i.InputRegister(1); -- DCHECK(!AreAliased(dst, src1, src2)); -+ CHECK(!AreAliased(dst, src1, src2)); - if (CpuFeatures::IsSupported(MISC_INSTR_EXT2)) { - __ msgrkc(dst, src1, src2); - } else { -- __ mgrk(r0, src1, src2); // r0 = high 64-bits, r1 = low 64-bits. -- __ lgr(dst, r1); -- __ ShiftRightS64(r1, r1, Operand(63)); -+ // Mul high. -+ __ MulHighS64(r1, src1, src2); -+ // Mul low. -+ __ mov(dst, src1); -+ __ MulS64(dst, src2); - // Test whether {high} is a sign-extension of {result}. -- __ CmpU64(r0, r1); -+ __ ShiftRightS64(r0, dst, Operand(63)); -+ __ CmpU64(r1, r0); - } - break; - } -@@ -1725,20 +1728,7 @@ CodeGenerator::CodeGenResult CodeGenerat - ASSEMBLE_BIN_OP(RRRInstr(MulHighU64), nullInstr, nullInstr); - break; - case kS390_MulHighS64: -- if (CpuFeatures::IsSupported(MISC_INSTR_EXT2)) { -- ASSEMBLE_BIN_OP(RRRInstr(MulHighS64), nullInstr, nullInstr); -- } else { -- __ Push(r2, r3, i.InputRegister(0), i.InputRegister(1)); -- __ Pop(r2, r3); -- { -- FrameScope scope(masm(), StackFrame::INTERNAL); -- __ PrepareCallCFunction(2, 0, kScratchReg); -- __ CallCFunction(ExternalReference::int64_mul_high_function(), 2, 0); -- } -- __ mov(kScratchReg, r2); -- __ Pop(r2, r3); -- __ mov(i.OutputRegister(), kScratchReg); -- } -+ ASSEMBLE_BIN_OP(RRRInstr(MulHighS64), nullInstr, nullInstr); - break; - case kS390_MulFloat: - ASSEMBLE_BIN_OP(DDInstr(meebr), DMTInstr(MulFloat32), nullInstr); -Index: node-v20.1.0/deps/v8/src/codegen/s390/macro-assembler-s390.cc -=================================================================== ---- node-v20.1.0.orig/deps/v8/src/codegen/s390/macro-assembler-s390.cc -+++ node-v20.1.0/deps/v8/src/codegen/s390/macro-assembler-s390.cc -@@ -2906,8 +2906,23 @@ void MacroAssembler::MulS64(Register dst - } - - void MacroAssembler::MulHighS64(Register dst, Register src1, Register src2) { -- mgrk(r0, src1, src2); -- lgr(dst, r0); -+ if (CpuFeatures::IsSupported(MISC_INSTR_EXT2)) { -+ mgrk(r0, src1, src2); -+ lgr(dst, r0); -+ } else { -+ SaveFPRegsMode fp_mode = SaveFPRegsMode::kSave; -+ PushCallerSaved(fp_mode, ip); -+ Push(src1, src2); -+ Pop(r2, r3); -+ { -+ FrameScope scope(this, StackFrame::INTERNAL); -+ PrepareCallCFunction(2, 0, r0); -+ CallCFunction(ExternalReference::int64_mul_high_function(), 2, 0); -+ } -+ mov(r0, r2); -+ PopCallerSaved(fp_mode, ip); -+ mov(dst, r0); -+ } - } - - void MacroAssembler::MulHighS64(Register dst, Register src1,