diff options
author | Jörg Krause <joerg.krause@embedded.rocks> | 2015-12-08 22:18:19 +0100 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-12-12 18:28:13 +0100 |
commit | 9d3b69dfdd2af06da20d04b84d6ae35f57789877 (patch) | |
tree | bd2b4a17bb0fe0336091c278ad7e940ccb21453d /package/nodejs/0.12.7/0004-fix-build-error-without-OpenSSL-support.patch | |
parent | 5cff6a83c66eff671831cb5fc6b9c96a4199677f (diff) | |
download | buildroot-9d3b69dfdd2af06da20d04b84d6ae35f57789877.tar.gz buildroot-9d3b69dfdd2af06da20d04b84d6ae35f57789877.zip |
package/nodejs: bump 0.12.x branch to version 0.12.9
Patch #4 was applied upstream, however a new bug was introduced which breaks
building nodejs without OpenSSL support. We replace the applied patch with a
new patch to fix:
error: ‘ALLOW_INSECURE_SERVER_DHPARAM’ was not declared in this scope
ALLOW_INSECURE_SERVER_DHPARAM = true;
Patch #4 status: Sent upstream [1]
[1] https://github.com/nodejs/node/pull/4201
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/nodejs/0.12.7/0004-fix-build-error-without-OpenSSL-support.patch')
-rw-r--r-- | package/nodejs/0.12.7/0004-fix-build-error-without-OpenSSL-support.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/package/nodejs/0.12.7/0004-fix-build-error-without-OpenSSL-support.patch b/package/nodejs/0.12.7/0004-fix-build-error-without-OpenSSL-support.patch deleted file mode 100644 index ccb29b1193..0000000000 --- a/package/nodejs/0.12.7/0004-fix-build-error-without-OpenSSL-support.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 - |