Skip to content

Commit 82c1d15

Browse files
codebyterecodebytere
authored
deps: update c-ares to v1.34.1
nodejs/node#55369
1 parent 363dfc3 commit 82c1d15

2 files changed

Lines changed: 57 additions & 42 deletions

File tree

‎patches/node/.patches‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ test_update_v8-stats_test_for_v8_12_6.patch
4848
src_do_not_use_soon-to-be-deprecated_v8_api.patch
4949
fix_add_property_query_interceptors.patch
5050
src_stop_using_deprecated_fields_of_fastapicallbackoptions.patch
51-
build_don_t_redefine_win32_lean_and_mean.patch
52-
src_use_supported_api_to_get_stalled_tla_messages.patch
5351
src_use_supported_api_to_get_stalled_tla_messages.patch
5452
build_compile_with_c_20_support.patch
5553
add_v8_taskpirority_to_foreground_task_runner_signature.patch

‎patches/node/build_add_gn_build_files.patch‎

Lines changed: 57 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -537,17 +537,21 @@ index 0e69d7383762f6b81c5b57698aa9d121d5a9c401..35bbeb37acc7ccb14b4b8a644ec3d4c7
537537
cflags_c = [
538538
"-mavx512vl",
539539
diff --git a/deps/cares/BUILD.gn b/deps/cares/BUILD.gn
540-
index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..7f4885631a85a25692e8969991951be02e5d73f1 100644
540+
index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..366ff1c729948e846dd867a3ad21ef667b51ae7f 100644
541541
--- a/deps/cares/BUILD.gn
542542
+++ b/deps/cares/BUILD.gn
543-
@@ -1,14 +1,175 @@
543+
@@ -1,14 +1,192 @@
544544
-##############################################################################
545545
-# #
546546
-# DO NOT EDIT THIS FILE! #
547547
-# #
548548
-##############################################################################
549549
+config("cares_config") {
550-
+ include_dirs = [ "include", "src/lib" ]
550+
+ include_dirs = [
551+
+ "include",
552+
+ "src/lib",
553+
+ "src/lib/include"
554+
+ ]
551555
+}
552556
+static_library("cares") {
553557
+ defines = [ "CARES_STATICLIB" ]
@@ -563,20 +567,19 @@ index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..7f4885631a85a25692e8969991951be0
563567
+
564568
+ sources = [
565569
+ "include/ares.h",
570+
+ "include/ares_build.h",
566571
+ "include/ares_dns.h",
567572
+ "include/ares_dns_record.h",
568573
+ "include/ares_nameser.h",
569574
+ "include/ares_version.h",
570-
+ "src/lib/ares__addrinfo2hostent.c",
571-
+ "src/lib/ares__addrinfo_localhost.c",
572-
+ "src/lib/ares__close_sockets.c",
573-
+ "src/lib/ares__hosts_file.c",
574-
+ "src/lib/ares__parse_into_addrinfo.c",
575-
+ "src/lib/ares__socket.c",
576-
+ "src/lib/ares__sortaddrinfo.c",
575+
+ "src/lib/ares_addrinfo2hostent.c",
576+
+ "src/lib/ares_addrinfo_localhost.c",
577577
+ "src/lib/ares_android.c",
578578
+ "src/lib/ares_android.h",
579579
+ "src/lib/ares_cancel.c",
580+
+ "src/lib/ares_close_sockets.c",
581+
+ "src/lib/ares_conn.c",
582+
+ "src/lib/ares_conn.h",
580583
+ "src/lib/ares_cookie.c",
581584
+ "src/lib/ares_data.c",
582585
+ "src/lib/ares_data.h",
@@ -590,43 +593,45 @@ index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..7f4885631a85a25692e8969991951be0
590593
+ "src/lib/ares_gethostbyaddr.c",
591594
+ "src/lib/ares_gethostbyname.c",
592595
+ "src/lib/ares_getnameinfo.c",
596+
+ "src/lib/ares_hosts_file.c",
593597
+ "src/lib/ares_inet_net_pton.h",
594598
+ "src/lib/ares_init.c",
595599
+ "src/lib/ares_ipv6.h",
596600
+ "src/lib/ares_library_init.c",
597601
+ "src/lib/ares_metrics.c",
598602
+ "src/lib/ares_options.c",
599-
+ "src/lib/ares_platform.c",
600-
+ "src/lib/ares_platform.h",
603+
+ "src/lib/ares_parse_into_addrinfo.c",
601604
+ "src/lib/ares_private.h",
602605
+ "src/lib/ares_process.c",
603606
+ "src/lib/ares_qcache.c",
604607
+ "src/lib/ares_query.c",
605608
+ "src/lib/ares_search.c",
606609
+ "src/lib/ares_send.c",
610+
+ "src/lib/ares_set_socket_functions.c",
607611
+ "src/lib/ares_setup.h",
612+
+ "src/lib/ares_socket.c",
613+
+ "src/lib/ares_socket.h",
614+
+ "src/lib/ares_sortaddrinfo.c",
608615
+ "src/lib/ares_strerror.c",
609616
+ "src/lib/ares_sysconfig.c",
610617
+ "src/lib/ares_sysconfig_files.c",
618+
+ "src/lib/ares_sysconfig_mac.c",
619+
+ "src/lib/ares_sysconfig_win.c",
611620
+ "src/lib/ares_timeout.c",
612621
+ "src/lib/ares_update_servers.c",
613622
+ "src/lib/ares_version.c",
614-
+ "src/lib/dsa/ares__array.c",
615-
+ "src/lib/dsa/ares__array.h",
616-
+ "src/lib/dsa/ares__htable.c",
617-
+ "src/lib/dsa/ares__htable.h",
618-
+ "src/lib/dsa/ares__htable_asvp.c",
619-
+ "src/lib/dsa/ares__htable_asvp.h",
620-
+ "src/lib/dsa/ares__htable_strvp.c",
621-
+ "src/lib/dsa/ares__htable_strvp.h",
622-
+ "src/lib/dsa/ares__htable_szvp.c",
623-
+ "src/lib/dsa/ares__htable_szvp.h",
624-
+ "src/lib/dsa/ares__htable_vpvp.c",
625-
+ "src/lib/dsa/ares__htable_vpvp.h",
626-
+ "src/lib/dsa/ares__llist.c",
627-
+ "src/lib/dsa/ares__llist.h",
628-
+ "src/lib/dsa/ares__slist.c",
629-
+ "src/lib/dsa/ares__slist.h",
623+
+ "src/lib/dsa/ares_array.c",
624+
+ "src/lib/dsa/ares_htable.c",
625+
+ "src/lib/dsa/ares_htable.h",
626+
+ "src/lib/dsa/ares_htable_asvp.c",
627+
+ "src/lib/dsa/ares_htable_dict.c",
628+
+ "src/lib/dsa/ares_htable_strvp.c",
629+
+ "src/lib/dsa/ares_htable_szvp.c",
630+
+ "src/lib/dsa/ares_htable_vpstr.c",
631+
+ "src/lib/dsa/ares_htable_vpvp.c",
632+
+ "src/lib/dsa/ares_llist.c",
633+
+ "src/lib/dsa/ares_slist.c",
634+
+ "src/lib/dsa/ares_slist.h",
630635
+ "src/lib/event/ares_event.h",
631636
+ "src/lib/event/ares_event_configchg.c",
632637
+ "src/lib/event/ares_event_epoll.c",
@@ -637,6 +642,17 @@ index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..7f4885631a85a25692e8969991951be0
637642
+ "src/lib/event/ares_event_wake_pipe.c",
638643
+ "src/lib/event/ares_event_win32.c",
639644
+ "src/lib/event/ares_event_win32.h",
645+
+ "src/lib/include/ares_array.h",
646+
+ "src/lib/include/ares_buf.h",
647+
+ "src/lib/include/ares_htable_asvp.h",
648+
+ "src/lib/include/ares_htable_dict.h",
649+
+ "src/lib/include/ares_htable_strvp.h",
650+
+ "src/lib/include/ares_htable_szvp.h",
651+
+ "src/lib/include/ares_htable_vpstr.h",
652+
+ "src/lib/include/ares_htable_vpvp.h",
653+
+ "src/lib/include/ares_llist.h",
654+
+ "src/lib/include/ares_mem.h",
655+
+ "src/lib/include/ares_str.h",
640656
+ "src/lib/inet_net_pton.c",
641657
+ "src/lib/inet_ntop.c",
642658
+ "src/lib/legacy/ares_create_query.c",
@@ -663,23 +679,24 @@ index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..7f4885631a85a25692e8969991951be0
663679
+ "src/lib/record/ares_dns_private.h",
664680
+ "src/lib/record/ares_dns_record.c",
665681
+ "src/lib/record/ares_dns_write.c",
666-
+ "src/lib/str/ares__buf.c",
667-
+ "src/lib/str/ares__buf.h",
682+
+ "src/lib/str/ares_buf.c",
668683
+ "src/lib/str/ares_str.c",
669-
+ "src/lib/str/ares_str.h",
670-
+ "src/lib/str/ares_strcasecmp.c",
671-
+ "src/lib/str/ares_strcasecmp.h",
672684
+ "src/lib/str/ares_strsplit.c",
673685
+ "src/lib/str/ares_strsplit.h",
674-
+ "src/lib/util/ares__iface_ips.c",
675-
+ "src/lib/util/ares__iface_ips.h",
676-
+ "src/lib/util/ares__threads.c",
677-
+ "src/lib/util/ares__threads.h",
678-
+ "src/lib/util/ares__timeval.c",
686+
+ "src/lib/thirdparty/apple/dnsinfo.h",
687+
+ "src/lib/util/ares_iface_ips.c",
688+
+ "src/lib/util/ares_iface_ips.h",
679689
+ "src/lib/util/ares_math.c",
690+
+ "src/lib/util/ares_math.h",
680691
+ "src/lib/util/ares_rand.c",
681-
+ "src/tools/ares_getopt.c",
682-
+ "src/tools/ares_getopt.h",
692+
+ "src/lib/util/ares_rand.h",
693+
+ "src/lib/util/ares_threads.c",
694+
+ "src/lib/util/ares_threads.h",
695+
+ "src/lib/util/ares_time.h",
696+
+ "src/lib/util/ares_timeval.c",
697+
+ "src/lib/util/ares_uri.c",
698+
+ "src/lib/util/ares_uri.h",
699+
+ "src/lib/windows_port.c",
683700
+ ]
684701
+
685702
+ if (!is_win) {

0 commit comments

Comments
 (0)