Skip to content

Commit 3a5f9e0

Browse files
electron-roller[bot]codebytere
electron-roller[bot]
and
codebytere
authored
chore: bump node to v24.13.1 (main) (#49744)
* chore: bump node in DEPS to v24.13.1 * chore: fixup patches refs: * nodejs/node#60425 * nodejs/node#61270 * nodejs/node#61044 * fix: generate_config_gypi needs to generate valid JSON nodejs/node#60794 * doc: align Buffer.concat documentation with behavior nodejs/node#60405 * src: fix off-thread cert loading in bundled cert mode nodejs/node#60764 * build: fix extraneous includes --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <[email protected]>
1 parent f90e35c commit 3a5f9e0

File tree

35 files changed

+169
-361
lines changed

35 files changed

+169
-361
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vars = {
44
'chromium_version':
55
'146.0.7666.0',
66
'node_version':
7-
'v24.13.0',
7+
'v24.13.1',
88
'nan_version':
99
'675cefebca42410733da8a454c8d9391fcebfbc2',
1010
'squirrel.mac_version':

‎patches/node/.patches‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ fix_adjust_wpt_and_webidl_tests_for_enabled_float16array.patch
2828
refactor_attach_cppgc_heap_on_v8_isolate_creation.patch
2929
fix_cppgc_initializing_twice.patch
3030
fix_expose_readfilesync_override_for_modules.patch
31-
fix_array_out-of-bounds_read_in_boyer-moore_search.patch
3231
test_accomodate_v8_thenable_stack_trace_change_in_snapshot.patch
3332
chore_exclude_electron_node_folder_from_exit-time-destructors.patch
3433
api_remove_deprecated_getisolate.patch
@@ -40,10 +39,9 @@ api_delete_deprecated_fields_on_v8_isolate.patch
4039
api_promote_deprecation_of_v8_context_and_v8_object_api_methods.patch
4140
fix_ensure_traverseparent_bails_on_resource_path_exit.patch
4241
reland_temporal_unflag_temporal.patch
43-
src_handle_der_decoding_errors_from_system_certificates.patch
4442
fix_suppress_nodiscard_warning_for_copy_options_operator.patch
45-
test_make_buffer_sizes_32bit-aware_in.patch
4643
src_refactor_module_wrap_cc_to_update_fixedarray_get_params.patch
4744
src_refactor_wasmstreaming_finish_to_accept_a_callback.patch
4845
src_stop_using_v8_propertycallbackinfo_t_this.patch
4946
build_restore_macos_deployment_target_to_12_0.patch
47+
fix_generate_config_gypi_needs_to_generate_valid_json.patch

‎patches/node/api_promote_deprecation_of_v8_context_and_v8_object_api_methods.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ index 404e2aa8c88d0cc0e6717c01e0df68899c64cc32..16462f305a2ac6b6c3d7b85024f2e526
5858
}
5959

6060
diff --git a/src/env-inl.h b/src/env-inl.h
61-
index 97c43afb487b58c0c77bd59b4a6b6d7a13690053..23a4d7b651935a4029249fb2f1dd3ed46ea3b26f 100644
61+
index 74bbb9fb83246a90bc425e259150f0868020ac9e..a4b3a1c0907c9d50baf6c8cd473cb4c7369d0a5c 100644
6262
--- a/src/env-inl.h
6363
+++ b/src/env-inl.h
6464
@@ -189,7 +189,8 @@ inline Environment* Environment::GetCurrent(v8::Local<v8::Context> context) {
@@ -178,10 +178,10 @@ index cb13d84388bcc6806d3b038a51e1cc2d1feccda1..687b2cf3e63b2a3306e2cbac67e3e216
178178
MakeWeak();
179179
}
180180
diff --git a/src/node_process_methods.cc b/src/node_process_methods.cc
181-
index fe4aad63bc877be105830a80aa6be10ce3f8fda4..588b1fef718853bec95a4e4a3b14809a0e7018ea 100644
181+
index 67278974199db46fed85b443e7cdd30accd7687f..e52c08541ec4180f16e4bceaac1bd6b97cf13e8b 100644
182182
--- a/src/node_process_methods.cc
183183
+++ b/src/node_process_methods.cc
184-
@@ -672,8 +672,8 @@ void BindingData::RegisterExternalReferences(
184+
@@ -680,8 +680,8 @@ void BindingData::RegisterExternalReferences(
185185

186186
BindingData* BindingData::FromV8Value(Local<Value> value) {
187187
Local<Object> v8_object = value.As<Object>();
@@ -193,10 +193,10 @@ index fe4aad63bc877be105830a80aa6be10ce3f8fda4..588b1fef718853bec95a4e4a3b14809a
193193

194194
void BindingData::MemoryInfo(MemoryTracker* tracker) const {
195195
diff --git a/src/node_realm-inl.h b/src/node_realm-inl.h
196-
index f162d1506c990a5fe578be6f1324427e3f9023f4..b57bb0b42e98b954c0c8662c667e589d6c68a5d3 100644
196+
index 0af487a9abc9ee1783367ac86b0016ab89e02006..c01cef477aaba52f9894943acede7fb22ed17dcb 100644
197197
--- a/src/node_realm-inl.h
198198
+++ b/src/node_realm-inl.h
199-
@@ -21,7 +21,8 @@ inline Realm* Realm::GetCurrent(v8::Local<v8::Context> context) {
199+
@@ -22,7 +22,8 @@ inline Realm* Realm::GetCurrent(v8::Local<v8::Context> context) {
200200
return nullptr;
201201
}
202202
return static_cast<Realm*>(

‎patches/node/api_remove_deprecated_getisolate.patch‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ index cc60ddddb037e0279615bbe24821eb20fd8da677..37d83e41b618a07aca98118260abe961
8585

8686
return handle;
8787
diff --git a/src/crypto/crypto_context.cc b/src/crypto/crypto_context.cc
88-
index f3631d538a38dc3a93a47707ea8dab0462fa2140..12ad6e6ddbda2cc679e733f7a9c6b9e4cf9623dd 100644
88+
index 2e3f31e1765024373c3fc2acd33fc3bfb352a906..ca62d3001bf51193d78caac0cccd93c188a8410c 100644
8989
--- a/src/crypto/crypto_context.cc
9090
+++ b/src/crypto/crypto_context.cc
91-
@@ -1022,7 +1022,7 @@ bool ArrayOfStringsToX509s(Local<Context> context,
91+
@@ -1045,7 +1045,7 @@ bool ArrayOfStringsToX509s(Local<Context> context,
9292
Local<Array> cert_array,
9393
std::vector<X509*>* certs) {
9494
ClearErrorOnReturn clear_error_on_return;
@@ -120,10 +120,10 @@ index 4c5427596d1c90d3a413cdd9ff4f1151e657073d..70135a6be65e41fcb3564ddf6d1e8083
120120
NewStringType::kNormal,
121121
mem->length)
122122
diff --git a/src/encoding_binding.cc b/src/encoding_binding.cc
123-
index 266f640fb1c6503a424e77cc41fc15bc658bb6a5..877ae8a18f6b8f2c7e3474dfba060d99db88e6b9 100644
123+
index a913e34c73db3fb62aedcf28bee1bf1c4d59de7a..9de38eb9907269e99fdf0907aa35862572a2c643 100644
124124
--- a/src/encoding_binding.cc
125125
+++ b/src/encoding_binding.cc
126-
@@ -76,7 +76,7 @@ void BindingData::Deserialize(Local<Context> context,
126+
@@ -75,7 +75,7 @@ void BindingData::Deserialize(Local<Context> context,
127127
int index,
128128
InternalFieldInfoBase* info) {
129129
DCHECK_IS_SNAPSHOT_SLOT(index);
@@ -388,10 +388,10 @@ index d278a32c9934c15bc721da164efccca7bc7e7111..ab862bf93a411e6ae6da7c9f9706cee2
388388
BlobBindingData* binding = realm->AddBindingData<BlobBindingData>(holder);
389389
CHECK_NOT_NULL(binding);
390390
diff --git a/src/node_builtins.cc b/src/node_builtins.cc
391-
index e69eb280050cae0c0f394b2f956eef947e628904..9bb4576fcf4f07550e7d6f4ff2310cedc8093c5f 100644
391+
index 703ac1be06249736073f797058d170576a0db1bf..f0607ec9fd1983386166d0f4782adac99ace943e 100644
392392
--- a/src/node_builtins.cc
393393
+++ b/src/node_builtins.cc
394-
@@ -274,7 +274,7 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompileInternal(
394+
@@ -275,7 +275,7 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompileInternal(
395395
const char* id,
396396
LocalVector<String>* parameters,
397397
Realm* optional_realm) {
@@ -400,7 +400,7 @@ index e69eb280050cae0c0f394b2f956eef947e628904..9bb4576fcf4f07550e7d6f4ff2310ced
400400
EscapableHandleScope scope(isolate);
401401

402402
Local<String> source;
403-
@@ -396,7 +396,7 @@ void BuiltinLoader::SaveCodeCache(const char* id, Local<Function> fun) {
403+
@@ -397,7 +397,7 @@ void BuiltinLoader::SaveCodeCache(const char* id, Local<Function> fun) {
404404
MaybeLocal<Function> BuiltinLoader::LookupAndCompile(Local<Context> context,
405405
const char* id,
406406
Realm* optional_realm) {
@@ -409,7 +409,7 @@ index e69eb280050cae0c0f394b2f956eef947e628904..9bb4576fcf4f07550e7d6f4ff2310ced
409409
LocalVector<String> parameters(isolate);
410410
// Detects parameters of the scripts based on module ids.
411411
// internal/bootstrap/realm: process, getLinkedBinding,
412-
@@ -450,7 +450,7 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompile(Local<Context> context,
412+
@@ -451,7 +451,7 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompile(Local<Context> context,
413413
MaybeLocal<Value> BuiltinLoader::CompileAndCall(Local<Context> context,
414414
const char* id,
415415
Realm* realm) {
@@ -418,7 +418,7 @@ index e69eb280050cae0c0f394b2f956eef947e628904..9bb4576fcf4f07550e7d6f4ff2310ced
418418
// Detects parameters of the scripts based on module ids.
419419
// internal/bootstrap/realm: process, getLinkedBinding,
420420
// getInternalBinding, primordials
421-
@@ -506,7 +506,7 @@ MaybeLocal<Value> BuiltinLoader::CompileAndCall(Local<Context> context,
421+
@@ -507,7 +507,7 @@ MaybeLocal<Value> BuiltinLoader::CompileAndCall(Local<Context> context,
422422
if (!maybe_fn.ToLocal(&fn)) {
423423
return MaybeLocal<Value>();
424424
}
@@ -427,7 +427,7 @@ index e69eb280050cae0c0f394b2f956eef947e628904..9bb4576fcf4f07550e7d6f4ff2310ced
427427
return fn->Call(context, undefined, argc, argv);
428428
}
429429

430-
@@ -544,14 +544,14 @@ bool BuiltinLoader::CompileAllBuiltinsAndCopyCodeCache(
430+
@@ -545,14 +545,14 @@ bool BuiltinLoader::CompileAllBuiltinsAndCopyCodeCache(
431431
to_eager_compile_.emplace(id);
432432
}
433433

@@ -533,10 +533,10 @@ index 55a0c986c5b6989ee9ce277bb6a9778abb2ad2ee..809d88f21e5572807e38132d40ee7587
533533
READONLY_PROPERTY(target, "exitCodes", exit_codes);
534534

535535
diff --git a/src/node_file.cc b/src/node_file.cc
536-
index 7dfb7a486040e0188eb53ee7a65f91a99e713a3a..c364f2a4f6dd6ec066b00f364108383154be12ec 100644
536+
index ba6ffc2b6565dea500bc8dd4818c8fcb7648694a..e834325a763f7ea8f53210145b5edd134d6b67e6 100644
537537
--- a/src/node_file.cc
538538
+++ b/src/node_file.cc
539-
@@ -3834,7 +3834,7 @@ void BindingData::Deserialize(Local<Context> context,
539+
@@ -3843,7 +3843,7 @@ void BindingData::Deserialize(Local<Context> context,
540540
int index,
541541
InternalFieldInfoBase* info) {
542542
DCHECK_IS_SNAPSHOT_SLOT(index);
@@ -586,7 +586,7 @@ index 57e068ae249d618c2658638f9f3b03e1fedb6524..8c51ae4e0a435971c6d0288af8781087
586586
data_.Reset();
587587
return ret;
588588
diff --git a/src/node_modules.cc b/src/node_modules.cc
589-
index d3907c3d063c7757cdd7ef99ed09bea1eb58a3fd..df9925404e77ec61900f89a5241c86a599e548c5 100644
589+
index cecdda74847801fd5821bc0afdf0dfc9f131c44a..04ebecc5d924f6c2fddd9992462d1ff692e1cee5 100644
590590
--- a/src/node_modules.cc
591591
+++ b/src/node_modules.cc
592592
@@ -70,7 +70,7 @@ void BindingData::Deserialize(v8::Local<v8::Context> context,
@@ -598,7 +598,7 @@ index d3907c3d063c7757cdd7ef99ed09bea1eb58a3fd..df9925404e77ec61900f89a5241c86a5
598598
Realm* realm = Realm::GetCurrent(context);
599599
BindingData* binding = realm->AddBindingData<BindingData>(holder);
600600
CHECK_NOT_NULL(binding);
601-
@@ -709,7 +709,7 @@ void BindingData::CreatePerContextProperties(Local<Object> target,
601+
@@ -750,7 +750,7 @@ void BindingData::CreatePerContextProperties(Local<Object> target,
602602
Realm* realm = Realm::GetCurrent(context);
603603
realm->AddBindingData<BindingData>(target);
604604

@@ -608,10 +608,10 @@ index d3907c3d063c7757cdd7ef99ed09bea1eb58a3fd..df9925404e77ec61900f89a5241c86a5
608608

609609
#define V(status) \
610610
diff --git a/src/node_process_methods.cc b/src/node_process_methods.cc
611-
index e453bacc3e5247493a3582c24174bfe6e590825d..fe4aad63bc877be105830a80aa6be10ce3f8fda4 100644
611+
index 4a258e5f140994536386492059d64c9cf94ea0a6..67278974199db46fed85b443e7cdd30accd7687f 100644
612612
--- a/src/node_process_methods.cc
613613
+++ b/src/node_process_methods.cc
614-
@@ -737,7 +737,7 @@ void BindingData::Deserialize(Local<Context> context,
614+
@@ -745,7 +745,7 @@ void BindingData::Deserialize(Local<Context> context,
615615
int index,
616616
InternalFieldInfoBase* info) {
617617
DCHECK_IS_SNAPSHOT_SLOT(index);
@@ -621,7 +621,7 @@ index e453bacc3e5247493a3582c24174bfe6e590825d..fe4aad63bc877be105830a80aa6be10c
621621
// Recreate the buffer in the constructor.
622622
InternalFieldInfo* casted_info = static_cast<InternalFieldInfo*>(info);
623623
diff --git a/src/node_realm.cc b/src/node_realm.cc
624-
index 2a5fe9fe501d1fd9356eeb7d044a872fa5a55f38..39f6f142044c42904d234da20a266315346c135a 100644
624+
index 6d2e4eb641a8ffaacf4aebd3522008a285387a30..47bd7d9f19077ac7a558c73db5f51bdf8da291e7 100644
625625
--- a/src/node_realm.cc
626626
+++ b/src/node_realm.cc
627627
@@ -22,7 +22,7 @@ using v8::String;
@@ -660,7 +660,7 @@ index c2e24b4645e7903e08c80aead1c18c7bcff1bd89..e34d24d51d5c090b560d06f727043f20
660660
// Recreate the buffer in the constructor.
661661
InternalFieldInfo* casted_info = static_cast<InternalFieldInfo*>(info);
662662
diff --git a/src/node_sqlite.cc b/src/node_sqlite.cc
663-
index 955b76cbc71d0cd3a1cc01c3c0dea0536a792dc0..0b111ce1fb1d59cad019ba13bbfc513f157d3f06 100644
663+
index 6bfc54dd81446545ebbb0faedb55a5383b81de49..2e52fb801684feb22800d4809daab006fc7cae9c 100644
664664
--- a/src/node_sqlite.cc
665665
+++ b/src/node_sqlite.cc
666666
@@ -2061,7 +2061,7 @@ bool StatementSync::BindParams(const FunctionCallbackInfo<Value>& args) {
@@ -736,7 +736,7 @@ index 370221d3cddc201180260ecb3a222bc831c91093..f5aff2f65fe6b9f48cf970ab3e7c57cf
736736
THROW_ERR_WASI_NOT_STARTED(isolate);
737737
return EinvalError<R>();
738738
diff --git a/src/node_webstorage.cc b/src/node_webstorage.cc
739-
index cc90af827a3fbd14fb4cbfbfd39cc661f22cf6e1..5819d9bca845e0eed6d4d93564469d8f3c36200b 100644
739+
index 5c7d268d38ff55ce4db07463b1ea0bcb2f4e63ea..bd83654012442195866e57173b6e5d4d25fecf0f 100644
740740
--- a/src/node_webstorage.cc
741741
+++ b/src/node_webstorage.cc
742742
@@ -57,7 +57,7 @@ using v8::Value;
@@ -748,7 +748,7 @@ index cc90af827a3fbd14fb4cbfbfd39cc661f22cf6e1..5819d9bca845e0eed6d4d93564469d8f
748748
auto dom_exception_str = FIXED_ONE_BYTE_STRING(isolate, "DOMException");
749749
auto err_name = FIXED_ONE_BYTE_STRING(isolate, "QuotaExceededError");
750750
auto err_message =
751-
@@ -433,7 +433,7 @@ Maybe<void> Storage::Store(Local<Name> key, Local<Value> value) {
751+
@@ -437,7 +437,7 @@ Maybe<void> Storage::Store(Local<Name> key, Local<Value> value) {
752752
}
753753

754754
static MaybeLocal<String> Uint32ToName(Local<Context> context, uint32_t index) {
@@ -758,10 +758,10 @@ index cc90af827a3fbd14fb4cbfbfd39cc661f22cf6e1..5819d9bca845e0eed6d4d93564469d8f
758758

759759
static void Clear(const FunctionCallbackInfo<Value>& info) {
760760
diff --git a/src/node_worker.cc b/src/node_worker.cc
761-
index 62c53368d1173edb7eb42e3337049c46fd7cdda9..7d08d8af7f6d99f7bd41cb7eb91063c630b3f87b 100644
761+
index e7d26b4c8cbb08a175084ceac51395860dc60598..fa4ec53ee556a23c8fd018caa1eee51bc5e004fe 100644
762762
--- a/src/node_worker.cc
763763
+++ b/src/node_worker.cc
764-
@@ -1466,8 +1466,6 @@ void GetEnvMessagePort(const FunctionCallbackInfo<Value>& args) {
764+
@@ -1465,8 +1465,6 @@ void GetEnvMessagePort(const FunctionCallbackInfo<Value>& args) {
765765
Local<Object> port = env->message_port();
766766
CHECK_IMPLIES(!env->is_main_thread(), !port.IsEmpty());
767767
if (!port.IsEmpty()) {

‎patches/node/build_add_gn_build_files.patch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ really in 20/21. We have to wait until 22 is released to be able to
1111
build with upstream GN files.
1212

1313
diff --git a/configure.py b/configure.py
14-
index 750ddc8ace6cad894e738f6e1d983b5906acc10f..e063f9131d4d547d231811dafea03c8c52b611e6 100755
14+
index f31d460038db2fa2fa4c47d62be3100da959978f..209f23b04663113e4f6b3c3242c0544cfed9a950 100755
1515
--- a/configure.py
1616
+++ b/configure.py
1717
@@ -1736,7 +1736,7 @@ def configure_v8(o, configs):
@@ -68,10 +68,10 @@ index d4438f7fd61598afac2c1e3184721a759d22b10c..e2407027ab05e59b2f0f1c213b98ea46
6868

6969
assert(!node_enable_inspector || node_use_openssl,
7070
diff --git a/src/node_builtins.cc b/src/node_builtins.cc
71-
index 581b9886ded52f294b7cc6b080b2269b7617c85e..e43e2559aaf48add88aad342b1c96fd34f26c87f 100644
71+
index 7b34b14856a5193c723987f69d6040bdb6aa7c34..90fdf52d79954bf2cd86fd1d2d6da8199683d344 100644
7272
--- a/src/node_builtins.cc
7373
+++ b/src/node_builtins.cc
74-
@@ -774,6 +774,7 @@ void BuiltinLoader::RegisterExternalReferences(
74+
@@ -775,6 +775,7 @@ void BuiltinLoader::RegisterExternalReferences(
7575
registry->Register(GetNatives);
7676

7777
RegisterExternalReferencesForInternalizedBuiltinCode(registry);
@@ -95,7 +95,7 @@ index 7a7b84337feb67960819472e43192dbdc151e299..bcdd50f635757f41287c87df1db9cd3b
9595
diff --git a/tools/js2c.cc b/tools/js2c.cc
9696
old mode 100644
9797
new mode 100755
98-
index 21992cbe894a880e3223c379326b62db22f2f12d..1296a5457422099035ba34f2b02624f2e9dfb0f0
98+
index 9c2f70de4e00834ff448e573743898072dc14c5d..71a12c606f4da7165cc41a295a278b2e504af1b6
9999
--- a/tools/js2c.cc
100100
+++ b/tools/js2c.cc
101101
@@ -28,6 +28,7 @@ namespace js2c {
@@ -190,7 +190,7 @@ index 21992cbe894a880e3223c379326b62db22f2f12d..1296a5457422099035ba34f2b02624f2
190190
static_cast<int>(def_buf.size()),
191191
def_buf.data(),
192192
static_cast<int>(init_buf.size()),
193-
@@ -846,12 +890,15 @@ int JS2C(const FileList& js_files,
193+
@@ -836,12 +880,15 @@ int JS2C(const FileList& js_files,
194194
}
195195
}
196196

@@ -206,7 +206,7 @@ index 21992cbe894a880e3223c379326b62db22f2f12d..1296a5457422099035ba34f2b02624f2
206206
Fragment out = Format(definitions, initializers, registrations);
207207
return WriteIfChanged(out, dest);
208208
}
209-
@@ -877,6 +924,8 @@ int Main(int argc, char* argv[]) {
209+
@@ -867,6 +914,8 @@ int Main(int argc, char* argv[]) {
210210
std::string arg(argv[i]);
211211
if (arg == "--verbose") {
212212
is_verbose = true;
@@ -215,7 +215,7 @@ index 21992cbe894a880e3223c379326b62db22f2f12d..1296a5457422099035ba34f2b02624f2
215215
} else if (arg == "--root") {
216216
if (i == argc - 1) {
217217
fprintf(stderr, "--root must be followed by a path\n");
218-
@@ -925,6 +974,14 @@ int Main(int argc, char* argv[]) {
218+
@@ -915,6 +964,14 @@ int Main(int argc, char* argv[]) {
219219
}
220220
}
221221

@@ -230,7 +230,7 @@ index 21992cbe894a880e3223c379326b62db22f2f12d..1296a5457422099035ba34f2b02624f2
230230
// Should have exactly 3 types: `.js`, `.mjs` and `.gypi`.
231231
assert(file_map.size() == 3);
232232
auto gypi_it = file_map.find(".gypi");
233-
@@ -951,6 +1008,7 @@ int Main(int argc, char* argv[]) {
233+
@@ -941,6 +998,7 @@ int Main(int argc, char* argv[]) {
234234
std::sort(mjs_it->second.begin(), mjs_it->second.end());
235235

236236
return JS2C(js_it->second, mjs_it->second, gypi_it->second[0], output);

‎patches/node/build_enable_perfetto.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ index e664663348adc7bb31f7c9ec78481bbeb71401d9..62b659beb766b8256b214447af376f43
6464

6565
function ipToInt(ip) {
6666
diff --git a/node.gyp b/node.gyp
67-
index c3917f805464669c709bef83b9982ef95d0fbaa1..56e11cde31897260bf41db3f32f5c6d6fbd6d5bf 100644
67+
index c035d1d7cdac1d18cca0ef5cefbc5ce4c1fd1b86..a48e4e5d1fb7621b12b9abeaaf78214515a23efc 100644
6868
--- a/node.gyp
6969
+++ b/node.gyp
7070
@@ -176,7 +176,6 @@

‎patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Subject: build: ensure native module compilation fails if not using a new
77
This should not be upstreamed, it is a quality-of-life patch for downstream module builders.
88

99
diff --git a/common.gypi b/common.gypi
10-
index 8280cff0d93d42a95875b78de84221aa1bcae092..76a03b9a5458f4afc0ab5768c8a2e90633749fe9 100644
10+
index cf3ceaf19972ee107deff63b4dba16c12191c615..6159350823fd9f0090e2b98e8797e829fd481750 100644
1111
--- a/common.gypi
1212
+++ b/common.gypi
1313
@@ -89,6 +89,8 @@
@@ -42,7 +42,7 @@ index 8280cff0d93d42a95875b78de84221aa1bcae092..76a03b9a5458f4afc0ab5768c8a2e906
4242
# list in v8/BUILD.gn.
4343
['v8_enable_v8_checks == 1', {
4444
diff --git a/configure.py b/configure.py
45-
index e063f9131d4d547d231811dafea03c8c52b611e6..a5c764d9e7fb0ffa219202015ec67ed6d3e14c04 100755
45+
index 209f23b04663113e4f6b3c3242c0544cfed9a950..88164b99ae3d37f47e5e9a9ba96d7b450d6ba4ab 100755
4646
--- a/configure.py
4747
+++ b/configure.py
4848
@@ -1717,6 +1717,7 @@ def configure_library(lib, output, pkgname=None):

‎patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ index 605dee28cace56f2366fec9d7f18894559044ae4..15dcabb3b1682438eb6d5a681363b7ea
3434
let kResistStopPropagation;
3535

3636
diff --git a/src/node_builtins.cc b/src/node_builtins.cc
37-
index e43e2559aaf48add88aad342b1c96fd34f26c87f..e69eb280050cae0c0f394b2f956eef947e628904 100644
37+
index 90fdf52d79954bf2cd86fd1d2d6da8199683d344..703ac1be06249736073f797058d170576a0db1bf 100644
3838
--- a/src/node_builtins.cc
3939
+++ b/src/node_builtins.cc
4040
@@ -39,6 +39,7 @@ using v8::Value;

‎patches/node/build_restore_clang_as_default_compiler_on_macos.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ node-gyp will use the result of `process.config` that reflects the environment
1111
in which the binary got built.
1212

1313
diff --git a/common.gypi b/common.gypi
14-
index 76a03b9a5458f4afc0ab5768c8a2e90633749fe9..bdadbdaa607b2f668749fc484271de8d126bbd17 100644
14+
index 6159350823fd9f0090e2b98e8797e829fd481750..5f47ec9bb405f6c1574304ac68807929604cd402 100644
1515
--- a/common.gypi
1616
+++ b/common.gypi
1717
@@ -128,6 +128,7 @@

‎patches/node/build_restore_macos_deployment_target_to_12_0.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ M151, and so we should allow for building until then.
1010
This patch can be removed at the M151 branch point.
1111

1212
diff --git a/common.gypi b/common.gypi
13-
index bdadbdaa607b2f668749fc484271de8d126bbd17..8df2802191b7fe6ae14edbd85cb3a5d16eb5a76a 100644
13+
index 5f47ec9bb405f6c1574304ac68807929604cd402..914f28b41d05b1485874885570ae5adaabd8e1b2 100644
1414
--- a/common.gypi
1515
+++ b/common.gypi
1616
@@ -677,7 +677,7 @@

0 commit comments

Comments
 (0)