orca/config/patches/node-pty@1.1.0.patch

diff --git a/binding.gyp b/binding.gyp
index 5f63978b..b3309a07 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -5,9 +5,6 @@
     ],
     'conditions': [
       ['OS=="win"', {
-        'msvs_configuration_attributes': {
-          'SpectreMitigation': 'Spectre'
-        },
         'msvs_settings': {
             'VCCLCompilerTool': {
               'AdditionalOptions': [
diff --git a/deps/winpty/src/winpty.gyp b/deps/winpty/src/winpty.gyp
index 1ac5758b..e6198137 100644
--- a/deps/winpty/src/winpty.gyp
+++ b/deps/winpty/src/winpty.gyp
@@ -10,7 +10,7 @@
     #    make -j4 CXX=i686-w64-mingw32-g++ LDFLAGS="-static -static-libgcc -static-libstdc++"

     'variables': {
-        'WINPTY_COMMIT_HASH%': '<!(cmd /c "cd shared && GetCommitHash.bat")',
+        'WINPTY_COMMIT_HASH%': '<!(cmd /c "cd shared && .\\GetCommitHash.bat")',
     },
     'target_defaults' : {
         'defines' : [
@@ -22,7 +22,7 @@
         'include_dirs': [
             # Add the 'src/gen' directory to the include path and force gyp to
             # run the script (re)generating the version header.
-            '<!(cmd /c "cd shared && UpdateGenVersion.bat <(WINPTY_COMMIT_HASH)")',
+            '<!(cmd /c "cd shared && .\\UpdateGenVersion.bat <(WINPTY_COMMIT_HASH)")',
         ]
     },
     'targets' : [
@@ -40,9 +40,6 @@
                 '-lshell32',
                 '-luser32',
             ],
-            'msvs_configuration_attributes': {
-                'SpectreMitigation': 'Spectre'
-            },
             'msvs_settings': {
                 # Specify this setting here to override a setting from somewhere
                 # else, such as node's common.gypi.
@@ -142,9 +139,6 @@
                 '-ladvapi32',
                 '-luser32',
             ],
-            'msvs_configuration_attributes': {
-                'SpectreMitigation': 'Spectre'
-            },
             'msvs_settings': {
                 # Specify this setting here to override a setting from somewhere
                 # else, such as node's common.gypi.
diff --git a/lib/unixTerminal.js b/lib/unixTerminal.js
index 1ec12f79..cec8b67a 100644
--- a/lib/unixTerminal.js
+++ b/lib/unixTerminal.js
@@ -28,8 +28,12 @@ var native = utils_1.loadNativeModule('pty');
 var pty = native.module;
 var helperPath = native.dir + '/spawn-helper';
 helperPath = path.resolve(__dirname, helperPath);
-helperPath = helperPath.replace('app.asar', 'app.asar.unpacked');
-helperPath = helperPath.replace('node_modules.asar', 'node_modules.asar.unpacked');
+if (!helperPath.includes('app.asar.unpacked')) {
+    helperPath = helperPath.replace('app.asar', 'app.asar.unpacked');
+}
+if (!helperPath.includes('node_modules.asar.unpacked')) {
+    helperPath = helperPath.replace('node_modules.asar', 'node_modules.asar.unpacked');
+}
 var DEFAULT_FILE = 'sh';
 var DEFAULT_NAME = 'xterm';
 var DESTROY_SOCKET_TIMEOUT_MS = 200;
diff --git a/src/unix/pty.cc b/src/unix/pty.cc
index 7b4b9e1f..0544b86d 100644
--- a/src/unix/pty.cc
+++ b/src/unix/pty.cc
@@ -23,7 +23,9 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <unistd.h>
+#include <string>
 #include <thread>

 #include <sys/types.h>
@@ -237,13 +239,23 @@ pty_getproc(int, char *);
 #endif

 #if defined(__APPLE__) || defined(__OpenBSD__)
+struct pty_spawn_error {
+  const char* step;
+  int errnum;
+  std::string detail_name;
+  std::string detail_value;
+};
+
+static std::string
+pty_format_spawn_error(const pty_spawn_error&);
+
 static void
 pty_posix_spawn(char** argv, char** env,
                 const struct termios *termp,
                 const struct winsize *winp,
                 int* master,
                 pid_t* pid,
-                int* err);
+                pty_spawn_error* err);
 #endif

 struct DelBuf {
@@ -367,10 +379,11 @@ Napi::Value PtyFork(const Napi::CallbackInfo& info) {
     argv[i + 3] = strdup(arg.c_str());
   }

-  int err = -1;
-  pty_posix_spawn(argv, env, term, &winp, &master, &pid, &err);
-  if (err != 0) {
-    throw Napi::Error::New(napiEnv, "posix_spawnp failed.");
+  pty_spawn_error spawn_error = { NULL, 0, "", "" };
+  pty_posix_spawn(argv, env, term, &winp, &master, &pid, &spawn_error);
+  if (spawn_error.errnum != 0) {
+    std::string spawn_message = pty_format_spawn_error(spawn_error);
+    throw Napi::Error::New(napiEnv, spawn_message);
   }
   if (pty_nonblock(master) == -1) {
     throw Napi::Error::New(napiEnv, "Could not set master fd to nonblocking.");
@@ -684,13 +697,65 @@ pty_getproc(int fd, char *tty) {
 #endif

 #if defined(__APPLE__)
+static const char*
+pty_errno_name(int errnum) {
+  switch (errnum) {
+    case E2BIG: return "E2BIG";
+    case EACCES: return "EACCES";
+    case EAGAIN: return "EAGAIN";
+    case EMFILE: return "EMFILE";
+    case ENFILE: return "ENFILE";
+    case ENOENT: return "ENOENT";
+    case ENOMEM: return "ENOMEM";
+    default: return "errno";
+  }
+}
+
+static void
+pty_set_spawn_error(pty_spawn_error* err,
+                    const char* step,
+                    int errnum,
+                    const char* detail_name = NULL,
+                    const char* detail_value = NULL) {
+  err->step = step;
+  err->errnum = errnum;
+  err->detail_name = detail_name ? detail_name : "";
+  err->detail_value = detail_value ? detail_value : "";
+}
+
+static std::string
+pty_format_spawn_error(const pty_spawn_error& err) {
+  char errno_buf[64];
+  snprintf(errno_buf, sizeof(errno_buf), "%d", err.errnum);
+
+  std::string message = "node-pty: ";
+  message += err.step ? err.step : "unknown";
+  message += " failed: ";
+  message += pty_errno_name(err.errnum);
+  message += " (errno ";
+  message += errno_buf;
+  message += ", ";
+  message += strerror(err.errnum);
+  message += ")";
+
+  if (!err.detail_name.empty()) {
+    message += " - ";
+    message += err.detail_name;
+    message += "='";
+    message += err.detail_value;
+    message += "'";
+  }
+
+  return message;
+}
+
 static void
 pty_posix_spawn(char** argv, char** env,
                 const struct termios *termp,
                 const struct winsize *winp,
                 int* master,
                 pid_t* pid,
-                int* err) {
+                pty_spawn_error* err) {
   int low_fds[3];
   size_t count = 0;

@@ -706,11 +771,19 @@ pty_posix_spawn(char** argv, char** env,
               POSIX_SPAWN_SETSID;
   *master = posix_openpt(O_RDWR);
   if (*master == -1) {
+    pty_set_spawn_error(err, "posix_openpt", errno);
+    return;
+  }
+
+  int res = grantpt(*master);
+  if (res == -1) {
+    pty_set_spawn_error(err, "grantpt", errno);
     return;
   }

-  int res = grantpt(*master) || unlockpt(*master);
+  res = unlockpt(*master);
   if (res == -1) {
+    pty_set_spawn_error(err, "unlockpt", errno);
     return;
   }

@@ -719,17 +792,20 @@ pty_posix_spawn(char** argv, char** env,
   char slave_pty_name[128];
   res = ioctl(*master, TIOCPTYGNAME, slave_pty_name);
   if (res == -1) {
+    pty_set_spawn_error(err, "ioctl_TIOCPTYGNAME", errno);
     return;
   }

   slave = open(slave_pty_name, O_RDWR | O_NOCTTY);
   if (slave == -1) {
+    pty_set_spawn_error(err, "open_slave", errno, "slave", slave_pty_name);
     return;
   }

   if (termp) {
     res = tcsetattr(slave, TCSANOW, termp);
     if (res == -1) {
+      pty_set_spawn_error(err, "tcsetattr", errno, "slave", slave_pty_name);
       return;
     };
   }
@@ -737,6 +813,7 @@ pty_posix_spawn(char** argv, char** env,
   if (winp) {
     res = ioctl(slave, TIOCSWINSZ, winp);
     if (res == -1) {
+      pty_set_spawn_error(err, "ioctl_TIOCSWINSZ", errno, "slave", slave_pty_name);
       return;
     }
   }
@@ -751,35 +828,41 @@ pty_posix_spawn(char** argv, char** env,

   posix_spawnattr_t attrs;
   posix_spawnattr_init(&attrs);
-  *err = posix_spawnattr_setflags(&attrs, flags);
-  if (*err != 0) {
+  res = posix_spawnattr_setflags(&attrs, flags);
+  if (res != 0) {
+    pty_set_spawn_error(err, "posix_spawnattr_setflags", res);
     goto done;
   }

   sigset_t signal_set;
   /* Reset all signal the child to their default behavior */
   sigfillset(&signal_set);
-  *err = posix_spawnattr_setsigdefault(&attrs, &signal_set);
-  if (*err != 0) {
+  res = posix_spawnattr_setsigdefault(&attrs, &signal_set);
+  if (res != 0) {
+    pty_set_spawn_error(err, "posix_spawnattr_setsigdefault", res);
     goto done;
   }

   /* Reset the signal mask for all signals */
   sigemptyset(&signal_set);
-  *err = posix_spawnattr_setsigmask(&attrs, &signal_set);
-  if (*err != 0) {
+  res = posix_spawnattr_setsigmask(&attrs, &signal_set);
+  if (res != 0) {
+    pty_set_spawn_error(err, "posix_spawnattr_setsigmask", res);
     goto done;
   }

   do
-    *err = posix_spawn(pid, argv[0], &acts, &attrs, argv, env);
-  while (*err == EINTR);
+    res = posix_spawn(pid, argv[0], &acts, &attrs, argv, env);
+  while (res == EINTR);
+  if (res != 0) {
+    pty_set_spawn_error(err, "posix_spawn", res, "helper", argv[0]);
+  }
 done:
   posix_spawn_file_actions_destroy(&acts);
   posix_spawnattr_destroy(&attrs);

-  for (; count > 0; count--) {
-    close(low_fds[count]);
+  for (size_t i = 0; i <= count && i < 3; i++) {
+    close(low_fds[i]);
   }
 }
 #endif