Hello community,
here is the log from the commit of package nodejs10 for openSUSE:Factory
checked in at 2020-12-15 12:30:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nodejs10 (Old)
and /work/SRC/openSUSE:Factory/.nodejs10.new.2328 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs10"
Tue Dec 15 12:30:47 2020 rev:31 rq:855765 version:10.23.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/nodejs10/nodejs10.changes 2020-11-25
19:28:17.854410632 +0100
+++ /work/SRC/openSUSE:Factory/.nodejs10.new.2328/nodejs10.changes
2020-12-15 12:33:00.704127323 +0100
@@ -1,0 +2,5 @@
+Mon Nov 30 19:45:43 UTC 2020 - Adam Majer <adam.ma...@suse.de>
+
+- openssl_binary_detection.patch: fixes unit tests on SLE12
+
+-------------------------------------------------------------------
New:
----
openssl_binary_detection.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nodejs10.spec ++++++
--- /var/tmp/diff_new_pack.udirnc/_old 2020-12-15 12:33:01.512127973 +0100
+++ /var/tmp/diff_new_pack.udirnc/_new 2020-12-15 12:33:01.512127973 +0100
@@ -132,6 +132,7 @@
Patch3: fix_ci_tests.patch
Patch7: manual_configure.patch
Patch11: valgrind_fixes.patch
+Patch13: openssl_binary_detection.patch
## Patches specific to SUSE and openSUSE
# PATCH-FIX-OPENSUSE -- set correct path for dtrace if it is built
@@ -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
@@ -768,6 +776,7 @@
%if 0%{with valgrind_tests}
%patch11 -p1
%endif
+%patch13 -p1
%patch101 -p1
%patch102 -p1
# Add check_output to configure script (not part of Python 2.6 in SLE11).
++++++ openssl_binary_detection.patch ++++++
Allow non-standard openssl binary names
Index: node-v10.23.0/test/common/index.js
===================================================================
--- node-v10.23.0.orig/test/common/index.js
+++ node-v10.23.0/test/common/index.js
@@ -817,20 +817,27 @@ 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 {
// 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';
-
- const opensslCmd = spawnSync(opensslCli, ['version']);
- if (opensslCmd.status !== 0 || opensslCmd.error !== undefined) {
- // openssl command cannot be executed
- opensslCli = false;
+ 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;
+ };
+ for (let i=0; i<cli_candidates.length && !opensslCli; i=i+1) {
+ opensslCli = checkOpensslCli(cli_candidates[i]);
}
return opensslCli;
},
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
