Compare commits
37 Commits
Author | SHA256 | Date | |
---|---|---|---|
53d5d47fb3 | |||
88e397ffeb | |||
21e917d9f6 | |||
|
0f072a1906 | ||
d90b9e27b8 | |||
|
cc34b4ccdc | ||
|
3534ff7adf | ||
|
b6ba0e7b1c | ||
83218434a0 | |||
|
0db9914acc | ||
|
2c55c04ed9 | ||
|
51bb1ad5e2 | ||
|
f763afe7ee | ||
23cf91a32e | |||
|
71bf67d95e | ||
ac78790012 | |||
|
52ab1a1c03 | ||
|
dc79a4f482 | ||
|
8299606920 | ||
3d5b1115bd | |||
|
6586d8ad8b | ||
|
d586f74551 | ||
|
d4c227477f | ||
|
9469ebacd2 | ||
|
f6c46f801d | ||
8c173ca824 | |||
|
3907153e1c | ||
e848697030 | |||
2230538801 | |||
40cb971dfe | |||
778f39206c | |||
b5b4495339 | |||
32d439777b | |||
0b63d076a6 | |||
91029cadd3 | |||
580f45d154 | |||
c1a219c943 |
@@ -1,46 +0,0 @@
|
||||
Applied following patches,
|
||||
|
||||
From 5ff3a07d9add449021d806e45c4168203aa833ff Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andr=C3=A9=20Cruz?= <andremiguelcruz@msn.com>
|
||||
Date: Wed, 6 Nov 2024 22:02:49 +0000
|
||||
Subject: [PATCH] fix: disable regexp backtracking (#160)
|
||||
|
||||
---
|
||||
lib/util/escape.js | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
|
||||
From 640d391fde65388548601d95abedccc12943374f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andr=C3=A9=20Cruz?= <andre.cruz@uphold.com>
|
||||
Date: Thu, 7 Nov 2024 12:50:38 +0000
|
||||
Subject: [PATCH] fix: fix escaping bug introduced by backtracking
|
||||
|
||||
---
|
||||
lib/util/escape.js | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
|
||||
Index: node-v18.20.5/deps/npm/node_modules/cross-spawn/lib/util/escape.js
|
||||
===================================================================
|
||||
--- node-v18.20.5.orig/deps/npm/node_modules/cross-spawn/lib/util/escape.js
|
||||
+++ node-v18.20.5/deps/npm/node_modules/cross-spawn/lib/util/escape.js
|
||||
@@ -15,15 +15,17 @@ function escapeArgument(arg, doubleEscap
|
||||
arg = `${arg}`;
|
||||
|
||||
// Algorithm below is based on https://qntm.org/cmd
|
||||
+ // It's slightly altered to disable JS backtracking to avoid hanging on specially crafted input
|
||||
+ // Please see https://github.com/moxystudio/node-cross-spawn/pull/160 for more information
|
||||
|
||||
// Sequence of backslashes followed by a double quote:
|
||||
// double up all the backslashes and escape the double quote
|
||||
- arg = arg.replace(/(\\*)"/g, '$1$1\\"');
|
||||
+ arg = arg.replace(/(?=(\\+?)?)\1"/g, '$1$1\\"');
|
||||
|
||||
// Sequence of backslashes followed by the end of the string
|
||||
// (which will become a double quote later):
|
||||
// double up all the backslashes
|
||||
- arg = arg.replace(/(\\*)$/, '$1$1');
|
||||
+ arg = arg.replace(/(?=(\\+?)?)\1$/, '$1$1');
|
||||
|
||||
// All other backslashes occur literally
|
||||
|
@@ -1,41 +1,41 @@
|
||||
ed52239294ad517fbe91a268146d5d2aa8a17d2d62d64873e43219078ba71c4e node-v22.13.1-aix-ppc64.tar.gz
|
||||
be127be1d98cad94c56f46245d0f2de89934d300028694456861a6d5ac558bf3 node-v22.13.1-arm64.msi
|
||||
97483ff4361d239a56d038c6335767a56a291e78c10f07446f463f05d9d19b89 node-v22.13.1-darwin-arm64.tar.gz
|
||||
9c169a9369f6c667a4de6b14c7492065adbae0fa830ef4c666bea2c53ac7b576 node-v22.13.1-darwin-arm64.tar.xz
|
||||
6fdcc8412d434664238b0651ebd5ad55d15a08598ff42dcb6d9cf1d434a6c4be node-v22.13.1-darwin-x64.tar.gz
|
||||
cbc49a2f179ec51f3a7d49f91b05e16db2ea8ea4ca586e1e370d19661becf0eb node-v22.13.1-darwin-x64.tar.xz
|
||||
f9cde9ace585c3979f1b4ee247914f35fae6e7b7eabc6a40961f89ad39e78964 node-v22.13.1-headers.tar.gz
|
||||
2722236564df6d33b1d953f23e21bf5247b62b38ea9000b47c655ee3a9a440e7 node-v22.13.1-headers.tar.xz
|
||||
911d9c07af38c82be22cd0a3db613aabc578ba940b35380aeedadd6d48070bc1 node-v22.13.1-linux-arm64.tar.gz
|
||||
0a237c413ccbab920640438bf6e1a32edb19845bdc21f0e1cd5b91545ce1c126 node-v22.13.1-linux-arm64.tar.xz
|
||||
82be9fa5e74ee29d7342d38306dbee19d3e2239b5b753870c04fd03768916a7e node-v22.13.1-linux-armv7l.tar.gz
|
||||
f2be8dca2a7a518f6d187aa4b18abbeeafd71096a6d95f73f4d8bc0f8d2394ea node-v22.13.1-linux-armv7l.tar.xz
|
||||
e4d34550d791cc809cfbfe8d0e3082634796add404169484b0849fbae0714576 node-v22.13.1-linux-ppc64le.tar.gz
|
||||
377a7a1ea66f39251e1657f419e9404d526fcca9910620d0ecf0a870c6308f6b node-v22.13.1-linux-ppc64le.tar.xz
|
||||
56375cf2c827a425d708bd0322fd635b6f2038e272468395f4e160e1ea4ae91e node-v22.13.1-linux-s390x.tar.gz
|
||||
22da01dbcead3ef7e69de6c1310a1c5c485039631f731a6ff0c35530cf5c811b node-v22.13.1-linux-s390x.tar.xz
|
||||
666148b9fe0c7e1301cc1b029e33a45e9e4a893f68d2d2bb1cc88a931a88a004 node-v22.13.1-linux-x64.tar.gz
|
||||
0d2a5af33c7deab5555c8309cd3f373446fe1526c1b95833935ab3f019733b3b node-v22.13.1-linux-x64.tar.xz
|
||||
620a7b4008aa0406678987ce2dd22458a38bae163fe7c69fd243f1204725e6c2 node-v22.13.1.pkg
|
||||
e7d5b1e84e7f3c3cebda81e2b138469eef41ba4ecf16a87fd15fc3f7afa3f701 node-v22.13.1.tar.gz
|
||||
cfce282119390f7e0c2220410924428e90dadcb2df1744c0c4a0e7baae387cc2 node-v22.13.1.tar.xz
|
||||
b2c537f24a725d7e6058d23b1b89bbf31e6c7299b51ac31e9c25dc3c6a61e2d9 node-v22.13.1-win-arm64.7z
|
||||
db6d3d28e1b34acdbd9db7bac5ec37980e07e48a6a2edcd3747d605fc8a5468e node-v22.13.1-win-arm64.zip
|
||||
d495abe2ae53962065fad979814259735fd90a4e03c6b94ccd3e32bc933aeda5 node-v22.13.1-win-x64.7z
|
||||
398a61e250a5584a62a5959e2f69f5d597fc83f1a5ebe3ed8fff29ba39d55f14 node-v22.13.1-win-x64.zip
|
||||
3c87ddd4aac7f980ed11caf97942bd87a647ce61d644ca08321508836b3d1899 node-v22.13.1-win-x86.7z
|
||||
504ed03c8596dfeabddfcd0736f987be93e3330a5c690306dedacef8880b592c node-v22.13.1-win-x86.zip
|
||||
821566022dc3b262ac2f76598ee4f46003a6edafe5dadb84e5fbc7daaa1a78c7 node-v22.13.1-x64.msi
|
||||
79c36ea6aa2ede10b416bdae55b568ab31798ede2697440b266312bba95ef580 node-v22.13.1-x86.msi
|
||||
afb7dcd60c7557843e5c2777205564950544297ba0588faa2aae573ccb735767 win-arm64/node.exe
|
||||
988eb8c60a5ade17e652dbdb60d56d3c6ad5e599a99ce04932b8c4c86583cdaf win-arm64/node.lib
|
||||
b19efd6f54283a2c01027f0e74e54563d06495b87efe08d111e1a176afd14d02 win-arm64/node_pdb.7z
|
||||
0bb490f44fc575dd570326fae9f0a5fca1187bfc342f57a50084ef86aa2e6679 win-arm64/node_pdb.zip
|
||||
8f6945c55a51c893691534e7163372e4cedb62c8ad80a2a975df3f14a19fba16 win-x64/node.exe
|
||||
65e45757c026c93a170743a811ef1b921ae12d6d9dd62d258bbbca0626687626 win-x64/node.lib
|
||||
2ad1af26e2f78247473e1e05f78fff3be7401f47c327f45602c84dce5d552cc0 win-x64/node_pdb.7z
|
||||
31099d09933aad429c36071503cd200eb66c41529524ac159873f97d9f097c83 win-x64/node_pdb.zip
|
||||
0b7071f0a7d90d4e1567d94a37c5d94441a3ca71a4eaa9596bc06e992c06e9c8 win-x86/node.exe
|
||||
79bae10059e833ce7fa4de05e5601034461327e2e7cb75c2144b87d4ab5ac547 win-x86/node.lib
|
||||
c3fb150e58d16dadd95c24c8a0a4c020a18b3c852b63e36df39587a301512ca4 win-x86/node_pdb.7z
|
||||
97890935271fe117a745584ca710f0fcd38bbf24b8c920800411df87a3e22dc3 win-x86/node_pdb.zip
|
||||
2fe635ed920633a890fd594860e5fe35f5ca1ef6da3cda62c6692c39cfefb894 node-v22.15.1-aix-ppc64.tar.gz
|
||||
3242884a544d8d7e4c1e7ee04ee82e48ae9820723b46589284e86441610f04fa node-v22.15.1-arm64.msi
|
||||
d2689b86b17e1b51e76f801ffe2d9acca4225e76eda4b843c3d8438d4a7cd6fe node-v22.15.1-darwin-arm64.tar.gz
|
||||
da2ce4f4616f5adae82de433481e00af86c7e6624a07e5a3c3fdaa1d8a6028fa node-v22.15.1-darwin-arm64.tar.xz
|
||||
1c722d0dd6d3f60e8b0be014ea01b8a59f5088f4419197a1b37544854d61cc6f node-v22.15.1-darwin-x64.tar.gz
|
||||
4f7f6dd674ffa4935dba358fe503a396347d918603e3c9657ce586280c702f61 node-v22.15.1-darwin-x64.tar.xz
|
||||
7410efd260c92faa736cfa56f5cbc41cbb672e20d007d19353992ef9a96c2449 node-v22.15.1-headers.tar.gz
|
||||
4b625fb4a7c7da9f04f9e897c7ec87a3d9c170504506f184e66d93f4604d2a5b node-v22.15.1-headers.tar.xz
|
||||
eb3f232b83dfe83397b98395ec77a973e888e8959c978b3e4eeb551b8845b74f node-v22.15.1-linux-arm64.tar.gz
|
||||
f4ae8ddf7487dfaf7da92fef463ee55cc29d8772d62891361dc3fc8b8e469205 node-v22.15.1-linux-arm64.tar.xz
|
||||
346426e2bca62c98fb12213c39e80b0e349d7620238f74b7208d12e18fde87fd node-v22.15.1-linux-armv7l.tar.gz
|
||||
6947386b4c8373b625c6a49b5571bf2226dac7c7b560a9a561a1f81bf71a25ef node-v22.15.1-linux-armv7l.tar.xz
|
||||
156518af6901fb134ddde5f4b7ee39e047c4154480c3dd93030912a5d3f87097 node-v22.15.1-linux-ppc64le.tar.gz
|
||||
da07858c6404dbe7c627bd7baea33c7825640652ad24468a6feb23c770cf7ce4 node-v22.15.1-linux-ppc64le.tar.xz
|
||||
6b5a9615b66e553189578a4be33099f70add96c3b00bf38b7dcd91825ea1672f node-v22.15.1-linux-s390x.tar.gz
|
||||
7a6206af04399c090aaa7b3d568b1540e127b50931f5022ff2eaf680fc32a9c6 node-v22.15.1-linux-s390x.tar.xz
|
||||
f4b8eec683708acb1a2a73c7182ba2de5466a5dd5f705934a0830903df28821c node-v22.15.1-linux-x64.tar.gz
|
||||
7dca2ab34ec817aa4781e2e99dfd34d349eff9be86e5d5fbaa7e96cae8ee3179 node-v22.15.1-linux-x64.tar.xz
|
||||
2cafb8c5ee545d387409b6dab34b3552c90e247b7d2bd3964a68f42b26b3e8bf node-v22.15.1-win-arm64.7z
|
||||
dec85d230d45a6319130cbc844e8ecf8767b150bfeddd340f6b7c4a2e8c3ccb8 node-v22.15.1-win-arm64.zip
|
||||
3abcca34447dace08cecd2bfd7b6521b22bfa89cff7bd70e7cde777218c84d6a node-v22.15.1-win-x64.7z
|
||||
7c7997d6ef2efd9525a54b033fc0be6f22549a5905f5da6573a41e61a436a1b5 node-v22.15.1-win-x64.zip
|
||||
7b9999b5da0933f677ffff2a9ab211aebdcf23b1ed0f2e1db573cea757944103 node-v22.15.1-win-x86.7z
|
||||
dd432043e8c90b7f221bd3ba8e6443fb69e7b8273049fad0669a3a7d66939985 node-v22.15.1-win-x86.zip
|
||||
facb02bdf67cb9a7519c192b504fbfdbf47d8a67f36696d7d91a069b69904398 node-v22.15.1-x64.msi
|
||||
89ef1c6181749a7739f6df58a73aa2127d0c7d6afe0236f5998d69ec98ec2154 node-v22.15.1-x86.msi
|
||||
839f599498d36fabc3f7c940cabbaf14844e6380ba97a91299f7378b69e675c6 node-v22.15.1.pkg
|
||||
38aea029f8818f7783f273fbc70dcf930f9ef54bdd49c5f90c0152caec7a57be node-v22.15.1.tar.gz
|
||||
c19f0177d21c621746625e5f37590bd0d79a72043b77b53784cba5f145e7263e node-v22.15.1.tar.xz
|
||||
e9e669cf7e9772406e3a59cb4b9b606e75eb1d9f454b675e1c78a6aaa542b31d win-arm64/node.exe
|
||||
6c43922c747e0c07fcc4ceb64f08e98854a5c1b31665764076f5783556973d16 win-arm64/node.lib
|
||||
957076a2623c6f9355a21aba2031a7248d411a6f40950e7b710fbf76a666f5e9 win-arm64/node_pdb.7z
|
||||
5ac29419b5aaa475ba0606a021ed5cea77b18df74b5e42d57a706011004f6be4 win-arm64/node_pdb.zip
|
||||
b3191cc083480282f1edaa3324002c320704a00d7564cf1f7c48b610d1c060b6 win-x64/node.exe
|
||||
e731ad9af05eabe6bd941442b19dd6037f559a19a2fa8df2a8297ccb46ed7577 win-x64/node.lib
|
||||
84eec3bf646e04287fef10dc110a7aa82a4304ddcbd0b148aa90c0d44b08ea1d win-x64/node_pdb.7z
|
||||
b8b3364ad0735d45c25fb19c8b49f4c5e0c72a94f5d8fa44abddd80c15715538 win-x64/node_pdb.zip
|
||||
ddd0ef952950dcaa7f705bdde5f4fd0c8a78a7c6db6dad32f8e13e3b120ad5e4 win-x86/node.exe
|
||||
5f66397542e27adb288e1742720cedbeaba8a2034ebd58397306b2905f4acd2d win-x86/node.lib
|
||||
e5bd0ae9dc388aa4fd72067e3239333537c42329746124437c32b81ff2291ef4 win-x86/node_pdb.7z
|
||||
b5e39e2168abe7c9418f2cebcd813db9c1a0841274b1405aeffe13ffef74c264 win-x86/node_pdb.zip
|
||||
|
Binary file not shown.
@@ -1,3 +0,0 @@
|
||||
mtime: 1737543704
|
||||
commit: 604d97274942396e3e03c2c2c6a6edd2aa64bbf67e33f6a9c68bdbef05449ac7
|
||||
url: https://src.opensuse.org/nodejs/nodejs22.git
|
@@ -2,10 +2,10 @@ Author: Adam Majer <amajer@suse.de>
|
||||
Date: Dec 20 09:18:49 UTC 2017
|
||||
Summary: Fix CI unit tests framework for OBS building
|
||||
|
||||
Index: node-v22.12.0/test/parallel/test-module-loading-globalpaths.js
|
||||
Index: node-v22.14.0/test/parallel/test-module-loading-globalpaths.js
|
||||
===================================================================
|
||||
--- node-v22.12.0.orig/test/parallel/test-module-loading-globalpaths.js
|
||||
+++ node-v22.12.0/test/parallel/test-module-loading-globalpaths.js
|
||||
--- node-v22.14.0.orig/test/parallel/test-module-loading-globalpaths.js
|
||||
+++ node-v22.14.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-v22.12.0/test/parallel/test-module-loading-globalpaths.js
|
||||
if (process.argv[2] === 'child') {
|
||||
console.log(require(pkgName).string);
|
||||
} else {
|
||||
Index: node-v22.12.0/test/parallel/test-tls-passphrase.js
|
||||
Index: node-v22.14.0/test/parallel/test-tls-passphrase.js
|
||||
===================================================================
|
||||
--- node-v22.12.0.orig/test/parallel/test-tls-passphrase.js
|
||||
+++ node-v22.12.0/test/parallel/test-tls-passphrase.js
|
||||
--- node-v22.14.0.orig/test/parallel/test-tls-passphrase.js
|
||||
+++ node-v22.14.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-v22.12.0/test/parallel/test-tls-passphrase.js
|
||||
|
||||
// Missing passphrase
|
||||
assert.throws(function() {
|
||||
Index: node-v22.12.0/test/parallel/test-repl-envvars.js
|
||||
Index: node-v22.14.0/test/parallel/test-repl-envvars.js
|
||||
===================================================================
|
||||
--- node-v22.12.0.orig/test/parallel/test-repl-envvars.js
|
||||
+++ node-v22.12.0/test/parallel/test-repl-envvars.js
|
||||
--- node-v22.14.0.orig/test/parallel/test-repl-envvars.js
|
||||
+++ node-v22.14.0/test/parallel/test-repl-envvars.js
|
||||
@@ -2,7 +2,9 @@
|
||||
|
||||
// Flags: --expose-internals
|
||||
@@ -44,11 +44,11 @@ Index: node-v22.12.0/test/parallel/test-repl-envvars.js
|
||||
const stream = require('stream');
|
||||
const { describe, test } = require('node:test');
|
||||
const REPL = require('internal/repl');
|
||||
Index: node-v22.12.0/Makefile
|
||||
Index: node-v22.14.0/Makefile
|
||||
===================================================================
|
||||
--- node-v22.12.0.orig/Makefile
|
||||
+++ node-v22.12.0/Makefile
|
||||
@@ -397,7 +397,6 @@ ADDONS_HEADERS_PREREQS := tools/install.
|
||||
--- node-v22.14.0.orig/Makefile
|
||||
+++ node-v22.14.0/Makefile
|
||||
@@ -399,7 +399,6 @@ ADDONS_HEADERS_PREREQS := tools/install.
|
||||
$(wildcard deps/uv/include/*/*.h) \
|
||||
$(wildcard deps/v8/include/*.h) \
|
||||
$(wildcard deps/v8/include/*/*.h) \
|
||||
@@ -56,15 +56,15 @@ Index: node-v22.12.0/Makefile
|
||||
src/node.h src/node_api.h src/js_native_api.h src/js_native_api_types.h \
|
||||
src/node_api_types.h src/node_buffer.h src/node_object_wrap.h \
|
||||
src/node_version.h
|
||||
@@ -570,6 +569,7 @@ test-ci-js: | clear-stalled ## Build and
|
||||
@@ -593,6 +592,7 @@ test-ci-js: | clear-stalled ## Build and
|
||||
# Related CI jobs: most CI tests, excluding node-test-commit-arm-fanned
|
||||
test-ci: LOGLEVEL := info ## Build and test everything (CI).
|
||||
test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tests build-node-api-tests doc-only
|
||||
test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests doc-only
|
||||
+ strip $(NODE_EXE)
|
||||
out/Release/cctest --gtest_output=xml:out/junit/cctest.xml
|
||||
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
|
||||
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
|
||||
@@ -750,7 +750,8 @@ apidocs_json = $(addprefix out/,$(apidoc
|
||||
@@ -787,7 +787,8 @@ apidocs_json = $(addprefix out/,$(apidoc
|
||||
apiassets = $(subst api_assets,api/assets,$(addprefix out/,$(wildcard doc/api_assets/*)))
|
||||
|
||||
tools/doc/node_modules: tools/doc/package.json
|
||||
@@ -74,10 +74,10 @@ Index: node-v22.12.0/Makefile
|
||||
echo "Skipping tools/doc/node_modules (no crypto)"; \
|
||||
else \
|
||||
cd tools/doc && $(call available-node,$(run-npm-ci)) \
|
||||
Index: node-v22.12.0/tools/test.py
|
||||
Index: node-v22.14.0/tools/test.py
|
||||
===================================================================
|
||||
--- node-v22.12.0.orig/tools/test.py
|
||||
+++ node-v22.12.0/tools/test.py
|
||||
--- node-v22.14.0.orig/tools/test.py
|
||||
+++ node-v22.14.0/tools/test.py
|
||||
@@ -1386,7 +1386,7 @@ def BuildOptions():
|
||||
result.add_option("-s", "--suite", help="A test suite",
|
||||
default=[], action="append")
|
||||
@@ -87,23 +87,23 @@ Index: node-v22.12.0/tools/test.py
|
||||
result.add_option("--arch", help='The architecture to run tests for',
|
||||
default='none')
|
||||
result.add_option("--snapshot", help="Run the tests with snapshot turned on",
|
||||
Index: node-v22.12.0/test/parallel/test-crypto-dh.js
|
||||
Index: node-v22.14.0/test/parallel/test-crypto-dh.js
|
||||
===================================================================
|
||||
--- node-v22.12.0.orig/test/parallel/test-crypto-dh.js
|
||||
+++ node-v22.12.0/test/parallel/test-crypto-dh.js
|
||||
@@ -93,7 +93,7 @@ const crypto = require('crypto');
|
||||
--- node-v22.14.0.orig/test/parallel/test-crypto-dh.js
|
||||
+++ node-v22.14.0/test/parallel/test-crypto-dh.js
|
||||
@@ -98,7 +98,7 @@ const {
|
||||
dh3.computeSecret('');
|
||||
}, { message: common.hasOpenSSL3 && !hasOpenSSL3WithNewErrorMessage ?
|
||||
}, { message: hasOpenSSL3 && !hasOpenSSL3WithNewErrorMessage ?
|
||||
'Unspecified validation error' :
|
||||
- 'Supplied key is too small' });
|
||||
+ /(Supplied key is too small|invalid public key)/ });
|
||||
}
|
||||
}
|
||||
|
||||
Index: node-v22.12.0/test/parallel/test-dns.js
|
||||
Index: node-v22.14.0/test/parallel/test-dns.js
|
||||
===================================================================
|
||||
--- node-v22.12.0.orig/test/parallel/test-dns.js
|
||||
+++ node-v22.12.0/test/parallel/test-dns.js
|
||||
--- node-v22.14.0.orig/test/parallel/test-dns.js
|
||||
+++ node-v22.14.0/test/parallel/test-dns.js
|
||||
@@ -403,7 +403,7 @@ assert.throws(() => {
|
||||
|
||||
const server = dgram.createSocket('udp4');
|
||||
@@ -113,10 +113,10 @@ Index: node-v22.12.0/test/parallel/test-dns.js
|
||||
const parsed = dnstools.parseDNSPacket(msg);
|
||||
const domain = parsed.questions[0].domain;
|
||||
assert.strictEqual(domain, 'example.org');
|
||||
Index: node-v22.12.0/test/wpt/test-webcrypto.js
|
||||
Index: node-v22.14.0/test/wpt/test-webcrypto.js
|
||||
===================================================================
|
||||
--- node-v22.12.0.orig/test/wpt/test-webcrypto.js
|
||||
+++ node-v22.12.0/test/wpt/test-webcrypto.js
|
||||
--- node-v22.14.0.orig/test/wpt/test-webcrypto.js
|
||||
+++ node-v22.14.0/test/wpt/test-webcrypto.js
|
||||
@@ -1,7 +1,8 @@
|
||||
'use strict';
|
||||
|
||||
|
@@ -1,13 +0,0 @@
|
||||
Index: node-v22.11.0/configure.py
|
||||
===================================================================
|
||||
--- node-v22.11.0.orig/configure.py
|
||||
+++ node-v22.11.0/configure.py
|
||||
@@ -1876,7 +1876,7 @@ def configure_intl(o):
|
||||
elif with_intl == 'system-icu':
|
||||
# ICU from pkg-config.
|
||||
o['variables']['v8_enable_i18n_support'] = 1
|
||||
- pkgicu = pkg_config('icu-i18n')
|
||||
+ pkgicu = pkg_config('icu-i18n icu-uc')
|
||||
if not pkgicu[0]:
|
||||
error('''Could not load pkg-config data for "icu-i18n".
|
||||
See above errors or the README.md.''')
|
73
icu_732.patch
Normal file
73
icu_732.patch
Normal file
@@ -0,0 +1,73 @@
|
||||
23c23
|
||||
< "hi": "25/7/1980, पू 1:35:33",
|
||||
---
|
||||
> "hi": "25/7/1980, 1:35:33 am",
|
||||
26c26
|
||||
< "ar": "25/7/1980، 1:35:33 ص",
|
||||
---
|
||||
> "ar": "٢٥/٧/١٩٨٠، ١:٣٥:٣٣ ص",
|
||||
30c30
|
||||
< "ur": "25/7/1980، 1:35:33 ق.د.",
|
||||
---
|
||||
> "ur": "25/7/1980، 1:35:33 AM",
|
||||
44c44
|
||||
< "ar": "25/7/1980",
|
||||
---
|
||||
> "ar": "٢٥/٧/١٩٨٠",
|
||||
80c80
|
||||
< "ar": "275,760.913",
|
||||
---
|
||||
> "ar": "٢٧٥٬٧٦٠٫٩١٣",
|
||||
116c116
|
||||
< "ar": "قبل 586,920.617 ساعة",
|
||||
---
|
||||
> "ar": "قبل ٥٨٦٬٩٢٠٫٦١٧ ساعة",
|
||||
Index: node-v22.15.1/test/fixtures/icu/localizationData-v74.2.json
|
||||
===================================================================
|
||||
--- node-v22.15.1.orig/test/fixtures/icu/localizationData-v74.2.json
|
||||
+++ node-v22.15.1/test/fixtures/icu/localizationData-v74.2.json
|
||||
@@ -20,14 +20,14 @@
|
||||
"dateTimeFormats": {
|
||||
"en": "7/25/1980, 1:35:33 AM",
|
||||
"zh": "1980/7/25 01:35:33",
|
||||
- "hi": "25/7/1980, पू 1:35:33",
|
||||
+ "hi": "25/7/1980, 1:35:33 am",
|
||||
"es": "25/7/1980, 1:35:33",
|
||||
"fr": "25/07/1980 01:35:33",
|
||||
- "ar": "25/7/1980، 1:35:33 ص",
|
||||
+ "ar": "٢٥/٧/١٩٨٠، ١:٣٥:٣٣ ص",
|
||||
"bn": "২৫/৭/১৯৮০, ১:৩৫:৩৩ AM",
|
||||
"ru": "25.07.1980, 01:35:33",
|
||||
"pt": "25/07/1980, 01:35:33",
|
||||
- "ur": "25/7/1980، 1:35:33 ق.د.",
|
||||
+ "ur": "25/7/1980، 1:35:33 AM",
|
||||
"id": "25/7/1980, 01.35.33",
|
||||
"de": "25.7.1980, 01:35:33",
|
||||
"ja": "1980/7/25 1:35:33",
|
||||
@@ -41,7 +41,7 @@
|
||||
"hi": "25/7/1980",
|
||||
"es": "25/7/1980",
|
||||
"fr": "25/07/1980",
|
||||
- "ar": "25/7/1980",
|
||||
+ "ar": "٢٥/٧/١٩٨٠",
|
||||
"bn": "২৫/৭/১৯৮০",
|
||||
"ru": "25.07.1980",
|
||||
"pt": "25/07/1980",
|
||||
@@ -77,7 +77,7 @@
|
||||
"hi": "2,75,760.913",
|
||||
"es": "275.760,913",
|
||||
"fr": "275 760,913",
|
||||
- "ar": "275,760.913",
|
||||
+ "ar": "٢٧٥٬٧٦٠٫٩١٣",
|
||||
"bn": "২,৭৫,৭৬০.৯১৩",
|
||||
"ru": "275 760,913",
|
||||
"pt": "275.760,913",
|
||||
@@ -113,7 +113,7 @@
|
||||
"hi": "5,86,920.617 घंटे पहले",
|
||||
"es": "hace 586.920,617 horas",
|
||||
"fr": "il y a 586 920,617 heures",
|
||||
- "ar": "قبل 586,920.617 ساعة",
|
||||
+ "ar": "قبل ٥٨٦٬٩٢٠٫٦١٧ ساعة",
|
||||
"bn": "৫,৮৬,৯২০.৬১৭ ঘন্টা আগে",
|
||||
"ru": "586 920,617 часа назад",
|
||||
"pt": "há 586.920,617 horas",
|
BIN
node-v22.11.0.tar.xz
(Stored with Git LFS)
BIN
node-v22.11.0.tar.xz
(Stored with Git LFS)
Binary file not shown.
BIN
node-v22.12.0.tar.xz
(Stored with Git LFS)
BIN
node-v22.12.0.tar.xz
(Stored with Git LFS)
Binary file not shown.
BIN
node-v22.13.0.tar.xz
(Stored with Git LFS)
BIN
node-v22.13.0.tar.xz
(Stored with Git LFS)
Binary file not shown.
BIN
node-v22.13.1.tar.xz
(Stored with Git LFS)
BIN
node-v22.13.1.tar.xz
(Stored with Git LFS)
Binary file not shown.
BIN
node-v22.15.1.tar.xz
(Stored with Git LFS)
Normal file
BIN
node-v22.15.1.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
node-v22.3.0.tar.xz
(Stored with Git LFS)
BIN
node-v22.3.0.tar.xz
(Stored with Git LFS)
Binary file not shown.
@@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 5 15:58:24 UTC 2025 - Adam Majer <adam.majer@suse.de>
|
||||
|
||||
- Update to 22.15.1
|
||||
* fix error handling on async crypto operation (bsc#1243218, CVE-2025-23166)
|
||||
* add missing call to uv_fs_req_cleanup (bsc#1243217, CVE-2025-23165)
|
||||
|
||||
- changes since 22.15.0:
|
||||
* dns: add TLSA record query and parsing
|
||||
* assert: improve partialDeepStrictEqual
|
||||
* process: add execve
|
||||
* tls: implement tls.getCACertificates()
|
||||
* v8: add v8.getCppHeapStatistics() method
|
||||
|
||||
- old_cares.patch: dropped in favour of bundling until we can update SLE15 cares
|
||||
- icu_732.patch: handle our ICU version in SLE15
|
||||
- fab6906c5d1c16b046187485a7cb136b3659d42b.patch: dropped, upstreamed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 23 14:46:18 UTC 2025 - Adam Majer <adam.majer@suse.de>
|
||||
|
||||
- drop http2 priority checks as new nghttp2 dropped this
|
||||
unused feature
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 14 09:14:51 UTC 2025 - Adam Majer <adam.majer@suse.de>
|
||||
|
||||
- fab6906c5d1c16b046187485a7cb136b3659d42b.patch: fix build with
|
||||
OpenSSL 3.5.0 (bsc#1241050)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 10 09:47:03 UTC 2025 - Adam Majer <adam.majer@suse.de>
|
||||
|
||||
- Update to 22.14.0
|
||||
* fs: allow exclude option in globs to accept glob patterns
|
||||
* lib: add typescript support to STDIN eval
|
||||
* module: add ERR_UNSUPPORTED_TYPESCRIPT_SYNTAX
|
||||
* module: add findPackageJSON util
|
||||
* process: add process.ref() and process.unref() methods
|
||||
* sqlite: support TypedArray and DataView in StatementSync
|
||||
* src: add --disable-sigusr1 to prevent signal i/o thread
|
||||
* src,worker: add isInternalWorker
|
||||
* test_runner: add TestContext.prototype.waitFor()
|
||||
* test_runner: add t.assert.fileSnapshot()
|
||||
* test_runner: add assert.register() API
|
||||
* worker: add eval ts input
|
||||
|
||||
- openssl_binary_detection.patch fix_ci_tests.patch: refreshed
|
||||
- Build with PIE (bsc#1239949)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 22 10:10:36 UTC 2025 - Adam Majer <adam.majer@suse.de>
|
||||
|
||||
|
@@ -31,7 +31,7 @@
|
||||
%endif
|
||||
|
||||
Name: nodejs22
|
||||
Version: 22.13.1
|
||||
Version: 22.15.1
|
||||
Release: 0
|
||||
|
||||
# Double DWZ memory limits
|
||||
@@ -93,7 +93,7 @@ ExclusiveArch do_not_build
|
||||
%bcond_without intree_openssl
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} >= 1330 || 0%{?fedora_version} >= 35
|
||||
%if 0%{?suse_version} >= 1550 || 0%{?fedora_version} >= 35
|
||||
%bcond_with intree_cares
|
||||
%else
|
||||
%bcond_without intree_cares
|
||||
@@ -170,9 +170,9 @@ Patch132: test-skip-y2038-on-32bit-time_t.patch
|
||||
Patch200: versioned.patch
|
||||
|
||||
Patch305: qemu_timeouts_arches.patch
|
||||
Patch306: icu_732.patch
|
||||
Patch307: v8-i586.patch
|
||||
Patch309: gcc13.patch
|
||||
Patch311: old_cares.patch
|
||||
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: fdupes
|
||||
@@ -209,6 +209,7 @@ BuildRequires: gcc48-c++
|
||||
%if 0%{?suse_version} == 1315
|
||||
%if %node_version_number >= 17
|
||||
BuildRequires: gcc12-c++
|
||||
BuildRequires: gcc12-PIE
|
||||
%define forced_gcc_version 12
|
||||
%else
|
||||
%if %node_version_number >= 14
|
||||
@@ -226,6 +227,7 @@ BuildRequires: gcc7-c++
|
||||
%if 0%{?suse_version} == 1500
|
||||
%if %node_version_number >= 17
|
||||
BuildRequires: gcc12-c++
|
||||
BuildRequires: gcc12-PIE
|
||||
%define forced_gcc_version 12
|
||||
%endif
|
||||
%endif
|
||||
@@ -312,7 +314,7 @@ BuildRequires: bundled_openssl_should_not_be_required
|
||||
%if ! 0%{with intree_cares}
|
||||
BuildRequires: pkgconfig(libcares) >= 1.17.0
|
||||
%else
|
||||
Provides: bundled(libcares2) = 1.34.4
|
||||
Provides: bundled(libcares2) = 1.34.5
|
||||
%endif
|
||||
|
||||
%if %node_version_number >= 22 && 0%{?suse_version} > 1500
|
||||
@@ -395,13 +397,13 @@ Provides: bundled(simdjson) = 3.10.1
|
||||
# bundled url-ada parser, not ada
|
||||
Provides: bundled(ada) = 2.9.2
|
||||
|
||||
Provides: bundled(node-acorn) = 8.14.0
|
||||
Provides: bundled(node-acorn) = 8.14.1
|
||||
Provides: bundled(node-acorn-walk) = 8.3.4
|
||||
Provides: bundled(node-amaro) = 0.2.0
|
||||
Provides: bundled(node-cjs-module-lexer) = 1.4.1
|
||||
Provides: bundled(node-corepack) = 0.30.0
|
||||
Provides: bundled(node-amaro) = 0.4.1
|
||||
Provides: bundled(node-cjs-module-lexer) = 2.1.0
|
||||
Provides: bundled(node-corepack) = 0.32.0
|
||||
Provides: bundled(node-minimatch) = 10.0.1
|
||||
Provides: bundled(node-undici) = 6.21.1
|
||||
Provides: bundled(node-undici) = 6.21.2
|
||||
|
||||
%description
|
||||
Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js
|
||||
@@ -698,9 +700,9 @@ popd
|
||||
%patch -P 200 -p1
|
||||
|
||||
%patch -P 305 -p1
|
||||
%patch -P 306 -p1
|
||||
%patch -P 307 -p1
|
||||
%patch -P 309 -p1
|
||||
%patch -P 311 -p1
|
||||
|
||||
%if %{node_version_number} == 12
|
||||
# minimist security update - patch50
|
||||
@@ -930,11 +932,15 @@ export CI_JS_SUITES=default
|
||||
export NODE_TEST_NO_INTERNET=1
|
||||
|
||||
%if %{node_version_number} >= 12
|
||||
find test \( -name \*.out -or -name \*.js \) -exec sed -i 's,Use `node ,Use `node%{node_version_number} ,' {} \;
|
||||
find test \( -name \*.out -or -name \*.js -or -name \*.snapshot \) -exec sed -i 's,Use `node ,Use `node%{node_version_number} ,' {} \;
|
||||
%endif
|
||||
|
||||
%if %{node_version_number} >= 20
|
||||
rm test/parallel/test-strace-openat-openssl.js
|
||||
|
||||
# https://github.com/nodejs/node/pull/57269 -- nghttp2 dropped priority support
|
||||
rm test/parallel/test-http2-client-set-priority.js
|
||||
rm test/parallel/test-http2-priority-event.js
|
||||
%endif
|
||||
|
||||
# Update the python3 executable name to point at forced python version
|
||||
@@ -957,8 +963,10 @@ rm test/parallel/test-dns-cancel-reverse-lookup.js \
|
||||
test/parallel/test-dns-resolveany.js
|
||||
# multicast test fail since no socket?
|
||||
rm test/parallel/test-dgram-membership.js
|
||||
# ::1 not defined in OBS on TW - https://github.com/openSUSE/obs-build/issues/848
|
||||
rm test/report/test-report-exclude-network.js
|
||||
%if %{node_version_number} >= 20
|
||||
# missing ICU test data for 15.6/15.7/SLFO
|
||||
ln test/fixtures/icu/localizationData-v74.2.json test/fixtures/icu/localizationData-v73.2.json
|
||||
%endif
|
||||
|
||||
%if %{node_version_number} >= 18
|
||||
# OBS broken /etc/hosts -- https://github.com/openSUSE/open-build-service/issues/13104
|
||||
|
155
old_cares.patch
155
old_cares.patch
@@ -1,155 +0,0 @@
|
||||
temporary revert changes until we can upgrade c-ares in SLE-15:Update
|
||||
|
||||
commit bf68733e7f61bf4ff51a456e27123f44a526aebc
|
||||
Author: Aviv Keller <redyetidev@gmail.com>
|
||||
Date: Wed Oct 30 10:10:28 2024 -0400
|
||||
|
||||
dns: stop using deprecated `ares_query`
|
||||
|
||||
PR-URL: https://github.com/nodejs/node/pull/55430
|
||||
Refs: https://github.com/nodejs/node/issues/52464
|
||||
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
|
||||
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
|
||||
|
||||
|
||||
Index: node-v22.12.0/src/cares_wrap.cc
|
||||
===================================================================
|
||||
--- node-v22.12.0.orig/src/cares_wrap.cc
|
||||
+++ node-v22.12.0/src/cares_wrap.cc
|
||||
@@ -825,62 +825,62 @@ void ChannelWrap::EnsureServers() {
|
||||
}
|
||||
|
||||
int AnyTraits::Send(QueryWrap<AnyTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_ANY);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_any);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int ATraits::Send(QueryWrap<ATraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_A);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_a);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int AaaaTraits::Send(QueryWrap<AaaaTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_AAAA);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_aaaa);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int CaaTraits::Send(QueryWrap<CaaTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_CAA);
|
||||
+ wrap->AresQuery(name, ns_c_in, T_CAA);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int CnameTraits::Send(QueryWrap<CnameTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_CNAME);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_cname);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int MxTraits::Send(QueryWrap<MxTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_MX);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_mx);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int NsTraits::Send(QueryWrap<NsTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_NS);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_ns);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int TxtTraits::Send(QueryWrap<TxtTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_TXT);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_txt);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int SrvTraits::Send(QueryWrap<SrvTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_SRV);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_srv);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int PtrTraits::Send(QueryWrap<PtrTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_PTR);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_ptr);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int NaptrTraits::Send(QueryWrap<NaptrTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_NAPTR);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_naptr);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int SoaTraits::Send(QueryWrap<SoaTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_SOA);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_soa);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
Index: node-v22.12.0/src/cares_wrap.h
|
||||
===================================================================
|
||||
--- node-v22.12.0.orig/src/cares_wrap.h
|
||||
+++ node-v22.12.0/src/cares_wrap.h
|
||||
@@ -246,20 +246,18 @@ class QueryWrap final : public AsyncWrap
|
||||
return Traits::Send(this, name);
|
||||
}
|
||||
|
||||
- void AresQuery(const char* name,
|
||||
- ares_dns_class_t dnsclass,
|
||||
- ares_dns_rec_type_t type) {
|
||||
+ void AresQuery(const char* name, int dnsclass, int type) {
|
||||
channel_->EnsureServers();
|
||||
TRACE_EVENT_NESTABLE_ASYNC_BEGIN1(
|
||||
TRACING_CATEGORY_NODE2(dns, native), trace_name_, this,
|
||||
"name", TRACE_STR_COPY(name));
|
||||
- ares_query_dnsrec(channel_->cares_channel(),
|
||||
- name,
|
||||
- dnsclass,
|
||||
- type,
|
||||
- Callback,
|
||||
- MakeCallbackPointer(),
|
||||
- nullptr);
|
||||
+ ares_query(
|
||||
+ channel_->cares_channel(),
|
||||
+ name,
|
||||
+ dnsclass,
|
||||
+ type,
|
||||
+ Callback,
|
||||
+ MakeCallbackPointer());
|
||||
}
|
||||
|
||||
void ParseError(int status) {
|
||||
@@ -306,20 +304,19 @@ class QueryWrap final : public AsyncWrap
|
||||
return wrap;
|
||||
}
|
||||
|
||||
- static void Callback(void* arg,
|
||||
- ares_status_t status,
|
||||
- size_t timeouts,
|
||||
- const ares_dns_record_t* dnsrec) {
|
||||
+ static void Callback(
|
||||
+ void* arg,
|
||||
+ int status,
|
||||
+ int timeouts,
|
||||
+ unsigned char* answer_buf,
|
||||
+ int answer_len) {
|
||||
QueryWrap<Traits>* wrap = FromCallbackPointer(arg);
|
||||
if (wrap == nullptr) return;
|
||||
|
||||
unsigned char* buf_copy = nullptr;
|
||||
- size_t answer_len = 0;
|
||||
if (status == ARES_SUCCESS) {
|
||||
- // No need to explicitly call ares_free_string here,
|
||||
- // as it is a wrapper around free, which is already
|
||||
- // invoked when MallocedBuffer is destructed.
|
||||
- ares_dns_write(dnsrec, &buf_copy, &answer_len);
|
||||
+ buf_copy = node::Malloc<unsigned char>(answer_len);
|
||||
+ memcpy(buf_copy, answer_buf, answer_len);
|
||||
}
|
||||
|
||||
wrap->response_data_ = std::make_unique<ResponseData>();
|
@@ -1,26 +1,27 @@
|
||||
Allow non-standard openssl binary names
|
||||
|
||||
Index: node-v14.15.1/test/common/index.js
|
||||
Index: node-v22.14.0/test/common/crypto.js
|
||||
===================================================================
|
||||
--- node-v14.15.1.orig/test/common/index.js
|
||||
+++ node-v14.15.1/test/common/index.js
|
||||
@@ -797,20 +797,28 @@ const common = {
|
||||
--- node-v22.14.0.orig/test/common/crypto.js
|
||||
+++ node-v22.14.0/test/common/crypto.js
|
||||
@@ -141,23 +141,29 @@ module.exports = {
|
||||
get opensslCli() {
|
||||
if (opensslCli !== null) return opensslCli;
|
||||
|
||||
+ let cli_candidates = [];
|
||||
+
|
||||
if (process.config.variables.node_shared_openssl) {
|
||||
// Use external command
|
||||
- opensslCli = 'openssl';
|
||||
+ cli_candidates = cli_candidates.concat(['openssl-1_1', 'openssl']);
|
||||
} else {
|
||||
const path = require('path');
|
||||
// Use command built from sources included in Node.js repository
|
||||
- opensslCli = path.join(path.dirname(process.execPath), 'openssl-cli');
|
||||
+ cli_candidates.push(path.join(path.dirname(process.execPath), 'openssl-cli'));
|
||||
}
|
||||
|
||||
- if (exports.isWindows) opensslCli += '.exe';
|
||||
-
|
||||
+ let checkOpensslCli = function(opensslCli) {
|
||||
+ if (exports.isWindows) opensslCli += '.exe';
|
||||
+ const opensslCmd = spawnSync(opensslCli, ['version']);
|
||||
@@ -30,6 +31,7 @@ Index: node-v14.15.1/test/common/index.js
|
||||
+ }
|
||||
+ return opensslCli;
|
||||
+ };
|
||||
const { spawnSync } = require('child_process');
|
||||
|
||||
- const opensslCmd = spawnSync(opensslCli, ['version']);
|
||||
- if (opensslCmd.status !== 0 || opensslCmd.error !== undefined) {
|
||||
|
Reference in New Issue
Block a user