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.9/0004-src-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.9/0004-src-fix-build-error-without-OpenSSL-support.patch')
-rw-r--r-- | package/nodejs/0.12.9/0004-src-fix-build-error-without-OpenSSL-support.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/package/nodejs/0.12.9/0004-src-fix-build-error-without-OpenSSL-support.patch b/package/nodejs/0.12.9/0004-src-fix-build-error-without-OpenSSL-support.patch new file mode 100644 index 0000000000..62966eb1d3 --- /dev/null +++ b/package/nodejs/0.12.9/0004-src-fix-build-error-without-OpenSSL-support.patch @@ -0,0 +1,44 @@ +From ba6142dbaebe06738686da150043abbd1ef1fbf5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> +Date: Tue, 8 Dec 2015 21:22:45 +0100 +Subject: [PATCH] src: fix build error without OpenSSL support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +PR #3890 [1] introduced the variable ALLOW_INSECURE_SERVER_DHPARAM defined +in src/node_crypto.cc. However, if nodejs is built without OpenSSL support, +the build fails: + error: ‘ALLOW_INSECURE_SERVER_DHPARAM’ was not declared in this scope + ALLOW_INSECURE_SERVER_DHPARAM = true; + +Fix this by using the preprocessor macro HAVE_OPENSSL to opt-out the use of +ALLOW_INSECURE_SERVER_DHPARAM in non-OpenSSL builds. + +Patch status: Sent upstream [2] + +[1] https://github.com/nodejs/node/pull/3890 +[2] https://github.com/nodejs/node/pull/4201 + +Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> +--- + src/node.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/node.cc b/src/node.cc +index 1da8328..e5239ac 100644 +--- a/src/node.cc ++++ b/src/node.cc +@@ -3042,7 +3042,9 @@ static void ParseArgs(int* argc, + SSL3_ENABLE = true; + #endif + } else if (strcmp(arg, "--allow-insecure-server-dhparam") == 0) { ++#if HAVE_OPENSSL + ALLOW_INSECURE_SERVER_DHPARAM = true; ++#endif + } else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) { + PrintHelp(); + exit(0); +-- +2.6.3 + |