From da11efa0c6627616d879a115604702079a1286f8 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 23 Jul 2016 15:48:29 -0400
Subject: [PATCH] nodejs: Update from 6.3.0 to 6.3.1

---
 packages/nodejs/build.sh               |  2 +-
 packages/nodejs/node.gyp.patch         | 31 +++++++++++++++++---------
 packages/nodejs/src-node_main.cc.patch | 23 +++++++------------
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh
index 244580a87..9789145ba 100644
--- a/packages/nodejs/build.sh
+++ b/packages/nodejs/build.sh
@@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://nodejs.org/
 TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications"
-TERMUX_PKG_VERSION=6.3.0
+TERMUX_PKG_VERSION=6.3.1
 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="openssl, libuv, libgnustl, c-ares"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make.bat share/systemtap lib/dtrace"
diff --git a/packages/nodejs/node.gyp.patch b/packages/nodejs/node.gyp.patch
index f3e75164b..bd0276703 100644
--- a/packages/nodejs/node.gyp.patch
+++ b/packages/nodejs/node.gyp.patch
@@ -1,7 +1,7 @@
-diff -u -r ../node-v6.3.0/node.gyp ./node.gyp
---- ../node-v6.3.0/node.gyp	2016-07-06 13:14:10.000000000 -0400
-+++ ./node.gyp	2016-07-15 09:30:10.150224361 -0400
-@@ -805,54 +805,7 @@
+diff -u -r ../node-v6.3.1/node.gyp ./node.gyp
+--- ../node-v6.3.1/node.gyp	2016-07-21 16:44:43.000000000 -0400
++++ ./node.gyp	2016-07-23 14:03:01.349959957 -0400
+@@ -808,65 +808,6 @@
            ],
          } ],
        ]
@@ -30,14 +30,26 @@ diff -u -r ../node-v6.3.0/node.gyp ./node.gyp
 -
 -      'conditions': [
 -        ['v8_inspector=="true"', {
--          'dependencies': [
--            'deps/openssl/openssl.gyp:openssl',
--            'deps/http_parser/http_parser.gyp:http_parser',
--            'deps/uv/uv.gyp:libuv'
--          ],
 -          'sources': [
 -            'src/inspector_socket.cc',
 -            'test/cctest/test_inspector_socket.cc'
+-          ],
+-          'conditions': [
+-            [ 'node_shared_openssl=="false"', {
+-              'dependencies': [
+-                'deps/openssl/openssl.gyp:openssl'
+-              ]
+-            }],
+-            [ 'node_shared_http_parser=="false"', {
+-              'dependencies': [
+-                'deps/http_parser/http_parser.gyp:http_parser'
+-              ]
+-            }],
+-            [ 'node_shared_libuv=="false"', {
+-              'dependencies': [
+-                'deps/uv/uv.gyp:libuv'
+-              ]
+-            }]
 -          ]
 -        }],
 -        [ 'node_use_v8_platform=="true"', {
@@ -55,4 +67,3 @@ diff -u -r ../node-v6.3.0/node.gyp ./node.gyp
      }
    ], # end targets
  
-   'conditions': [
diff --git a/packages/nodejs/src-node_main.cc.patch b/packages/nodejs/src-node_main.cc.patch
index 6c43c5224..06610ac6b 100644
--- a/packages/nodejs/src-node_main.cc.patch
+++ b/packages/nodejs/src-node_main.cc.patch
@@ -1,21 +1,14 @@
-diff -u -r ../node-v6.0.0/src/node_main.cc ./src/node_main.cc
---- ../node-v6.0.0/src/node_main.cc	2016-04-26 15:50:22.000000000 -0400
-+++ ./src/node_main.cc	2016-05-02 16:29:08.313594254 -0400
-@@ -1,4 +1,5 @@
- #include "node.h"
-+#include <stdlib.h>
- 
- #ifdef _WIN32
- #include <VersionHelpers.h>
-@@ -50,6 +51,11 @@
- // UNIX
- int main(int argc, char *argv[]) {
-   setvbuf(stderr, NULL, _IOLBF, 1024);
+diff -u -r ../node-v6.3.1/src/node_main.cc ./src/node_main.cc
+--- ../node-v6.3.1/src/node_main.cc	2016-07-21 16:44:43.000000000 -0400
++++ ./src/node_main.cc	2016-07-23 13:53:57.530095071 -0400
+@@ -54,6 +54,10 @@
+   // calls elsewhere in the program (e.g., any logging from V8.)
+   setvbuf(stdout, nullptr, _IONBF, 0);
+   setvbuf(stderr, nullptr, _IONBF, 0);
 +  if (getenv("TMPDIR") == NULL) {
-+    /* Give javascript programs (such as updated versions of npm) a working tmpdir. */
++    // Give javascript programs (such as updated versions of npm) a working tmpdir.
 +    putenv("TMPDIR=@TERMUX_PREFIX@/tmp");
 +  }
-+
    return node::Start(argc, argv);
  }
  #endif