Merge ~bryce/ubuntu/+source/node-nan:merge-v2.16.0-1-kinetic into ubuntu/+source/node-nan:debian/sid

[Bryce Harrington]

Simple merge from upstream. I kind of wonder if this could be a sync - I tried building the debian package in a PPA with s390x enabled but it only built for amd64:

    https://launchpad.net/~bryce/+archive/ubuntu/node-nan-merge-v2.16.0-1/+packages

However looking at the git log there's just one change of substance, which doesn't relate to the test problem (just enables Node 18). The delta has been forwarded upstream, but no response yet. So it seems doubtful the test is fixed yet, and the delta should remain for now.

The Node 18 support is probably important for kinetic, though, as it appears nodejs 18 is in -proposed:

 nodejs | 12.22.9~dfsg-1ubuntu3 | jammy/universe
 nodejs | 16.14.2+dfsg1-1ubuntu3 | kinetic/universe
 nodejs | 18.6.0+dfsg-3ubuntu1 | kinetic-proposed/universe

PPA: https://launchpad.net/~bryce/+archive/ubuntu/node-nan-merge-v2.16.0-1/+packages

$ lp-test-ppa ppa:bryce/node-nan-merge-v2.16.0-1 --release kinetic

stirling: ~$ lp-test-ppa ppa:bryce/node-nan-merge-v2.16.0-1 --release kinetic
Tests for PPA node-nan-merge-v2.16.0-1
---- ---- ---- ----
Release: kinetic
Sources:
  SRC: node-nan @ 2.16.0-1ubuntu1~kinetic1 - Published
Triggers on published Sources:
              node-nan @ amd64 for node-nan/2.16.0-1ubuntu1~kinetic1 Trigger @amd64 ♻️ Trigger all proposed @{arch} ♻️ 💍
              node-nan @ s390x for node-nan/2.16.0-1ubuntu1~kinetic1 Trigger @s390x ♻️ Trigger all proposed @{arch} ♻️ 💍
              node-nan @ ppc64el for node-nan/2.16.0-1ubuntu1~kinetic1 Trigger @ppc64el ♻️ Trigger all proposed @{arch} ♻️ 💍
              node-nan @ arm64 for node-nan/2.16.0-1ubuntu1~kinetic1 Trigger @arm64 ♻️ Trigger all proposed @{arch} ♻️ 💍
              node-nan @ armhf for node-nan/2.16.0-1ubuntu1~kinetic1 Trigger @armhf ♻️ Trigger all proposed @{arch} ♻️ 💍
              node-nan @ riscv64 for node-nan/2.16.0-1ubuntu1~kinetic1 Trigger @riscv64 ♻️ Trigger all proposed @{arch} ♻️ 💍
Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-bryce-node-nan-merge-v2.16.0-1/?format=plain)
  node-nan @ amd64:
    23.08.22 22:14:25 Log 🗒️ ✅ Triggers: node-nan/2.16.0-1ubuntu1~kinetic1
  node-nan @ armhf:
    23.08.22 22:04:56 Log 🗒️ ✅ Triggers: node-nan/2.16.0-1ubuntu1~kinetic1
  node-nan @ ppc64el:
    23.08.22 22:04:06 Log 🗒️ ✅ Triggers: node-nan/2.16.0-1ubuntu1~kinetic1
  node-nan @ s390x:
    23.08.22 22:03:47 Log 🗒️ ✅ Triggers: node-nan/2.16.0-1ubuntu1~kinetic1
Running:
    time pkg release arch ppa trigger
    2423 node-nan kinetic arm64 bryce/node-nan-merge-v2.16.0-1 node-nan/2.16.0-1ubuntu1~kinetic1
Waiting: (none)

[Sergio Durigan Junior (sergiodj)]

I will take a look at this one.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Bryce.

The package is "Architecture: all", so it won't build on non-amd64 architectures. The problem fixed by the patch doesn't seem to be fixed indeed; Debian is also affected by it, and we can see that the test is still failing there:

https://ci.debian.net/data/autopkgtest/unstable/s390x/n/node-nan/24616299/log.gz

Therefore, I agree that the delta should be kept.

BTW, this also means that it may be a good idea to send the patch to Debian and have the package become a sync.

Otherwise, LGTM. +1

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: bryce, sergiodj
Uploaders: bryce, sergiodj
MP auto-approved

review: Approve

[Bryce Harrington (bryce)]

This has migrated

$ rmad node-nan
 node-nan | 2.15.0-1ubuntu1 | jammy/universe
 node-nan | 2.16.0-1ubuntu1 | kinetic/universe

node-nan | 2.14.2-2 | stable
node-nan | 2.16.0-1 | testing
node-nan | 2.16.0-1 | unstable

diff --git a/debian/changelog b/debian/changelog
index ea78b91..6a46326 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+node-nan (2.16.0-1ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1987440). Remaining changes:
+    - d/p/disable-test-for-s390x.patch: Disable part of strings-test
+      + This test case breaks on s390x, presumably due to endian issue
+        (LP #1967589)
+
+ -- Bryce Harrington <[e-mail]>  Tue, 23 Aug 2022 14:09:37 -0700
+
 node-nan (2.16.0-1) unstable; urgency=medium
 
   [ Debian Janitor ]
@@ -9,6 +18,14 @@ node-nan (2.16.0-1) unstable; urgency=medium
 
  -- Jérémy Lal <[e-mail]>  Tue, 28 Jun 2022 14:00:12 +0200
 
+node-nan (2.15.0-1ubuntu1) jammy; urgency=medium
+
+  * d/p/disable-test-for-s390x.patch: Disable part of strings-test
+    - This test case breaks on s390x, presumably due to endian issue
+      (LP: #1967589)
+
+ -- Bryce Harrington <[e-mail]>  Sat, 02 Apr 2022 02:16:42 +0000
+
 node-nan (2.15.0-1) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/control b/debian/control
index d90ef9c..abc48c4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: node-nan
 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]>
 Build-Depends: debhelper-compat (= 13)
  , dh-sequence-nodejs
diff --git a/debian/patches/disable-test-for-s390x.patch b/debian/patches/disable-test-for-s390x.patch
new file mode 100644
index 0000000..38e862d
--- /dev/null
+++ b/debian/patches/disable-test-for-s390x.patch
@@ -0,0 +1,35 @@
+Description: Disable test that fails on s390x, probably due to an endian issue.
+Author: Bryce Harrington <[e-mail]>
+Origin: vendor
+Forwarded: not-needed
+Bug: https://github.com/nodejs/nan/issues/935
+Bug-Ubuntu: https://bugs.launchpad.net/node-nan/+bug/1967589
+
+--- a/test/js/strings-test.js
++++ b/test/js/strings-test.js
+@@ -12,7 +12,7 @@
+ 
+ 
+ test('FromV8String', function (t) {
+-  t.plan(6);
++  t.plan(4);
+ 
+   var a = bindings.returnUtf8String;
+   var b = bindings.heapString;
+@@ -22,16 +22,4 @@
+ 
+   t.equal(a('an utf8 strïng'), 'an utf8 strïng');
+   t.equal(b('an utf8 strïng'), 'an utf8 strïng');
+-
+-  var buf;
+-
+-  /* we check Buffer.alloc rather than Buffer.from because
+-   * we don't want the base class Uint8Array.from */
+-  if (typeof(Buffer.alloc) === "function") {
+-    buf = Buffer.from('hello');
+-  } else {
+-    buf = new Buffer('hello');
+-  }
+-  t.equal(bindings.encodeHex(), buf.toString('hex'));
+-  t.equal(bindings.encodeUCS2(), 'hello');
+ });
diff --git a/debian/patches/series b/debian/patches/series
index 559536f..e1d78e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_returnvalue_test.patch
+disable-test-for-s390x.patch