Hello community, here is the log from the commit of package nodejs12 for openSUSE:Factory checked in at 2020-12-14 18:10:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs12 (Old) and /work/SRC/openSUSE:Factory/.nodejs12.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs12" Mon Dec 14 18:10:21 2020 rev:28 rq:855766 version:12.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/nodejs12/nodejs12.changes 2020-11-26 23:15:12.149028449 +0100 +++ /work/SRC/openSUSE:Factory/.nodejs12.new.2328/nodejs12.changes 2020-12-14 18:10:38.143715663 +0100 @@ -1,0 +2,5 @@ +Mon Nov 30 19:45:06 UTC 2020 - Adam Majer <[email protected]> + +- openssl_binary_detection.patch: fixes unit tests on SLE12 + +------------------------------------------------------------------- New: ---- openssl_binary_detection.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs12.spec ++++++ --- /var/tmp/diff_new_pack.GWgcWQ/_old 2020-12-14 18:10:39.063716577 +0100 +++ /var/tmp/diff_new_pack.GWgcWQ/_new 2020-12-14 18:10:39.067716582 +0100 @@ -131,6 +131,7 @@ ## Patches not distribution specific Patch3: fix_ci_tests.patch Patch7: manual_configure.patch +Patch13: openssl_binary_detection.patch ## Patches specific to SUSE and openSUSE Patch100: linker_lto_jobs.patch @@ -230,6 +231,13 @@ %if %node_version_number >= 8 BuildRequires: pkgconfig(openssl) >= %{openssl_req_ver} + +%if 0%{suse_version} >= 1330 +BuildRequires: openssl >= %{openssl_req_ver} +%else +BuildRequires: openssl-1_1 >= %{openssl_req_ver} +%endif + %else %if 0%{?suse_version} >= 1330 @@ -777,6 +785,7 @@ %patch7 -p1 %if 0%{with valgrind_tests} %endif +%patch13 -p1 %patch100 -p1 %patch101 -p1 %patch102 -p1 ++++++ openssl_binary_detection.patch ++++++ 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; }, _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
