From d246c5e67e8912d1a2076cf1403dee4eef4ea394 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Tue, 1 Aug 2017 15:10:35 +0200 Subject: [PATCH] Update to 6.11.2 --- .gitignore | 1 + nodejs.spec | 14 ++++++-------- sources | 2 +- 3 files changed, 8 insertions(+), 9 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 e8b4c8a..7481c14 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -18,7 +18,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 @@ -99,10 +99,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 -# 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 @@ -251,9 +247,6 @@ rm -rf deps/icu-small \ deps/uv \ deps/zlib -# Fix GCC7 build -%patch4 -p1 - %if 0%{?epel} %patch2 -p1 %patch5 -p1 @@ -443,6 +436,11 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog +* Tue Aug 01 2917 Zuzana Svetlikova - 1:6.11.2-1 +- Update to 6.11.2 +- https://nodejs.org/en/blog/release/v6.11.2/ +- gcc 7 patch was backported in upstream + * Fri Jul 14 2017 Zuzana Svetlikova - 1:6.11.1-1 - Security update (https://nodejs.org/en/blog/vulnerability/july-2017-security-releases/) diff --git a/sources b/sources index 2573d80..2adcec3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v6.11.1-stripped.tar.gz) = 5b539c43103422c059034f99cdef25dd6556cf0b08d85cea6e8bc74862c944d368455e6139680c8b00e602cbf807533bdabf2dfa43d714c9864ab8c79679b74e +SHA512 (node-v6.11.2-stripped.tar.gz) = 037382205b38d1dd693bc40b9c3d2c66b6c9bf4e635b1caaa11e897eaf4411834ca2132fd9c2113833c67cec8fe0764c6475841b8dc3a7477f535bcf28bbf2dd