diff --git a/c-ares-fixes.patch b/c-ares-fixes.patch index b593c52..5c0b8df 100644 --- a/c-ares-fixes.patch +++ b/c-ares-fixes.patch @@ -11,7 +11,7 @@ Index: node-v20.10.0/test/parallel/test-dns-resolveany-bad-ancount.js server.on('message', common.mustCall((msg, { address, port }) => { const parsed = dnstools.parseDNSPacket(msg); -@@ -18,16 +20,20 @@ server.on('message', common.mustCall((ms +@@ -18,25 +20,29 @@ server.on('message', common.mustCall((ms questions: parsed.questions, answers: { type: 'A', address: '1.2.3.4', ttl: 123, domain }, }); @@ -34,13 +34,16 @@ Index: node-v20.10.0/test/parallel/test-dns-resolveany-bad-ancount.js + resolverPromises.resolveAny('example.org') .then(common.mustNotCall()) .catch(common.expectsError({ - code: 'EBADRESP', -@@ -35,7 +41,7 @@ server.bind(0, common.mustCall(async () +- code: 'EBADRESP', ++ code: /^(?:EBADRESP|ETIMEOUT)$/, + syscall: 'queryAny', hostname: 'example.org' })); - dns.resolveAny('example.org', common.mustCall((err) => { +- assert.strictEqual(err.code, 'EBADRESP'); + resolver.resolveAny('example.org', common.mustCall((err) => { - assert.strictEqual(err.code, 'EBADRESP'); ++ assert.notStrictEqual(err.code, 'SUCCESS'); assert.strictEqual(err.syscall, 'queryAny'); assert.strictEqual(err.hostname, 'example.org'); + const descriptor = Object.getOwnPropertyDescriptor(err, 'message'); diff --git a/nodejs20.changes b/nodejs20.changes index 6404c70..a0a0a3a 100644 --- a/nodejs20.changes +++ b/nodejs20.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 8 15:36:04 UTC 2024 - Adam Majer + +- c-ares-fixes.patch: add additional backports for unit test fixes + ------------------------------------------------------------------- Tue Jan 2 16:14:58 UTC 2024 - Adam Majer diff --git a/nodejs20.spec b/nodejs20.spec index da6834a..6a2ea04 100644 --- a/nodejs20.spec +++ b/nodejs20.spec @@ -384,6 +384,7 @@ Provides: bundled(llhttp) = 8.1.1 Provides: bundled(ngtcp2) = 0.8.1 Provides: bundled(base64) = 0.5.0 Provides: bundled(simdutf) = 3.2.18 + # bundled url-ada parser, not ada Provides: bundled(ada) = 2.7.2