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

[Bryce Harrington]

Merge with Debian's package. The only delta is disabling a couple testcases for s390x. The delta for those is forwarded upstream but no response yet.

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

Autopkgtests (Local):

    autopkgtest [21:09:25]: test pkg-js-autopkgtest: - - - - - - - - - - results - - - - - - - - - -
    pkg-js-autopkgtest PASS
    autopkgtest [21:09:25]: @@@@@@@@@@@@@@@@@@@@ summary
    command1 PASS
    pkg-js-autopkgtest-require PASS (superficial)
    pkg-js-autopkgtest PASS

Autopkgtests (PPA - from http://autopkgtest.ubuntu.com/results/autopkgtest-lunar-bryce-node-nan-merge-v2.17.0-1/?format=plain)
  node-nan @ armhf:
    13.01.23 21:59:41 Log 🗒️ ✅ Triggers: node-nan/2.17.0-1ubuntu1~lunar1
      command1 PASS 🟩
      pkg-js-autopkgtest-require PASS 🟩
      pkg-js-autopkgtest PASS 🟩
Running:
    time pkg release arch ppa trigger
    1112 node-nan lunar ppc64el bryce/node-nan-merge-v2.17.0-1 node-nan/2.17.0-1ubuntu1~lunar1
    1112 node-nan lunar s390x bryce/node-nan-merge-v2.17.0-1 node-nan/2.17.0-1ubuntu1~lunar1
    1122 node-nan lunar arm64 bryce/node-nan-merge-v2.17.0-1 node-nan/2.17.0-1ubuntu1~lunar1
    40 node-nan lunar amd64 bryce/node-nan-merge-v2.17.0-1 node-nan/2.17.0-1ubuntu1~lunar1

I don't expect any of the remaining arches to fail, though s390x is the main one to be concerned with since I think upstream does not test on that arch.

Usual tags pushed for review:
  - tags/old/debian 333f6e2
  - tags/new/debian 58af960
  - tags/old/ubuntu dbb7c30
  - tags/logical/2.16.0-1ubuntu1 75ad599
  - tags/reconstruct/2.16.0-1ubuntu1 2c71de6
  - tags/split/2.16.0-1ubuntu1 ff5e8e5

[Sergio Durigan Junior (sergiodj)]

Thanks, Bryce.

Package build & tested fine (including the s390x test). Did you try verifying whether the delta is still necessary? It doesn't look like upstream addressed the underlying issue (and as you said, they don't seem to care about s390x), but I think it's worth a try anyway.

Otherwise, changes LGTM. +1

review: Approve

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

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

review: Approve

[Bryce Harrington (bryce)]

Yeah I don't think it's fixed yet. Next merge I'll re-test and spend some additional time poking upstream. Thanks for the review.

[Bryce Harrington (bryce)]

Uploaded:

Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/node-nan
Vcs-Git-Commit: 961aa82db3ed0fb4333a2dff70e49a78acfd9b81
Vcs-Git-Ref: refs/heads/merge-v2.17.0-1-lunar
$ dput ubuntu ../node-nan_2.17.0-1ubuntu1_source.changes
gpg: ../node-nan_2.17.0-1ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
gpg: ../node-nan_2.17.0-1ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
D: Setting host argument.
Checking signature on .changes
Checking signature on .dsc
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading node-nan_2.17.0-1ubuntu1.dsc: done.
  Uploading node-nan_2.17.0.orig.tar.gz: done.
  Uploading node-nan_2.17.0-1ubuntu1.debian.tar.xz: done.
  Uploading node-nan_2.17.0-1ubuntu1_source.buildinfo: done.
  Uploading node-nan_2.17.0-1ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index a78057d..e331217 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+node-nan (2.17.0-1ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable (LP: #2002854). 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]>  Fri, 13 Jan 2023 12:53:01 -0800
+
 node-nan (2.17.0-1) unstable; urgency=medium
 
   * Team upload
@@ -7,6 +16,15 @@ node-nan (2.17.0-1) unstable; urgency=medium
 
  -- Yadd <[e-mail]>  Tue, 22 Nov 2022 13:34:37 +0100
 
+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 ]
@@ -18,6 +36,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 8a80995..b22872b 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