From cbcccf579762faf14847a34640b952e99e802ef6 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Thu, 11 Jan 2018 08:27:13 -0500
Subject: [PATCH] Update to 8.9.4

https://nodejs.org/en/blog/release/v8.9.4/

Switch to system copy of nghttp2

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 .gitignore  |  1 +
 nodejs.spec | 33 ++++++++++++++++++++++-----------
 sources     |  2 +-
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index ec96e06..ade8dc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,3 +83,4 @@
 /node-v8.9.0-stripped.tar.gz
 /node-v8.9.1-stripped.tar.gz
 /node-v8.9.3-stripped.tar.gz
+/node-v8.9.4-stripped.tar.gz
diff --git a/nodejs.spec b/nodejs.spec
index 5e8e737..d03919d 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -22,17 +22,17 @@
 %global nodejs_epoch 1
 %global nodejs_major 8
 %global nodejs_minor 9
-%global nodejs_patch 3
+%global nodejs_patch 4
 %global nodejs_abi %{nodejs_major}.%{nodejs_minor}
 %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
-%global nodejs_release 2
+%global nodejs_release 1
 
 # == Bundled Dependency Versions ==
 # v8 - from deps/v8/include/v8-version.h
 %global v8_major 6
 %global v8_minor 1
 %global v8_build 534
-%global v8_patch 48
+%global v8_patch 50
 # V8 presently breaks ABI at least every x.y release while never bumping SONAME
 %global v8_abi %{v8_major}.%{v8_minor}
 %global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch}
@@ -56,9 +56,15 @@
 %global libuv_patch 0
 %global libuv_version %{libuv_major}.%{libuv_minor}.%{libuv_patch}
 
+# nghttp2 - from deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h
+%global nghttp2_major 1
+%global nghttp2_minor 25
+%global nghttp2_patch 0
+%global nghttp2_version %{nghttp2_major}.%{nghttp2_minor}.%{nghttp2_patch}
+
 # punycode - from lib/punycode.js
 # Note: this was merged into the mainline since 0.6.x
-# Note: this will be unmerged in v7 or v8
+# Note: this will be unmerged in an upcoming major release
 %global punycode_major 2
 %global punycode_minor 0
 %global punycode_patch 0
@@ -67,8 +73,8 @@
 # npm - from deps/npm/package.json
 %global npm_epoch 1
 %global npm_major 5
-%global npm_minor 5
-%global npm_patch 1
+%global npm_minor 6
+%global npm_patch 0
 %global npm_version %{npm_major}.%{npm_minor}.%{npm_patch}
 
 # In order to avoid needing to keep incrementing the release version for the
@@ -121,12 +127,15 @@ BuildRequires: gcc-c++ >= 4.9.4
 %if %{with bootstrap}
 Provides: bundled(http-parser) = %{http_parser_version}
 Provides: bundled(libuv) = %{libuv_version}
+Provides: bundled(nghttp2) = %{nghttp2_version}
 %else
 BuildRequires: systemtap-sdt-devel
 BuildRequires: http-parser-devel >= 2.7.0
 Requires: http-parser >= 2.7.0
 BuildRequires: libuv-devel >= 1:1.9.1
 Requires: libuv >= 1:1.9.1
+BuildRequires: libnghttp2-devel >= 1.25.0
+Requires: libnghttpd2 >= 1.25.0
 %endif
 
 BuildRequires: (openssl-devel <= 1:1.1.0 or compat-openssl10-devel)
@@ -174,10 +183,6 @@ Provides: bundled(c-ares) = %{c_ares_version}
 # See https://github.com/nodejs/node/commit/d726a177ed59c37cf5306983ed00ecd858cfbbef
 Provides: bundled(v8) = %{v8_version}
 
-# As of v8.4.0, Node.js has http/2 support. They however don't provide --shared-<lib>
-# option yet.
-Provides: bundled(nghttp2) = 1.25.0
-
 # Make sure we keep NPM up to date when we update Node.js
 %if 0%{?epel}
 # EPEL doesn't support Recommends, so make it strict
@@ -294,6 +299,7 @@ export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' '  ')"
            --shared-zlib \
            --shared-libuv \
            --shared-http-parser \
+           --shared-nghttp2 \
            --with-dtrace \
            --with-intl=system-icu \
            --debug-http2 \
@@ -453,7 +459,12 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
 %{_pkgdocdir}/npm/doc
 
 %changelog
-* Fri Dec 08 2017 Stephen Gallagher <sgallagh@redhat.com> - -
+* Thu Jan 11 2018 Stephen Gallagher <sgallagh@redhat.com> - 1:8.9.4-1
+- Update to 8.9.4
+- https://nodejs.org/en/blog/release/v8.9.4/
+- Switch to system copy of nghttp2
+
+* Fri Dec 08 2017 Stephen Gallagher <sgallagh@redhat.com> - 1:8.9.3-2
 - Update to 8.9.3
 - https://nodejs.org/en/blog/release/v8.9.3/
 - https://nodejs.org/en/blog/release/v8.9.2/
diff --git a/sources b/sources
index a53b570..6320142 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (node-v8.9.3-stripped.tar.gz) = 4aa1e9e5a5a0d4ef404804b5c8a7dac34511290cb8abfdaeb46c05f2ad80298556c2990ca3cdedf482371ce1fb31fa97a7ea6d6f23283c250c52aa1716c2f6bf
+SHA512 (node-v8.9.4-stripped.tar.gz) = de10b27c87e2b4fd7a09f58921a7b4733e86cf41c0360f15f23f0d02a78830e34ae1360b6868124194d684de53f12c1f815b63283b062c76730b9c4165bc5224