From fa0911acb9b10bb378ec2b3f1f465b89db1b6bf0 Mon Sep 17 00:00:00 2001
From: Zuzana Svetlikova <zsvetlik@redhat.com>
Date: Wed, 2 Aug 2017 14:06:22 +0200
Subject: [PATCH] Update to 6.11.2

---
 .gitignore  |  1 +
 nodejs.spec | 22 ++++++----------------
 sources     |  2 +-
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7739b68..a10250b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,4 @@
 /node-v6.10.3-stripped.tar.gz
 /node-v6.11.0-stripped.tar.gz
 /node-v6.11.1-stripped.tar.gz
+/node-v6.11.2-stripped.tar.gz
diff --git a/nodejs.spec b/nodejs.spec
index e56b21b..848538d 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -16,7 +16,7 @@
 %global nodejs_epoch 1
 %global nodejs_major 6
 %global nodejs_minor 11
-%global nodejs_patch 1
+%global nodejs_patch 2
 %global nodejs_abi %{nodejs_major}.%{nodejs_minor}
 %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
 %global nodejs_release 1
@@ -91,15 +91,6 @@ Patch1: 0001-Disable-running-gyp-files-for-bundled-deps.patch
 # EPEL only has OpenSSL 1.0.1, so we need to carry a patch on that platform
 Patch2: 0002-Use-openssl-1.0.1.patch
 
-# use system certificates instead of the bundled ones
-# Backported from upstream 7.5.0+
-# merged in 6.11.0
-#Patch3: 0003-crypto-Use-system-CAs-instead-of-using-bundled-ones.patch
-
-# Backported upstream patch to allow building with GCC 7 from
-# https://github.com/nodejs/node/commit/2bbee49e6f170a5d6628444a7c9a2235fe0dd929
-Patch4: 0004-Fix-compatibility-with-GCC-7.patch
-
 # RHEL 7 still uses OpenSSL 1.0.1 for now, and it segfaults on SSL
 # Revert this upstream patch until RHEL 7 upgrades to 1.0.2
 Patch5: EPEL01-openssl101-compat.patch
@@ -242,12 +233,6 @@ rm -rf deps/http-parser \
        deps/uv \
        deps/zlib
 
-# Use system CA certificates
-#%patch3 -p1
-
-# Fix GCC7 build
-%patch4 -p1
-
 %if 0%{?epel} || 0%{?rhel}
 %patch2 -p1
 %patch5 -p1
@@ -421,6 +406,11 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
 %{_pkgdocdir}/npm/doc
 
 %changelog
+* Wed Aug 02 2017 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:6.11.2-1
+- Update to 6.11.2
+- https://nodejs.org/en/blog/release/v6.11.2/
+- remove GCC 7 patch merged upstream
+
 * Thu Jul 13 2017 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:6.11.1-1
 - Security update (https://nodejs.org/en/blog/vulnerability/july-2017-security-releases/)
 
diff --git a/sources b/sources
index d1795c8..a2ec9ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (node-v6.11.1-stripped.tar.gz) = c67b60a38b6deeb71ac7f18caf02a2ddd6d4f636c5241002d8e2dd3bcf486185a09cef37a5e5578ffa68ca180789bfa25e474dac1812e4200ec0be323343a39b
+SHA512 (node-v6.11.2-stripped.tar.gz) = f87b65626877ed102f101d095a50a162ca8f471474d6099af40ca27783c6a9da082de4f251325bb51e214395c714b894b22d6d6adb983916e3880c929865703c