diff --git a/SHASUMS256.txt b/SHASUMS256.txt index 5c7643d..728cec2 100644 --- a/SHASUMS256.txt +++ b/SHASUMS256.txt @@ -1,41 +1,41 @@ -40cd0361b75fb13b5cb6edf9113c48b0771dae961750622030c82dff2ac30911 node-v20.2.0-aix-ppc64.tar.gz -35591fc9659662d78ab21e97adc400b33c2ea1e01e1e87866b8c8e715a396d40 node-v20.2.0-arm64.msi -8dd23fb204b2c239239085761ccae232c5cdc129f633489598a8759248e5f063 node-v20.2.0-darwin-arm64.tar.gz -9c2e4d5b4b3b8dd8cfab718044d2484a604a116a3ccdfd6c3a0053d68137d215 node-v20.2.0-darwin-arm64.tar.xz -d92bc1e96b2458595f41f5e75749ad4d2b1dd8e96b5ebc34cf5a45ab21797cb3 node-v20.2.0-darwin-x64.tar.gz -e9ca46512de17de846747b328e059d42e202f6b37b4881170d575a2ea85ae648 node-v20.2.0-darwin-x64.tar.xz -1b1909a179cdff7e664d05e78af4006bde364f4eede614c2af80ba8f40b76bf9 node-v20.2.0-headers.tar.gz -c6b24d67a665fd42ed60cf009417c7a2e55221412fb6fdabf5c7ed72c50c28a3 node-v20.2.0-headers.tar.xz -c5a755230e9cf63ed708a79bd06604fe4c01283bdf9e9bc687ea107d02d3a2fd node-v20.2.0-linux-arm64.tar.gz -4ff85df72645e17b3d6253fd8eb45d9cdbed7c68b416ac770adb2fd85ac67e3d node-v20.2.0-linux-arm64.tar.xz -f016635afb75d69585f0b6520478774218a1b800781eab448b5f1ad0417d4bb5 node-v20.2.0-linux-armv7l.tar.gz -1af63104e276269c1c312aeb8ba894716536ae323fb612d8177bdd1c6d713e9b node-v20.2.0-linux-armv7l.tar.xz -5180d87a815851e39723ae4b8bf00bbc932cf8fbe3de1e87b310321b2f6d2ce0 node-v20.2.0-linux-ppc64le.tar.gz -7cb4e5d680b4cd6543fabdf7b02a8739b17d3980e94f02b0c8902317340868b8 node-v20.2.0-linux-ppc64le.tar.xz -50d062cc0a0588cea5952eb9adc641335d04f90a6243f6baee9065f47e92e108 node-v20.2.0-linux-s390x.tar.gz -e8bdfba9de8937286401c87671d7c436bb950422fe7a8a7f2cc8501222fa5865 node-v20.2.0-linux-s390x.tar.xz -cb0eff87d37f0df1dcd176a58b9ed0be3b5c08a02fe133a5dffd11dcae29626b node-v20.2.0-linux-x64.tar.gz -9257b5d5cc807d372da0d3574ce0e2d9b14c9510d7099081d30a464e5d4c0b2b node-v20.2.0-linux-x64.tar.xz -9333ed45178a28a91c0537b5b8f26e34f8592ca7106ef37dadd7ebb74f6eb0d5 node-v20.2.0.pkg -cd1b0eb67fffe83112034fbdc64b363287e017f835251702f041982633e4b6aa node-v20.2.0.tar.gz -22523df2316c35569714ff1f69b053c2e286ced460898417dee46945efcdf989 node-v20.2.0.tar.xz -3e94296dd5314da3eeecc6280069486317b6e110e49322c164184193d98b5bf4 node-v20.2.0-win-arm64.7z -3307f2824581f5e6b8566c601ed6935b2d0fd8355bcc31c92f6236f4cb139938 node-v20.2.0-win-arm64.zip -d71be022ef9037075fb026cc674f731d42408facb0c74ecd9169ed77d56c6816 node-v20.2.0-win-x64.7z -eda20d37da0c6629414121dc70c639944e0cfce37f0c5351a9c3141bdb80a4ff node-v20.2.0-win-x64.zip -1ad5011bc31dd99090770fd5e45cdaffc101c0ca08fb25633b4129214441861b node-v20.2.0-win-x86.7z -c7ac90d7896d8092df3a91925bee21d809a397b0c12316cadf5dfec7154d96e5 node-v20.2.0-win-x86.zip -6dfcc9a997786098caf01686e766a1d337dae037bb77245c92f976eb0786f6ae node-v20.2.0-x64.msi -72454cbbb6bf365fd9a54d23e245533e4965d3340ce88a824e78b4f509b0e928 node-v20.2.0-x86.msi -c60eb4c8e8f7e1a0b1d0d4bafb0a32fcf0c4dc7d09df1ee12617ebdb66be4efe win-arm64/node.exe -b6e79c69a02e20e5a7ba9a245b2f4fa43812f67c6fc1f14e5cedab1feca0df85 win-arm64/node.lib -964032febceaf26e55c185dec1ef0ae8fc77796defd8e34e21b4f039bc2c7c7b win-arm64/node_pdb.7z -ccd5c27bc40304b5be6352d5239051274f4a68189f2d251389c1d0fc5b8cc3c0 win-arm64/node_pdb.zip -6796553b5c8ead97b27d2db72487a0a624d68365981dc421574046dc780d9c85 win-x64/node.exe -6eabe8bd6964ccb5c72fbe92e78022bb8900bac082dc1de1f607a29203fed432 win-x64/node.lib -5f356e6743f8caf6b1987025fb04a2a846cb4683b82b75aaf0d5bc31d1eba1c9 win-x64/node_pdb.7z -c4a32421ed8aafba77715d803f9a1cb22f5e97805f2890e014d686f2ff289d46 win-x64/node_pdb.zip -fcc2cfd45935ce403d949684f8de6de8987dee48b8b04d474b9b427f432817bf win-x86/node.exe -ba589bd03347e3ab9b0bc05923317d274d1b2f95df48bacbcc14905c28e379cf win-x86/node.lib -d6335b491dccf1cf0553745fc73965b1fc8b4c07a4080bf90f78826e78a6d426 win-x86/node_pdb.7z -9d17aee95d928fd777e57a37a9bc21884ceb4df98928ae7fc3227df278945bfc win-x86/node_pdb.zip +45375449725aa845f605a77e6ff88886a2f73294183e82ea8d38e0c24722f853 node-v20.3.0-aix-ppc64.tar.gz +ce9af071a58909f81a0601b976c688ef04a027442b1bca2baa35445efca53b2d node-v20.3.0-arm64.msi +25d5db6192ebcb7013f4138c71a7c423d0da33f28149d28b3b6df7c00527dd40 node-v20.3.0-darwin-arm64.tar.gz +c45ff3a1c6a3d69fde8fb8023ec21b987e5c56d5bd3d527ecde0932378e562af node-v20.3.0-darwin-arm64.tar.xz +24293d0217f009cbf821e5f399dcf72c1df2cb27f70cb1f05fd07af2ee6ad2c2 node-v20.3.0-darwin-x64.tar.gz +f26e9e3f1fb8bd603b879ae7e81fdf6bcc3ee97a15afa4c5af3e88fab7fb7368 node-v20.3.0-darwin-x64.tar.xz +01015dffc18bc86e56b3d59773391cc812cd0ce8e69d96e23b2e9a6540f43340 node-v20.3.0-headers.tar.gz +729408bc7548f384412a8744c579bc4fecb1452cba1bc4e4f57e5b1198bd4cd2 node-v20.3.0-headers.tar.xz +c3476b293f3b26a14163184171896ef17dc33ee26a208256170556b493a2b2c5 node-v20.3.0-linux-arm64.tar.gz +9b661e54f8ea73a3b0a1c92c2af32cf020f67f2c123789539fb343f2a1e36ffd node-v20.3.0-linux-arm64.tar.xz +25a06a1477cd5c91e4b69d86bae03890d80e07c996c677032de4278fa389eed3 node-v20.3.0-linux-armv7l.tar.gz +7efca84caaaf9003bb6adc7cfee3c13048891494e928018f6994cb4b7887176d node-v20.3.0-linux-armv7l.tar.xz +36ccc8c274d00a5eb195477b62cacc9aec0e1f56a6965b07c9de7f28a67ca52b node-v20.3.0-linux-ppc64le.tar.gz +620662ccf99973835cecc8d6c16f5d20c5af8d76f5da18deb21f41cef78e985e node-v20.3.0-linux-ppc64le.tar.xz +02e287c74218d6418af5173a641f8b78d7539e11e96c2af4bf946437c9833e0c node-v20.3.0-linux-s390x.tar.gz +26444015212c8e6cc00516826de48ae9447015405f7890ce053c77c61f4dd6c2 node-v20.3.0-linux-s390x.tar.xz +80238ee1a9dee6b0d5d1081503c6fdd1c7f81bdf4ca6abd90aa5a568712a2eaa node-v20.3.0-linux-x64.tar.gz +2dd1f5c0e01732024ba1f5de4517fa3976eb0976fa7976ff687ec09b62dd73fa node-v20.3.0-linux-x64.tar.xz +7fe22ee0fc446ed2e2cc153947ed7861a83a5c8b5182d86f80314049d0ed4172 node-v20.3.0.pkg +2f5f80be36315a2dd4a0da123597c3cbbba2b0ec19ba7832bf93414b1a645ca4 node-v20.3.0.tar.gz +1ba8d49423ed3a75729066bb3ea26493ee9cb7d6568ef948597fc9ef454f7435 node-v20.3.0.tar.xz +15297e64b07742719cceca13acb66b067c06e7d610114d85834a2e33eb58e11f node-v20.3.0-win-arm64.7z +700065af61429edc88ed714f1e2e64fe476a289ccc30d4345b7f6472a9b943b4 node-v20.3.0-win-arm64.zip +b8bda54d0936e2295dd3267dba7d61903af92a0427dac56251047fed2e8ff05f node-v20.3.0-win-x64.7z +43be53f9f4d6fa19e27efdb724e10cbdf3c7abfaebe0d852af62fc80c6f465a2 node-v20.3.0-win-x64.zip +32f63af144aa64c5fbe83a26dced8305934063393e34886aec7abf4e1d6637d8 node-v20.3.0-win-x86.7z +56699afcf06278f8b136a325bc34e5dbaf1cf836f57030630496fa28fe853e6f node-v20.3.0-win-x86.zip +9a8404fc31d9dce5a490a31f8624c3fc6f8adeee7686f255d0fe031c80188c04 node-v20.3.0-x64.msi +015e02672d93f5cc162a690cd5010df5cd45a46f884f97d0e7be8875feb71355 node-v20.3.0-x86.msi +6efd7b085f4b6e7b893963e34522dda7c01d8bcfd6bdb7ceeda7734a39c63242 win-arm64/node.exe +7d27551370e78fdf44e4e515458ad33d0c39983985853649fb01368999172662 win-arm64/node.lib +380bde84e409dde3044421ff4ffe49ac4a9f4ffa1a5d58827f44f0c3b1d76aa8 win-arm64/node_pdb.7z +ff756fde597c62d1a679e6e8843d2131e75d1bf68f65e1e875dcd609ce9c694a win-arm64/node_pdb.zip +8b56881aa5cc919897a217106713d4e34697143ba41170e632a482c3c2e891b4 win-x64/node.exe +68a3ed4ccb2780dda353f609ec83ff6d6dc02a399f1dfed6621ae8c1f39a5788 win-x64/node.lib +6e62f3bdc215761372dc38f4c044b4de8bceb16f3d4b1fb5b87cc5764946ef6a win-x64/node_pdb.7z +8483f149955a344d3faa6c4659f680f11bfa23757c146fd3c9d510e01340b75c win-x64/node_pdb.zip +47c59d9a2ad4924b7886d54af9cd8454129f26d88c30895023b4ef1807940b42 win-x86/node.exe +13fb4b75d9e6fdf5a708b4dc8ea4ca60b565e4a3235514870e4b369e26fade5f win-x86/node.lib +40f0966f25b91837d9be795b20cd21c45d9f6b46258838fb62796cec4eb0d90d win-x86/node_pdb.7z +122c5f8f61a3cb53454e269c0ab7e131bdc89a549b1c446be3b2ed64286bd03f win-x86/node_pdb.zip diff --git a/SHASUMS256.txt.sig b/SHASUMS256.txt.sig index 19da8c0..470c50c 100644 Binary files a/SHASUMS256.txt.sig and b/SHASUMS256.txt.sig differ diff --git a/fix_ci_tests.patch b/fix_ci_tests.patch index 20cb956..2bed6bf 100644 --- a/fix_ci_tests.patch +++ b/fix_ci_tests.patch @@ -2,10 +2,10 @@ Author: Adam Majer Date: Dec 20 09:18:49 UTC 2017 Summary: Fix CI unit tests framework for OBS building -Index: node-v20.1.0/test/parallel/test-module-loading-globalpaths.js +Index: node-v20.3.0/test/parallel/test-module-loading-globalpaths.js =================================================================== ---- node-v20.1.0.orig/test/parallel/test-module-loading-globalpaths.js -+++ node-v20.1.0/test/parallel/test-module-loading-globalpaths.js +--- node-v20.3.0.orig/test/parallel/test-module-loading-globalpaths.js ++++ node-v20.3.0/test/parallel/test-module-loading-globalpaths.js @@ -11,6 +11,9 @@ const { addLibraryPath } = require('../c addLibraryPath(process.env); @@ -16,10 +16,10 @@ Index: node-v20.1.0/test/parallel/test-module-loading-globalpaths.js if (process.argv[2] === 'child') { console.log(require(pkgName).string); } else { -Index: node-v20.1.0/test/parallel/test-tls-passphrase.js +Index: node-v20.3.0/test/parallel/test-tls-passphrase.js =================================================================== ---- node-v20.1.0.orig/test/parallel/test-tls-passphrase.js -+++ node-v20.1.0/test/parallel/test-tls-passphrase.js +--- node-v20.3.0.orig/test/parallel/test-tls-passphrase.js ++++ node-v20.3.0/test/parallel/test-tls-passphrase.js @@ -223,7 +223,7 @@ server.listen(0, common.mustCall(functio }, onSecureConnect()); })).unref(); @@ -29,10 +29,10 @@ Index: node-v20.1.0/test/parallel/test-tls-passphrase.js // Missing passphrase assert.throws(function() { -Index: node-v20.1.0/test/parallel/test-repl-envvars.js +Index: node-v20.3.0/test/parallel/test-repl-envvars.js =================================================================== ---- node-v20.1.0.orig/test/parallel/test-repl-envvars.js -+++ node-v20.1.0/test/parallel/test-repl-envvars.js +--- node-v20.3.0.orig/test/parallel/test-repl-envvars.js ++++ node-v20.3.0/test/parallel/test-repl-envvars.js @@ -2,7 +2,9 @@ // Flags: --expose-internals @@ -42,12 +42,12 @@ Index: node-v20.1.0/test/parallel/test-repl-envvars.js +common.skip('Not running test in OBS'); + const stream = require('stream'); + const { describe, test } = require('node:test'); const REPL = require('internal/repl'); - const assert = require('assert'); -Index: node-v20.1.0/Makefile +Index: node-v20.3.0/Makefile =================================================================== ---- node-v20.1.0.orig/Makefile -+++ node-v20.1.0/Makefile +--- node-v20.3.0.orig/Makefile ++++ node-v20.3.0/Makefile @@ -545,7 +545,8 @@ test-ci-js: | clear-stalled .PHONY: test-ci # Related CI jobs: most CI tests, excluding node-test-commit-arm-fanned @@ -68,10 +68,10 @@ Index: node-v20.1.0/Makefile echo "Skipping tools/doc/node_modules (no crypto)"; \ else \ cd tools/doc && $(call available-node,$(run-npm-ci)) \ -Index: node-v20.1.0/test/parallel/test-crypto-dh.js +Index: node-v20.3.0/test/parallel/test-crypto-dh.js =================================================================== ---- node-v20.1.0.orig/test/parallel/test-crypto-dh.js -+++ node-v20.1.0/test/parallel/test-crypto-dh.js +--- node-v20.3.0.orig/test/parallel/test-crypto-dh.js ++++ node-v20.3.0/test/parallel/test-crypto-dh.js @@ -167,7 +167,7 @@ assert.throws(() => { dh3.computeSecret(''); }, { message: common.hasOpenSSL3 ? @@ -81,10 +81,10 @@ Index: node-v20.1.0/test/parallel/test-crypto-dh.js // Invalid test: curve argument is undefined assert.throws( -Index: node-v20.1.0/tools/test.py +Index: node-v20.3.0/tools/test.py =================================================================== ---- node-v20.1.0.orig/tools/test.py -+++ node-v20.1.0/tools/test.py +--- node-v20.3.0.orig/tools/test.py ++++ node-v20.3.0/tools/test.py @@ -1355,7 +1355,7 @@ def BuildOptions(): result.add_option("-s", "--suite", help="A test suite", default=[], action="append") diff --git a/node-v20.2.0.tar.xz b/node-v20.2.0.tar.xz deleted file mode 100644 index a4e69e9..0000000 --- a/node-v20.2.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:22523df2316c35569714ff1f69b053c2e286ced460898417dee46945efcdf989 -size 41778040 diff --git a/node-v20.3.0.tar.xz b/node-v20.3.0.tar.xz new file mode 100644 index 0000000..c98a0c7 --- /dev/null +++ b/node-v20.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ba8d49423ed3a75729066bb3ea26493ee9cb7d6568ef948597fc9ef454f7435 +size 41709484 diff --git a/nodejs20.changes b/nodejs20.changes index 2d570cc..79dba0c 100644 --- a/nodejs20.changes +++ b/nodejs20.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Jun 15 11:25:18 UTC 2023 - Adam Majer + +- Update to version 20.3.0: + * deps: upgrade to libuv 1.45.0, including significant performance + improvements to file system operations on Linux + * module: change default resolver to not throw on unknown scheme + * stream: deprecate asIndexedPairs + +- versioned.patch, fix_ci_tests.patch: refreshed +- openssl3_1-adapt_tests.patch: upstreamed and removed + +For details see, +https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V20.md#20.3.0 + ------------------------------------------------------------------- Mon May 22 14:45:27 UTC 2023 - Adam Majer diff --git a/nodejs20.spec b/nodejs20.spec index b1ae7e6..74d8964 100644 --- a/nodejs20.spec +++ b/nodejs20.spec @@ -31,7 +31,7 @@ %endif Name: nodejs20 -Version: 20.2.0 +Version: 20.3.0 Release: 0 # Double DWZ memory limits @@ -172,7 +172,6 @@ Patch200: versioned.patch Patch305: qemu_timeouts_arches.patch Patch308: node-gyp-config.patch Patch309: gcc13.patch -Patch310: openssl3_1-adapt_tests.patch Patch311: z13.patch BuildRequires: pkg-config @@ -305,7 +304,7 @@ BuildRequires: bundled_openssl_should_not_be_required %if ! 0%{with intree_cares} BuildRequires: pkgconfig(libcares) >= 1.17.0 %else -Provides: bundled(libcares2) = 1.19.0 +Provides: bundled(libcares2) = 1.19.1 %endif %if ! 0%{with intree_icu} @@ -317,7 +316,7 @@ Provides: bundled(icu) = 73.1 %if ! 0%{with intree_nghttp2} BuildRequires: libnghttp2-devel >= 1.41.0 %else -Provides: bundled(nghttp2) = 1.52.0 +Provides: bundled(nghttp2) = 1.53.0 %endif %if 0%{with valgrind_tests} @@ -366,8 +365,8 @@ ExclusiveArch: not_buildable %endif %endif -Provides: bundled(uvwasi) = 0.0.16 -Provides: bundled(libuv) = 1.44.2 +Provides: bundled(uvwasi) = 0.0.18 +Provides: bundled(libuv) = 1.45.0 Provides: bundled(v8) = 11.3.244.8 %if %{with intree_brotli} Provides: bundled(brotli) = 1.0.9 @@ -379,9 +378,9 @@ BuildRequires: pkgconfig(libbrotlidec) Provides: bundled(llhttp) = 8.1.0 Provides: bundled(ngtcp2) = 0.8.1 Provides: bundled(base64) = 0.5.0 -Provides: bundled(simdutf) = 3.2.9 +Provides: bundled(simdutf) = 3.2.12 # bundled url-ada parser, not ada -Provides: bundled(ada) = 2.4.0 +Provides: bundled(ada) = 2.5.0 Provides: bundled(node-acorn) = 8.8.2 Provides: bundled(node-acorn-walk) = 8.2.0 @@ -389,10 +388,10 @@ Provides: bundled(node-balanced-match) = 1.0.2 Provides: bundled(node-brace-expansion) = 2.0.1 Provides: bundled(node-busboy) = 1.6.0 Provides: bundled(node-cjs-module-lexer) = 1.2.2 -Provides: bundled(node-corepack) = 0.17.2 -Provides: bundled(node-minimatch) = 9.0.0 +Provides: bundled(node-corepack) = 0.18.0 +Provides: bundled(node-minimatch) = 9.0.1 Provides: bundled(node-streamsearch) = 1.1.0 -Provides: bundled(node-undici) = 5.22.0 +Provides: bundled(node-undici) = 5.22.1 %description Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js @@ -421,7 +420,7 @@ Requires: nodejs-common Requires: nodejs20 = %{version} Provides: nodejs-npm = %{version} Obsoletes: nodejs-npm < 4.0.0 -Provides: npm(npm) = 9.6.6 +Provides: npm(npm) = 9.6.7 Provides: npm = %{version} %if 0%{?suse_version} >= 1500 %if %{node_version_number} >= 10 @@ -452,7 +451,7 @@ 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) = 16.1.3 -Provides: bundled(node-cacache) = 17.1.0 +Provides: bundled(node-cacache) = 17.1.2 Provides: bundled(node-chalk) = 4.1.2 Provides: bundled(node-chownr) = 2.0.0 Provides: bundled(node-ci-info) = 3.8.0 @@ -492,7 +491,7 @@ 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.2 +Provides: bundled(node-glob) = 10.2.4 Provides: bundled(node-glob) = 7.2.3 Provides: bundled(node-glob) = 8.1.0 Provides: bundled(node-graceful-fs) = 4.2.11 @@ -534,7 +533,7 @@ Provides: bundled(node-libnpmfund) = 4.0.17 Provides: bundled(node-libnpmhook) = 9.0.3 Provides: bundled(node-libnpmorg) = 5.0.4 Provides: bundled(node-libnpmpack) = 5.0.17 -Provides: bundled(node-libnpmpublish) = 7.1.4 +Provides: bundled(node-libnpmpublish) = 7.2.0 Provides: bundled(node-libnpmsearch) = 6.0.2 Provides: bundled(node-libnpmteam) = 5.0.3 Provides: bundled(node-libnpmversion) = 4.0.2 @@ -583,8 +582,8 @@ Provides: bundled(node-pacote) = 15.1.3 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.7.0 -Provides: bundled(node-postcss-selector-parser) = 6.0.12 +Provides: bundled(node-path-scurry) = 1.9.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 Provides: bundled(node-promise-all-reject-late) = 1.0.1 @@ -598,18 +597,18 @@ Provides: bundled(node-read-cmd-shim) = 4.0.0 Provides: bundled(node-read-package-json) = 6.0.3 Provides: bundled(node-read-package-json-fast) = 3.0.2 Provides: bundled(node-readable-stream) = 3.6.2 -Provides: bundled(node-readable-stream) = 4.3.0 +Provides: bundled(node-readable-stream) = 4.4.0 Provides: bundled(node-retry) = 0.12.0 Provides: bundled(node-rimraf) = 3.0.2 Provides: bundled(node-safe-buffer) = 5.1.2 Provides: bundled(node-safer-buffer) = 2.1.2 -Provides: bundled(node-semver) = 7.5.0 +Provides: bundled(node-semver) = 7.5.1 Provides: bundled(node-set-blocking) = 2.0.0 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.1 -Provides: bundled(node-sigstore) = 1.4.0 +Provides: bundled(node-signal-exit) = 4.0.2 +Provides: bundled(node-sigstore) = 1.5.2 Provides: bundled(node-smart-buffer) = 4.2.0 Provides: bundled(node-socks) = 2.7.1 Provides: bundled(node-socks-proxy-agent) = 7.0.0 @@ -629,7 +628,7 @@ Provides: bundled(node-tar) = 6.1.14 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.5 +Provides: bundled(node-tuf-js) = 1.1.6 Provides: bundled(node-unique-filename) = 2.0.1 Provides: bundled(node-unique-filename) = 3.0.0 Provides: bundled(node-unique-slug) = 3.0.0 @@ -731,7 +730,6 @@ popd %patch305 -p1 %patch309 -p1 -%patch310 -p1 %patch311 -p1 %if %{node_version_number} == 12 diff --git a/openssl3_1-adapt_tests.patch b/openssl3_1-adapt_tests.patch deleted file mode 100644 index 416c0e6..0000000 --- a/openssl3_1-adapt_tests.patch +++ /dev/null @@ -1,104 +0,0 @@ -commit 33ee7a0221b1fad07639c3c8948ad322238a52ab -Author: Otto Hollmann -Date: Wed May 10 11:07:36 2023 +0200 - - test: Adapt tests for OpenSSL 3.1 - -diff --git a/test/common/index.js b/test/common/index.js -index f3caa9d1d4..a3e317d24b 100644 ---- a/test/common/index.js -+++ b/test/common/index.js -@@ -57,7 +57,10 @@ const hasCrypto = Boolean(process.versions.openssl) && - !process.env.NODE_SKIP_CRYPTO; - - const hasOpenSSL3 = hasCrypto && -- require('crypto').constants.OPENSSL_VERSION_NUMBER >= 805306368; -+ require('crypto').constants.OPENSSL_VERSION_NUMBER >= 0x30000000; -+ -+const hasOpenSSL31 = hasCrypto && -+ require('crypto').constants.OPENSSL_VERSION_NUMBER >= 0x30100000; - - const hasQuic = hasCrypto && !!process.config.variables.openssl_quic; - -@@ -913,6 +916,7 @@ const common = { - hasIntl, - hasCrypto, - hasOpenSSL3, -+ hasOpenSSL31, - hasQuic, - hasMultiLocalhost, - invalidArgTypeHelper, -diff --git a/test/parallel/test-https-agent-session-eviction.js b/test/parallel/test-https-agent-session-eviction.js -index 20cdb870a0..da56007105 100644 ---- a/test/parallel/test-https-agent-session-eviction.js -+++ b/test/parallel/test-https-agent-session-eviction.js -@@ -56,6 +56,7 @@ function faultyServer(port) { - function second(server, session) { - const req = https.request({ - port: server.address().port, -+ ciphers: (common.hasOpenSSL31 ? 'DEFAULT:@SECLEVEL=0' : 'DEFAULT'), - rejectUnauthorized: false - }, function(res) { - res.resume(); -diff --git a/test/parallel/test-tls-alert.js b/test/parallel/test-tls-alert.js -index 31b07104c2..9e92ccca49 100644 ---- a/test/parallel/test-tls-alert.js -+++ b/test/parallel/test-tls-alert.js -@@ -41,7 +41,7 @@ const server = tls.Server({ - key: loadPEM('agent2-key'), - cert: loadPEM('agent2-cert') - }, null).listen(0, common.mustCall(() => { -- const args = ['s_client', '-quiet', '-tls1_1', -+ const args = ['s_client', '-quiet', '-tls1_1', '-cipher', (common.hasOpenSSL31 ? 'DEFAULT:@SECLEVEL=0' : 'DEFAULT'), - '-connect', `127.0.0.1:${server.address().port}`]; - - execFile(common.opensslCli, args, common.mustCall((err, _, stderr) => { -diff --git a/test/parallel/test-tls-getprotocol.js b/test/parallel/test-tls-getprotocol.js -index d45287d671..ee33200916 100644 ---- a/test/parallel/test-tls-getprotocol.js -+++ b/test/parallel/test-tls-getprotocol.js -@@ -11,8 +11,8 @@ const tls = require('tls'); - const fixtures = require('../common/fixtures'); - - const clientConfigs = [ -- { secureProtocol: 'TLSv1_method', version: 'TLSv1' }, -- { secureProtocol: 'TLSv1_1_method', version: 'TLSv1.1' }, -+ { secureProtocol: 'TLSv1_method', version: 'TLSv1', ciphers: (common.hasOpenSSL31 ? 'DEFAULT:@SECLEVEL=0' : 'DEFAULT') }, -+ { secureProtocol: 'TLSv1_1_method', version: 'TLSv1.1', ciphers: (common.hasOpenSSL31 ? 'DEFAULT:@SECLEVEL=0' : 'DEFAULT') }, - { secureProtocol: 'TLSv1_2_method', version: 'TLSv1.2' }, - ]; - -@@ -30,6 +30,7 @@ const server = tls.createServer(serverConfig, common.mustCall(clientConfigs.leng - tls.connect({ - host: common.localhostIPv4, - port: server.address().port, -+ ciphers: v.ciphers, - rejectUnauthorized: false, - secureProtocol: v.secureProtocol - }, common.mustCall(function() { -diff --git a/test/parallel/test-tls-min-max-version.js b/test/parallel/test-tls-min-max-version.js -index 5cea41ca7e..ab351558a4 100644 ---- a/test/parallel/test-tls-min-max-version.js -+++ b/test/parallel/test-tls-min-max-version.js -@@ -22,6 +22,9 @@ function test(cmin, cmax, cprot, smin, smax, sprot, proto, cerr, serr) { - if (serr !== 'ERR_SSL_UNSUPPORTED_PROTOCOL') - ciphers = 'ALL@SECLEVEL=0'; - } -+ if (common.hasOpenSSL31 && cerr === 'ERR_SSL_TLSV1_ALERT_PROTOCOL_VERSION') { -+ ciphers = 'DEFAULT@SECLEVEL=0'; -+ } - // Report where test was called from. Strip leading garbage from - // at Object. (file:line) - // from the stack location, we only want the file:line part. -diff --git a/test/parallel/test-tls-session-cache.js b/test/parallel/test-tls-session-cache.js -index c4bebff2e3..e4ecb53282 100644 ---- a/test/parallel/test-tls-session-cache.js -+++ b/test/parallel/test-tls-session-cache.js -@@ -100,6 +100,7 @@ function doTest(testOptions, callback) { - const args = [ - 's_client', - '-tls1', -+ '-cipher', (common.hasOpenSSL31 ? 'DEFAULT:@SECLEVEL=0' : 'DEFAULT'), - '-connect', `localhost:${this.address().port}`, - '-servername', 'ohgod', - '-key', fixtures.path('keys/rsa_private.pem'), diff --git a/versioned.patch b/versioned.patch index 09aac8d..9ec427b 100644 --- a/versioned.patch +++ b/versioned.patch @@ -8,10 +8,10 @@ management via update_alternatives. This is also important for generation of binary modules for multiple versions of NodeJS -Index: node-v20.1.0/Makefile +Index: node-v20.3.0/Makefile =================================================================== ---- node-v20.1.0.orig/Makefile -+++ node-v20.1.0/Makefile +--- node-v20.3.0.orig/Makefile ++++ node-v20.3.0/Makefile @@ -76,7 +76,7 @@ BUILDTYPE_LOWER := $(shell echo $(BUILDT EXEEXT := $(shell $(PYTHON) -c \ "import sys; print('.exe' if sys.platform == 'win32' else '')") @@ -21,10 +21,10 @@ Index: node-v20.1.0/Makefile NODE ?= ./$(NODE_EXE) NODE_G_EXE = node_g$(EXEEXT) NPM ?= ./deps/npm/bin/npm-cli.js -Index: node-v20.1.0/tools/install.py +Index: node-v20.3.0/tools/install.py =================================================================== ---- node-v20.1.0.orig/tools/install.py -+++ node-v20.1.0/tools/install.py +--- node-v20.3.0.orig/tools/install.py ++++ node-v20.3.0/tools/install.py @@ -86,7 +86,7 @@ def uninstall(paths, dst): try_remove(path, dst) @@ -113,10 +113,10 @@ Index: node-v20.1.0/tools/install.py if sys.platform == 'zos': zoslibinc = os.environ.get('ZOSLIB_INCLUDES') -Index: node-v20.1.0/doc/node.1 +Index: node-v20.3.0/doc/node.1 =================================================================== ---- node-v20.1.0.orig/doc/node.1 -+++ node-v20.1.0/doc/node.1 +--- node-v20.3.0.orig/doc/node.1 ++++ node-v20.3.0/doc/node.1 @@ -31,24 +31,24 @@ .Dt NODE 1 . @@ -146,10 +146,10 @@ Index: node-v20.1.0/doc/node.1 .Op Fl -v8-options . .\"====================================================================== -Index: node-v20.1.0/src/node_main.cc +Index: node-v20.3.0/src/node_main.cc =================================================================== ---- node-v20.1.0.orig/src/node_main.cc -+++ node-v20.1.0/src/node_main.cc +--- node-v20.3.0.orig/src/node_main.cc ++++ node-v20.3.0/src/node_main.cc @@ -94,6 +94,7 @@ int wmain(int argc, wchar_t* wargv[]) { // UNIX @@ -158,10 +158,10 @@ Index: node-v20.1.0/src/node_main.cc return node::Start(argc, argv); } #endif -Index: node-v20.1.0/tools/test.py +Index: node-v20.3.0/tools/test.py =================================================================== ---- node-v20.1.0.orig/tools/test.py -+++ node-v20.1.0/tools/test.py +--- node-v20.3.0.orig/tools/test.py ++++ node-v20.3.0/tools/test.py @@ -947,7 +947,7 @@ class Context(object): if self.vm is not None: return self.vm @@ -171,10 +171,10 @@ Index: node-v20.1.0/tools/test.py else: name = 'out/%s.%s/node' % (arch, mode) -Index: node-v20.1.0/node.gyp +Index: node-v20.3.0/node.gyp =================================================================== ---- node-v20.1.0.orig/node.gyp -+++ node-v20.1.0/node.gyp +--- node-v20.3.0.orig/node.gyp ++++ node-v20.3.0/node.gyp @@ -23,8 +23,8 @@ 'node_shared_openssl%': 'false', 'node_v8_options%': '', @@ -185,4 +185,4 @@ Index: node-v20.1.0/node.gyp + 'node_lib_target_name%': 'libnode20', 'node_intermediate_lib_type%': 'static_library', 'node_builtin_modules_path%': '', - # We list the deps/ files out instead of globbing them in js2c.py since we + # We list the deps/ files out instead of globbing them in js2c.cc since we