Skip to content
This repository was archived by the owner on Oct 30, 2023. It is now read-only.

Commit 6095bd1

Browse files
electron-roller[bot]jkleinsc
authored and
khalwa
committed
chore: bump node to v16.15.0 (main) (electron#33947)
* chore: bump node in DEPS to v16.15.0 * chore: update patches * src: allow preventing InitializeInspector in env nodejs/node#35025 * chore: update node gn filenames * crypto: change default check(Host|Email) behavior * Revert "crypto: change default check(Host|Email) behavior" This reverts commit 1f1eb23. * update node crypto tests to work with boringssl Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
1 parent b8e5852 commit 6095bd1

23 files changed

Lines changed: 111 additions & 182 deletions

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vars = {
44
'chromium_version':
55
'102.0.4999.0',
66
'node_version':
7-
'v16.14.2',
7+
'v16.15.0',
88
'nan_version':
99
# The following commit hash of NAN is v2.14.2 with *only* changes to the
1010
# test suite. This should be updated to a specific tag when one becomes

‎patches/node/.patches‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ chore_read_nobrowserglobals_from_global_not_process.patch
1313
enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch
1414
fix_handle_boringssl_and_openssl_incompatibilities.patch
1515
fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
16-
fix_allow_preventing_initializeinspector_in_env.patch
1716
src_allow_embedders_to_provide_a_custom_pageallocator_to.patch
1817
fix_crypto_tests_to_run_with_bssl.patch
1918
fix_account_for_debugger_agent_race_condition.patch
@@ -22,7 +21,6 @@ fix_readbarrier_undefined_symbol_error_on_woa_arm64.patch
2221
chore_fix_-wimplicit-fallthrough.patch
2322
fix_crash_caused_by_gethostnamew_on_windows_7.patch
2423
fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch
25-
fix_don_t_create_console_window_when_creating_process.patch
2624
fix_serdes_test.patch
2725
darwin_remove_eprototype_error_workaround_3405.patch
2826
darwin_translate_eprototype_to_econnreset_3413.patch

‎patches/node/build_add_gn_build_files.patch‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -973,10 +973,10 @@ index 0000000000000000000000000000000000000000..2c9d2826c85bdd033f1df1d6188df636
973973
+}
974974
diff --git a/filenames.json b/filenames.json
975975
new file mode 100644
976-
index 0000000000000000000000000000000000000000..d2d196a59037ed32800ab6981c6a7424afb63ca5
976+
index 0000000000000000000000000000000000000000..a2cfdffcd7308b73c5c302ebc4b946c6de1bd518
977977
--- /dev/null
978978
+++ b/filenames.json
979-
@@ -0,0 +1,612 @@
979+
@@ -0,0 +1,616 @@
980980
+// This file is automatically generated by generate_gn_filenames_json.py
981981
+// DO NOT EDIT
982982
+{
@@ -1233,6 +1233,7 @@ index 0000000000000000000000000000000000000000..d2d196a59037ed32800ab6981c6a7424
12331233
+ "lib/internal/cluster/primary.js",
12341234
+ "lib/internal/cluster/utils.js",
12351235
+ "lib/internal/cluster/child.js",
1236+
+ "lib/internal/webstreams/compression.js",
12361237
+ "lib/internal/webstreams/util.js",
12371238
+ "lib/internal/webstreams/writablestream.js",
12381239
+ "lib/internal/webstreams/readablestream.js",
@@ -1314,6 +1315,7 @@ index 0000000000000000000000000000000000000000..d2d196a59037ed32800ab6981c6a7424
13141315
+ "lib/internal/modules/package_json_reader.js",
13151316
+ "lib/internal/modules/esm/module_job.js",
13161317
+ "lib/internal/modules/esm/assert.js",
1318+
+ "lib/internal/modules/esm/fetch_module.js",
13171319
+ "lib/internal/modules/esm/get_source.js",
13181320
+ "lib/internal/modules/esm/translators.js",
13191321
+ "lib/internal/modules/esm/resolve.js",
@@ -1323,6 +1325,7 @@ index 0000000000000000000000000000000000000000..d2d196a59037ed32800ab6981c6a7424
13231325
+ "lib/internal/modules/esm/initialize_import_meta.js",
13241326
+ "lib/internal/modules/esm/module_map.js",
13251327
+ "lib/internal/modules/esm/get_format.js",
1328+
+ "lib/internal/modules/esm/formats.js",
13261329
+ "lib/internal/modules/esm/loader.js",
13271330
+ "lib/internal/modules/cjs/helpers.js",
13281331
+ "lib/internal/modules/cjs/loader.js",
@@ -1381,7 +1384,8 @@ index 0000000000000000000000000000000000000000..d2d196a59037ed32800ab6981c6a7424
13811384
+ "deps/acorn/acorn/dist/acorn.js",
13821385
+ "deps/acorn/acorn-walk/dist/walk.js",
13831386
+ "deps/cjs-module-lexer/lexer.js",
1384-
+ "deps/cjs-module-lexer/dist/lexer.js"
1387+
+ "deps/cjs-module-lexer/dist/lexer.js",
1388+
+ "deps/undici/undici.js"
13851389
+ ],
13861390
+ "node_sources": [
13871391
+ "src/api/async_resource.cc",
@@ -1795,7 +1799,7 @@ index 0000000000000000000000000000000000000000..d1d6b51e8c0c5bc6a5d09e217eb30483
17951799
+ args = rebase_path(inputs + outputs, root_build_dir)
17961800
+}
17971801
diff --git a/src/node_version.h b/src/node_version.h
1798-
index 41081f82714169f3bf388c3a8c2d9aa78e21a3f4..48c0d2655789a0528dfea0a60f756aacb48a6f60 100644
1802+
index 29c9be6366d63be7b340b35cea141e4d7e7f71cc..587735f2ddc0e5d93edd8644d121c6fb31fc4378 100644
17991803
--- a/src/node_version.h
18001804
+++ b/src/node_version.h
18011805
@@ -89,7 +89,10 @@

‎patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ they use themselves as the entry point. We should try to upstream some form
88
of this.
99

1010
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
11-
index 3c5e6fe40070f52d8b3f4e9757485845c1d6dbed..2af6b11c97ecdca3c40792ab35c69b07b9db76a0 100644
11+
index b184a0d9ae3434af746be269495e9e4c80c58091..899d5a906683e8967746e10a6de452e99e236903 100644
1212
--- a/lib/internal/bootstrap/pre_execution.js
1313
+++ b/lib/internal/bootstrap/pre_execution.js
14-
@@ -95,11 +95,13 @@ function patchProcessObject(expandArgv1) {
14+
@@ -103,11 +103,13 @@ function patchProcessObject(expandArgv1) {
1515
if (expandArgv1 && process.argv[1] &&
1616
!StringPrototypeStartsWith(process.argv[1], '-')) {
1717
// Expand process.argv[1] into a full path.
@@ -31,10 +31,10 @@ index 3c5e6fe40070f52d8b3f4e9757485845c1d6dbed..2af6b11c97ecdca3c40792ab35c69b07
3131
}
3232

3333
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
34-
index caca939942cb721a3efde7005b0a987a19237a8b..2d30a56a87ff8657cddb3d9e6af5bd9f81deffdb 100644
34+
index 5195ff2da0496f2bfb9112d336c38040f662087b..5c62e367f2dd7d112096551f1c34ee67ce1a5c3a 100644
3535
--- a/lib/internal/modules/cjs/loader.js
3636
+++ b/lib/internal/modules/cjs/loader.js
37-
@@ -1077,6 +1077,13 @@ Module.prototype._compile = function(content, filename) {
37+
@@ -1079,6 +1079,13 @@ Module.prototype._compile = function(content, filename) {
3838
if (getOptionValue('--inspect-brk') && process._eval == null) {
3939
if (!resolvedArgv) {
4040
// We enter the repl if we're not given a filename argument.

‎patches/node/chore_fix_-wimplicit-fallthrough.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ index 8bfecba74d4d90e9fbf0e2cd301118e4adc6cba8..63e1149f0c4a39cb944114e5824d6074
1818
"-Wno-unreachable-code-return",
1919
"-Wno-unused-but-set-variable",
2020
diff --git a/deps/nghttp2/lib/nghttp2_hd.c b/deps/nghttp2/lib/nghttp2_hd.c
21-
index 5e8693152599215261e47b152d565bbd9a0083e7..6d54e91dea6d77ad8925ad0452fd2a0a36f35f73 100644
21+
index 30ee9b88920c0a0bb8f8b714e3deabe0207cac40..010edf48f614c23e971df0f37716275cc1656469 100644
2222
--- a/deps/nghttp2/lib/nghttp2_hd.c
2323
+++ b/deps/nghttp2/lib/nghttp2_hd.c
24-
@@ -1891,7 +1891,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
24+
@@ -1892,7 +1892,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
2525
rv = NGHTTP2_ERR_HEADER_COMP;
2626
goto fail;
2727
}
@@ -30,7 +30,7 @@ index 5e8693152599215261e47b152d565bbd9a0083e7..6d54e91dea6d77ad8925ad0452fd2a0a
3030
case NGHTTP2_HD_STATE_INFLATE_START:
3131
case NGHTTP2_HD_STATE_OPCODE:
3232
if ((*in & 0xe0u) == 0x20u) {
33-
@@ -2001,7 +2001,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
33+
@@ -2002,7 +2002,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
3434
inflater->left = 0;
3535
inflater->shift = 0;
3636
DEBUGF("inflatehd: huffman encoded=%d\n", inflater->huffman_encoded != 0);
@@ -39,7 +39,7 @@ index 5e8693152599215261e47b152d565bbd9a0083e7..6d54e91dea6d77ad8925ad0452fd2a0a
3939
case NGHTTP2_HD_STATE_NEWNAME_READ_NAMELEN:
4040
rfin = 0;
4141
rv = hd_inflate_read_len(inflater, &rfin, in, last, 7, NGHTTP2_HD_MAX_NV);
42-
@@ -2085,7 +2085,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
42+
@@ -2086,7 +2086,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
4343
inflater->left = 0;
4444
inflater->shift = 0;
4545
DEBUGF("inflatehd: huffman encoded=%d\n", inflater->huffman_encoded != 0);
@@ -49,7 +49,7 @@ index 5e8693152599215261e47b152d565bbd9a0083e7..6d54e91dea6d77ad8925ad0452fd2a0a
4949
rfin = 0;
5050
rv = hd_inflate_read_len(inflater, &rfin, in, last, 7, NGHTTP2_HD_MAX_NV);
5151
diff --git a/deps/nghttp2/lib/nghttp2_session.c b/deps/nghttp2/lib/nghttp2_session.c
52-
index 36f1179f72a22595dda0b98927d87e2098cad4df..f007dbf410b1bdc5d1f603aa85c3a4f0704e9741 100644
52+
index 380a47c1b1e82b015c271e2818aed0baf982aa2d..2f3997709cd07f6f8294f985f60b2e1e4b85a2cf 100644
5353
--- a/deps/nghttp2/lib/nghttp2_session.c
5454
+++ b/deps/nghttp2/lib/nghttp2_session.c
5555
@@ -2644,10 +2644,10 @@ static int session_after_frame_sent1(nghttp2_session *session) {

‎patches/node/chore_read_nobrowserglobals_from_global_not_process.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This is used so that we can modify the flag at runtime where
77
config can only be set at compile time.
88

99
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
10-
index 085dd7e09d31fb1800b3596cc068637e1956ba52..9e0f811b2a37f45a9d8162dff7c9d5c935b856d6 100644
10+
index 8c31d0202b70ec9784b4289a175a62fd9fd85f8c..2b4c7a933d7f87050f7342e6c3ae2070e3dde030 100644
1111
--- a/lib/internal/bootstrap/node.js
1212
+++ b/lib/internal/bootstrap/node.js
1313
@@ -209,7 +209,7 @@ const {

‎patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ node modules will have different (wrong) ideas about how v8 structs are laid
88
out in memory on 64-bit machines, and will summarily fail to work.
99

1010
diff --git a/common.gypi b/common.gypi
11-
index b86c3f3bbeddfa57c223ff066451fd3e1ce1315d..59e6a857060a35ca52cff2b44bc412a3f5e8eece 100644
11+
index 3fd1d4ddddc109dfd87f4ba6115948f1c31b1261..7ffd577817d3c6ae7164dd3945479aedcee9640e 100644
1212
--- a/common.gypi
1313
+++ b/common.gypi
1414
@@ -64,7 +64,7 @@
@@ -20,7 +20,7 @@ index b86c3f3bbeddfa57c223ff066451fd3e1ce1315d..59e6a857060a35ca52cff2b44bc412a3
2020

2121
# Disable V8 untrusted code mitigations.
2222
# See https://github.com/v8/v8/wiki/Untrusted-code-mitigations
23-
@@ -130,6 +130,9 @@
23+
@@ -133,6 +133,9 @@
2424
'v8_enable_pointer_compression': 0,
2525
'v8_enable_31bit_smis_on_64bit_arch': 0,
2626
}],

‎patches/node/feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ Subject: feat: add kNoStartDebugSignalHandler to Environment to prevent
77
This patch should be upstreamed, it allows embedders to prevent the call to StartDebugSignalHandler which handles SIGUSR1 and starts the inspector agent. Apps that have --inspect disabled also don't want SIGUSR1 to have this affect.
88

99
diff --git a/src/env-inl.h b/src/env-inl.h
10-
index 2da8174fe9e4209f4705af0a1cf8bca5928f088c..954602f3fc7c3344509bb57530840bb1dfeacab3 100644
10+
index 4a34393cad7e071bf27947418be6b3d9bdd42f98..b9834a797c89f707d1e4978587af66ebf11591d4 100644
1111
--- a/src/env-inl.h
1212
+++ b/src/env-inl.h
13-
@@ -886,6 +886,10 @@ inline bool Environment::should_initialize_inspector() const {
14-
return (flags_ & EnvironmentFlags::kNoInitializeInspector) == 0;
13+
@@ -886,6 +886,10 @@ inline bool Environment::no_global_search_paths() const {
14+
!options_->global_search_paths;
1515
}
1616

1717
+inline bool Environment::should_start_debug_signal_handler() const {
@@ -22,22 +22,22 @@ index 2da8174fe9e4209f4705af0a1cf8bca5928f088c..954602f3fc7c3344509bb57530840bb1
2222
return emit_filehandle_warning_;
2323
}
2424
diff --git a/src/env.h b/src/env.h
25-
index 2554c530f2ca7078ed0cca03968b31f56027231b..1fbf965788f9c68d2999f38b40d39579f746d768 100644
25+
index cda7a52fa1ffc66d7ba42de3a275f49093f8557d..86f3c718ada13ee71e5af87e1b3772f39274cf43 100644
2626
--- a/src/env.h
2727
+++ b/src/env.h
2828
@@ -1216,6 +1216,7 @@ class Environment : public MemoryRetainer {
29+
inline bool tracks_unmanaged_fds() const;
2930
inline bool hide_console_windows() const;
3031
inline bool no_global_search_paths() const;
31-
inline bool should_initialize_inspector() const;
3232
+ inline bool should_start_debug_signal_handler() const;
3333
inline uint64_t thread_id() const;
3434
inline worker::Worker* worker_context() const;
3535
Environment* worker_parent_env() const;
3636
diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
37-
index fd9f514b9b6a7b7b1c1a6f5fe834f51266156596..14565f6885b3f88194b3b8efb340a4099ca1966c 100644
37+
index 5fc533741d7c8d7a8471b3c3c6a334c0e9e43501..2c36a0b132cf1b21595ac39619b99d316ad81d9e 100644
3838
--- a/src/inspector_agent.cc
3939
+++ b/src/inspector_agent.cc
40-
@@ -680,8 +680,10 @@ bool Agent::Start(const std::string& path,
40+
@@ -690,8 +690,10 @@ bool Agent::Start(const std::string& path,
4141
StartIoThreadAsyncCallback));
4242
uv_unref(reinterpret_cast<uv_handle_t*>(&start_io_thread_async));
4343
start_io_thread_async.data = this;
@@ -51,19 +51,19 @@ index fd9f514b9b6a7b7b1c1a6f5fe834f51266156596..14565f6885b3f88194b3b8efb340a409
5151
parent_env_->AddCleanupHook([](void* data) {
5252
Environment* env = static_cast<Environment*>(data);
5353
diff --git a/src/node.h b/src/node.h
54-
index b2b766f242e02593631be087fceaf63f71d74284..535df2d8dfb48ddc4d01e94565fdc527aed15ef7 100644
54+
index 0a9f5139276eb2e102b41a586adf61fa563b47d6..0b807cb25f9eb52b2100f0e2a7c25344790967cf 100644
5555
--- a/src/node.h
5656
+++ b/src/node.h
57-
@@ -444,7 +444,11 @@ enum Flags : uint64_t {
58-
// Controls whether or not the Environment should call InitializeInspector.
57+
@@ -445,7 +445,11 @@ enum Flags : uint64_t {
5958
// This control is needed by embedders who may not want to initialize the V8
60-
// inspector in situations where it already exists.
61-
- kNoInitializeInspector = 1 << 8
62-
+ kNoInitializeInspector = 1 << 8,
59+
// inspector in situations where one has already been created,
60+
// e.g. Blink's in Chromium.
61+
- kNoCreateInspector = 1 << 9
62+
+ kNoCreateInspector = 1 << 9,
6363
+ // Controls where or not the InspectorAgent for this Environment should
6464
+ // call StartDebugSignalHandler. This control is needed by embedders who may
6565
+ // not want to allow other processes to start the V8 inspector.
66-
+ kNoStartDebugSignalHandler = 1 << 9
66+
+ kNoStartDebugSignalHandler = 1 << 10
6767
};
6868
} // namespace EnvironmentFlags
6969

‎patches/node/feat_initialize_asar_support.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ Subject: feat: initialize asar support
66
This patch initializes asar support in Node.js.
77

88
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
9-
index f21ba048b4863863e6c7b740f410775776a7649a..3c5e6fe40070f52d8b3f4e9757485845c1d6dbed 100644
9+
index 8de57a5666131ff0c9f7ad844498e1bd3c357a70..b184a0d9ae3434af746be269495e9e4c80c58091 100644
1010
--- a/lib/internal/bootstrap/pre_execution.js
1111
+++ b/lib/internal/bootstrap/pre_execution.js
12-
@@ -76,6 +76,7 @@ function prepareMainThreadExecution(expandArgv1 = false) {
12+
@@ -84,6 +84,7 @@ function prepareMainThreadExecution(expandArgv1 = false) {
1313
assert(!CJSLoader.hasLoadedAnyUserCJSModule);
1414
loadPreloadModules();
1515
initializeFrozenIntrinsics();
1616
+ setupAsarSupport();
1717
}
1818

1919
function patchProcessObject(expandArgv1) {
20-
@@ -477,6 +478,10 @@ function loadPreloadModules() {
20+
@@ -540,6 +541,10 @@ function loadPreloadModules() {
2121
}
2222
}
2323

‎patches/node/fix_add_default_values_for_variables_in_common_gypi.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ common.gypi is a file that's included in the node header bundle, despite
77
the fact that we do not build node with gyp.
88

99
diff --git a/common.gypi b/common.gypi
10-
index be30169cf58d9759320f1763ede7e0ce89be3aa2..b86c3f3bbeddfa57c223ff066451fd3e1ce1315d 100644
10+
index bdc2c105abeddc4c8e434ead05ebc0d7d82cfae8..3fd1d4ddddc109dfd87f4ba6115948f1c31b1261 100644
1111
--- a/common.gypi
1212
+++ b/common.gypi
13-
@@ -81,6 +81,23 @@
13+
@@ -84,6 +84,23 @@
1414

1515
##### end V8 defaults #####
1616

0 commit comments

Comments
 (0)