Merge ~liushuyu-011/ubuntu/+source/nodejs:ubuntu/devel into ubuntu/+source/nodejs:ubuntu/devel

[Zixing Liu]

This merge proposal fixes some upstream unit tests and re-enables all the disabled tests on Ubuntu.

Requires https://bugs.launchpad.net/ubuntu/+source/node-undici/+bug/2066977 to be processed and published first.

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc-1/+sourcepub/16152538/+listing-archive-extra

[Zixing Liu (liushuyu-011)]

Already included in the archive version.
It was not marked as merged due to issues with LP git-importer.

diff --git a/debian/changelog b/debian/changelog
index 52389dc..526dc9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+nodejs (20.13.1+dfsg-2ubuntu3) oracular; urgency=medium
+
+  * d/p/series: Disable OpenSSL 3.2 patches on Ubuntu.
+  * d/p/test-lowerseclevel.patch: Remove unneeded test workarounds
+    from the patch.
+  * d/p/disable-failing-tests.patch: Delete unneeded patch.
+  * d/p/ubuntu-openssl-fix-strace-openat-test.patch: fix test Ubuntu also needs
+    to access system icu libraries and access OpenSSL configuration in
+    a different location.
+  * d/p/build/test_ci.patch: refresh the patch after disabling
+    OpenSSL 3.2 patch.
+
+ -- Zixing Liu <[e-mail]>  Thu, 23 May 2024 14:58:21 -0600
+
 nodejs (20.13.1+dfsg-2ubuntu2) oracular; urgency=medium
 
   * Merge from Debian unstable. Remaining changes:
diff --git a/debian/control b/debian/control
index c965182..eede4ee 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: nodejs
 Section: javascript
 Priority: optional
-Maintainer: Debian Javascript Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Javascript Maintainers <[e-mail]>
 Uploaders: Jérémy Lal <[e-mail]>,
  Jonas Smedegaard <[e-mail]>
 Build-Depends:
diff --git a/debian/patches/build/test_ci.patch b/debian/patches/build/test_ci.patch
index d7297ab..fbe7d01 100644
--- a/debian/patches/build/test_ci.patch
+++ b/debian/patches/build/test_ci.patch
@@ -20,9 +20,11 @@ Forwarded: not-needed
 Reviewed-By: Xavier Guimard <[e-mail]>
 Last-Update: 2020-02-09
 
---- a/Makefile
-+++ b/Makefile
-@@ -551,7 +551,7 @@
+Index: nodejs/Makefile
+===================================================================
+--- nodejs.orig/Makefile
++++ nodejs/Makefile
+@@ -551,7 +551,7 @@ test-ci-native: | benchmark/napi/.builds
  # This target should not use a native compiler at all
  # Related CI job: node-test-commit-arm-fanned
  test-ci-js: | clear-stalled
@@ -31,9 +33,11 @@ Last-Update: 2020-02-09
  		--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
  		$(TEST_CI_ARGS) $(CI_JS_SUITES)
  	$(info Clean up any leftover processes, error if found.)
---- a/test/parallel/parallel.status
-+++ b/test/parallel/parallel.status
-@@ -12,6 +12,45 @@
+Index: nodejs/test/parallel/parallel.status
+===================================================================
+--- nodejs.orig/test/parallel/parallel.status
++++ nodejs/test/parallel/parallel.status
+@@ -12,6 +12,45 @@ test-fs-read-stream-concurrent-reads: PA
  # https://github.com/nodejs/node/issues/52630
  test-error-serdes: PASS, FLAKY
  
@@ -79,7 +83,7 @@ Last-Update: 2020-02-09
  [$system==win32]
  
  # Windows on x86
-@@ -43,6 +82,10 @@
+@@ -43,6 +82,10 @@ test-inspector-async-stack-traces-set-in
  test-crypto-dh-stateless: SKIP
  test-crypto-keygen: SKIP
  
@@ -90,7 +94,7 @@ Last-Update: 2020-02-09
  [$system==solaris] # Also applies to SmartOS
  # https://github.com/nodejs/node/issues/43457
  test-domain-no-error-handler-abort-on-uncaught-0: PASS, FLAKY
-@@ -94,9 +137,10 @@
+@@ -94,9 +137,10 @@ test-tls-write-error: PASS, FLAKY
  # https://github.com/nodejs/node/issues/48047
  test-http-pipeline-flood: SKIP
  
@@ -102,11 +106,13 @@ Last-Update: 2020-02-09
  
  [$arch==s390x]
  # https://github.com/nodejs/node/issues/50222
---- a/test/sequential/sequential.status
-+++ b/test/sequential/sequential.status
-@@ -16,6 +16,25 @@
- # fails on arm64, armhf, loong64 since openssl32
- test-tls-session-timeout: PASS, FLAKY
+Index: nodejs/test/sequential/sequential.status
+===================================================================
+--- nodejs.orig/test/sequential/sequential.status
++++ nodejs/test/sequential/sequential.status
+@@ -13,6 +13,25 @@ test-watch-mode-inspect: PASS, FLAKY
+ # https://github.com/nodejs/node/issues/47409
+ test-http2-large-file: PASS, FLAKY
  
 +# flaky or failing at least on debian build servers
 +test-fs-watch                                   : PASS,FLAKY
@@ -130,9 +136,11 @@ Last-Update: 2020-02-09
  [$system==win32]
  # https://github.com/nodejs/node/issues/47116
  test-http-max-sockets: PASS, FLAKY
---- a/tools/test.py
-+++ b/tools/test.py
-@@ -941,25 +941,7 @@
+Index: nodejs/tools/test.py
+===================================================================
+--- nodejs.orig/tools/test.py
++++ nodejs/tools/test.py
+@@ -941,25 +941,7 @@ class Context(object):
      self.node_has_crypto = True
  
    def GetVm(self, arch, mode):
@@ -159,9 +167,11 @@ Last-Update: 2020-02-09
  
    def GetTimeout(self, mode, section=''):
      timeout = self.timeout * TIMEOUT_SCALEFACTOR[ARCH_GUESS or 'ia32'][mode]
---- a/test/common/index.js
-+++ b/test/common/index.js
-@@ -267,16 +267,15 @@
+Index: nodejs/test/common/index.js
+===================================================================
+--- nodejs.orig/test/common/index.js
++++ nodejs/test/common/index.js
+@@ -264,16 +264,15 @@ const pwdCommand = isWindows ?
  
  function platformTimeout(ms) {
    const multipliers = typeof ms === 'bigint' ?
diff --git a/debian/patches/disable-failing-tests.patch b/debian/patches/disable-failing-tests.patch
deleted file mode 100644
index acae4d8..0000000
--- a/debian/patches/disable-failing-tests.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Description: Ignore failing tests regressed also with release pocket nodejs version 18.13.0+dfsg1-1ubuntu2
-
-not ok 778 parallel/test-fetch
-  ---
-  duration_ms: 326.25900
-  severity: fail
-  exitcode: 1
-  stack: |-
-    node:internal/process/promises:288
-                triggerUncaughtException(err, true /* fromPromise */);
-                ^
-    
-    [CompileError: WebAssembly.compile(): expected 47560 bytes, fell off end @+1361]
-    
-    Node.js v18.19.0
-
-not ok 1298 parallel/test-http-response-setheaders
-  ---
-  duration_ms: 327.39600
-  severity: fail
-  exitcode: 1
-  stack: |-
-    node:internal/process/promises:288
-                triggerUncaughtException(err, true /* fromPromise */);
-                ^
-    
-    [CompileError: WebAssembly.compile(): expected 47560 bytes, fell off end @+1361]
-    
-    Node.js v18.19.0
-
-995s not ok 2379 parallel/test-strace-openat-openssl
-995s   ---
-995s   duration_ms: 329.57000
-995s   severity: fail
-995s   exitcode: 1
-995s   stack: |-
-995s     node:assert:399
-995s         throw err;
-995s         ^
-995s     
-995s     AssertionError [ERR_ASSERTION]: /tmp/autopkgtest.r0o3p5/build.UoJ/src/deps/openssl/openssl/apps/openssl.cnf is not in the list of allowed openat calls
-995s         at Interface.<anonymous> (/tmp/autopkgtest.r0o3p5/build.UoJ/src/test/parallel/test-strace-openat-openssl.js:46:5)
-995s         at Interface.emit (node:events:517:28)
-995s         at [_onLine] [as _onLine] (node:internal/readline/interface:423:12)
-995s         at [_normalWrite] [as _normalWrite] (node:internal/readline/interface:617:22)
-995s         at Socket.ondata (node:internal/readline/interface:250:23)
-995s         at Socket.emit (node:events:529:35)
-995s         at addChunk (node:internal/streams/readable:368:12)
-995s         at readableAddChunk (node:internal/streams/readable:337:11)
-995s         at Readable.push (node:internal/streams/readable:278:10)
-995s         at Pipe.onStreamRead (node:internal/stream_base_commons:190:23) {
-995s       generatedMessage: false,
-995s       code: 'ERR_ASSERTION',
-995s       actual: false,
-995s       expected: true,
-995s       operator: '=='
-995s     }
-995s     
-995s     Node.js v18.19.0
-995s   ...
-
-956s not ok 2135 parallel/test-process-versions
-956s   ---
-956s   duration_ms: 215.55300
-956s   severity: fail
-956s   exitcode: 1
-956s   stack: |-
-956s     node:assert:125
-956s       throw new AssertionError(obj);
-956s       ^
-956s     
-956s     AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:
-956s     + actual - expected
-956s     
-956s     + '1.2.2'
-956s     - '1.2.3'
-956s            ^
-956s         at Object.<anonymous> (/tmp/autopkgtest.r0o3p5/build.UoJ/src/test/parallel/test-process-versions.js:109:8)
-956s         at Module._compile (node:internal/modules/cjs/loader:1356:14)
-956s         at Module._extensions..js (node:internal/modules/cjs/loader:1414:10)
-956s         at Module.load (node:internal/modules/cjs/loader:1197:32)
-956s         at Module._load (node:internal/modules/cjs/loader:1013:12)
-956s         at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:128:12)
-956s         at node:internal/main/run_main_module:28:49 {
-956s       generatedMessage: true,
-
-Author: Gianfranco Costamagna <[e-mail]>
-Last-Update: 2024-01-16
-
-Index: nodejs/test/parallel/parallel.status
-===================================================================
---- nodejs.orig/test/parallel/parallel.status
-+++ nodejs/test/parallel/parallel.status
-@@ -57,6 +57,15 @@ test-corepack-version: SKIP
- test-fs-utimes: PASS,FLAKY
- test-fs-utimes-y2K38: PASS,FLAKY
- 
-+# Ubuntu regressed also in release pocket, new wasm issue?
-+test-fetch: PASS,FLAKY
-+test-http-response-setheaders: PASS,FLAKY
-+test-blob: PASS,FLAKY
-+test-websocket: PASS,FLAKY
-+# Ubuntu: incompatible with openssl < 3.2?
-+test-strace-openat-openssl: PASS,FLAKY
-+test-tls-junk-server: PASS,FLAKY
-+
- [$system==win32]
- 
- # Windows on x86
diff --git a/debian/patches/series b/debian/patches/series
index 1505bbd..7d7a0ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,7 @@
 test-lowerseclevel.patch
 #build/openssl_config_explicit_lower.patch
 build/openssl_3011_without_new_error_message.patch
-build/openssl_32.patch
+#build/openssl_32.patch
 build/more_shareable_builtins.patch
 build/builtins_module_paths_not_shareable.patch
 build/cctest_disable.patch
@@ -27,4 +27,4 @@ build/disable_sea_dfsg_postject.patch
 loong64/tests.patch
 deps/v8-no-static-zlib.patch
 deps/uv_io_uring_tests.patch
-disable-failing-tests.patch
+ubuntu-openssl-fix-strace-openat-test.patch
diff --git a/debian/patches/test-lowerseclevel.patch b/debian/patches/test-lowerseclevel.patch
index ef7d29d..d1ecd77 100644
--- a/debian/patches/test-lowerseclevel.patch
+++ b/debian/patches/test-lowerseclevel.patch
@@ -44,29 +44,3 @@ Index: nodejs/deps/openssl/openssl/apps/openssl.cnf
 +[system_default_sect]
 +MinProtocol = TLSv1.2
 +CipherString = DEFAULT:@SECLEVEL=1
-Index: nodejs/test/parallel/test-tls-enable-keylog-cli.js
-===================================================================
---- nodejs.orig/test/parallel/test-tls-enable-keylog-cli.js
-+++ nodejs/test/parallel/test-tls-enable-keylog-cli.js
-@@ -17,7 +17,7 @@ tmpdir.refresh();
- const file = tmpdir.resolve('keylog.log');
- 
- const child = fork(__filename, ['test'], {
--  execArgv: ['--tls-keylog=' + file]
-+  execArgv: ['--tls-keylog=' + file, "--openssl-shared-config"]
- });
- 
- child.on('close', common.mustCall((code, signal) => {
-Index: nodejs/test/parallel/test-tls-enable-trace-cli.js
-===================================================================
---- nodejs.orig/test/parallel/test-tls-enable-trace-cli.js
-+++ nodejs/test/parallel/test-tls-enable-trace-cli.js
-@@ -19,7 +19,7 @@ if (!binding('tls_wrap').HAVE_SSL_TRACE)
- 
- const child = fork(__filename, ['test'], {
-   silent: true,
--  execArgv: ['--trace-tls']
-+  execArgv: ['--trace-tls', '--openssl-shared-config']
- });
- 
- let stdout = '';
diff --git a/debian/patches/ubuntu-openssl-fix-strace-openat-test.patch b/debian/patches/ubuntu-openssl-fix-strace-openat-test.patch
new file mode 100644
index 0000000..0cdf3c7
--- /dev/null
+++ b/debian/patches/ubuntu-openssl-fix-strace-openat-test.patch
@@ -0,0 +1,14 @@
+diff --git a/test/parallel/test-strace-openat-openssl.js b/test/parallel/test-strace-openat-openssl.js
+index 13882e67a..6206c1661 100644
+--- a/test/parallel/test-strace-openat-openssl.js
++++ b/test/parallel/test-strace-openat-openssl.js
+@@ -17,7 +17,8 @@ if (spawnSync('strace').error !== undefined) {
+ 
+ {
+   const allowedOpenCalls = new Set([
+-    '/etc/ssl/openssl.cnf',
++    '/usr/share/zoneinfo-icu/44/le/zoneinfo64.res',
++    '/usr/lib/ssl/openssl.cnf',
+   ]);
+   const strace = spawn('strace', [
+     '-f', '-ff',