[nodejs/epel7: 3/3] Merge branch 'f19' into epel7

[T.C. Hollingsworth]

commit b151db5835a8760237c0776f301cc11e76a90915
Merge: 3a1ba2d 870eb6e
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Thu Jul 31 21:59:35 2014 -0700

    Merge branch 'f19' into epel7
    
    Conflicts:
    	nodejs.spec

 nodejs-revert-utf8-node.patch |  784 +++++++++++++++++++++++++++++++++++++++++
 nodejs-revert-utf8-v8.patch   |   90 +++++
 nodejs.spec                   |   12 +-
 3 files changed, 884 insertions(+), 2 deletions(-)
---
diff --cc nodejs.spec
index fd43fba,9d366d4..f504803
--- a/nodejs.spec
+++ b/nodejs.spec
@@@ -23,11 -23,13 +23,18 @@@ Source7: nodejs_native.att
  # Disable running gyp on bundled deps we don't use
  Patch1: nodejs-disable-gyp-deps.patch
  
 +# use system certificates instead of the bundled ones
 +# modified version of Debian patch:
 +# http://patch-tracker.debian.org/patch/series/view/nodejs/0.10.26~dfsg1-1/2014_donotinclude_root_certs.patch
 +Patch2: nodejs-use-system-certs.patch
 +
+ # The invalid UTF8 fix has been reverted since this breaks v8 API, which cannot
+ # be done in a stable distribution release.  This build of nodejs will behave as
+ # if NODE_INVALID_UTF8 was set.  For more information on the implications, see:
+ # http://blog.nodejs.org/2014/06/16/openssl-and-breaking-utf-8-change/
+ Patch3: nodejs-revert-utf8-v8.patch
+ Patch4: nodejs-revert-utf8-node.patch
+ 
  # V8 presently breaks ABI at least every x.y release while never bumping SONAME,
  # so we need to be more explicit until spot fixes that
  %global v8_ge 1:3.14.5.7
@@@ -91,15 -90,11 +98,18 @@@ The API documentation for the Node.js J
  
  %prep
  %setup -q -n node-v%{version}
 +
 +# remove bundled dependencies
  %patch1 -p1
 +rm -rf deps
 +
 +# remove bundled CA certificates
 +%patch2 -p1
 +rm -f src/node_root_certs.h
 +
+ %patch3 -p1
+ %patch4 -p1
+ 
 -rm -rf deps
  
  %build
  # build with debugging symbols and add defines from libuv (#892601)