Skip to content

Commit 1a4acf3

Browse files
codebyterecodebytere
committed
deps: update c-ares to v1.32.2
nodejs/node#53865
1 parent f1e9d66 commit 1a4acf3

5 files changed

Lines changed: 44 additions & 73 deletions

‎patches/node/.patches‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ chore_remove_calls_to_v8_functioncallbackinfo_holder.patch
4949
src_do_not_use_soon-to-be-deprecated_v8_api.patch
5050
fix_add_property_query_interceptors.patch
5151
src_account_for_openssl_unexpected_version.patch
52-
windows_32bit_config_change_callback_needs_to_be_stdcall.patch
53-
fix_building_with_unicode.patch
5452
src_stop_using_deprecated_fields_of_fastapicallbackoptions.patch
53+
src_use_supported_api_to_get_stalled_tla_messages.patch
54+
build_don_t_redefine_win32_lean_and_mean.patch

‎patches/node/build_add_gn_build_files.patch‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -537,10 +537,10 @@ index 0e69d7383762f6b81c5b57698aa9d121d5a9c401..35bbeb37acc7ccb14b4b8a644ec3d4c7
537537
cflags_c = [
538538
"-mavx512vl",
539539
diff --git a/deps/cares/BUILD.gn b/deps/cares/BUILD.gn
540-
index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..087e27424f3997575e4e089a57955d04b8802321 100644
540+
index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..d083aea4cb895d8425041879f1b22a6ee43a0b60 100644
541541
--- a/deps/cares/BUILD.gn
542542
+++ b/deps/cares/BUILD.gn
543-
@@ -1,14 +1,170 @@
543+
@@ -1,14 +1,172 @@
544544
-##############################################################################
545545
-# #
546546
-# DO NOT EDIT THIS FILE! #
@@ -566,7 +566,6 @@ index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..087e27424f3997575e4e089a57955d04
566566
+ "include/ares_dns.h",
567567
+ "include/ares_dns_record.h",
568568
+ "include/ares_nameser.h",
569-
+ "include/ares_rules.h",
570569
+ "include/ares_version.h",
571570
+ "src/lib/ares__addrinfo2hostent.c",
572571
+ "src/lib/ares__addrinfo_localhost.c",
@@ -604,6 +603,8 @@ index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..087e27424f3997575e4e089a57955d04
604603
+ "src/lib/ares_data.h",
605604
+ "src/lib/ares_destroy.c",
606605
+ "src/lib/ares_dns_mapping.c",
606+
+ "src/lib/ares_dns_multistring.c",
607+
+ "src/lib/ares_dns_multistring.h",
607608
+ "src/lib/ares_dns_name.c",
608609
+ "src/lib/ares_dns_parse.c",
609610
+ "src/lib/ares_dns_record.c",
@@ -637,6 +638,7 @@ index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..087e27424f3997575e4e089a57955d04
637638
+ "src/lib/ares_library_init.c",
638639
+ "src/lib/ares_ipv6.h",
639640
+ "src/lib/ares_math.c",
641+
+ "src/lib/ares_metrics.c",
640642
+ "src/lib/ares_options.c",
641643
+ "src/lib/ares_parse_a_reply.c",
642644
+ "src/lib/ares_parse_aaaa_reply.c",
@@ -673,7 +675,6 @@ index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..087e27424f3997575e4e089a57955d04
673675
+ "src/lib/ares_version.c",
674676
+ "src/lib/inet_net_pton.c",
675677
+ "src/lib/inet_ntop.c",
676-
+ "src/lib/setup_once.h",
677678
+ "src/tools/ares_getopt.c",
678679
+ "src/tools/ares_getopt.h",
679680
+ ]
@@ -694,6 +695,7 @@ index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..087e27424f3997575e4e089a57955d04
694695
+ defines += [ "CARES_PULL_WS2TCPIP_H=1" ]
695696
+ include_dirs += [ "config/win32" ]
696697
+ sources += [
698+
+ "src/lib/ares_sysconfig_win.c",
697699
+ "src/lib/config-win32.h",
698700
+ "src/lib/windows_port.c",
699701
+ ]

‎patches/node/build_don_t_redefine_win32_lean_and_mean.patch‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Shelley Vohr <shelley.vohr@gmail.com>
3+
Date: Fri, 23 Aug 2024 16:50:19 +0200
4+
Subject: build: don't redefine WIN32_LEAN_AND_MEAN
5+
6+
https://github.com/nodejs/node/pull/53722 added a new define for WIN32_LEAN_AND_MEAN
7+
without first checking to see if it was defined - other areas in c-ares do this so
8+
we should here as well. Compilation errors occur otherwise:
9+
10+
../../third_party/electron_node/deps/cares/include\ares_build.h(168,11): error: 'WIN32_LEAN_AND_MEAN' macro redefined [-Werror,-Wmacro-redefined]
11+
168 | # define WIN32_LEAN_AND_MEAN
12+
| ^
13+
<command line>(25,9): note: previous definition is here
14+
25 | #define WIN32_LEAN_AND_MEAN 1
15+
| ^
16+
1 error generated.
17+
[287 processes, 49437/51449 @ 48.5/s : 1018.562s] CC obj/third_party/electron_node/deps/cares/cares/ares__socket.obj
18+
FAILED: obj/third_party/electron_node/deps/cares/cares/ares__socket.obj
19+
20+
This should be upstreamed.
21+
22+
diff --git a/deps/cares/include/ares_build.h b/deps/cares/include/ares_build.h
23+
index 18a92606a817145302c73b5081b4c989799bc620..bafd26d9210d2347fec41f028e9e65088b83c48c 100644
24+
--- a/deps/cares/include/ares_build.h
25+
+++ b/deps/cares/include/ares_build.h
26+
@@ -165,7 +165,9 @@
27+
# define CARES_TYPEOF_ARES_SOCKLEN_T int
28+
29+
#elif defined(_WIN32)
30+
-# define WIN32_LEAN_AND_MEAN
31+
+# ifndef WIN32_LEAN_AND_MEAN
32+
+# define WIN32_LEAN_AND_MEAN
33+
+# endif
34+
# define CARES_TYPEOF_ARES_SOCKLEN_T int
35+
# define CARES_HAVE_WINDOWS_H 1
36+
# define CARES_HAVE_SYS_TYPES_H 1

‎patches/node/fix_building_with_unicode.patch‎

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

‎patches/node/windows_32bit_config_change_callback_needs_to_be_stdcall.patch‎

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

0 commit comments

Comments
 (0)