Adam Majer
ec89f014ab
since 16.x series, please see https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V17.md#17.3.0 - patches carried from 16.x series with some adaptations include cares_public_headers.patch, fix_ci_tests.patch, flaky_test_rerun.patch, legacy_python.patch, linker_lto_jobs.patch, manual_configure.patch, node-gyp-addon-gypi.patch, nodejs-libpath.patch, npm_search_paths.patch, openssl_binary_detection.patch, skip_no_console.patch, sle12_python3_compat.patch, test-skip-y2038-on-32bit-time_t.patch, versioned.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs17?expand=0&rev=1
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
Allow non-standard openssl binary names
|
|
|
|
Index: node-v14.15.1/test/common/index.js
|
|
===================================================================
|
|
--- node-v14.15.1.orig/test/common/index.js
|
|
+++ node-v14.15.1/test/common/index.js
|
|
@@ -797,20 +797,28 @@ const common = {
|
|
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 {
|
|
// 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']);
|
|
+ if (opensslCmd.status !== 0 || opensslCmd.error !== undefined) {
|
|
+ // OpenSSL command cannot be executed
|
|
+ opensslCli = false;
|
|
+ }
|
|
+ return opensslCli;
|
|
+ };
|
|
|
|
- const opensslCmd = spawnSync(opensslCli, ['version']);
|
|
- if (opensslCmd.status !== 0 || opensslCmd.error !== undefined) {
|
|
- // OpenSSL command cannot be executed
|
|
- opensslCli = false;
|
|
+ for (let i=0; i<cli_candidates.length && !opensslCli; i=i+1) {
|
|
+ opensslCli = checkOpensslCli(cli_candidates[i]);
|
|
}
|
|
return opensslCli;
|
|
},
|