[nodejs/f20: 2/2] Merge branch 'f19' into f20

[T.C. Hollingsworth]

commit c59552d1dbeebc241530d3832d90c17822cbe883
Merge: 29e8916 ee85520
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Nov 18 18:24:22 2014 -0700

    Merge branch 'f19' into f20

 nodejs-revert-utf8-v8.patch |    9 +++++----
 nodejs.spec                 |   12 ++++++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)
---
diff --cc nodejs.spec
index 4c441c3,6dcd469..bc49545
--- a/nodejs.spec
+++ b/nodejs.spec
@@@ -181,10 -176,17 +181,18 @@@ cp -p common.gypi %{buildroot}%{_datadi
  %{_datadir}/node/common.gypi
  
  %files docs
 -%{_defaultdocdir}/%{name}-docs-%{version}
 +%dir %{_pkgdocdir}
 +%{_pkgdocdir}/html
  
  %changelog
+ * Wed Nov 19 2014 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.33-1
+ - new upstream release 0.10.33
+   http://blog.nodejs.org/2014/10/23/node-v0-10-33-stable/
+ - This release disables SSLv3 to secure Node.js services against the POODLE
+   attack.  (CVE-2014-3566; RHBZ#1152789)  For more information or to learn how
+   to re-enable SSLv3 in order to support legacy clients, please see the upstream
+   release announcement linked above.
+ 
  * Tue Oct 21 2014 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.32-2
  - add Provides nodejs-punycode (RHBZ#1151811)