From 54b36861f75dc32ea667311a9ba8bbfbeaaeaa55 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 13 Jan 2016 10:09:41 -0500 Subject: [PATCH] New upstream bugfix release 4.2.4 - https://github.com/nodejs/node/blob/v4.2.3/CHANGELOG.md --- .gitignore | 1 + nodejs-disable-gyp-deps.patch | 4 ++-- nodejs-use-system-certs.patch | 8 ++++---- nodejs.spec | 8 ++++++-- sources | 2 +- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 68d500d..c073935 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /node-v0.10.36-stripped.tar.gz /node-v4.2.2-stripped.tar.gz /node-v4.2.3-stripped.tar.gz +/node-v4.2.4-stripped.tar.gz diff --git a/nodejs-disable-gyp-deps.patch b/nodejs-disable-gyp-deps.patch index 23fe9ee..676b360 100644 --- a/nodejs-disable-gyp-deps.patch +++ b/nodejs-disable-gyp-deps.patch @@ -1,4 +1,4 @@ -From 34a6454fc02ae79362cc03f501bb08fb95495a1b Mon Sep 17 00:00:00 2001 +From e23b2803b886fb6d001ebcc70aa29713561f316f Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 1 Dec 2015 16:35:29 -0500 Subject: [PATCH 1/2] disable running gyp files for bundled deps @@ -25,5 +25,5 @@ index 02619fac98ddd7bd90648f6493ccf49fcf22c47b..981c3ce4daa8724547979d7646117182 if [ -f $@ ]; then $(error Stale $@, please re-run ./configure) -- -2.5.0 +2.7.0 diff --git a/nodejs-use-system-certs.patch b/nodejs-use-system-certs.patch index 344356f..4e68fc6 100644 --- a/nodejs-use-system-certs.patch +++ b/nodejs-use-system-certs.patch @@ -1,4 +1,4 @@ -From 8bdb9e5d7dcde463d9664fc6a999c11a3048a673 Mon Sep 17 00:00:00 2001 +From 515a1619d3b13a7af52d58dee9a43b981e45c2bb Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 1 Dec 2015 16:29:07 -0500 Subject: [PATCH 2/2] Do not bundle CA Certificates @@ -22,7 +22,7 @@ Node.js 4.2 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/src/node_crypto.cc b/src/node_crypto.cc -index bd7314c9db902c59035b60ee5e2ebb4dc99a9a9f..ddc6f081136dd327e35d6326ba9835df7f834e70 100644 +index b03e6444ff8a3b4209d1e7806380e80566da243c..331c155aebfa0a42277dbe48e03a0b866b98bd06 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -125,11 +125,11 @@ struct ClearErrorOnReturn { @@ -38,7 +38,7 @@ index bd7314c9db902c59035b60ee5e2ebb4dc99a9a9f..ddc6f081136dd327e35d6326ba9835df X509_STORE* root_cert_store; // Just to generate static methods -@@ -715,36 +715,21 @@ void SecureContext::AddRootCerts(const FunctionCallbackInfo& args) { +@@ -704,36 +704,21 @@ void SecureContext::AddRootCerts(const FunctionCallbackInfo& args) { (void) &clear_error_on_return; // Silence compiler warning. CHECK_EQ(sc->ca_store_, nullptr); @@ -83,5 +83,5 @@ index bd7314c9db902c59035b60ee5e2ebb4dc99a9a9f..ddc6f081136dd327e35d6326ba9835df void SecureContext::SetCiphers(const FunctionCallbackInfo& args) { SecureContext* sc = Unwrap(args.Holder()); -- -2.5.0 +2.7.0 diff --git a/nodejs.spec b/nodejs.spec index 4c3e329..2408ad2 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -7,8 +7,8 @@ %endif Name: nodejs -Version: 4.2.3 -Release: 2%{?dist} +Version: 4.2.4 +Release: 1%{?dist} Summary: JavaScript runtime License: MIT and ASL 2.0 and ISC and BSD Group: Development/Languages @@ -215,6 +215,10 @@ mv %{buildroot}/%{_datadir}/doc/node/gdbinit %{buildroot}/%{_pkgdocdir}/gdbinit %{_pkgdocdir}/html %changelog +* Wed Jan 13 2016 Stephen Gallagher - 4.2.4-1 +- New upstream bugfix release 4.2.4 +- https://github.com/nodejs/node/blob/v4.2.3/CHANGELOG.md + * Fri Dec 04 2015 Stephen Gallagher 4.2.3-2 - Add %%with_debug variable to spec file The debug build is not supported on all architectures. diff --git a/sources b/sources index 20fa923..eb3803c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2dad5363627c0059ce262edb91157e2b node-v4.2.3-stripped.tar.gz +12d2042dd79c39c5365e36d55527542e node-v4.2.4-stripped.tar.gz