openpkg-packages/node9/node9.patch

Index: common.gypi
--- common.gypi.orig	2017-10-06 20:33:19.000000000 +0200
+++ common.gypi	2017-10-07 09:39:20.751676000 +0200
@@ -123,7 +123,7 @@
         'variables': {
           'v8_enable_handle_zapping': 0,
         },
-        'cflags': [ '-O3' ],
+        'cflags': [ '-O2' ],
         'conditions': [
           ['target_arch=="x64"', {
             'msvs_configuration_platform': 'x64',
@@ -280,7 +280,7 @@
         'ldflags': [ '-pthread' ],
       }],
       [ 'OS in "linux freebsd openbsd solaris android aix"', {
-        'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
+        'cflags': [ '-Wno-unused-parameter', ],
         'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++0x' ],
         'ldflags': [ '-rdynamic' ],
         'target_conditions': [
@@ -371,10 +371,7 @@
             '-fno-strict-aliasing',
           ],
           'WARNING_CFLAGS': [
-            '-Wall',
-            '-Wendif-labels',
-            '-W',
-            '-Wno-unused-parameter',
+            '-Wno-unused-parameter'
           ],
         },
         'target_conditions': [
Index: configure
--- configure.orig	2017-10-06 20:33:19.000000000 +0200
+++ configure	2017-10-07 09:39:20.752006000 +0200
@@ -667,6 +667,8 @@
 
   if is_clang:
     o['variables']['llvm_version'] = get_llvm_version(CC)
+  else:
+    o['variables']['llvm_version'] = 0
 
   # Need xcode_version or gas_version when openssl asm files are compiled.
   if options.without_ssl or options.openssl_no_asm or options.shared_openssl:
Index: deps/uv/common.gypi
--- deps/uv/common.gypi.orig	2017-10-07 09:39:20.752192000 +0200
+++ deps/uv/common.gypi	2017-10-07 09:39:44.201257000 +0200
@@ -46,7 +46,7 @@
       'Release': {
         'defines': [ 'NDEBUG' ],
         'cflags': [
-          '-O3',
+          '-O2',
         ],
         'msvs_settings': {
           'VCCLCompilerTool': {
Index: deps/uv/uv.gyp
--- deps/uv/uv.gyp.orig	2017-10-06 20:33:32.000000000 +0200
+++ deps/uv/uv.gyp	2017-10-07 09:39:20.752463000 +0200
@@ -167,7 +167,7 @@
             'src/unix/udp.c',
           ],
           'link_settings': {
-            'libraries': [ '-lm' ],
+            'libraries': [ '-lz', '-lm' ],
             'conditions': [
               ['OS=="solaris"', {
                 'ldflags': [ '-pthreads' ],
Index: deps/v8/gypfiles/toolchain.gypi
--- deps/v8/gypfiles/toolchain.gypi.orig	2017-10-06 20:33:33.000000000 +0200
+++ deps/v8/gypfiles/toolchain.gypi	2017-10-07 09:39:20.752724000 +0200
@@ -1079,12 +1079,6 @@
       ['OS=="solaris"', {
         'defines': [ '__C99FEATURES__=1' ],  # isinf() etc.
       }],
-      ['OS=="freebsd" or OS=="openbsd"', {
-        'cflags': [ '-I/usr/local/include' ],
-      }],
-      ['OS=="netbsd"', {
-        'cflags': [ '-I/usr/pkg/include' ],
-      }],
       ['OS=="aix"', {
         'defines': [
           # Support for malloc(0)
@@ -1194,8 +1188,8 @@
               # Don't use -O3 with sanitizers.
               ['asan==0 and msan==0 and lsan==0 \
                 and tsan==0 and ubsan==0 and ubsan_vptr==0', {
-                'cflags': ['-O3'],
-                'cflags!': ['-O2'],
+                'cflags': ['-O2'],
+                'cflags!': ['-O3'],
                 }, {
                 'cflags': ['-O2'],
                 'cflags!': ['-O3'],
@@ -1310,8 +1304,8 @@
               # Don't use -O3 with sanitizers.
               ['asan==0 and msan==0 and lsan==0 \
                 and tsan==0 and ubsan==0 and ubsan_vptr==0', {
-                'cflags': ['-O3'],
-                'cflags!': ['-O2'],
+                'cflags': ['-O2'],
+                'cflags!': ['-O3'],
               }, {
                 'cflags': ['-O2'],
                 'cflags!': ['-O3'],
Index: deps/v8/src/base/platform/platform-freebsd.cc
--- deps/v8/src/base/platform/platform-freebsd.cc.orig	2017-10-06 20:33:34.000000000 +0200
+++ deps/v8/src/base/platform/platform-freebsd.cc	2017-10-07 09:39:20.752865000 +0200
@@ -25,6 +25,7 @@
 #include <strings.h>    // index
 
 #include <cmath>
+#include <cstdio>
 
 #undef MAP_TYPE
 
Index: deps/v8/src/log-utils.cc
--- deps/v8/src/log-utils.cc.orig	2017-10-06 20:33:40.000000000 +0200
+++ deps/v8/src/log-utils.cc	2017-10-07 09:39:20.753082000 +0200
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "src/log-utils.h"
 
 #include "src/assert-scope.h"
Index: deps/v8/src/v8.gyp
--- deps/v8/src/v8.gyp.orig	2017-10-06 20:33:43.000000000 +0200
+++ deps/v8/src/v8.gyp	2017-10-07 09:39:20.753468000 +0200
@@ -2028,7 +2028,7 @@
         ['OS=="freebsd"', {
             'link_settings': {
               'libraries': [
-                '-L/usr/local/lib -lexecinfo',
+                '-lexecinfo',
             ]},
             'sources': [
               'base/debug/stack_trace_posix.cc',
@@ -2043,7 +2043,7 @@
         ['OS=="openbsd"', {
             'link_settings': {
               'libraries': [
-                '-L/usr/local/lib -lexecinfo',
+                '-lexecinfo',
             ]},
             'sources': [
               'base/platform/platform-openbsd.cc',
@@ -2057,7 +2057,7 @@
         ['OS=="netbsd"', {
             'link_settings': {
               'libraries': [
-                '-L/usr/pkg/lib -Wl,-R/usr/pkg/lib -lexecinfo',
+                '-lexecinfo',
             ]},
             'sources': [
               'base/debug/stack_trace_posix.cc',
Index: deps/v8/src/wasm/wasm-result.cc
--- deps/v8/src/wasm/wasm-result.cc.orig	2017-10-06 20:33:43.000000000 +0200
+++ deps/v8/src/wasm/wasm-result.cc	2017-10-07 09:39:20.753608000 +0200
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <cstdarg>
+
 #include "src/wasm/wasm-result.h"
 
 #include "src/factory.h"
Index: lib/dns.js
--- lib/dns.js.orig	2017-10-06 20:34:01.000000000 +0200
+++ lib/dns.js	2017-10-07 09:39:20.753785000 +0200
@@ -187,6 +187,10 @@
   req.hostname = hostname;
   req.oncomplete = all ? onlookupall : onlookup;
 
+  /*  FreeBSD getaddrinfo(3) knows AI_V4MAPPED, but dislikes it  */
+  if (process.platform === "freebsd")
+      hints &= ~(exports.V4MAPPED);
+
   var err = cares.getaddrinfo(req, hostname, family, hints, verbatim);
   if (err) {
     process.nextTick(callback, errnoException(err, 'getaddrinfo', hostname));
Index: lib/module.js
--- lib/module.js.orig	2017-10-06 20:34:02.000000000 +0200
+++ lib/module.js	2017-10-07 09:39:20.753967000 +0200
@@ -662,7 +662,10 @@
   } else {
     prefixDir = path.resolve(process.execPath, '..', '..');
   }
-  var paths = [path.resolve(prefixDir, 'lib', 'node')];
+  var paths = [
+      path.resolve(prefixDir, '..', 'lib', 'node', 'usr'),
+      path.resolve(prefixDir, '..', 'lib', 'node', 'pkg')
+  ];
 
   if (homeDir) {
     paths.unshift(path.resolve(homeDir, '.node_libraries'));
Index: src/inspector_socket_server.cc
--- src/inspector_socket_server.cc.orig	2017-10-06 20:34:03.000000000 +0200
+++ src/inspector_socket_server.cc	2017-10-07 09:39:20.754182000 +0200
@@ -36,7 +36,7 @@
 
 namespace {
 
-static const uint8_t PROTOCOL_JSON[] = {
+static uint8_t PROTOCOL_JSON[] = {
   #include "v8_inspector_protocol_json.h"  // NOLINT(build/include_order)
 };
 
Index: src/node_constants.cc
--- src/node_constants.cc.orig	2017-10-06 20:34:03.000000000 +0200
+++ src/node_constants.cc	2017-10-07 09:39:20.754391000 +0200
@@ -35,10 +35,10 @@
 #include <limits>
 
 #if HAVE_OPENSSL
-# include <openssl/ec.h>
-# include <openssl/ssl.h>
+# include "openssl/ec.h"
+# include "openssl/ssl.h"
 # ifndef OPENSSL_NO_ENGINE
-#  include <openssl/engine.h>
+#  include "openssl/engine.h"
 # endif  // !OPENSSL_NO_ENGINE
 #endif
 
Index: src/node_crypto.cc
--- src/node_crypto.cc.orig	2017-10-06 20:34:03.000000000 +0200
+++ src/node_crypto.cc	2017-10-07 09:39:20.755195000 +0200
@@ -51,6 +51,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <cmath>
+
 #define THROW_AND_RETURN_IF_NOT_STRING_OR_BUFFER(val, prefix)                  \
   do {                                                                         \
     if (!Buffer::HasInstance(val) && !val->IsString()) {                       \
@@ -5384,7 +5386,7 @@
   }
 
   raw_keylen = args[3]->NumberValue();
-  if (raw_keylen < 0.0 || isnan(raw_keylen) || isinf(raw_keylen) ||
+  if (raw_keylen < 0.0 || std::isnan(raw_keylen) || std::isinf(raw_keylen) ||
       raw_keylen > INT_MAX) {
     type_error = "Bad key length";
     goto err;
Index: src/node_crypto.h
--- src/node_crypto.h.orig	2017-10-06 20:34:03.000000000 +0200
+++ src/node_crypto.h	2017-10-07 09:39:20.755399000 +0200
@@ -38,20 +38,20 @@
 
 #include "v8.h"
 
-#include <openssl/ssl.h>
-#include <openssl/ec.h>
-#include <openssl/ecdh.h>
+#include "openssl/ssl.h"
+#include "openssl/ec.h"
+#include "openssl/ecdh.h"
 #ifndef OPENSSL_NO_ENGINE
-# include <openssl/engine.h>
+# include "openssl/engine.h"
 #endif  // !OPENSSL_NO_ENGINE
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
-#include <openssl/hmac.h>
-#include <openssl/rand.h>
-#include <openssl/pkcs12.h>
+#include "openssl/err.h"
+#include "openssl/evp.h"
+#include "openssl/pem.h"
+#include "openssl/x509.h"
+#include "openssl/x509v3.h"
+#include "openssl/hmac.h"
+#include "openssl/rand.h"
+#include "openssl/pkcs12.h"
 
 #define EVP_F_EVP_DECRYPTFINAL 101
 
Index: src/node_internals.h
--- src/node_internals.h.orig	2017-10-06 20:34:04.000000000 +0200
+++ src/node_internals.h	2017-10-07 09:39:20.755546000 +0200
@@ -172,6 +172,7 @@
 # define ROUND_UP(a, b) ((a) % (b) ? ((a) + (b)) - ((a) % (b)) : (a))
 #endif
 
+# undef MUST_USE_RESULT
 #ifdef __GNUC__
 # define MUST_USE_RESULT __attribute__((warn_unused_result))
 #else
Index: src/tls_wrap.h
--- src/tls_wrap.h.orig	2017-10-06 20:34:05.000000000 +0200
+++ src/tls_wrap.h	2017-10-07 09:39:20.755676000 +0200
@@ -33,7 +33,7 @@
 #include "util.h"
 #include "v8.h"
 
-#include <openssl/ssl.h>
+#include "openssl/ssl.h"
 
 namespace node {
 
Index: src/util.h
--- src/util.h.orig	2017-10-06 20:34:06.000000000 +0200
+++ src/util.h	2017-10-07 09:39:20.755832000 +0200
@@ -84,9 +84,11 @@
 
 template <typename T> using remove_reference = std::remove_reference<T>;
 
+#undef  FIXED_ONE_BYTE_STRING
 #define FIXED_ONE_BYTE_STRING(isolate, string)                                \
   (node::OneByteString((isolate), (string), sizeof(string) - 1))
 
+#undef DISALLOW_COPY_AND_ASSIGN
 #define DISALLOW_COPY_AND_ASSIGN(TypeName)                                    \
   void operator=(const TypeName&) = delete;                                   \
   void operator=(TypeName&&) = delete;                                        \
@@ -124,13 +126,20 @@
     }                                                                         \
   } while (0)
 
+#undef  CHECK_EQ
 #define CHECK_EQ(a, b) CHECK((a) == (b))
+#undef  CHECK_GE
 #define CHECK_GE(a, b) CHECK((a) >= (b))
+#undef  CHECK_GT
 #define CHECK_GT(a, b) CHECK((a) > (b))
+#undef  CHECK_LE
 #define CHECK_LE(a, b) CHECK((a) <= (b))
+#undef  CHECK_LT
 #define CHECK_LT(a, b) CHECK((a) < (b))
+#undef  CHECK_NE
 #define CHECK_NE(a, b) CHECK((a) != (b))
 
+#undef  UNREACHABLE
 #define UNREACHABLE() ABORT()
 
 #define ASSIGN_OR_RETURN_UNWRAP(ptr, obj, ...)                                \
Index: tools/install.py
--- tools/install.py.orig	2017-10-06 20:34:29.000000000 +0200
+++ tools/install.py	2017-10-07 09:39:20.755973000 +0200
@@ -148,10 +148,7 @@
   action(['deps/v8/tools/lldbinit'], 'share/doc/node/')
   action(['deps/v8/tools/lldb_commands.py'], 'share/doc/node/')
 
-  if 'freebsd' in sys.platform or 'openbsd' in sys.platform:
-    action(['doc/node.1'], 'man/man1/')
-  else:
-    action(['doc/node.1'], 'share/man/man1/')
+  action(['doc/node.1'], 'man/man1/')
 
   if 'true' == variables.get('node_install_npm'): npm_files(action)