Hi,
Here is an update that brings node to the latest. Tests have been merged
upstream (still 4 failures in 'make test').
- Regen patches.
- Update PLIST to remove .orig entries (pointed out by espie@).
- Add a new patch to remove this workaround[1] until the API is exposed
(9.x already has it).
All my tests run fine.
OK?
diff --git a/lang/node/Makefile b/lang/node/Makefile
index 2d7bc75396b..d40b29ab10c 100644
--- a/lang/node/Makefile
+++ b/lang/node/Makefile
@@ -10,14 +10,13 @@ USE_WXNEEDED = Yes
COMMENT = V8 JavaScript for clients and servers
-NODE_VERSION = v8.11.1
+NODE_VERSION = v8.11.2
PLEDGE_VER = 1.1.0
DISTFILES = node-pledge-{}${PLEDGE_VER}.tar.gz:0 ${DISTNAME}.tar.gz
DISTNAME = node-${NODE_VERSION}
PKGNAME = ${DISTNAME:S/v//g}
-REVISION = 0
MASTER_SITES0 = https://github.com/qbit/node-pledge/archive/
diff --git a/lang/node/distinfo b/lang/node/distinfo
index a7419d536f9..9e3d0608f1e 100644
--- a/lang/node/distinfo
+++ b/lang/node/distinfo
@@ -1,4 +1,4 @@
SHA256 (node-pledge-1.1.0.tar.gz) =
BuKnrXSkqpTb5Tfap1AHk+l7ucTJLEWbMFNbgQkNBsw=
-SHA256 (node-v8.11.1.tar.gz) = hmeAKPE7Js7tCO/EuDiSHKG/UUwLfoFRv+yLoVxeZq0=
+SHA256 (node-v8.11.2.tar.gz) = CsLE3icMqgi1rc2zxry4quNlGjfQNdOFvIGfusrzUOY=
SIZE (node-pledge-1.1.0.tar.gz) = 2560
-SIZE (node-v8.11.1.tar.gz) = 31030225
+SIZE (node-v8.11.2.tar.gz) = 31111468
diff --git a/lang/node/patches/patch-Makefile b/lang/node/patches/patch-Makefile
index 2f76660236f..ab82d70ed61 100644
--- a/lang/node/patches/patch-Makefile
+++ b/lang/node/patches/patch-Makefile
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile,v 1.5 2018/02/10 14:50:35 abieber Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -100,7 +100,7 @@ out/Makefile: common.gypi deps/uv/uv.gyp deps/http_par
+@@ -101,7 +101,7 @@ out/Makefile: common.gypi deps/uv/uv.gyp deps/http_par
config.gypi: configure
$(error Missing or stale $@, please run ./$<)
@@ -11,7 +11,7 @@ Index: Makefile
$(PYTHON) tools/install.py $@ '$(DESTDIR)' '$(PREFIX)'
uninstall: ## Uninstalls node from $PREFIX (default=/usr/local).
-@@ -247,7 +247,6 @@ test-cov: all
+@@ -248,7 +248,6 @@ test-cov: all
$(PYTHON) tools/test.py --mode=release -J \
$(CI_JS_SUITES) \
$(CI_NATIVE_SUITES)
@@ -19,7 +19,7 @@ Index: Makefile
test-parallel: all
$(PYTHON) tools/test.py --mode=release parallel -J
-@@ -326,6 +325,12 @@ test/addons/.buildstamp: config.gypi \
+@@ -327,6 +326,12 @@ test/addons/.buildstamp: config.gypi \
# Just goes to show that recursive make really is harmful...
# TODO(bnoordhuis) Force rebuild after gyp update.
build-addons: | $(NODE_EXE) test/addons/.buildstamp
diff --git a/lang/node/patches/patch-common_gypi
b/lang/node/patches/patch-common_gypi
index e5ee1065543..459281bf4cb 100644
--- a/lang/node/patches/patch-common_gypi
+++ b/lang/node/patches/patch-common_gypi
@@ -2,7 +2,7 @@ $OpenBSD: patch-common_gypi,v 1.9 2018/02/10 14:50:35 abieber
Exp $
Index: common.gypi
--- common.gypi.orig
+++ common.gypi
-@@ -425,6 +425,10 @@
+@@ -426,6 +426,10 @@
'ldflags': [
'-Wl,--export-dynamic',
],
diff --git a/lang/node/patches/patch-deps_uv_src_unix_openbsd_c
b/lang/node/patches/patch-deps_uv_src_unix_openbsd_c
index 7fad2140cba..ed5c8b4c61a 100644
--- a/lang/node/patches/patch-deps_uv_src_unix_openbsd_c
+++ b/lang/node/patches/patch-deps_uv_src_unix_openbsd_c
@@ -20,7 +20,7 @@ Index: deps/uv/src/unix/openbsd.c
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-@@ -61,12 +63,53 @@ void uv_loadavg(double avg[3]) {
+@@ -68,12 +70,53 @@ void uv_loadavg(double avg[3]) {
}
@@ -75,7 +75,7 @@ Index: deps/uv/src/unix/openbsd.c
pid_t mypid;
int err;
-@@ -94,18 +137,11 @@ int uv_exepath(char* buffer, size_t* size) {
+@@ -101,18 +144,11 @@ int uv_exepath(char* buffer, size_t* size) {
argsbuf_size *= 2U;
}
diff --git a/lang/node/patches/patch-deps_v8_Makefile
b/lang/node/patches/patch-deps_v8_Makefile
index 59ce4d0e43f..4d7f24ba9a2 100644
--- a/lang/node/patches/patch-deps_v8_Makefile
+++ b/lang/node/patches/patch-deps_v8_Makefile
@@ -2,7 +2,7 @@ $OpenBSD: patch-deps_v8_Makefile,v 1.4 2018/02/10 14:50:35
abieber Exp $
Index: deps/v8/Makefile
--- deps/v8/Makefile.orig
+++ deps/v8/Makefile
-@@ -432,7 +432,7 @@ $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
+@@ -436,7 +436,7 @@ $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
$(eval V8_TARGET_ARCH:=$(subst .,,$(suffix $(basename $@))))
PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell
pwd)/gypfiles:$(PYTHONPATH):$(shell pwd)/tools/gyp/pylib:$(PYTHONPATH)" \
GYP_GENERATORS=make \
@@ -11,7 +11,7 @@ Index: deps/v8/Makefile
-Igypfiles/standalone.gypi --depth=. \
-Dv8_target_arch=$(V8_TARGET_ARCH) \
$(if $(findstring $(CXX_TARGET_ARCH),$(V8_TARGET_ARCH)), \
-@@ -445,7 +445,7 @@ $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
+@@ -449,7 +449,7 @@ $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
$(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE)
PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell
pwd)/gypfiles:$(PYTHONPATH):$(shell pwd)/tools/gyp/pylib:$(PYTHONPATH)" \
GYP_GENERATORS=make \
diff --git a/lang/node/patches/patch-deps_v8_src_globals_h
b/lang/node/patches/patch-deps_v8_src_globals_h
index 6d412dff658..6bffb7fd17c 100644
--- a/lang/node/patches/patch-deps_v8_src_globals_h
+++ b/lang/node/patches/patch-deps_v8_src_globals_h
@@ -5,7 +5,7 @@ Slightly modified version of robert@'s patch for chromium v8
Index: deps/v8/src/globals.h
--- deps/v8/src/globals.h.orig
+++ deps/v8/src/globals.h
-@@ -190,7 +190,11 @@ const size_t kCodeRangeAreaAlignment = 256 * MB;
+@@ -204,7 +204,11 @@ const size_t kCodeRangeAreaAlignment = 256 * MB;
const size_t kMaximalCodeRangeSize = 512 * MB;
const size_t kCodeRangeAreaAlignment = 64 * KB; // OS page on PPC Linux
#else
diff --git a/lang/node/patches/patch-deps_v8_src_v8_gyp
b/lang/node/patches/patch-deps_v8_src_v8_gyp
index c702edaa9cb..a830f8066d9 100644
--- a/lang/node/patches/patch-deps_v8_src_v8_gyp
+++ b/lang/node/patches/patch-deps_v8_src_v8_gyp
@@ -12,15 +12,3 @@ Index: deps/v8/src/v8.gyp
}],
],
},
-@@ -2046,9 +2046,10 @@
- '-L/usr/local/lib -lexecinfo',
- ]},
- 'sources': [
-+ 'base/debug/stack_trace_posix.cc',
- 'base/platform/platform-openbsd.cc',
- 'base/platform/platform-posix.h',
-- 'base/platform/platform-posix.cc'
-+ 'base/platform/platform-posix.cc',
- 'base/platform/platform-posix-time.h',
- 'base/platform/platform-posix-time.cc',
- ],
diff --git a/lang/node/patches/patch-lib_internal_bootstrap_node_js
b/lang/node/patches/patch-lib_internal_bootstrap_node_js
index e69de29bb2d..ff268bb9822 100644
--- a/lang/node/patches/patch-lib_internal_bootstrap_node_js
+++ b/lang/node/patches/patch-lib_internal_bootstrap_node_js
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Index: lib/internal/bootstrap_node.js
+--- lib/internal/bootstrap_node.js.orig
++++ lib/internal/bootstrap_node.js
+@@ -71,13 +71,6 @@
+ // URL::ToObject() method is used.
+ NativeModule.require('internal/url');
+
+- // On OpenBSD process.execPath will be relative unless we
+- // get the full path before process.execPath is used.
+- if (process.platform === 'openbsd') {
+- const { realpathSync } = NativeModule.require('fs');
+- process.execPath = realpathSync.native(process.execPath);
+- }
+-
+ Object.defineProperty(process, 'argv0', {
+ enumerable: true,
+ configurable: false,
diff --git a/lang/node/patches/patch-lib_module_js
b/lang/node/patches/patch-lib_module_js
index 6ad34d74eae..0800039918e 100644
--- a/lang/node/patches/patch-lib_module_js
+++ b/lang/node/patches/patch-lib_module_js
@@ -2,7 +2,7 @@ $OpenBSD: patch-lib_module_js,v 1.7 2018/02/10 14:50:35 abieber
Exp $
Index: lib/module.js
--- lib/module.js.orig
+++ lib/module.js
-@@ -705,7 +705,10 @@ Module._initPaths = function() {
+@@ -714,7 +714,10 @@ Module._initPaths = function() {
} else {
prefixDir = path.resolve(process.execPath, '..', '..');
}
diff --git a/lang/node/patches/patch-node_gypi
b/lang/node/patches/patch-node_gypi
index e6a24c4bc49..9a650a2f0cc 100644
--- a/lang/node/patches/patch-node_gypi
+++ b/lang/node/patches/patch-node_gypi
@@ -3,7 +3,7 @@ $OpenBSD: patch-node_gypi,v 1.2 2018/02/10 14:50:35 abieber Exp
$
Index: node.gypi
--- node.gypi.orig
+++ node.gypi
-@@ -154,11 +154,14 @@
+@@ -137,11 +137,14 @@
'NODE_PLATFORM="darwin"',
],
}],
diff --git a/lang/node/patches/patch-test_common_index_js
b/lang/node/patches/patch-test_common_index_js
deleted file mode 100644
index b4a4319eaff..00000000000
--- a/lang/node/patches/patch-test_common_index_js
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-test_common_index_js,v 1.3 2018/02/10 14:50:35 abieber Exp $
-
-Index: test/common/index.js
---- test/common/index.js.orig
-+++ test/common/index.js
-@@ -50,6 +50,7 @@ exports.isLinuxPPCBE = (process.platform === 'linux')
- (os.endianness() === 'BE');
- exports.isSunOS = process.platform === 'sunos';
- exports.isFreeBSD = process.platform === 'freebsd';
-+exports.isOpenBSD = process.platform === 'openbsd';
- exports.isLinux = process.platform === 'linux';
- exports.isOSX = process.platform === 'darwin';
-
diff --git
a/lang/node/patches/patch-test_parallel_test-child-process-exec-timeout_js
b/lang/node/patches/patch-test_parallel_test-child-process-exec-timeout_js
deleted file mode 100644
index c768d2d9393..00000000000
--- a/lang/node/patches/patch-test_parallel_test-child-process-exec-timeout_js
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-test_parallel_test-child-process-exec-timeout_js,v 1.1
2017/10/10 13:32:07 abieber Exp $
-
-Index: test/parallel/test-child-process-exec-timeout.js
---- test/parallel/test-child-process-exec-timeout.js.orig
-+++ test/parallel/test-child-process-exec-timeout.js
-@@ -3,6 +3,11 @@ const common = require('../common');
- const assert = require('assert');
- const cp = require('child_process');
-
-+if (common.isOpenBSD) {
-+ common.skip('OpenBSD does not keep a full path for processes');
-+ return;
-+}
-+
- if (process.argv[2] === 'child') {
- setTimeout(() => {
- // The following console statements are part of the test.
diff --git a/lang/node/patches/patch-test_parallel_test-cluster-dgram-1_js
b/lang/node/patches/patch-test_parallel_test-cluster-dgram-1_js
deleted file mode 100644
index 1322d41d721..00000000000
--- a/lang/node/patches/patch-test_parallel_test-cluster-dgram-1_js
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-test_parallel_test-cluster-dgram-1_js,v 1.2 2018/02/10
14:50:35 abieber Exp $
-
-Index: test/parallel/test-cluster-dgram-1.js
---- test/parallel/test-cluster-dgram-1.js.orig
-+++ test/parallel/test-cluster-dgram-1.js
-@@ -21,8 +21,8 @@
-
- 'use strict';
- const common = require('../common');
--if (common.isWindows)
-- common.skip('dgram clustering is currently not supported on Windows.');
-+if (common.isWindows || common.isOpenBSD)
-+ common.skip('dgram clustering is currently not supported');
-
- const NUM_WORKERS = 4;
- const PACKETS_PER_WORKER = 10;
diff --git a/lang/node/patches/patch-test_parallel_test-fs-utimes_js
b/lang/node/patches/patch-test_parallel_test-fs-utimes_js
deleted file mode 100644
index 8b2eb2a41f4..00000000000
--- a/lang/node/patches/patch-test_parallel_test-fs-utimes_js
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-test_parallel_test-fs-utimes_js,v 1.1 2018/02/10 14:50:35
abieber Exp $
-
-Index: test/parallel/test-fs-utimes.js
---- test/parallel/test-fs-utimes.js.orig
-+++ test/parallel/test-fs-utimes.js
-@@ -171,8 +171,8 @@ process.on('exit', function() {
- const path = `${common.tmpDir}/test-utimes-precision`;
- fs.writeFileSync(path, '');
-
--// test Y2K38 for all platforms [except 'arm', and 'SunOS']
--if (!process.arch.includes('arm') && !common.isSunOS) {
-+// test Y2K38 for all platforms [except 'arm', 'SunOS', 'OpenBSD']
-+if (!process.arch.includes('arm') && !common.isSunOS && !common.isOpenBSD) {
- // because 2 ** 31 doesn't look right
- // eslint-disable-next-line space-infix-ops
- const Y2K38_mtime = 2**31;
diff --git a/lang/node/patches/patch-test_parallel_test-http-dns-error_js
b/lang/node/patches/patch-test_parallel_test-http-dns-error_js
deleted file mode 100644
index 4268efa9b51..00000000000
--- a/lang/node/patches/patch-test_parallel_test-http-dns-error_js
+++ /dev/null
@@ -1,29 +0,0 @@
-$OpenBSD: patch-test_parallel_test-http-dns-error_js,v 1.2 2018/02/10 14:50:35
abieber Exp $
-
-Index: test/parallel/test-http-dns-error.js
---- test/parallel/test-http-dns-error.js.orig
-+++ test/parallel/test-http-dns-error.js
-@@ -39,9 +39,13 @@ function test(mod) {
-
- // Bad host name should not throw an uncatchable exception.
- // Ensure that there is time to attach an error listener.
-+ var err_check = 'ENOTFOUND';
-+ if (common.isOpenBSD) {
-+ err_check = 'EAI_FAIL'
-+ }
- const req1 = mod.get({ host: host, port: 42 }, do_not_call);
- req1.on('error', common.mustCall(function(err) {
-- assert.strictEqual(err.code, 'ENOTFOUND');
-+ assert.strictEqual(err.code, err_check);
- }));
- // http.get() called req1.end() for us
-
-@@ -51,7 +55,7 @@ function test(mod) {
- port: 42
- }, do_not_call);
- req2.on('error', common.mustCall(function(err) {
-- assert.strictEqual(err.code, 'ENOTFOUND');
-+ assert.strictEqual(err.code, err_check);
- }));
- req2.end();
- }
diff --git a/lang/node/patches/patch-test_parallel_test-net-dns-error_js
b/lang/node/patches/patch-test_parallel_test-net-dns-error_js
deleted file mode 100644
index f976209b457..00000000000
--- a/lang/node/patches/patch-test_parallel_test-net-dns-error_js
+++ /dev/null
@@ -1,27 +0,0 @@
-$OpenBSD: patch-test_parallel_test-net-dns-error_js,v 1.2 2018/02/10 14:50:35
abieber Exp $
-
-Index: test/parallel/test-net-dns-error.js
---- test/parallel/test-net-dns-error.js.orig
-+++ test/parallel/test-net-dns-error.js
-@@ -33,11 +33,19 @@ function do_not_call() {
-
- const socket = net.connect(42, host, do_not_call);
- socket.on('error', common.mustCall(function(err) {
-- assert.strictEqual(err.code, 'ENOTFOUND');
-+ if (common.isOpenBSD) {
-+ assert.strictEqual(err.code, 'EAI_FAIL');
-+ } else {
-+ assert.strictEqual(err.code, 'ENOTFOUND');
-+ }
- }));
- socket.on('lookup', function(err, ip, type) {
- assert(err instanceof Error);
-- assert.strictEqual(err.code, 'ENOTFOUND');
-+ if (common.isOpenBSD) {
-+ assert.strictEqual(err.code, 'EAI_FAIL');
-+ } else {
-+ assert.strictEqual(err.code, 'ENOTFOUND');
-+ }
- assert.strictEqual(ip, undefined);
- assert.strictEqual(type, undefined);
- });
diff --git a/lang/node/patches/patch-test_parallel_test-process-execpath_js
b/lang/node/patches/patch-test_parallel_test-process-execpath_js
deleted file mode 100644
index 35210e47555..00000000000
--- a/lang/node/patches/patch-test_parallel_test-process-execpath_js
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-test_parallel_test-process-execpath_js,v 1.2 2017/10/31
01:31:45 abieber Exp $
-
-Index: test/parallel/test-process-execpath.js
---- test/parallel/test-process-execpath.js.orig
-+++ test/parallel/test-process-execpath.js
-@@ -8,6 +8,11 @@ const child_process = require('child_process');
- const path = require('path');
- const fs = require('fs');
-
-+if (common.isOpenBSD) {
-+ common.skip('OpenBSD does not keep a full path for processes');
-+ return;
-+}
-+
- assert.strictEqual(process.execPath, fs.realpathSync(process.execPath));
-
- if (process.argv[2] === 'child') {
diff --git a/lang/node/patches/patch-test_parallel_test-setproctitle_js
b/lang/node/patches/patch-test_parallel_test-setproctitle_js
deleted file mode 100644
index 43576f65feb..00000000000
--- a/lang/node/patches/patch-test_parallel_test-setproctitle_js
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-test_parallel_test-setproctitle_js,v 1.1 2018/02/10 14:50:35
abieber Exp $
-
-Index: test/parallel/test-setproctitle.js
---- test/parallel/test-setproctitle.js.orig
-+++ test/parallel/test-setproctitle.js
-@@ -34,7 +34,7 @@ exec(cmd, common.mustCall((error, stdout, stderr) => {
- assert.strictEqual(stderr, '');
-
- // freebsd always add ' (procname)' to the process title
-- if (common.isFreeBSD)
-+ if (common.isFreeBSD || common.isOpenBSD)
- title += ` (${path.basename(process.execPath)})`;
-
- // omitting trailing whitespace and \n
diff --git
a/lang/node/patches/patch-test_sequential_test-child-process-execsync_js
b/lang/node/patches/patch-test_sequential_test-child-process-execsync_js
deleted file mode 100644
index 58cd43c00c5..00000000000
--- a/lang/node/patches/patch-test_sequential_test-child-process-execsync_js
+++ /dev/null
@@ -1,127 +0,0 @@
-$OpenBSD: patch-test_sequential_test-child-process-execsync_js,v 1.4
2018/02/10 14:50:35 abieber Exp $
-
-Index: test/sequential/test-child-process-execsync.js
---- test/sequential/test-child-process-execsync.js.orig
-+++ test/sequential/test-child-process-execsync.js
-@@ -45,53 +45,55 @@ assert.throws(
- );
-
- let cmd, ret;
--try {
-- cmd = `"${process.execPath}" -e "setTimeout(function(){}, ${SLEEP});"`;
-- ret = execSync(cmd, { timeout: TIMER });
--} catch (e) {
-- caught = true;
-- assert.strictEqual(e.errno, 'ETIMEDOUT');
-- err = e;
--} finally {
-- assert.strictEqual(ret, undefined,
-- `should not have a return value, received ${ret}`);
-- assert.strictEqual(caught, true, 'execSync should throw');
-- const end = Date.now() - start;
-- assert(end < SLEEP);
-- assert(err.status > 128 || err.signal);
--}
-+if (!common.isOpenBSD) {
-+ try {
-+ cmd = `"${process.execPath}" -e "setTimeout(function(){}, ${SLEEP});"`;
-+ ret = execSync(cmd, { timeout: TIMER });
-+ } catch (e) {
-+ caught = true;
-+ assert.strictEqual(e.errno, 'ETIMEDOUT');
-+ err = e;
-+ } finally {
-+ assert.strictEqual(ret, undefined,
-+ `should not have a return value, received ${ret}`);
-+ assert.strictEqual(caught, true, 'execSync should throw');
-+ const end = Date.now() - start;
-+ assert(end < SLEEP);
-+ assert(err.status > 128 || err.signal);
-+ }
-
--assert.throws(function() {
-- execSync('iamabadcommand');
--}, /Command failed: iamabadcommand/);
-+ assert.throws(function() {
-+ execSync('iamabadcommand');
-+ }, /Command failed: iamabadcommand/);
-
--const msg = 'foobar';
--const msgBuf = Buffer.from(`${msg}\n`);
-+ const msg = 'foobar';
-+ const msgBuf = Buffer.from(`${msg}\n`);
-
--// console.log ends every line with just '\n', even on Windows.
-+ // console.log ends every line with just '\n', even on Windows.
-
--cmd = `"${process.execPath}" -e "console.log('${msg}');"`;
-+ cmd = `"${process.execPath}" -e "console.log('${msg}');"`;
-
--ret = execSync(cmd);
-+ ret = execSync(cmd);
-
--assert.strictEqual(ret.length, msgBuf.length);
--assert.deepStrictEqual(ret, msgBuf);
-+ assert.strictEqual(ret.length, msgBuf.length);
-+ assert.deepStrictEqual(ret, msgBuf);
-
--ret = execSync(cmd, { encoding: 'utf8' });
-+ ret = execSync(cmd, { encoding: 'utf8' });
-
--assert.strictEqual(ret, `${msg}\n`);
-+ assert.strictEqual(ret, `${msg}\n`);
-
--const args = [
-- '-e',
-- `console.log("${msg}");`
--];
--ret = execFileSync(process.execPath, args);
-+ const args = [
-+ '-e',
-+ `console.log("${msg}");`
-+ ];
-+ ret = execFileSync(process.execPath, args);
-
--assert.deepStrictEqual(ret, msgBuf);
-+ assert.deepStrictEqual(ret, msgBuf);
-
--ret = execFileSync(process.execPath, args, { encoding: 'utf8' });
-+ ret = execFileSync(process.execPath, args, { encoding: 'utf8' });
-
--assert.strictEqual(ret, `${msg}\n`);
-+ assert.strictEqual(ret, `${msg}\n`);
-+}
-
- // Verify that the cwd option works - GH #7824
- {
-@@ -110,17 +112,19 @@ assert.strictEqual(ret, `${msg}\n`);
- }
-
- // Verify the execFileSync() behavior when the child exits with a non-zero
code.
--{
-- const args = ['-e', 'process.exit(1)'];
-+if (!common.isOpenBSD) {
-+ {
-+ const args = ['-e', 'process.exit(1)'];
-
-- assert.throws(() => {
-- execFileSync(process.execPath, args);
-- }, (err) => {
-- const msg = `Command failed: ${process.execPath} ${args.join(' ')}`;
-+ assert.throws(() => {
-+ execFileSync(process.execPath, args);
-+ }, (err) => {
-+ const msg = `Command failed: ${process.execPath} ${args.join(' ')}`;
-
-- assert(err instanceof Error);
-- assert.strictEqual(err.message, msg);
-- assert.strictEqual(err.status, 1);
-- return true;
-- });
-+ assert(err instanceof Error);
-+ assert.strictEqual(err.message, msg);
-+ assert.strictEqual(err.status, 1);
-+ return true;
-+ });
-+ }
- }
diff --git a/lang/node/patches/patch-test_sequential_test-module-loading_js
b/lang/node/patches/patch-test_sequential_test-module-loading_js
deleted file mode 100644
index e71100bc6c5..00000000000
--- a/lang/node/patches/patch-test_sequential_test-module-loading_js
+++ /dev/null
@@ -1,36 +0,0 @@
-$OpenBSD: patch-test_sequential_test-module-loading_js,v 1.2 2018/02/10
14:50:35 abieber Exp $
-
-Index: test/sequential/test-module-loading.js
---- test/sequential/test-module-loading.js.orig
-+++ test/sequential/test-module-loading.js
-@@ -20,7 +20,7 @@
- // USE OR OTHER DEALINGS IN THE SOFTWARE.
-
- 'use strict';
--require('../common');
-+const common = require('../common');
- const assert = require('assert');
- const path = require('path');
- const fs = require('fs');
-@@ -197,7 +197,9 @@ try {
- require(`${loadOrder}file3`);
- } catch (e) {
- // Not a real .node module, but we know we require'd the right thing.
-- assert.ok(/file3\.node/.test(e.message.replace(backslash, '/')));
-+ if (!common.isOpenBSD) {
-+ assert.ok(/file3\.node/.test(e.message.replace(backslash, '/')));
-+ }
- }
- assert.strictEqual(require(`${loadOrder}file4`).file4, 'file4.reg', msg);
- assert.strictEqual(require(`${loadOrder}file5`).file5, 'file5.reg2', msg);
-@@ -205,7 +207,9 @@ try {
- try {
- require(`${loadOrder}file7`);
- } catch (e) {
-- assert.ok(/file7\/index\.node/.test(e.message.replace(backslash, '/')));
-+ if (!common.isOpenBSD) {
-+ assert.ok(/file7\/index\.node/.test(e.message.replace(backslash, '/')));
-+ }
- }
- assert.strictEqual(require(`${loadOrder}file8`).file8, 'file8/index.reg',
- msg);
diff --git a/lang/node/patches/patch-tools_icu_icu-generic_gyp
b/lang/node/patches/patch-tools_icu_icu-generic_gyp
index 4ca37d5202c..68a513e4173 100644
--- a/lang/node/patches/patch-tools_icu_icu-generic_gyp
+++ b/lang/node/patches/patch-tools_icu_icu-generic_gyp
@@ -2,7 +2,7 @@ $OpenBSD: patch-tools_icu_icu-generic_gyp,v 1.2 2018/02/10
14:50:35 abieber Exp
Index: tools/icu/icu-generic.gyp
--- tools/icu/icu-generic.gyp.orig
+++ tools/icu/icu-generic.gyp
-@@ -548,6 +548,7 @@
+@@ -549,6 +549,7 @@
'toolsets': [ 'host' ],
'type': 'executable',
'dependencies': [ 'icutools' ],
diff --git a/lang/node/pkg/PLIST b/lang/node/pkg/PLIST
index fdfc7f9668f..990bc2985c3 100644
--- a/lang/node/pkg/PLIST
+++ b/lang/node/pkg/PLIST
@@ -1,14 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.34 2018/02/10 14:50:35 abieber Exp $
-@comment node/6.x/lib/node_modules/npm/bin/node-gyp-bin/node-gyp.orig
-@comment node/6.x/lib/node_modules/npm/lib/build.js.orig
-@comment node/6.x/lib/node_modules/npm/lib/npm.js.orig
-@comment
node/6.x/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py.orig
-@comment
node/6.x/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py.orig
-@comment
node/6.x/lib/node_modules/npm/node_modules/node-gyp/lib/install.js.beforesubst
-@comment
node/6.x/lib/node_modules/npm/node_modules/node-gyp/lib/install.js.orig
-@comment
node/6.x/lib/nede_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/man/man1/sshpk-verify.1
-@comment
node/6.x/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/man/man1/sshpk-conv.1
-@comment
node/6.x/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/man/man1/sshpk-sign.1
+@comment $OpenBSD: PLIST,v$
@bin bin/node
bin/node-gyp
bin/npm
@@ -3101,7 +3091,7 @@ lib/node_modules/npm/lib/visnup.js
lib/node_modules/npm/lib/whoami.js
lib/node_modules/npm/lib/xmas.js
lib/node_modules/npm/make.bat
-lib/node_modules/npm/man/
+@mandir lib/node_modules/npm/man/
lib/node_modules/npm/man/man1/
@man lib/node_modules/npm/man/man1/npm-README.1
@man lib/node_modules/npm/man/man1/npm-access.1
@@ -4570,9 +4560,9 @@
lib/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/ssh-
lib/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/utils.js
lib/node_modules/request/node_modules/http-signature/node_modules/sshpk/man/
lib/node_modules/request/node_modules/http-signature/node_modules/sshpk/man/man1/
-@man
lib/node_modules/request/node_modules/http-signature/node_modules/sshpk/man/man1/sshpk-conv.1
-@man
lib/node_modules/request/node_modules/http-signature/node_modules/sshpk/man/man1/sshpk-sign.1
-@man
lib/node_modules/request/node_modules/http-signature/node_modules/sshpk/man/man1/sshpk-verify.1
+lib/node_modules/request/node_modules/http-signature/node_modules/sshpk/man/man1/sshpk-conv.1
+lib/node_modules/request/node_modules/http-signature/node_modules/sshpk/man/man1/sshpk-sign.1
+lib/node_modules/request/node_modules/http-signature/node_modules/sshpk/man/man1/sshpk-verify.1
lib/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/
lib/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/
lib/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/.npmignore
--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
