mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-04-20 11:38:34 +00:00
Nodejs - Upgrade to 16.18.1
* Drop Openssl legacy provider patch and install both binaries patch which are already available in 16.x * Refresh native binaries patch against 16.x base Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Archana Polampalli
committed by
Khem Raj
Khem Raj
parent
172c707251
commit
c4829fa338
@@ -3,14 +3,17 @@ From: Guillaume Burel <guillaume.burel@stormshield.eu>
|
||||
Date: Fri, 3 Jan 2020 11:25:54 +0100
|
||||
Subject: [PATCH] Using native binaries
|
||||
|
||||
Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
|
||||
---
|
||||
node.gyp | 4 ++--
|
||||
tools/v8_gypfiles/v8.gyp | 11 ++++-------
|
||||
2 files changed, 6 insertions(+), 9 deletions(-)
|
||||
node.gyp | 2 ++
|
||||
tools/v8_gypfiles/v8.gyp | 5 +++++
|
||||
2 files changed, 7 insertions(+)
|
||||
|
||||
diff --git a/node.gyp b/node.gyp
|
||||
index 24505da7ba..7d41bd52db 100644
|
||||
--- a/node.gyp
|
||||
+++ b/node.gyp
|
||||
@@ -294,6 +294,7 @@
|
||||
@@ -319,6 +319,7 @@
|
||||
'action_name': 'run_mkcodecache',
|
||||
'process_outputs_as_sources': 1,
|
||||
'inputs': [
|
||||
@@ -18,14 +21,16 @@ Subject: [PATCH] Using native binaries
|
||||
'<(mkcodecache_exec)',
|
||||
],
|
||||
'outputs': [
|
||||
@@ -319,6 +320,7 @@
|
||||
'action_name': 'node_mksnapshot',
|
||||
'process_outputs_as_sources': 1,
|
||||
'inputs': [
|
||||
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
|
||||
'<(node_mksnapshot_exec)',
|
||||
],
|
||||
'outputs': [
|
||||
@@ -366,6 +367,7 @@
|
||||
'action_name': 'node_mksnapshot',
|
||||
'process_outputs_as_sources': 1,
|
||||
'inputs': [
|
||||
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
|
||||
'<(node_mksnapshot_exec)',
|
||||
],
|
||||
'outputs': [
|
||||
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
|
||||
index ed042f8829..371b8e02c2 100644
|
||||
--- a/tools/v8_gypfiles/v8.gyp
|
||||
+++ b/tools/v8_gypfiles/v8.gyp
|
||||
@@ -68,6 +68,7 @@
|
||||
@@ -40,11 +45,11 @@ Subject: [PATCH] Using native binaries
|
||||
'<@(torque_outputs_inc)',
|
||||
],
|
||||
'action': [
|
||||
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
|
||||
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
|
||||
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
|
||||
'-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated',
|
||||
'-v8-root', '<(V8_ROOT)',
|
||||
@@ -225,6 +227,7 @@
|
||||
@@ -211,6 +213,7 @@
|
||||
{
|
||||
'action_name': 'generate_bytecode_builtins_list_action',
|
||||
'inputs': [
|
||||
@@ -52,7 +57,7 @@ Subject: [PATCH] Using native binaries
|
||||
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)bytecode_builtins_list_generator<(EXECUTABLE_SUFFIX)',
|
||||
],
|
||||
'outputs': [
|
||||
@@ -415,6 +418,7 @@
|
||||
@@ -395,6 +398,7 @@
|
||||
],
|
||||
},
|
||||
'inputs': [
|
||||
@@ -60,7 +65,7 @@ Subject: [PATCH] Using native binaries
|
||||
'<(mksnapshot_exec)',
|
||||
],
|
||||
'outputs': [
|
||||
@@ -1548,6 +1552,7 @@
|
||||
@@ -1513,6 +1517,7 @@
|
||||
{
|
||||
'action_name': 'run_gen-regexp-special-case_action',
|
||||
'inputs': [
|
||||
@@ -68,3 +73,6 @@ Subject: [PATCH] Using native binaries
|
||||
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)gen-regexp-special-case<(EXECUTABLE_SUFFIX)',
|
||||
],
|
||||
'outputs': [
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -1,96 +0,0 @@
|
||||
From 62ddf8499747fb1e366477d666c0634ad50039a9 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Tue, 19 Mar 2019 23:22:40 -0400
|
||||
Subject: [PATCH 2/2] Install both binaries and use libdir.
|
||||
|
||||
This allows us to build with a shared library for other users while
|
||||
still providing the normal executable.
|
||||
|
||||
Taken from - https://src.fedoraproject.org/rpms/nodejs/raw/rawhide/f/0002-Install-both-binaries-and-use-libdir.patch
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
configure.py | 7 +++++++
|
||||
tools/install.py | 21 +++++++++------------
|
||||
2 files changed, 16 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/configure.py b/configure.py
|
||||
index 6efb98c2316f089f3167e486282593245373af3f..a6d2ec939e4480dfae703f3978067537abf9f0f0 100755
|
||||
--- a/configure.py
|
||||
+++ b/configure.py
|
||||
@@ -721,10 +721,16 @@ parser.add_argument('--shared',
|
||||
dest='shared',
|
||||
default=None,
|
||||
help='compile shared library for embedding node in another project. ' +
|
||||
'(This mode is not officially supported for regular applications)')
|
||||
|
||||
+parser.add_argument('--libdir',
|
||||
+ action='store',
|
||||
+ dest='libdir',
|
||||
+ default='lib',
|
||||
+ help='a directory to install the shared library into')
|
||||
+
|
||||
parser.add_argument('--without-v8-platform',
|
||||
action='store_true',
|
||||
dest='without_v8_platform',
|
||||
default=False,
|
||||
help='do not initialize v8 platform during node.js startup. ' +
|
||||
@@ -1305,10 +1311,11 @@ def configure_node(o):
|
||||
o['variables']['debug_nghttp2'] = 'false'
|
||||
|
||||
o['variables']['node_no_browser_globals'] = b(options.no_browser_globals)
|
||||
|
||||
o['variables']['node_shared'] = b(options.shared)
|
||||
+ o['variables']['libdir'] = options.libdir
|
||||
node_module_version = getmoduleversion.get_version()
|
||||
|
||||
if options.dest_os == 'android':
|
||||
shlib_suffix = 'so'
|
||||
elif sys.platform == 'darwin':
|
||||
diff --git a/tools/install.py b/tools/install.py
|
||||
index 41cc1cbc60a9480cc08df3aa0ebe582c2becc3a2..11208f9e7166ab60da46d5ace2257c239a7e9263 100755
|
||||
--- a/tools/install.py
|
||||
+++ b/tools/install.py
|
||||
@@ -128,26 +128,23 @@ def subdir_files(path, dest, action):
|
||||
for subdir, files_in_path in ret.items():
|
||||
action(files_in_path, subdir + '/')
|
||||
|
||||
def files(action):
|
||||
is_windows = sys.platform == 'win32'
|
||||
- output_file = 'node'
|
||||
output_prefix = 'out/Release/'
|
||||
+ output_libprefix = output_prefix
|
||||
|
||||
- if 'false' == variables.get('node_shared'):
|
||||
- if is_windows:
|
||||
- output_file += '.exe'
|
||||
+ if is_windows:
|
||||
+ output_bin = 'node.exe'
|
||||
+ output_lib = 'node.dll'
|
||||
else:
|
||||
- if is_windows:
|
||||
- output_file += '.dll'
|
||||
- else:
|
||||
- output_file = 'lib' + output_file + '.' + variables.get('shlib_suffix')
|
||||
+ output_bin = 'node'
|
||||
+ output_lib = 'libnode.' + variables.get('shlib_suffix')
|
||||
|
||||
- if 'false' == variables.get('node_shared'):
|
||||
- action([output_prefix + output_file], 'bin/' + output_file)
|
||||
- else:
|
||||
- action([output_prefix + output_file], 'lib/' + output_file)
|
||||
+ action([output_prefix + output_bin], 'bin/' + output_bin)
|
||||
+ if 'true' == variables.get('node_shared'):
|
||||
+ action([output_libprefix + output_lib], variables.get('libdir') + '/' + output_lib)
|
||||
|
||||
if 'true' == variables.get('node_use_dtrace'):
|
||||
action(['out/Release/node.d'], 'lib/dtrace/node.d')
|
||||
|
||||
# behave similarly for systemtap
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@@ -1,151 +0,0 @@
|
||||
From 86d1c0cc6a5dcf57e413a1cc1c29203e87cf9a14 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Bevenius <daniel.bevenius@gmail.com>
|
||||
Date: Sat, 16 Oct 2021 08:50:16 +0200
|
||||
Subject: [PATCH] src: add --openssl-legacy-provider option
|
||||
|
||||
This commit adds an option to Node.js named --openssl-legacy-provider
|
||||
and if specified will load OpenSSL 3.0 Legacy provider.
|
||||
|
||||
$ ./node --help
|
||||
...
|
||||
--openssl-legacy-provider enable OpenSSL 3.0 legacy provider
|
||||
|
||||
Example usage:
|
||||
|
||||
$ ./node --openssl-legacy-provider -p 'crypto.createHash("md4")'
|
||||
Hash {
|
||||
_options: undefined,
|
||||
[Symbol(kHandle)]: Hash {},
|
||||
[Symbol(kState)]: { [Symbol(kFinalized)]: false }
|
||||
}
|
||||
|
||||
Co-authored-by: Richard Lau <rlau@redhat.com>
|
||||
Signed-off-by: Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
|
||||
Upstream-Status: Backport [https://github.com/nodejs/node/issues/40455]
|
||||
---
|
||||
doc/api/cli.md | 10 ++++++++++
|
||||
src/crypto/crypto_util.cc | 10 ++++++++++
|
||||
src/node_options.cc | 10 ++++++++++
|
||||
src/node_options.h | 7 +++++++
|
||||
.../test-process-env-allowed-flags-are-documented.js | 5 +++++
|
||||
5 files changed, 42 insertions(+)
|
||||
|
||||
diff --git a/doc/api/cli.md b/doc/api/cli.md
|
||||
index 74057706bf8d..608b9cdeddf1 100644
|
||||
--- a/doc/api/cli.md
|
||||
+++ b/doc/api/cli.md
|
||||
@@ -687,6 +687,14 @@ Load an OpenSSL configuration file on startup. Among other uses, this can be
|
||||
used to enable FIPS-compliant crypto if Node.js is built
|
||||
against FIPS-enabled OpenSSL.
|
||||
|
||||
+### `--openssl-legacy-provider`
|
||||
+<!-- YAML
|
||||
+added: REPLACEME
|
||||
+-->
|
||||
+
|
||||
+Enable OpenSSL 3.0 legacy provider. For more information please see
|
||||
+[providers readme][].
|
||||
+
|
||||
### `--pending-deprecation`
|
||||
|
||||
<!-- YAML
|
||||
@@ -1544,6 +1552,7 @@ Node.js options that are allowed are:
|
||||
* `--no-warnings`
|
||||
* `--node-memory-debug`
|
||||
* `--openssl-config`
|
||||
+* `--openssl-legacy-provider`
|
||||
* `--pending-deprecation`
|
||||
* `--policy-integrity`
|
||||
* `--preserve-symlinks-main`
|
||||
@@ -1933,6 +1942,7 @@ $ node --max-old-space-size=1536 index.js
|
||||
[emit_warning]: process.md#processemitwarningwarning-options
|
||||
[jitless]: https://v8.dev/blog/jitless
|
||||
[libuv threadpool documentation]: https://docs.libuv.org/en/latest/threadpool.html
|
||||
+[providers readme]: https://github.com/openssl/openssl/blob/openssl-3.0.0/README-PROVIDERS.md
|
||||
[remote code execution]: https://www.owasp.org/index.php/Code_Injection
|
||||
[security warning]: #warning-binding-inspector-to-a-public-ipport-combination-is-insecure
|
||||
[timezone IDs]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
|
||||
diff --git a/src/crypto/crypto_util.cc b/src/crypto/crypto_util.cc
|
||||
index 7e0c8ba3eb60..796ea3025e41 100644
|
||||
--- a/src/crypto/crypto_util.cc
|
||||
+++ b/src/crypto/crypto_util.cc
|
||||
@@ -148,6 +148,16 @@ void InitCryptoOnce() {
|
||||
}
|
||||
#endif
|
||||
|
||||
+#if OPENSSL_VERSION_MAJOR >= 3
|
||||
+ // --openssl-legacy-provider
|
||||
+ if (per_process::cli_options->openssl_legacy_provider) {
|
||||
+ OSSL_PROVIDER* legacy_provider = OSSL_PROVIDER_load(nullptr, "legacy");
|
||||
+ if (legacy_provider == nullptr) {
|
||||
+ fprintf(stderr, "Unable to load legacy provider.\n");
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
OPENSSL_init_ssl(0, settings);
|
||||
OPENSSL_INIT_free(settings);
|
||||
settings = nullptr;
|
||||
diff --git a/src/node_options.cc b/src/node_options.cc
|
||||
index 00bdc6688a4c..3363860919a9 100644
|
||||
--- a/src/node_options.cc
|
||||
+++ b/src/node_options.cc
|
||||
@@ -4,6 +4,9 @@
|
||||
#include "env-inl.h"
|
||||
#include "node_binding.h"
|
||||
#include "node_internals.h"
|
||||
+#if HAVE_OPENSSL
|
||||
+#include "openssl/opensslv.h"
|
||||
+#endif
|
||||
|
||||
#include <errno.h>
|
||||
#include <sstream>
|
||||
diff --git a/src/node_options.h b/src/node_options.h
|
||||
index fd772478d04d..1c0e018ab16f 100644
|
||||
--- a/src/node_options.h
|
||||
+++ b/src/node_options.h
|
||||
@@ -11,6 +11,10 @@
|
||||
#include "node_mutex.h"
|
||||
#include "util.h"
|
||||
|
||||
+#if HAVE_OPENSSL
|
||||
+#include "openssl/opensslv.h"
|
||||
+#endif
|
||||
+
|
||||
namespace node {
|
||||
|
||||
class HostPort {
|
||||
@@ -251,6 +255,9 @@ class PerProcessOptions : public Options {
|
||||
bool enable_fips_crypto = false;
|
||||
bool force_fips_crypto = false;
|
||||
#endif
|
||||
+#if OPENSSL_VERSION_MAJOR >= 3
|
||||
+ bool openssl_legacy_provider = false;
|
||||
+#endif
|
||||
|
||||
// Per-process because reports can be triggered outside a known V8 context.
|
||||
bool report_on_fatalerror = false;
|
||||
diff --git a/test/parallel/test-process-env-allowed-flags-are-documented.js b/test/parallel/test-process-env-allowed-flags-are-documented.js
|
||||
index 64626b71f019..8a4e35997907 100644
|
||||
--- a/test/parallel/test-process-env-allowed-flags-are-documented.js
|
||||
+++ b/test/parallel/test-process-env-allowed-flags-are-documented.js
|
||||
@@ -43,6 +43,10 @@ for (const line of [...nodeOptionsLines, ...v8OptionsLines]) {
|
||||
}
|
||||
}
|
||||
|
||||
+if (!common.hasOpenSSL3) {
|
||||
+ documented.delete('--openssl-legacy-provider');
|
||||
+}
|
||||
+
|
||||
// Filter out options that are conditionally present.
|
||||
const conditionalOpts = [
|
||||
{
|
||||
@@ -50,6 +54,7 @@ const conditionalOpts = [
|
||||
filter: (opt) => {
|
||||
return [
|
||||
'--openssl-config',
|
||||
+ common.hasOpenSSL3 ? '--openssl-legacy-provider' : '',
|
||||
'--tls-cipher-list',
|
||||
'--use-bundled-ca',
|
||||
'--use-openssl-ca',
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
|
||||
HOMEPAGE = "http://nodejs.org"
|
||||
LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=6ba5b21ac7a505195ca69344d3d7a94a"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=6e54852cd826c41e80c6d80f6db00a85"
|
||||
|
||||
DEPENDS = "openssl"
|
||||
DEPENDS:append:class-target = " qemu-native"
|
||||
@@ -19,9 +19,7 @@ COMPATIBLE_HOST:powerpc = "null"
|
||||
|
||||
SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
|
||||
file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
|
||||
file://0002-Install-both-binaries-and-use-libdir.patch \
|
||||
file://0004-v8-don-t-override-ARM-CFLAGS.patch \
|
||||
file://0005-add-openssl-legacy-provider-option.patch \
|
||||
file://big-endian.patch \
|
||||
file://mips-less-memory.patch \
|
||||
file://system-c-ares.patch \
|
||||
@@ -29,7 +27,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
|
||||
file://0001-mips-Use-32bit-cast-for-operand-on-mips32.patch \
|
||||
"
|
||||
SRC_URI:append:class-target = " \
|
||||
file://0002-Using-native-binaries.patch \
|
||||
file://0001-Using-native-binaries.patch \
|
||||
"
|
||||
SRC_URI:append:toolchain-clang:x86 = " \
|
||||
file://libatomic.patch \
|
||||
@@ -37,7 +35,7 @@ SRC_URI:append:toolchain-clang:x86 = " \
|
||||
SRC_URI:append:toolchain-clang:powerpc64le = " \
|
||||
file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "e922e215cc68eb5f94d33e8a0b61e2c863b7731cc8600ab955d3822da90ff8d1"
|
||||
SRC_URI[sha256sum] = "1f8051a88f86f42064f4415fe7a980e59b0a502ecc8def583f6303bc4d445238"
|
||||
|
||||
S = "${WORKDIR}/node-v${PV}"
|
||||
|
||||
Reference in New Issue
Block a user