From 6513469645c879af29fedcb9d9b4beab8c19b63f1b240cf80b6149756bed26f1 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Mon, 16 Oct 2023 13:01:28 +0000 Subject: [PATCH] - fix_ci_tests.patch: refreshed OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs20?expand=0&rev=43 --- fix_ci_tests.patch | 43 ++++++++++++++++++++++++++++--------------- nodejs20.changes | 2 ++ 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/fix_ci_tests.patch b/fix_ci_tests.patch index 8b8bc74..e950d7f 100644 --- a/fix_ci_tests.patch +++ b/fix_ci_tests.patch @@ -2,10 +2,10 @@ Author: Adam Majer Date: Dec 20 09:18:49 UTC 2017 Summary: Fix CI unit tests framework for OBS building -Index: node-v20.8.0/test/parallel/test-module-loading-globalpaths.js +Index: node-v20.8.1/test/parallel/test-module-loading-globalpaths.js =================================================================== ---- node-v20.8.0.orig/test/parallel/test-module-loading-globalpaths.js -+++ node-v20.8.0/test/parallel/test-module-loading-globalpaths.js +--- node-v20.8.1.orig/test/parallel/test-module-loading-globalpaths.js ++++ node-v20.8.1/test/parallel/test-module-loading-globalpaths.js @@ -11,6 +11,9 @@ const { addLibraryPath } = require('../c addLibraryPath(process.env); @@ -16,10 +16,10 @@ Index: node-v20.8.0/test/parallel/test-module-loading-globalpaths.js if (process.argv[2] === 'child') { console.log(require(pkgName).string); } else { -Index: node-v20.8.0/test/parallel/test-tls-passphrase.js +Index: node-v20.8.1/test/parallel/test-tls-passphrase.js =================================================================== ---- node-v20.8.0.orig/test/parallel/test-tls-passphrase.js -+++ node-v20.8.0/test/parallel/test-tls-passphrase.js +--- node-v20.8.1.orig/test/parallel/test-tls-passphrase.js ++++ node-v20.8.1/test/parallel/test-tls-passphrase.js @@ -223,7 +223,7 @@ server.listen(0, common.mustCall(functio }, onSecureConnect()); })).unref(); @@ -29,10 +29,10 @@ Index: node-v20.8.0/test/parallel/test-tls-passphrase.js // Missing passphrase assert.throws(function() { -Index: node-v20.8.0/test/parallel/test-repl-envvars.js +Index: node-v20.8.1/test/parallel/test-repl-envvars.js =================================================================== ---- node-v20.8.0.orig/test/parallel/test-repl-envvars.js -+++ node-v20.8.0/test/parallel/test-repl-envvars.js +--- node-v20.8.1.orig/test/parallel/test-repl-envvars.js ++++ node-v20.8.1/test/parallel/test-repl-envvars.js @@ -2,7 +2,9 @@ // Flags: --expose-internals @@ -44,10 +44,10 @@ Index: node-v20.8.0/test/parallel/test-repl-envvars.js const stream = require('stream'); const { describe, test } = require('node:test'); const REPL = require('internal/repl'); -Index: node-v20.8.0/Makefile +Index: node-v20.8.1/Makefile =================================================================== ---- node-v20.8.0.orig/Makefile -+++ node-v20.8.0/Makefile +--- node-v20.8.1.orig/Makefile ++++ node-v20.8.1/Makefile @@ -545,7 +545,8 @@ test-ci-js: | clear-stalled .PHONY: test-ci # Related CI jobs: most CI tests, excluding node-test-commit-arm-fanned @@ -68,10 +68,10 @@ Index: node-v20.8.0/Makefile echo "Skipping tools/doc/node_modules (no crypto)"; \ else \ cd tools/doc && $(call available-node,$(run-npm-ci)) \ -Index: node-v20.8.0/tools/test.py +Index: node-v20.8.1/tools/test.py =================================================================== ---- node-v20.8.0.orig/tools/test.py -+++ node-v20.8.0/tools/test.py +--- node-v20.8.1.orig/tools/test.py ++++ node-v20.8.1/tools/test.py @@ -1361,7 +1361,7 @@ def BuildOptions(): result.add_option("-s", "--suite", help="A test suite", default=[], action="append") @@ -81,3 +81,16 @@ Index: node-v20.8.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-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'); + dh3.computeSecret(''); + }, { 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)/ }); + } + + // Through a fluke of history, g=0 defaults to DH_GENERATOR (2). diff --git a/nodejs20.changes b/nodejs20.changes index 3be0f13..06ff18f 100644 --- a/nodejs20.changes +++ b/nodejs20.changes @@ -9,6 +9,8 @@ Mon Oct 16 09:28:06 UTC 2023 - Adam Majer - 20.8.1 * (CVE-2023-38552, bsc#1216272): Integrity checks according to policies can be circumvented * (CVE-2023-39333, bsc#1216273): Code injection via WebAssembly export names +- fix_ci_tests.patch: refreshed + ------------------------------------------------------------------- Thu Oct 5 13:45:41 UTC 2023 - Adam Majer - 20.8.0