Skip to content

Commit 9d3b69d

Browse files
joerg-krausetpetazzoni
joerg-krause
authored and
tpetazzoni
committed
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] nodejs/node#4201 Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
1 parent 5cff6a8 commit 9d3b69d

8 files changed

Lines changed: 48 additions & 50 deletions

‎package/nodejs/0.12.7/0004-fix-build-error-without-OpenSSL-support.patch‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

package/nodejs/0.12.7/0001-Remove-dependency-on-Python-bz2-module.patch renamed to package/nodejs/0.12.9/0001-Remove-dependency-on-Python-bz2-module.patch

File renamed without changes.

package/nodejs/0.12.7/0002-gyp-force-link-command-to-use-CXX.patch renamed to package/nodejs/0.12.9/0002-gyp-force-link-command-to-use-CXX.patch

File renamed without changes.

package/nodejs/0.12.7/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch renamed to package/nodejs/0.12.9/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch

File renamed without changes.

‎package/nodejs/0.12.9/0004-src-fix-build-error-without-OpenSSL-support.patch‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
From ba6142dbaebe06738686da150043abbd1ef1fbf5 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
3+
Date: Tue, 8 Dec 2015 21:22:45 +0100
4+
Subject: [PATCH] src: fix build error without OpenSSL support
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
9+
PR #3890 [1] introduced the variable ALLOW_INSECURE_SERVER_DHPARAM defined
10+
in src/node_crypto.cc. However, if nodejs is built without OpenSSL support,
11+
the build fails:
12+
error: ‘ALLOW_INSECURE_SERVER_DHPARAM’ was not declared in this scope
13+
ALLOW_INSECURE_SERVER_DHPARAM = true;
14+
15+
Fix this by using the preprocessor macro HAVE_OPENSSL to opt-out the use of
16+
ALLOW_INSECURE_SERVER_DHPARAM in non-OpenSSL builds.
17+
18+
Patch status: Sent upstream [2]
19+
20+
[1] https://github.com/nodejs/node/pull/3890
21+
[2] https://github.com/nodejs/node/pull/4201
22+
23+
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
24+
---
25+
src/node.cc | 2 ++
26+
1 file changed, 2 insertions(+)
27+
28+
diff --git a/src/node.cc b/src/node.cc
29+
index 1da8328..e5239ac 100644
30+
--- a/src/node.cc
31+
+++ b/src/node.cc
32+
@@ -3042,7 +3042,9 @@ static void ParseArgs(int* argc,
33+
SSL3_ENABLE = true;
34+
#endif
35+
} else if (strcmp(arg, "--allow-insecure-server-dhparam") == 0) {
36+
+#if HAVE_OPENSSL
37+
ALLOW_INSECURE_SERVER_DHPARAM = true;
38+
+#endif
39+
} else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) {
40+
PrintHelp();
41+
exit(0);
42+
--
43+
2.6.3
44+

package/nodejs/0.12.7/0005-Fix-typo-for-arm-predefined-macro-in-atomicops_inte.patch renamed to package/nodejs/0.12.9/0005-Fix-typo-for-arm-predefined-macro-in-atomicops_inte.patch

File renamed without changes.

‎package/nodejs/Config.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ config BR2_BR2_PACKAGE_NODEJS_0_10_X
4545
bool "v0.10.41"
4646

4747
config BR2_BR2_PACKAGE_NODEJS_0_12_X
48-
bool "v0.12.7"
48+
bool "v0.12.9"
4949
depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
5050

5151
config BR2_BR2_PACKAGE_NODEJS_4_X
@@ -62,7 +62,7 @@ endchoice
6262
config BR2_PACKAGE_NODEJS_VERSION_STRING
6363
string
6464
default "0.10.41" if BR2_BR2_PACKAGE_NODEJS_0_10_X
65-
default "0.12.7" if BR2_BR2_PACKAGE_NODEJS_0_12_X
65+
default "0.12.9" if BR2_BR2_PACKAGE_NODEJS_0_12_X
6666
default "4.1.2" if BR2_BR2_PACKAGE_NODEJS_4_X
6767

6868
menu "Module Selection"

‎package/nodejs/nodejs.hash‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# From upstream URL: http://nodejs.org/dist/v0.10.41/SHASUMS256.txt
22
sha256 79f694e2a5c42543b75d0c69f6860499d7593136d0f6b59e7163b9e66fb2c995 node-v0.10.41.tar.gz
33

4-
# From upstream URL: http://nodejs.org/dist/v0.12.7/SHASUMS256.txt
5-
sha256 b23d64df051c9c969b0c583f802d5d71de342e53067127a5061415be7e12f39d node-v0.12.7.tar.gz
4+
# From upstream URL: http://nodejs.org/dist/v0.12.9/SHASUMS256.txt
5+
sha256 35daad301191e5f8dd7e5d2fbb711d081b82d1837d59837b8ee224c256cfe5e4 node-v0.12.9.tar.gz
66

77
# From upstream URL: http://nodejs.org/dist/v4.1.2/SHASUMS256.txt
88
sha256 443c8251e812b1f2c4b3e9152a47df23c55567ade739e017e2c0ca0869b71e74 node-v4.1.2.tar.xz

0 commit comments

Comments
 (0)