summaryrefslogtreecommitdiffstats
path: root/package/nodejs/0.12.6/0004-fix-build-error-without-OpenSSL-support.patch
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2015-07-05 19:43:23 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-07-06 11:50:00 +0200
commit781529b159313c04903791c6f9e437e697f0e3a9 (patch)
treeba1ceeaf02d28fc4a754e2b012746cc13e8d1446 /package/nodejs/0.12.6/0004-fix-build-error-without-OpenSSL-support.patch
parenteb6254a5aa2e0bf539b74279828c64be6693593b (diff)
downloadbuildroot-781529b159313c04903791c6f9e437e697f0e3a9.tar.gz
buildroot-781529b159313c04903791c6f9e437e697f0e3a9.zip
package/nodejs: security bump
Critical security flaw: https://medium.com/@iojs/important-security-upgrades-for-node-js-and-io-js-8ac14ece5852 Fixes #8201. Reported-by: Chris Becker <goabonga@gmail.com> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/nodejs/0.12.6/0004-fix-build-error-without-OpenSSL-support.patch')
-rw-r--r--package/nodejs/0.12.6/0004-fix-build-error-without-OpenSSL-support.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/package/nodejs/0.12.6/0004-fix-build-error-without-OpenSSL-support.patch b/package/nodejs/0.12.6/0004-fix-build-error-without-OpenSSL-support.patch
new file mode 100644
index 0000000000..ccb29b1193
--- /dev/null
+++ b/package/nodejs/0.12.6/0004-fix-build-error-without-OpenSSL-support.patch
@@ -0,0 +1,46 @@
+From 6bfa497dceb83de5257c64da59fbcf6a32d83305 Mon Sep 17 00:00:00 2001
+From: Martin Bark <martin@barkynet.com>
+Date: Tue, 30 Jun 2015 09:45:07 +0100
+Subject: [PATCH 4/4] fix build error without OpenSSL support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Krause <jkrause@posteo.de>
+[Martin: adapt to 0.12.5]
+Signed-off-by: Martin Bark <martin@barkynet.com>
+---
+ src/node.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/node.cc b/src/node.cc
+index e669706..d43b791 100644
+--- a/src/node.cc
++++ b/src/node.cc
+@@ -2934,8 +2934,10 @@ static void PrintHelp() {
+ " present.\n"
+ #endif
+ #endif
++#if HAVE_OPENSSL
+ " --enable-ssl2 enable ssl2\n"
+ " --enable-ssl3 enable ssl3\n"
++#endif
+ "\n"
+ "Environment variables:\n"
+ #ifdef _WIN32
+@@ -3003,10 +3005,12 @@ static void ParseArgs(int* argc,
+ } else if (strcmp(arg, "--version") == 0 || strcmp(arg, "-v") == 0) {
+ printf("%s\n", NODE_VERSION);
+ exit(0);
++#if HAVE_OPENSSL
+ } else if (strcmp(arg, "--enable-ssl2") == 0) {
+ SSL2_ENABLE = true;
+ } else if (strcmp(arg, "--enable-ssl3") == 0) {
+ SSL3_ENABLE = true;
++#endif
+ } else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) {
+ PrintHelp();
+ exit(0);
+--
+2.1.4
+
OpenPOWER on IntegriCloud