mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

chore: upgrade node to 12.6.0 (#19312)

Browse source
This commit is contained in:
Samuel Attard 2019-07-17 14:22:27 -07:00 committed by GitHub
parent fbcbdb051b
commit afa5266c7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 140 additions and 246 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DEPS
View file

@ -12,7 +12,7 @@ vars = {
'chromium_version':
'5a48e127c8cb8ae827f4fead0b527079194b9899',
'node_version':
'v12.4.0',
'v12.6.0',
'nan_version':
'2ee313aaca52e2b478965ac50eb5082520380d1b',

2
patches/node/.patches
View file

@ -29,13 +29,11 @@ build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.pa
refactor_allow_embedder_overriding_of_internal_fs_calls.patch
chore_add_ability_to_prevent_warn_non_context-aware_native_modules.patch
fsevents_fix_file_event_reporting.patch
src_only_run_preloadmodules_if_the_preload_array_is_not_empty.patch
src_read_break_node_first_line_from_the_inspect_options.patch
chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch
inherit_electron_crashpad_pipe_name_in_child_process.patch
fixme_revert_crypto_add_support_for_rsa-pss_keys.patch
chore_re-add_compileandcall_this_should_be_added_as_a_helper_in.patch
chore_remove_unused_private_runtimeagent_member_env.patch
src_add_missing_option_parser_template_for_the_debugoptionsparser.patch
src_expose_maybeinitializecontext_to_allow_existing_contexts.patch
fix_extern_the_nativemoduleenv_and_options_parser_for_debug_builds.patch

21
patches/node/build_add_gn_build_files.patch
View file

@ -6,10 +6,10 @@ Subject: build: add GN build files
diff --git a/BUILD.gn b/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..f27c13b312a60d9b5c7ea0948b347ab0936ab3f8
index 0000000000000000000000000000000000000000..5bc9ff072414a4c3bae896a08b9771984944f087
--- /dev/null
+++ b/BUILD.gn
@@ -0,0 +1,369 @@
@@ -0,0 +1,370 @@
+import("//electron/build/asar.gni")
+import("//v8/gni/v8.gni")
+
@ -255,6 +255,7 @@ index 0000000000000000000000000000000000000000..f27c13b312a60d9b5c7ea0948b347ab0
+ "$root_gen_dir/atom_natives.cc",
+ "$target_gen_dir/node_javascript.cc",
+ "src/node_code_cache_stub.cc",
+ "src/node_snapshot_stub.cc",
+ ]
+
+ if (is_win) {
@ -1330,10 +1331,10 @@ index 0000000000000000000000000000000000000000..edb0b215088118f567c5ad5e5969d1eb
+}
diff --git a/src/inspector/BUILD.gn b/src/inspector/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..48ad85e895b6111223119fafa57c13ba75cdbeae
index 0000000000000000000000000000000000000000..f3c5c798c0aefcb8cf9b1570a7b4817c477aecf6
--- /dev/null
+++ b/src/inspector/BUILD.gn
@@ -0,0 +1,195 @@
@@ -0,0 +1,199 @@
+import("//v8/gni/v8.gni")
+
+inspector_protocol_dir = "../../tools/inspector_protocol"
@ -1346,6 +1347,8 @@ index 0000000000000000000000000000000000000000..48ad85e895b6111223119fafa57c13ba
+ "protocol/NodeWorker.h",
+ "protocol/NodeTracing.cpp",
+ "protocol/NodeTracing.h",
+ "protocol/NodeRuntime.cpp",
+ "protocol/NodeRuntime.h",
+]
+
+# These are from node_protocol_config.json
@ -1371,6 +1374,8 @@ index 0000000000000000000000000000000000000000..48ad85e895b6111223119fafa57c13ba
+ "main_thread_interface.h",
+ "node_string.cc",
+ "node_string.h",
+ "runtime_agent.cc",
+ "runtime_agent.h",
+ "tracing_agent.cc",
+ "tracing_agent.h",
+ "worker_agent.cc",
@ -1530,7 +1535,7 @@ index 0000000000000000000000000000000000000000..48ad85e895b6111223119fafa57c13ba
+ args = rebase_path(inputs + outputs, root_build_dir)
+}
diff --git a/src/node_version.h b/src/node_version.h
index 1c04b102721f891c6b657702b7f8585137647e04..a9f8a9c8cbfd3996906eb400388aaa99ef77f547 100644
index 46f92e1b83847f6078c46c8ddd0efaae859cc06d..e484042b7b68e7bb5b2e6431bc76bdeea31decaf 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -89,7 +89,10 @@
@ -1542,8 +1547,8 @@ index 1c04b102721f891c6b657702b7f8585137647e04..a9f8a9c8cbfd3996906eb400388aaa99
#define NODE_MODULE_VERSION 72
+#endif
// the NAPI_VERSION provided by this version of the runtime
#define NAPI_VERSION 4
// The NAPI_VERSION provided by this version of the runtime. This is the version
// which the Node binary being built supports.
diff --git a/tools/generate_config_gypi.py b/tools/generate_config_gypi.py
new file mode 100644
index 0000000000000000000000000000000000000000..01f62d4ae6e3b9d539444e3dff069f0011353caa
@ -1662,7 +1667,7 @@ index 0000000000000000000000000000000000000000..3088ae4bdf814ae255c9805ebd393b2e
+
+ out_file.writelines(new_contents)
diff --git a/tools/js2c.py b/tools/js2c.py
index c3ac53f14b739142a5da43e15b43b8642b36fa84..68152c499ce610d759b5abd659340957efb864d6 100755
index 0189dd762919162c8a897d291bdda3cfd600eab6..7b3e90af88b873c32f8ed51712f7dfdff3c1c706 100755
--- a/tools/js2c.py
+++ b/tools/js2c.py
@@ -261,9 +261,17 @@ def NormalizeFileName(filename):

2
patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch
View file

@ -38,7 +38,7 @@ index fabaea75686161f488a03349e07049a513b98fad..5a6b01dc12fb77d5f8c26a1153ead2a1
bool Exists(const char* id);
diff --git a/tools/js2c.py b/tools/js2c.py
index 68152c499ce610d759b5abd659340957efb864d6..27c9ca57c3ad6188282d43ce1efdb53efd1161bc 100755
index 7b3e90af88b873c32f8ed51712f7dfdff3c1c706..586d0f72dcb4215ce73c23b401bce7238ed5bb0d 100755
--- a/tools/js2c.py
+++ b/tools/js2c.py
@@ -187,13 +187,15 @@ namespace native_module {{

10
patches/node/chore_add_ability_to_prevent_warn_non_context-aware_native_modules.patch
View file

@ -5,10 +5,10 @@ Subject: chore: add ability to prevent / warn non context-aware native modules
being loaded
diff --git a/src/env.h b/src/env.h
index b97d024a0e8396ebd21b96bd7f1a9473abfefe9b..23ad7569d31bc534247ed373819bc291a4f4bfe6 100644
index e60f76372a324b83cd054c830fc2d6f9ab2dcae8..63e71fc1fc2b0e95a85f38b58b34eeb290d8f09d 100644
--- a/src/env.h
+++ b/src/env.h
@@ -827,6 +827,15 @@ class Environment : public MemoryRetainer {
@@ -849,6 +849,15 @@ class Environment : public MemoryRetainer {
uint64_t thread_id = kNoThreadId);
~Environment();
@ -22,9 +22,9 @@ index b97d024a0e8396ebd21b96bd7f1a9473abfefe9b..23ad7569d31bc534247ed373819bc291
+ bool warn_non_context_aware() { return warn_non_context_aware_; }
+
void InitializeLibuv(bool start_profiler_idle_notifier);
v8::MaybeLocal<v8::Object> ProcessCliArgs(
const std::vector<std::string>& args,
@@ -1177,6 +1186,9 @@ class Environment : public MemoryRetainer {
inline const std::vector<std::string>& exec_argv();
inline const std::vector<std::string>& argv();
@@ -1197,6 +1206,9 @@ class Environment : public MemoryRetainer {
inline void ThrowError(v8::Local<v8::Value> (*fun)(v8::Local<v8::String>),
const char* errmsg);

4
patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch
View file

@ -25,10 +25,10 @@ index a998b095fb067ab6ca35cc276ac6a9a7c38dcf30..68ca0cefa4cf663cded9155bc4f2f226
// TODO(joyeecheung): most of these should be deprecated and removed,
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
index a643a77aec6398acfeae7f2e8e526d60c3b4453c..397cd8067849957599927bc033e3904964ac8c70 100644
index c975804d847eea5a8d759f79121aa4da61e88dc4..506ce67d553f4e755d56d386666c19f27d1ab694 100644
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -751,6 +751,13 @@ Module.prototype._compile = function(content, filename) {
@@ -753,6 +753,13 @@ Module.prototype._compile = function(content, filename) {
if (getOptionValue('--inspect-brk') && process._eval == null) {
if (!resolvedArgv) {
// We enter the repl if we're not given a filename argument.

4
patches/node/chore_read_nobrowserglobals_from_global_not_process.patch
View file

@ -7,10 +7,10 @@ This is used so that we can modify the flag at runtime where
config can only be set at compile time.
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
index 60c0bd845b18cd782d5b314f339e0c4e7bf88388..48c430e966e449397475887b4a65b9aea9021924 100644
index 48a38a6b5054c6bf14df82a8cb3c41d4bfb7bf68..a68e91171928ac3248a097bd6c58c9ae8c350f1a 100644
--- a/lib/internal/bootstrap/node.js
+++ b/lib/internal/bootstrap/node.js
@@ -168,7 +168,7 @@ const {
@@ -169,7 +169,7 @@ const {
queueMicrotask
} = require('internal/process/task_queues');

91
patches/node/chore_remove_unused_private_runtimeagent_member_env.patch
View file

@ -1,91 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 3 Jul 2019 09:29:26 -0700
Subject: chore: remove unused private RuntimeAgent member env
Removed in https://github.com/nodejs/node/pull/28036; this patch can
be removed when we update to v12.5.0
diff --git a/filenames.json b/filenames.json
index edb0b215088118f567c5ad5e5969d1eb5ef661a3..873fff0fac775b2a1276d6dff493146e5cd5ea2d 100644
--- a/filenames.json
+++ b/filenames.json
@@ -307,6 +307,7 @@
"src/node_env_var.cc",
"src/node_errors.cc",
"src/node_file.cc",
+ "src/node_snapshot_stub.cc",
"src/node_http_parser_llhttp.cc",
"src/node_http_parser_traditional.cc",
"src/node_http2.cc",
diff --git a/src/inspector/BUILD.gn b/src/inspector/BUILD.gn
index 48ad85e895b6111223119fafa57c13ba75cdbeae..ebe2c7f11a210817294e1fc1da02e2ae60244b9b 100644
--- a/src/inspector/BUILD.gn
+++ b/src/inspector/BUILD.gn
@@ -10,6 +10,8 @@ _protocol_generated = [
"protocol/NodeWorker.h",
"protocol/NodeTracing.cpp",
"protocol/NodeTracing.h",
+ "protocol/NodeRuntime.cpp",
+ "protocol/NodeRuntime.h"
]
# These are from node_protocol_config.json
@@ -41,6 +43,8 @@ source_set("inspector") {
"worker_agent.h",
"worker_inspector.cc",
"worker_inspector.h",
+ "runtime_agent.cc",
+ "runtime_agent.h",
]
sources += rebase_path(_protocol_generated,
".",
diff --git a/src/inspector/runtime_agent.cc b/src/inspector/runtime_agent.cc
index 4056140e70349377105ca190e54fbe61b489004f..037a77dbb9d044f2ada1191729599c72ea730687 100644
--- a/src/inspector/runtime_agent.cc
+++ b/src/inspector/runtime_agent.cc
@@ -7,8 +7,8 @@ namespace node {
namespace inspector {
namespace protocol {
-RuntimeAgent::RuntimeAgent(Environment* env)
- : notify_when_waiting_for_disconnect_(false), env_(env) {}
+RuntimeAgent::RuntimeAgent()
+ : notify_when_waiting_for_disconnect_(false) {}
void RuntimeAgent::Wire(UberDispatcher* dispatcher) {
frontend_ = std::make_unique<NodeRuntime::Frontend>(dispatcher->channel());
diff --git a/src/inspector/runtime_agent.h b/src/inspector/runtime_agent.h
index 63fc2a897caf21e7bf6987fff07d0e6413fc31fa..a408f9a438a339a8df2a5f5b9b9ac7d228948975 100644
--- a/src/inspector/runtime_agent.h
+++ b/src/inspector/runtime_agent.h
@@ -12,7 +12,7 @@ namespace protocol {
class RuntimeAgent : public NodeRuntime::Backend {
public:
- explicit RuntimeAgent(Environment* env);
+ explicit RuntimeAgent();
void Wire(UberDispatcher* dispatcher);
@@ -23,7 +23,6 @@ class RuntimeAgent : public NodeRuntime::Backend {
private:
std::shared_ptr<NodeRuntime::Frontend> frontend_;
bool notify_when_waiting_for_disconnect_;
- Environment* env_;
};
} // namespace protocol
} // namespace inspector
diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
index b208fad547fb5af9a1ff3988428e205a2a9ef39f..674ad4611a400de1e8f53fcb21214cb9f8de4442 100644
--- a/src/inspector_agent.cc
+++ b/src/inspector_agent.cc
@@ -239,7 +239,7 @@ class ChannelImpl final : public v8_inspector::V8Inspector::Channel,
tracing_agent_->Wire(node_dispatcher_.get());
worker_agent_ = std::make_unique<protocol::WorkerAgent>(worker_manager);
worker_agent_->Wire(node_dispatcher_.get());
- runtime_agent_ = std::make_unique<protocol::RuntimeAgent>(env);
+ runtime_agent_ = std::make_unique<protocol::RuntimeAgent>();
runtime_agent_->Wire(node_dispatcher_.get());
}

4
patches/node/export_environment_knodecontexttagptr.patch
View file

@ -5,10 +5,10 @@ Subject: export Environment::kNodeContextTagPtr
diff --git a/src/env.h b/src/env.h
index 0c6dbe3c8f581f92fc9f437cb340cfc16d509c1e..b97d024a0e8396ebd21b96bd7f1a9473abfefe9b 100644
index 3d955297920a98fc4f567cf8a12a6cc2267ed402..e60f76372a324b83cd054c830fc2d6f9ab2dcae8 100644
--- a/src/env.h
+++ b/src/env.h
@@ -1245,7 +1245,7 @@ class Environment : public MemoryRetainer {
@@ -1266,7 +1266,7 @@ class Environment : public MemoryRetainer {
uint64_t thread_id_;
std::unordered_set<worker::Worker*> sub_worker_contexts_;

37
patches/node/feat_add_flags_for_low-level_hooks_and_exceptions.patch
View file

@ -24,13 +24,13 @@ Environment on the V8 context of blink, so no new V8 context is created.
As a result, a renderer process may have multiple Node Environments in it.
diff --git a/src/env.cc b/src/env.cc
index bc43fac963bbc334ccf5c5e3895e9dbd568bcdb4..a942a880e93b11cbc0cfb3c86d3950bd7f261e77 100644
index df59eaaa94928fc26d8636bcbabe70c12c83fa04..a10b3db67872ebb24f10ac3bc6e43356a59c2644 100644
--- a/src/env.cc
+++ b/src/env.cc
@@ -318,6 +318,12 @@ Environment::Environment(IsolateData* isolate_data,
if (options_->no_force_async_hooks_checks) {
async_hooks_.no_force_checks();
}
@@ -383,6 +383,12 @@ Environment::Environment(IsolateData* isolate_data,
// TODO(joyeecheung): deserialize when the snapshot covers the environment
// properties.
CreateProperties();
+
+ // TODO(addaleax): the per-isolate state should not be controlled by
+ // a single Environment.
@ -41,7 +41,7 @@ index bc43fac963bbc334ccf5c5e3895e9dbd568bcdb4..a942a880e93b11cbc0cfb3c86d3950bd
CompileFnEntry::CompileFnEntry(Environment* env, uint32_t id)
diff --git a/src/node.cc b/src/node.cc
index f8b6fa6f33b67394ca68acabd4df0c64653083fe..eff0be6fef1274cd4210811bdc377702ca70b2a2 100644
index c074ed0dfe1b47611fdcf40537e5e70a2d95f58b..00fb0ed1c9cfbc86a7ec7d1d0ce7789b68d6a1e3 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -27,6 +27,7 @@
@ -52,7 +52,7 @@ index f8b6fa6f33b67394ca68acabd4df0c64653083fe..eff0be6fef1274cd4210811bdc377702
#include "node_internals.h"
#include "node_main_instance.h"
#include "node_metadata.h"
@@ -131,6 +132,9 @@ using v8::Undefined;
@@ -134,6 +135,9 @@ using v8::Undefined;
using v8::V8;
using v8::Value;
@ -62,20 +62,21 @@ index f8b6fa6f33b67394ca68acabd4df0c64653083fe..eff0be6fef1274cd4210811bdc377702
namespace per_process {
// node_revert.h
@@ -224,6 +228,12 @@ MaybeLocal<Value> ExecuteBootstrapper(Environment* env,
@@ -356,6 +360,13 @@ MaybeLocal<Value> Environment::RunBootstrapping() {
CHECK(!has_run_bootstrapping_code());
MaybeLocal<Value> RunBootstrapping(Environment* env) {
CHECK(!env->has_run_bootstrapping_code());
+ if (g_standalone_mode) {
+ env->isolate()->AddMessageListener(errors::PerIsolateMessageListener);
+ isolate()->AddMessageListener(errors::PerIsolateMessageListener);
+ }
+ if (g_upstream_node_mode) {
+ env->isolate()->SetFatalErrorHandler(OnFatalError);
+ isolate()->SetFatalErrorHandler(OnFatalError);
+ }
EscapableHandleScope scope(env->isolate());
Isolate* isolate = env->isolate();
@@ -618,7 +628,9 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
+
if (BootstrapInternalLoaders().IsEmpty()) {
return MaybeLocal<Value>();
}
@@ -736,7 +747,9 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
binding::RegisterBuiltinModules();
// Make inherited handles noninheritable.
@ -86,7 +87,7 @@ index f8b6fa6f33b67394ca68acabd4df0c64653083fe..eff0be6fef1274cd4210811bdc377702
#ifdef NODE_REPORT
// Cache the original command line to be
@@ -720,6 +732,9 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
@@ -838,6 +851,9 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
}
#endif
@ -96,7 +97,7 @@ index f8b6fa6f33b67394ca68acabd4df0c64653083fe..eff0be6fef1274cd4210811bdc377702
const int exit_code = ProcessGlobalArgs(argv, exec_argv, errors, false);
if (exit_code != 0) return exit_code;
@@ -742,6 +757,8 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
@@ -860,6 +876,8 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
per_process::metadata.versions.InitializeIntlVersions();
#endif

8
patches/node/feat_add_uv_loop_watcher_queue_code.patch
View file

@ -19,10 +19,10 @@ index f97801cec2f41b104fae591277ffbb94c3b2f299..da648b3efd5948843c485d65035ae29c
unsigned int active_handles;
void* handle_queue[2];
diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c
index 3bada900ebdc41c3acc823b9e4f74306afe2449f..1397d2cff770c732c18aba96ccfb6aaab2e36c17 100644
index 202c75bbb5e94cb2e8a588b09d4fbfdfe1ccfe3a..041b1838c629ec828f2160ac735953f1bf986c01 100644
--- a/deps/uv/src/unix/core.c
+++ b/deps/uv/src/unix/core.c
@@ -865,8 +865,11 @@ void uv__io_start(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
@@ -892,8 +892,11 @@ void uv__io_start(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
return;
#endif
@ -35,7 +35,7 @@ index 3bada900ebdc41c3acc823b9e4f74306afe2449f..1397d2cff770c732c18aba96ccfb6aaa
if (loop->watchers[w->fd] == NULL) {
loop->watchers[w->fd] = w;
@@ -902,8 +905,11 @@ void uv__io_stop(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
@@ -929,8 +932,11 @@ void uv__io_stop(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
w->events = 0;
}
}
@ -48,7 +48,7 @@ index 3bada900ebdc41c3acc823b9e4f74306afe2449f..1397d2cff770c732c18aba96ccfb6aaa
}
@@ -920,6 +926,8 @@ void uv__io_close(uv_loop_t* loop, uv__io_t* w) {
@@ -947,6 +953,8 @@ void uv__io_close(uv_loop_t* loop, uv__io_t* w) {
void uv__io_feed(uv_loop_t* loop, uv__io_t* w) {
if (QUEUE_EMPTY(&w->pending_queue))
QUEUE_INSERT_TAIL(&loop->pending_queue, &w->pending_queue);

2
patches/node/feat_initialize_asar_support.patch
View file

@ -18,7 +18,7 @@ index 7a98e4c96c87d4738829aadf1969ee90eda3876a..bf63de07613b4d19d95607f404139e58
return NativeModule.map.has(id);
};
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
index 24d25158f9e8adf5f2265504a21daa5ed96f517a..2351268eae27af7ae759dccb599c071e146ece71 100644
index bbb0786dcd20ec741892b02f96b3c37fec8f1de0..a998b095fb067ab6ca35cc276ac6a9a7c38dcf30 100644
--- a/lib/internal/bootstrap/pre_execution.js
+++ b/lib/internal/bootstrap/pre_execution.js
@@ -51,6 +51,7 @@ function prepareMainThreadExecution(expandArgv1 = false) {

4
patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
View file

@ -8,10 +8,10 @@ common.gypi is a file that's included in the node header bundle, despite
the fact that we do not build node with gyp.
diff --git a/common.gypi b/common.gypi
index 223043e55194c32493ccb9913295ec65d09a270c..bb60a045c1132bf3a16d0b773ba34e5e9efb0f0c 100644
index c106549f67c264b27144faa9c13b1a4cf31db9cb..c0538bad7a0323d609365521ee2feb5a1f22e967 100644
--- a/common.gypi
+++ b/common.gypi
@@ -72,6 +72,22 @@
@@ -77,6 +77,22 @@
##### end V8 defaults #####

6
patches/node/fix_build_and_expose_inspector_agent.patch
View file

@ -6,7 +6,7 @@ Subject: fix: build and expose inspector agent
Node inspector initialization happens in a different start-up function in node.cc, which we don't call in Electron. This allows for us to use the inspector agent in electron/atom/browser/node_debugger.cc
diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
index 8a12c2dddf7493a1c2a5f5deff7114d35ffa4f76..b208fad547fb5af9a1ff3988428e205a2a9ef39f 100644
index ceba6a59a83e4d9ec6cc42305cd0715ffbe61489..a2a714e39db999f4293adf8064f7f53b546850e6 100644
--- a/src/inspector_agent.cc
+++ b/src/inspector_agent.cc
@@ -217,7 +217,7 @@ const int CONTEXT_GROUP_ID = 1;
@ -28,7 +28,7 @@ index 8a12c2dddf7493a1c2a5f5deff7114d35ffa4f76..b208fad547fb5af9a1ff3988428e205a
info.is_default = true;
contextCreated(env->context(), info);
diff --git a/src/inspector_agent.h b/src/inspector_agent.h
index 1c2bde0da73e846159843a8c32879f227a8f0dd7..133e2187dcd6fed9cb3a2d13eb646ef5e9851e01 100644
index 5447a68485c2282f0a38821bd5858824275311dd..0722a0fde38ade1d621b020bba0e2680d132fa71 100644
--- a/src/inspector_agent.h
+++ b/src/inspector_agent.h
@@ -6,7 +6,9 @@
@ -51,7 +51,7 @@ index 1c2bde0da73e846159843a8c32879f227a8f0dd7..133e2187dcd6fed9cb3a2d13eb646ef5
explicit Agent(node::Environment* env);
~Agent();
diff --git a/src/inspector_io.cc b/src/inspector_io.cc
index 223e3592a1fc0901575153f2ec000dcaac37ea1f..d500d15b07c249f973c41967b5510f69429117b7 100644
index 91384ca949c2f13e0264811cd76e44743e695bd4..9edefd91be0effbad162ced398558785ad655cf1 100644
--- a/src/inspector_io.cc
+++ b/src/inspector_io.cc
@@ -13,6 +13,8 @@

6
patches/node/fix_do_not_define_debugoptions_s_constructors_in_header.patch
View file

@ -15,7 +15,7 @@ By putting the definitions of constructors into the implementation file,
we can avoid this problem.
diff --git a/src/node_options.cc b/src/node_options.cc
index 79e69a031dfc6331e0022b6354c909a36ae51c51..a85b650d2e75b5c7dd8018d9af76ac88d0d741aa 100644
index 11c910bbd17c8b8e345862e11a24aba7822c31b6..9b9b9324d681d8a55418c7a43a071a6f978750e7 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -26,6 +26,12 @@ Mutex cli_options_mutex;
@ -32,10 +32,10 @@ index 79e69a031dfc6331e0022b6354c909a36ae51c51..a85b650d2e75b5c7dd8018d9af76ac88
#if !NODE_USE_V8_PLATFORM
if (inspector_enabled) {
diff --git a/src/node_options.h b/src/node_options.h
index ddc18552611724e7e995862964dff616b1b9b66d..c79b08ad09c183ad24faf864fb8ba4692b527c70 100644
index 35daba3291c8358a44f9fca53df34b35c5423d15..b8959745f5bd66bb19f3f1d9b1bf45e8a6ebd4f7 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -56,11 +56,11 @@ class Options {
@@ -61,11 +61,11 @@ struct InspectPublishUid {
// per-Isolate, rather than per-Environment.
class NODE_EXTERN DebugOptions : public Options {
public:

12
patches/node/fix_export_debugoptions.patch
View file

@ -5,10 +5,10 @@ Subject: fix: export DebugOptions
diff --git a/src/node_options.cc b/src/node_options.cc
index 35094d66323d551c1bd1ea4430441444b7210299..79e69a031dfc6331e0022b6354c909a36ae51c51 100644
index 021fc5d70b250b39ac76028b5d384608d51f7248..11c910bbd17c8b8e345862e11a24aba7822c31b6 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -187,11 +187,6 @@ void EnvironmentOptions::CheckOptions(std::vector<std::string>* errors) {
@@ -202,11 +202,6 @@ void EnvironmentOptions::CheckOptions(std::vector<std::string>* errors) {
namespace options_parser {
@ -21,10 +21,10 @@ index 35094d66323d551c1bd1ea4430441444b7210299..79e69a031dfc6331e0022b6354c909a3
public:
EnvironmentOptionsParser();
diff --git a/src/node_options.h b/src/node_options.h
index 174f5369854a6a2bfc11d03ab4f251fe74ea9c8f..ddc18552611724e7e995862964dff616b1b9b66d 100644
index 34c54511e1bb8bba201994802f7fd53c4217cece..35daba3291c8358a44f9fca53df34b35c5423d15 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -54,7 +54,7 @@ class Options {
@@ -59,7 +59,7 @@ struct InspectPublishUid {
// to keep them separate since they are a group of options applying to a very
// specific part of Node. It might also make more sense for them to be
// per-Isolate, rather than per-Environment.
@ -33,7 +33,7 @@ index 174f5369854a6a2bfc11d03ab4f251fe74ea9c8f..ddc18552611724e7e995862964dff616
public:
DebugOptions() = default;
DebugOptions(const DebugOptions&) = default;
@@ -227,7 +227,7 @@ class PerProcessOptions : public Options {
@@ -236,7 +236,7 @@ class PerProcessOptions : public Options {
namespace options_parser {
@ -42,7 +42,7 @@ index 174f5369854a6a2bfc11d03ab4f251fe74ea9c8f..ddc18552611724e7e995862964dff616
std::vector<std::string>* errors);
void GetOptions(const v8::FunctionCallbackInfo<v8::Value>& args);
@@ -420,6 +420,11 @@ class OptionsParser {
@@ -429,6 +429,11 @@ class OptionsParser {
friend void GetOptions(const v8::FunctionCallbackInfo<v8::Value>& args);
};

4
patches/node/fix_export_node_abort_and_assert.patch
View file

@ -5,10 +5,10 @@ Subject: fix: Export node::Abort and Assert
diff --git a/src/node_errors.cc b/src/node_errors.cc
index 603c9e415c3f546c621793afd13ee58bcc4280be..20098777e290bfa66dc430c08eaad78e4c232266 100644
index 298d84b4f362b3b9e9a0e604c7635ac77eaf8925..e0c5eaacffbd1ac7aaa104dd15f5e5de4ed5240b 100644
--- a/src/node_errors.cc
+++ b/src/node_errors.cc
@@ -241,13 +241,13 @@ void AppendExceptionLine(Environment* env,
@@ -242,13 +242,13 @@ void AppendExceptionLine(Environment* env,
.FromMaybe(false));
}

4
patches/node/fix_expose_internalcallbackscope.patch
View file

@ -6,10 +6,10 @@ Subject: fix: expose InternalCallbackScope
This commit exposes InternalCallbackScope in order to allow us access to kAllowEmptyResource for usage https://github.com/electron/electron/blob/master/atom/common/api/atom_bindings.cc\#L108. We should look to accomplish this another way so we no longer need to do this, as in verbose mode the regular CallBack Scope doesn't swallow errors and so we can otherwise use it.
diff --git a/src/node_internals.h b/src/node_internals.h
index 21625e60232bbe586b312dc4928bcefdf507b229..9811c02d5438cd7008d3990f89b7161355e87cfc 100644
index 621ed0225ba674bc31656ec628ee2b376a4f900c..2311036beadf7efaac4999ceef985566fe41c763 100644
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -197,7 +197,7 @@ v8::MaybeLocal<v8::Value> InternalMakeCallback(
@@ -198,7 +198,7 @@ v8::MaybeLocal<v8::Value> InternalMakeCallback(
v8::Local<v8::Value> argv[],
async_context asyncContext);

4
patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch
View file

@ -5,10 +5,10 @@ Subject: fix: expose tracing::Agent and use tracing::TracingController instead
of v8::TracingController
diff --git a/src/api/environment.cc b/src/api/environment.cc
index eeeef7442d834ace51a6c6be11058d21e4995a99..bfc849d362a18bc7cd499584a439a1d29f0864f8 100644
index 8c1f5aaff2a5e4bbe7b534e0b130b1b50cad1c15..bfd279aa7e7cd4d50b6cffe75d6f8e41c0213acb 100644
--- a/src/api/environment.cc
+++ b/src/api/environment.cc
@@ -319,6 +319,10 @@ MultiIsolatePlatform* GetMainThreadMultiIsolatePlatform() {
@@ -320,6 +320,10 @@ MultiIsolatePlatform* GetMainThreadMultiIsolatePlatform() {
return per_process::v8_platform.Platform();
}

4
patches/node/fix_extern_the_nativemoduleenv_and_options_parser_for_debug_builds.patch
View file

@ -18,7 +18,7 @@ index b91a5059cd1f19d87e5876c372f3ded60681a5df..f81cf8dfb892a8ddd9084c5d9477b178
static void Initialize(v8::Local<v8::Object> target,
v8::Local<v8::Value> unused,
diff --git a/src/node_options.h b/src/node_options.h
index c79b08ad09c183ad24faf864fb8ba4692b527c70..a116b2fdaad590c8999142d18b9b81dac67b5359 100644
index b8959745f5bd66bb19f3f1d9b1bf45e8a6ebd4f7..5ef8476387e71d92ec7936959f8cc8a211490f1b 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -44,7 +44,7 @@ class HostPort {
@ -30,7 +30,7 @@ index c79b08ad09c183ad24faf864fb8ba4692b527c70..a116b2fdaad590c8999142d18b9b81da
public:
virtual void CheckOptions(std::vector<std::string>* errors) {}
virtual ~Options() = default;
@@ -427,7 +427,7 @@ class NODE_EXTERN DebugOptionsParser : public OptionsParser<DebugOptions> {
@@ -436,7 +436,7 @@ class NODE_EXTERN DebugOptionsParser : public OptionsParser<DebugOptions> {
using StringVector = std::vector<std::string>;
template <class OptionsType, class = Options>

8
patches/node/fix_key_gen_apis_are_not_available_in_boringssl.patch
View file

@ -6,7 +6,7 @@ Subject: fix: key gen APIs are not available in BoringSSL
This will make Node's key pair generation APIs fail.
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index f232c9571ae5452996955b7bc149da663ee7d56a..4b6eccd7fe96d185c28def27ff3d0da3e26e950f 100644
index 300d2b92d7040c831b3178202a725df15191407d..5622ae8a367b017aa4d8a7e6e5892b5caa9bbec3 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -290,24 +290,14 @@ Maybe<bool> Decorate(Environment* env, Local<Object> obj,
@ -62,7 +62,7 @@ index f232c9571ae5452996955b7bc149da663ee7d56a..4b6eccd7fe96d185c28def27ff3d0da3
default:
return Undefined(env()->isolate());
}
@@ -6196,6 +6192,8 @@ class DSAKeyPairGenerationConfig : public KeyPairGenerationConfig {
@@ -6194,6 +6190,8 @@ class DSAKeyPairGenerationConfig : public KeyPairGenerationConfig {
if (EVP_PKEY_paramgen_init(param_ctx.get()) <= 0)
return nullptr;
@ -71,7 +71,7 @@ index f232c9571ae5452996955b7bc149da663ee7d56a..4b6eccd7fe96d185c28def27ff3d0da3
if (EVP_PKEY_CTX_set_dsa_paramgen_bits(param_ctx.get(), modulus_bits_) <= 0)
return nullptr;
@@ -6215,6 +6213,8 @@ class DSAKeyPairGenerationConfig : public KeyPairGenerationConfig {
@@ -6213,6 +6211,8 @@ class DSAKeyPairGenerationConfig : public KeyPairGenerationConfig {
EVPKeyCtxPointer key_ctx(EVP_PKEY_CTX_new(params.get(), nullptr));
return key_ctx;
@ -80,7 +80,7 @@ index f232c9571ae5452996955b7bc149da663ee7d56a..4b6eccd7fe96d185c28def27ff3d0da3
}
private:
@@ -6906,9 +6906,12 @@ void Initialize(Local<Object> target,
@@ -6904,9 +6904,12 @@ void Initialize(Local<Object> target,
env->SetMethod(target, "generateKeyPairEC", GenerateKeyPairEC);
env->SetMethod(target, "generateKeyPairNid", GenerateKeyPairNid);
NODE_DEFINE_CONSTANT(target, EVP_PKEY_ED25519);

8
patches/node/fix_use_bssl_bn_bn2bin_padded_for_ossl_s_bn_bn2binpad.patch
View file

@ -6,10 +6,10 @@ Subject: fix: use bssl BN_bn2bin_padded for ossl's BN_bn2binpad
Also note that BN_bn2bin_padded returns 1 on success instead of size
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index a5710dc33b62b9b53174318aed62d8e7fe3a52b9..2143117ec3b782ce307bcb3c7183594bc233d5e8 100644
index 590c6d1c374c086e128580d6160ccbd71a7ef227..4933bf7f1bd2cd5e4293e52a241fcfd5fda6b779 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -5404,9 +5404,9 @@ void DiffieHellman::GenerateKeys(const FunctionCallbackInfo<Value>& args) {
@@ -5408,9 +5408,9 @@ void DiffieHellman::GenerateKeys(const FunctionCallbackInfo<Value>& args) {
const int size = BN_num_bytes(pub_key);
CHECK_GE(size, 0);
AllocatedBuffer data = env->AllocateManaged(size);
@ -22,7 +22,7 @@ index a5710dc33b62b9b53174318aed62d8e7fe3a52b9..2143117ec3b782ce307bcb3c7183594b
args.GetReturnValue().Set(data.ToBuffer().ToLocalChecked());
}
@@ -5426,8 +5426,8 @@ void DiffieHellman::GetField(const FunctionCallbackInfo<Value>& args,
@@ -5430,8 +5430,8 @@ void DiffieHellman::GetField(const FunctionCallbackInfo<Value>& args,
CHECK_GE(size, 0);
AllocatedBuffer data = env->AllocateManaged(size);
CHECK_EQ(
@ -33,7 +33,7 @@ index a5710dc33b62b9b53174318aed62d8e7fe3a52b9..2143117ec3b782ce307bcb3c7183594b
args.GetReturnValue().Set(data.ToBuffer().ToLocalChecked());
}
@@ -5750,9 +5750,9 @@ void ECDH::GetPrivateKey(const FunctionCallbackInfo<Value>& args) {
@@ -5748,9 +5748,9 @@ void ECDH::GetPrivateKey(const FunctionCallbackInfo<Value>& args) {
const int size = BN_num_bytes(b);
AllocatedBuffer out = env->AllocateManaged(size);

2
patches/node/fixme_comment_trace_event_macro.patch
View file

@ -5,7 +5,7 @@ Subject: fixme: Comment trace event macro
diff --git a/src/node_internals.h b/src/node_internals.h
index 9811c02d5438cd7008d3990f89b7161355e87cfc..3a92c530b1dd262fd12893ac35e6d229594f0792 100644
index 2311036beadf7efaac4999ceef985566fe41c763..10fbbc1d8cf43f76248efdac9a2539a8c8287d71 100644
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -348,10 +348,11 @@ class TraceEventScope {

66
patches/node/fixme_revert_crypto_add_support_for_rsa-pss_keys.patch
View file

@ -6,7 +6,7 @@ Subject: fixme: Revert "crypto: add support for RSA-PSS keys"
This reverts commit 969bd1eb7b56fda3573ad3d41745a491f2b06dde.
diff --git a/lib/internal/crypto/keygen.js b/lib/internal/crypto/keygen.js
index f646f436f7678a293f4742ee8abec9646509c2a6..2c577383f9828bafa11a0cac12d350b3c6023e00 100644
index 0a4bde77fa369b788bd7e2976441358254b13955..37835db411f7577d39e5e2af10590b6fa1b13489 100644
--- a/lib/internal/crypto/keygen.js
+++ b/lib/internal/crypto/keygen.js
@@ -5,7 +5,6 @@ const { Object } = primordials;
@ -17,7 +17,7 @@ index f646f436f7678a293f4742ee8abec9646509c2a6..2c577383f9828bafa11a0cac12d350b3
generateKeyPairDSA,
generateKeyPairEC,
generateKeyPairNid,
@@ -144,7 +143,6 @@ function check(type, options, callback) {
@@ -143,7 +142,6 @@ function check(type, options, callback) {
let impl;
switch (type) {
case 'rsa':
@ -25,7 +25,7 @@ index f646f436f7678a293f4742ee8abec9646509c2a6..2c577383f9828bafa11a0cac12d350b3
{
const { modulusLength } = needOptions();
if (!isUint32(modulusLength))
@@ -157,27 +155,10 @@ function check(type, options, callback) {
@@ -156,27 +154,10 @@ function check(type, options, callback) {
throw new ERR_INVALID_OPT_VALUE('publicExponent', publicExponent);
}
@ -57,7 +57,7 @@ index f646f436f7678a293f4742ee8abec9646509c2a6..2c577383f9828bafa11a0cac12d350b3
}
break;
case 'dsa':
@@ -246,7 +227,8 @@ function check(type, options, callback) {
@@ -245,7 +226,8 @@ function check(type, options, callback) {
break;
default:
throw new ERR_INVALID_ARG_VALUE('type', type,
@ -110,10 +110,10 @@ index b6a3376e735094f970ef61a52ef9bb6d6101647a..bb70c2305fd44cfea46a8df5e65d1af5
Sign.prototype.sign = function sign(options, encoding) {
diff --git a/src/env.h b/src/env.h
index 23ad7569d31bc534247ed373819bc291a4f4bfe6..8047b2c98398f0344274ec824abab88007ae5c3f 100644
index 63e71fc1fc2b0e95a85f38b58b34eeb290d8f09d..1415e32c02c4ffc6e3205ff15bef2006021bb1c2 100644
--- a/src/env.h
+++ b/src/env.h
@@ -165,7 +165,6 @@ constexpr size_t kFsStatsBufferLength = kFsStatsFieldsNumber * 2;
@@ -170,7 +170,6 @@ constexpr size_t kFsStatsBufferLength = kFsStatsFieldsNumber * 2;
V(crypto_x25519_string, "x25519") \
V(crypto_x448_string, "x448") \
V(crypto_rsa_string, "rsa") \
@ -122,7 +122,7 @@ index 23ad7569d31bc534247ed373819bc291a4f4bfe6..8047b2c98398f0344274ec824abab880
V(data_string, "data") \
V(dest_string, "dest") \
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 4b6eccd7fe96d185c28def27ff3d0da3e26e950f..70e9b2ddafc8aaa46063c5957c70d7a83ab99f9c 100644
index 5622ae8a367b017aa4d8a7e6e5892b5caa9bbec3..87b54447574c9aef094776f9bd9397aa63c7085b 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -3727,8 +3727,6 @@ Local<Value> KeyObject::GetAsymmetricKeyType() const {
@ -134,7 +134,7 @@ index 4b6eccd7fe96d185c28def27ff3d0da3e26e950f..70e9b2ddafc8aaa46063c5957c70d7a8
case EVP_PKEY_DSA:
return env()->crypto_dsa_string();
case EVP_PKEY_EC:
@@ -4726,14 +4724,13 @@ void SignBase::CheckThrow(SignBase::Error error) {
@@ -4730,14 +4728,13 @@ void SignBase::CheckThrow(SignBase::Error error) {
static bool ApplyRSAOptions(const ManagedEVPPKey& pkey,
EVP_PKEY_CTX* pkctx,
int padding,
@ -153,7 +153,7 @@ index 4b6eccd7fe96d185c28def27ff3d0da3e26e950f..70e9b2ddafc8aaa46063c5957c70d7a8
return false;
}
}
@@ -4784,16 +4781,11 @@ void Sign::SignUpdate(const FunctionCallbackInfo<Value>& args) {
@@ -4788,16 +4785,11 @@ void Sign::SignUpdate(const FunctionCallbackInfo<Value>& args) {
sign->CheckThrow(err);
}
@ -171,7 +171,7 @@ index 4b6eccd7fe96d185c28def27ff3d0da3e26e950f..70e9b2ddafc8aaa46063c5957c70d7a8
unsigned char m[EVP_MAX_MD_SIZE];
unsigned int m_len;
@@ -4826,7 +4818,7 @@ static AllocatedBuffer Node_SignFinal(Environment* env,
@@ -4830,7 +4822,7 @@ static AllocatedBuffer Node_SignFinal(Environment* env,
Sign::SignResult Sign::SignFinal(
const ManagedEVPPKey& pkey,
int padding,
@ -180,7 +180,7 @@ index 4b6eccd7fe96d185c28def27ff3d0da3e26e950f..70e9b2ddafc8aaa46063c5957c70d7a8
if (!mdctx_)
return SignResult(kSignNotInitialised);
@@ -4877,17 +4869,11 @@ void Sign::SignFinal(const FunctionCallbackInfo<Value>& args) {
@@ -4881,17 +4873,11 @@ void Sign::SignFinal(const FunctionCallbackInfo<Value>& args) {
if (!key)
return;
@ -202,7 +202,7 @@ index 4b6eccd7fe96d185c28def27ff3d0da3e26e950f..70e9b2ddafc8aaa46063c5957c70d7a8
SignResult ret = sign->SignFinal(
key,
@@ -4948,17 +4934,11 @@ void SignOneShot(const FunctionCallbackInfo<Value>& args) {
@@ -4952,17 +4938,11 @@ void SignOneShot(const FunctionCallbackInfo<Value>& args) {
return CheckThrow(env, SignBase::Error::kSignUnknownDigest);
}
@ -224,7 +224,7 @@ index 4b6eccd7fe96d185c28def27ff3d0da3e26e950f..70e9b2ddafc8aaa46063c5957c70d7a8
EVP_PKEY_CTX* pkctx = nullptr;
EVPMDPointer mdctx(EVP_MD_CTX_new());
@@ -5036,7 +5016,7 @@ SignBase::Error Verify::VerifyFinal(const ManagedEVPPKey& pkey,
@@ -5040,7 +5020,7 @@ SignBase::Error Verify::VerifyFinal(const ManagedEVPPKey& pkey,
const char* sig,
int siglen,
int padding,
@ -233,7 +233,7 @@ index 4b6eccd7fe96d185c28def27ff3d0da3e26e950f..70e9b2ddafc8aaa46063c5957c70d7a8
bool* verify_result) {
if (!mdctx_)
return kSignNotInitialised;
@@ -5080,17 +5060,11 @@ void Verify::VerifyFinal(const FunctionCallbackInfo<Value>& args) {
@@ -5084,17 +5064,11 @@ void Verify::VerifyFinal(const FunctionCallbackInfo<Value>& args) {
ArrayBufferViewContents<char> hbuf(args[offset]);
@ -255,7 +255,7 @@ index 4b6eccd7fe96d185c28def27ff3d0da3e26e950f..70e9b2ddafc8aaa46063c5957c70d7a8
bool verify_result;
Error err = verify->VerifyFinal(pkey, hbuf.data(), hbuf.length(), padding,
@@ -5123,17 +5097,11 @@ void VerifyOneShot(const FunctionCallbackInfo<Value>& args) {
@@ -5127,17 +5101,11 @@ void VerifyOneShot(const FunctionCallbackInfo<Value>& args) {
return CheckThrow(env, SignBase::Error::kSignUnknownDigest);
}
@ -277,7 +277,7 @@ index 4b6eccd7fe96d185c28def27ff3d0da3e26e950f..70e9b2ddafc8aaa46063c5957c70d7a8
EVP_PKEY_CTX* pkctx = nullptr;
EVPMDPointer mdctx(EVP_MD_CTX_new());
@@ -6137,48 +6105,6 @@ class RSAKeyPairGenerationConfig : public KeyPairGenerationConfig {
@@ -6135,48 +6103,6 @@ class RSAKeyPairGenerationConfig : public KeyPairGenerationConfig {
const unsigned int exponent_;
};
@ -326,7 +326,7 @@ index 4b6eccd7fe96d185c28def27ff3d0da3e26e950f..70e9b2ddafc8aaa46063c5957c70d7a8
class DSAKeyPairGenerationConfig : public KeyPairGenerationConfig {
public:
DSAKeyPairGenerationConfig(unsigned int modulus_bits, int divisor_bits)
@@ -6412,44 +6338,6 @@ void GenerateKeyPairRSA(const FunctionCallbackInfo<Value>& args) {
@@ -6410,44 +6336,6 @@ void GenerateKeyPairRSA(const FunctionCallbackInfo<Value>& args) {
GenerateKeyPair(args, 2, std::move(config));
}
@ -371,7 +371,7 @@ index 4b6eccd7fe96d185c28def27ff3d0da3e26e950f..70e9b2ddafc8aaa46063c5957c70d7a8
void GenerateKeyPairDSA(const FunctionCallbackInfo<Value>& args) {
CHECK(args[0]->IsUint32());
const uint32_t modulus_bits = args[0].As<Uint32>()->Value();
@@ -6901,7 +6789,6 @@ void Initialize(Local<Object> target,
@@ -6899,7 +6787,6 @@ void Initialize(Local<Object> target,
env->SetMethod(target, "pbkdf2", PBKDF2);
env->SetMethod(target, "generateKeyPairRSA", GenerateKeyPairRSA);
@ -380,10 +380,10 @@ index 4b6eccd7fe96d185c28def27ff3d0da3e26e950f..70e9b2ddafc8aaa46063c5957c70d7a8
env->SetMethod(target, "generateKeyPairEC", GenerateKeyPairEC);
env->SetMethod(target, "generateKeyPairNid", GenerateKeyPairNid);
diff --git a/src/node_crypto.h b/src/node_crypto.h
index 849b80f4e06268ca442e1d78ff60225d52077ce8..b404f0fcd4d1df5da86173955df45bb0eb4923fe 100644
index 3e337eaddbe490b98aa2f9da2e310c94e4a96bf8..e526325a60feaa345f02e021f7ba1c9e3d8ca602 100644
--- a/src/node_crypto.h
+++ b/src/node_crypto.h
@@ -671,7 +671,7 @@ class Sign : public SignBase {
@@ -657,7 +657,7 @@ class Sign : public SignBase {
SignResult SignFinal(
const ManagedEVPPKey& pkey,
int padding,
@ -392,7 +392,7 @@ index 849b80f4e06268ca442e1d78ff60225d52077ce8..b404f0fcd4d1df5da86173955df45bb0
protected:
static void New(const v8::FunctionCallbackInfo<v8::Value>& args);
@@ -692,7 +692,7 @@ class Verify : public SignBase {
@@ -678,7 +678,7 @@ class Verify : public SignBase {
const char* sig,
int siglen,
int padding,
@ -402,10 +402,10 @@ index 849b80f4e06268ca442e1d78ff60225d52077ce8..b404f0fcd4d1df5da86173955df45bb0
protected:
diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile
index 81fe36a81331eb1d1d1696763c887d252ac4fef9..3be2cd6655f7e60e5b3a92c4be0fea50c64d14df 100644
index 226dc67346ef740ae9d622c03271d2761e51e713..492a30f6e43fc8068b8b89da86cdfe6250fe1fe6 100644
--- a/test/fixtures/keys/Makefile
+++ b/test/fixtures/keys/Makefile
@@ -37,12 +37,6 @@ all: \
@@ -61,12 +61,6 @@ all: \
rsa_public_1024.pem \
rsa_public_2048.pem \
rsa_public_4096.pem \
@ -415,10 +415,10 @@ index 81fe36a81331eb1d1d1696763c887d252ac4fef9..3be2cd6655f7e60e5b3a92c4be0fea50
- rsa_pss_public_2048.pem \
- rsa_pss_public_2048_sha256_sha256_16.pem \
- rsa_pss_public_2048_sha512_sha256_20.pem \
#
# Create Certificate Authority: ca1
@@ -580,24 +574,6 @@ rsa_public_2048.pem: rsa_private_2048.pem
ed25519_private.pem \
ed25519_public.pem \
x25519_private.pem \
@@ -691,24 +685,6 @@ rsa_public_2048.pem: rsa_private_2048.pem
rsa_public_4096.pem: rsa_private_4096.pem
openssl rsa -in rsa_private_4096.pem -pubout -out rsa_public_4096.pem
@ -440,9 +440,9 @@ index 81fe36a81331eb1d1d1696763c887d252ac4fef9..3be2cd6655f7e60e5b3a92c4be0fea50
-rsa_pss_public_2048_sha512_sha256_20.pem: rsa_pss_private_2048_sha512_sha256_20.pem
- openssl pkey -in rsa_pss_private_2048_sha512_sha256_20.pem -pubout -out rsa_pss_public_2048_sha512_sha256_20.pem
-
clean:
rm -f *.pfx *.pem *.srl ca2-database.txt ca2-serial fake-startcom-root-serial *.print *.old fake-startcom-root-issued-certs/*.pem
@> fake-startcom-root-database.txt
ed25519_private.pem:
openssl genpkey -algorithm ED25519 -out ed25519_private.pem
diff --git a/test/fixtures/keys/rsa_pss_private_2048.pem b/test/fixtures/keys/rsa_pss_private_2048.pem
deleted file mode 100644
index ffca137a71219fb6a801c7a905f6607672acb168..0000000000000000000000000000000000000000
@ -629,7 +629,7 @@ index 0000000000000000000000000000000000000000..4e8e46f04133422128eea2b88a8f378f
+IHc67mAAez4i8fg2wTQ=
+-----END PRIVATE KEY-----
diff --git a/test/parallel/test-crypto-key-objects.js b/test/parallel/test-crypto-key-objects.js
index 2a3a3ec2f0bff1c581da245e00271da4d756abf5..642e1d6fa01fd8f6e86974a06bc1594aaa6d615b 100644
index 558f7dc1f4b67331629a92cbdd8b1734fdfc5980..a47083b3ace5bb6c27b71adcf65b3769c63994e7 100644
--- a/test/parallel/test-crypto-key-objects.js
+++ b/test/parallel/test-crypto-key-objects.js
@@ -8,8 +8,6 @@ const assert = require('assert');
@ -653,8 +653,8 @@ index 2a3a3ec2f0bff1c581da245e00271da4d756abf5..642e1d6fa01fd8f6e86974a06bc1594a
+}
+
[
{ private: fixtures.readSync('test_ed25519_privkey.pem', 'ascii'),
public: fixtures.readSync('test_ed25519_pubkey.pem', 'ascii'),
{ private: fixtures.readKey('ed25519_private.pem', 'ascii'),
public: fixtures.readKey('ed25519_public.pem', 'ascii'),
@@ -281,146 +286,6 @@ const privateDsa = fixtures.readKey('dsa_private_encrypted_1025.pem',
assert.strictEqual(privateKey.type, 'private');
assert.strictEqual(privateKey.asymmetricKeyType, 'dsa');

2
patches/node/fixme_use_redefined_version_of_internalmodulestat.patch
View file

@ -10,7 +10,7 @@ internalModuleStat` in the very beginning of the file holds a reference
to a native Node.js implementation of the function.
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
index a8d7786d644bc4129d96c63ffe58bd4909496219..6b881d22deef7164cb5c6e0ceb1daff0b8dc5c62 100644
index b6bef5f0fdb6f60e4baf5fbd647f191a0e290355..2f5385cea51d3456dffb43a852bd2b3cdce9998b 100644
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -85,6 +85,8 @@ const relativeResolveCache = Object.create(null);

6
patches/node/fsevents_fix_file_event_reporting.patch
View file

@ -192,10 +192,10 @@ index ea34bd63a70625c3e2c60d5a1bbb087c5f0bbb2e..38d722a27ef1a78717726272d54578c7
#if defined(NO_FS_EVENTS)
RETURN_SKIP(NO_FS_EVENTS);
diff --git a/deps/uv/test/test-list.h b/deps/uv/test/test-list.h
index 8886b07c8a74736208d5614257f832f59d79633a..3e758a1d2cbe104a691d362411770006d1494bae 100644
index a48f6f3806806af6bf844558d08fa9679e268112..f9020fc6c1ec8d076c470fa5042d062b74226ae4 100644
--- a/deps/uv/test/test-list.h
+++ b/deps/uv/test/test-list.h
@@ -333,6 +333,7 @@ TEST_DECLARE (fs_event_watch_dir_short_path)
@@ -335,6 +335,7 @@ TEST_DECLARE (fs_event_watch_dir_short_path)
#endif
TEST_DECLARE (fs_event_watch_file)
TEST_DECLARE (fs_event_watch_file_exact_path)
@ -203,7 +203,7 @@ index 8886b07c8a74736208d5614257f832f59d79633a..3e758a1d2cbe104a691d362411770006
TEST_DECLARE (fs_event_watch_file_twice)
TEST_DECLARE (fs_event_watch_file_current_dir)
#ifdef _WIN32
@@ -920,6 +921,7 @@ TASK_LIST_START
@@ -924,6 +925,7 @@ TASK_LIST_START
#endif
TEST_ENTRY (fs_event_watch_file)
TEST_ENTRY (fs_event_watch_file_exact_path)

2
patches/node/inherit_electron_crashpad_pipe_name_in_child_process.patch
View file

@ -6,7 +6,7 @@ Subject: Inherit ELECTRON_CRASHPAD_PIPE_NAME in child process
This is required for crashReporter to work correctly in node process.
diff --git a/lib/child_process.js b/lib/child_process.js
index 8934a90f8d5c0557689eba80512802a38a8072ec..a60985173b5b1b7937cd32e69f5cce2128b5af66 100644
index 2a2e68aaf23116203d756431cafd81c106ed9044..724ac30c5cfc79a01d4fc8c0e5b0a044a7143cd5 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -108,6 +108,10 @@ function fork(modulePath /* , args, options */) {

4
patches/node/make_module_globalpaths_a_reference.patch
View file

@ -10,10 +10,10 @@ node's module code.
(cherry picked from commit 76ba048c37588ee32636817fa7b8dffc64330cbf)
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
index 2798032fd962398cfd267709644c890377f61b59..1fb197c6c220693b6124f44fbe4b02dd97bcfc4f 100644
index 00bc575b1f7d4b271ccbb342ddbe3c53b7915c30..865e9d13e840351bcf61bec771462fc88ee0a602 100644
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -914,8 +914,8 @@ Module._initPaths = function() {
@@ -916,8 +916,8 @@ Module._initPaths = function() {
modulePaths = paths;

4
patches/node/pass_all_globals_through_require.patch
View file

@ -6,7 +6,7 @@ Subject: Pass all globals through "require"
(cherry picked from commit 7d015419cb7a0ecfe6728431a4ed2056cd411d62)
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
index 1fb197c6c220693b6124f44fbe4b02dd97bcfc4f..a8d7786d644bc4129d96c63ffe58bd4909496219 100644
index 865e9d13e840351bcf61bec771462fc88ee0a602..b6bef5f0fdb6f60e4baf5fbd647f191a0e290355 100644
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -71,6 +71,13 @@ const {
@ -23,7 +23,7 @@ index 1fb197c6c220693b6124f44fbe4b02dd97bcfc4f..a8d7786d644bc4129d96c63ffe58bd49
const isWindows = process.platform === 'win32';
const relativeResolveCache = Object.create(null);
@@ -769,10 +776,12 @@ Module.prototype._compile = function(content, filename) {
@@ -771,10 +778,12 @@ Module.prototype._compile = function(content, filename) {
if (requireDepth === 0) statCache = new Map();
if (inspectorWrapper) {
result = inspectorWrapper(compiledWrapper, thisValue, exports,

4
patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch
View file

@ -5,7 +5,7 @@ Subject: refactor: allow embedder overriding of internal FS calls
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
index 8dee38a0e71698258bee7642f9b91c5c8b9060c2..60c0bd845b18cd782d5b314f339e0c4e7bf88388 100644
index 86b2164bb0d74a531acd0f01da5269642ea574cf..48a38a6b5054c6bf14df82a8cb3c41d4bfb7bf68 100644
--- a/lib/internal/bootstrap/node.js
+++ b/lib/internal/bootstrap/node.js
@@ -65,6 +65,10 @@ if (ownsProcessState) {
@ -20,7 +20,7 @@ index 8dee38a0e71698258bee7642f9b91c5c8b9060c2..60c0bd845b18cd782d5b314f339e0c4e
process.config = JSON.parse(internalBinding('native_module').config);
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
index 6b881d22deef7164cb5c6e0ceb1daff0b8dc5c62..a643a77aec6398acfeae7f2e8e526d60c3b4453c 100644
index 2f5385cea51d3456dffb43a852bd2b3cdce9998b..c975804d847eea5a8d759f79121aa4da61e88dc4 100644
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -31,10 +31,7 @@ const assert = require('internal/assert');

2
patches/node/refactor_alter_child_process_fork_to_use_execute_script_with.patch
View file

@ -7,7 +7,7 @@ Subject: refactor: alter child_process.fork to use execute script with
When forking a child script, we setup a special environment to make the Electron binary run like the upstream node. On Mac, we use the helper app as node binary.
diff --git a/lib/child_process.js b/lib/child_process.js
index 66be7611dc958721aa67603396ac9dcc0b9737b0..8934a90f8d5c0557689eba80512802a38a8072ec 100644
index 0d3785f0d5b9b8a2959e9487500d010796709d7f..2a2e68aaf23116203d756431cafd81c106ed9044 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -102,6 +102,16 @@ function fork(modulePath /* , args, options */) {

4
patches/node/src_add_missing_option_parser_template_for_the_debugoptionsparser.patch
View file

@ -10,10 +10,10 @@ This can be removed once https://github.com/nodejs/node/pull/28543 is
merged and available in our node fork.
diff --git a/src/node_options.cc b/src/node_options.cc
index b619aca56f88f44a00aaa1d38e95ab1e55b63ad0..4689a3e405be5fbbe3bb960940b48276669d8bc6 100644
index e2f20d1b7b5ad4407b5630b163ee1c29a18027ce..01ecbd2c7318f90ec79af7450119d6368ed30d6a 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -217,6 +217,16 @@ class PerProcessOptionsParser : public OptionsParser<PerProcessOptions> {
@@ -232,6 +232,16 @@ class PerProcessOptionsParser : public OptionsParser<PerProcessOptions> {
#if HAVE_INSPECTOR
const DebugOptionsParser _dop_instance{};
const EnvironmentOptionsParser _eop_instance{_dop_instance};

2
patches/node/src_disable_node_use_v8_platform_in_node_options.patch
View file

@ -6,7 +6,7 @@ Subject: src: Disable NODE_USE_V8_PLATFORM in node_options
Electron does not set NODE_USE_V8_PLATFORM. If inspector is enabled when NODE_USE_V8_PLATFORM is false, then there's an error. We want to ignore that, use our own v8 platform but still use the node inspector
diff --git a/src/node_options.cc b/src/node_options.cc
index a85b650d2e75b5c7dd8018d9af76ac88d0d741aa..b619aca56f88f44a00aaa1d38e95ab1e55b63ad0 100644
index 9b9b9324d681d8a55418c7a43a071a6f978750e7..e2f20d1b7b5ad4407b5630b163ee1c29a18027ce 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -33,7 +33,7 @@ DebugOptions& DebugOptions::operator=(const DebugOptions&) = default;

4
patches/node/src_expose_maybeinitializecontext_to_allow_existing_contexts.patch
View file

@ -9,10 +9,10 @@ can still use them in a node Environment now that primordials are
initialized and required so early.
diff --git a/src/api/environment.cc b/src/api/environment.cc
index bfc849d362a18bc7cd499584a439a1d29f0864f8..e313460a13ced7e7a9982db6f4a988699ec56111 100644
index bfd279aa7e7cd4d50b6cffe75d6f8e41c0213acb..5011774be2c5fee910079790feae747fa1785b87 100644
--- a/src/api/environment.cc
+++ b/src/api/environment.cc
@@ -362,6 +362,13 @@ Local<Context> NewContext(Isolate* isolate,
@@ -363,6 +363,13 @@ Local<Context> NewContext(Isolate* isolate,
Local<ObjectTemplate> object_template) {
auto context = Context::New(isolate, nullptr, object_template);
if (context.IsEmpty()) return context;

19
patches/node/src_only_run_preloadmodules_if_the_preload_array_is_not_empty.patch
View file

@ -1,19 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Sun, 2 Jun 2019 00:27:17 -0700
Subject: src: only run preloadModules if the preload array is not empty
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
index 2351268eae27af7ae759dccb599c071e146ece71..a998b095fb067ab6ca35cc276ac6a9a7c38dcf30 100644
--- a/lib/internal/bootstrap/pre_execution.js
+++ b/lib/internal/bootstrap/pre_execution.js
@@ -386,7 +386,7 @@ function initializeFrozenIntrinsics() {
function loadPreloadModules() {
// For user code, we preload modules if `-r` is passed
const preloadModules = getOptionValue('--require');
- if (preloadModules) {
+ if (preloadModules && preloadModules.length > 0) {
const {
_preloadModules
} = require('internal/modules/cjs/loader');

16
patches/node/src_read_break_node_first_line_from_the_inspect_options.patch
View file

@ -7,15 +7,15 @@ There are cases where the debug_options() on the env are
different to the options that were passed into inspector::Agent.
diff --git a/src/node.cc b/src/node.cc
index eff0be6fef1274cd4210811bdc377702ca70b2a2..c0a8bdd28a403b399f2766e40b2fe90e76fca849 100644
index 00fb0ed1c9cfbc86a7ec7d1d0ce7789b68d6a1e3..707579c8254903f5c587fa42711eb5d0184b4112 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -271,7 +271,7 @@ MaybeLocal<Value> RunBootstrapping(Environment* env) {
env->set_primordials(primordials.As<Object>());
@@ -256,7 +256,7 @@ int Environment::InitializeInspector(
#if HAVE_INSPECTOR
- if (env->options()->debug_options().break_node_first_line) {
+ if (env->inspector_agent()->options().break_node_first_line) {
env->inspector_agent()->PauseOnNextJavascriptStatement(
"Break at bootstrap");
profiler::StartProfilers(this);
- if (options_->debug_options().break_node_first_line) {
+ if (inspector_agent_->options().break_node_first_line) {
inspector_agent_->PauseOnNextJavascriptStatement("Break at bootstrap");
}

2
patches/node/src_use_check_false_in_switch_default_case.patch
View file

@ -6,7 +6,7 @@ Subject: src: use CHECK(false) in switch default case
Porting https://github.com/nodejs/node/pull/26502
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 2143117ec3b782ce307bcb3c7183594bc233d5e8..f232c9571ae5452996955b7bc149da663ee7d56a 100644
index 4933bf7f1bd2cd5e4293e52a241fcfd5fda6b779..300d2b92d7040c831b3178202a725df15191407d 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -3476,7 +3476,7 @@ static ManagedEVPPKey GetPublicOrPrivateKeyFromJs(