From 7da7de5798f8cf3a128db6ce172dc4aef357cb2fa2023cea2261a2c42ba0eb96 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Fri, 27 Oct 2023 09:19:38 +0000 Subject: [PATCH] - fix_ci_tests.patch: adapt for openssl 3.1.4 OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs20?expand=0&rev=48 --- fix_ci_tests.patch | 10 ++++++---- nodejs20.changes | 5 +++++ nodejs20.spec | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/fix_ci_tests.patch b/fix_ci_tests.patch index e950d7f..a346781 100644 --- a/fix_ci_tests.patch +++ b/fix_ci_tests.patch @@ -85,12 +85,14 @@ Index: node-v20.8.1/test/parallel/test-crypto-dh.js =================================================================== --- node-v20.8.1.orig/test/parallel/test-crypto-dh.js +++ node-v20.8.1/test/parallel/test-crypto-dh.js -@@ -89,7 +89,7 @@ const crypto = require('crypto'); +@@ -87,9 +87,7 @@ const crypto = require('crypto'); + + assert.throws(() => { dh3.computeSecret(''); - }, { message: common.hasOpenSSL3 ? - 'error:02800080:Diffie-Hellman routines::invalid secret' : +- }, { message: common.hasOpenSSL3 ? +- 'error:02800080:Diffie-Hellman routines::invalid secret' : - 'Supplied key is too small' }); -+ /(error:05066066:Diffie-Hellman routines:compute_key:invalid public key|Supplied key is too small)/ }); ++ }, /(error:02800080:Diffie-Hellman routines::invalid secret|error:05066066:Diffie-Hellman routines:compute_key:invalid public key|Supplied key is too small)/); } // Through a fluke of history, g=0 defaults to DH_GENERATOR (2). diff --git a/nodejs20.changes b/nodejs20.changes index 2c16dc7..757ad8a 100644 --- a/nodejs20.changes +++ b/nodejs20.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 27 09:10:38 UTC 2023 - Adam Majer + +- fix_ci_tests.patch: adapt for openssl 3.1.4 + -------------------------------------------------------------------- Tue Oct 24 11:21:41 UTC 2023 - Dominique Leuenberger diff --git a/nodejs20.spec b/nodejs20.spec index a85e631..ce227ab 100644 --- a/nodejs20.spec +++ b/nodejs20.spec @@ -678,7 +678,7 @@ echo "`grep node-v%{version}.tar.xz %{S:1} | head -n1 | cut -c1-64` %{S:0}" | s %setup -q -n node-%{version} %endif -%if %{node_version_number} <= 16 +%if %{node_version_number} == 16 tar zxf %{S:12} %endif