Merge branch 'rightlib' into mergelibs-241019-1758

1 files changed, 67 insertions, 50 deletions

diff --git a/contrib/libs/c-ares/.yandex_meta/devtools.copyrights.report b/contrib/libs/c-ares/.yandex_meta/devtools.copyrights.report
index 79b26c01c2..f1eed72db1 100644
--- a/contrib/libs/c-ares/.yandex_meta/devtools.copyrights.report
+++ b/contrib/libs/c-ares/.yandex_meta/devtools.copyrights.report
@@ -55,8 +55,9 @@ BELONGS ya.make
         include/ares.h [3:4]
         include/ares_dns.h [3:4]
         include/ares_nameser.h [3:4]
-        src/lib/ares__addrinfo_localhost.c [3:4]
-        src/lib/ares__socket.c [3:4]
+        src/lib/ares_addrinfo_localhost.c [3:4]
+        src/lib/ares_conn.c [3:4]
+        src/lib/ares_socket.c [3:4]
 
 KEEP     COPYRIGHT_SERVICE_LABEL 169a51bc2a181587c3cadfcf8c1d7365
 BELONGS ya.make
@@ -70,6 +71,17 @@ BELONGS ya.make
     Files with this license:
         src/lib/inet_net_pton.c [2:3]
 
+KEEP     COPYRIGHT_SERVICE_LABEL 1c99eb644d88ff8097bfa9bdd8e99c78
+BELONGS ya.make
+    License text:
+         * Copyright (c) 2024 Brad house
+    Scancode info:
+        Original SPDX id: COPYRIGHT_SERVICE_LABEL
+        Score           : 100.00
+        Match type      : COPYRIGHT
+    Files with this license:
+        src/lib/util/ares_uri.c [3:3]
+
 KEEP     COPYRIGHT_SERVICE_LABEL 39576df1509c67e327ee115665da4bfb
 BELONGS ya.make
     License text:
@@ -118,23 +130,24 @@ BELONGS ya.make
         Match type      : COPYRIGHT
     Files with this license:
         include/ares_dns_record.h [3:3]
-        src/lib/ares__hosts_file.c [3:3]
-        src/lib/ares__parse_into_addrinfo.c [3:4]
+        src/lib/ares_hosts_file.c [3:3]
+        src/lib/ares_parse_into_addrinfo.c [3:4]
         src/lib/ares_qcache.c [3:3]
         src/lib/ares_update_servers.c [3:5]
-        src/lib/dsa/ares__htable.c [3:3]
-        src/lib/dsa/ares__htable.h [3:3]
-        src/lib/dsa/ares__htable_asvp.c [3:3]
-        src/lib/dsa/ares__htable_asvp.h [3:3]
-        src/lib/dsa/ares__htable_strvp.c [3:3]
-        src/lib/dsa/ares__htable_strvp.h [3:3]
-        src/lib/dsa/ares__htable_szvp.c [3:3]
-        src/lib/dsa/ares__htable_szvp.h [3:3]
-        src/lib/dsa/ares__llist.c [3:3]
-        src/lib/dsa/ares__llist.h [3:3]
-        src/lib/dsa/ares__slist.c [3:3]
-        src/lib/dsa/ares__slist.h [3:3]
+        src/lib/dsa/ares_htable.c [3:3]
+        src/lib/dsa/ares_htable.h [3:3]
+        src/lib/dsa/ares_htable_asvp.c [3:3]
+        src/lib/dsa/ares_htable_strvp.c [3:3]
+        src/lib/dsa/ares_htable_szvp.c [3:3]
+        src/lib/dsa/ares_llist.c [3:3]
+        src/lib/dsa/ares_slist.c [3:3]
+        src/lib/dsa/ares_slist.h [3:3]
         src/lib/event/ares_event.h [3:3]
+        src/lib/include/ares_buf.h [3:3]
+        src/lib/include/ares_htable_asvp.h [3:3]
+        src/lib/include/ares_htable_strvp.h [3:3]
+        src/lib/include/ares_htable_szvp.h [3:3]
+        src/lib/include/ares_llist.h [3:3]
         src/lib/legacy/ares_create_query.c [3:3]
         src/lib/legacy/ares_parse_caa_reply.c [3:3]
         src/lib/legacy/ares_parse_mx_reply.c [3:3]
@@ -151,14 +164,13 @@ BELONGS ya.make
         src/lib/record/ares_dns_private.h [3:3]
         src/lib/record/ares_dns_record.c [3:3]
         src/lib/record/ares_dns_write.c [3:3]
-        src/lib/str/ares__buf.c [3:3]
-        src/lib/str/ares__buf.h [3:3]
-        src/lib/util/ares__iface_ips.c [3:3]
-        src/lib/util/ares__iface_ips.h [3:3]
-        src/lib/util/ares__threads.c [3:3]
-        src/lib/util/ares__threads.h [3:3]
+        src/lib/str/ares_buf.c [3:3]
+        src/lib/util/ares_iface_ips.c [3:3]
+        src/lib/util/ares_iface_ips.h [3:3]
         src/lib/util/ares_math.c [3:3]
         src/lib/util/ares_rand.c [3:3]
+        src/lib/util/ares_threads.c [3:3]
+        src/lib/util/ares_threads.h [3:3]
 
 KEEP     COPYRIGHT_SERVICE_LABEL 581a26659693b3672712a294efb19777
 BELONGS ya.make
@@ -174,7 +186,7 @@ BELONGS ya.make
 
 KEEP     COPYRIGHT_SERVICE_LABEL 59a5d4a5ee570c05deb62c0668f64397
 BELONGS ya.make
-FILE_INCLUDE AUTHORS found in files: LICENSE.md at line 4, src/lib/ares__addrinfo2hostent.c at line 4, src/lib/ares__close_sockets.c at line 4, src/lib/ares_destroy.c at line 4, src/lib/ares_free_hostent.c at line 4, src/lib/ares_freeaddrinfo.c at line 4, src/lib/ares_getenv.c at line 4, src/lib/ares_getenv.h at line 4, src/lib/ares_gethostbyaddr.c at line 4, src/lib/ares_init.c at line 4, src/lib/ares_library_init.c at line 4, src/lib/ares_options.c at line 4, src/lib/ares_platform.c at line 4, src/lib/ares_platform.h at line 4, src/lib/ares_private.h at line 4, src/lib/ares_process.c at line 4, src/lib/ares_query.c at line 4, src/lib/ares_search.c at line 4, src/lib/ares_send.c at line 4, src/lib/ares_strerror.c at line 4, src/lib/ares_sysconfig.c at line 4, src/lib/ares_sysconfig_files.c at line 4, src/lib/ares_sysconfig_win.c at line 4, src/lib/ares_timeout.c at line 4, src/lib/ares_update_servers.c at line 4, src/lib/ares_version.c at line 4, src/lib/legacy/ares_expand_string.c at line 4, src/lib/legacy/ares_fds.c at line 4, src/lib/legacy/ares_parse_a_reply.c at line 4, src/lib/legacy/ares_parse_aaaa_reply.c at line 4, src/lib/str/ares_str.c at line 4, src/lib/str/ares_str.h at line 4, src/lib/str/ares_strcasecmp.c at line 4, src/lib/str/ares_strcasecmp.h at line 4, src/lib/windows_port.c at line 4
+FILE_INCLUDE AUTHORS found in files: LICENSE.md at line 4, src/lib/ares_addrinfo2hostent.c at line 4, src/lib/ares_close_sockets.c at line 4, src/lib/ares_destroy.c at line 4, src/lib/ares_free_hostent.c at line 4, src/lib/ares_freeaddrinfo.c at line 4, src/lib/ares_getenv.c at line 4, src/lib/ares_getenv.h at line 4, src/lib/ares_gethostbyaddr.c at line 4, src/lib/ares_init.c at line 4, src/lib/ares_library_init.c at line 4, src/lib/ares_options.c at line 4, src/lib/ares_private.h at line 4, src/lib/ares_process.c at line 4, src/lib/ares_query.c at line 4, src/lib/ares_search.c at line 4, src/lib/ares_send.c at line 4, src/lib/ares_strerror.c at line 4, src/lib/ares_sysconfig.c at line 4, src/lib/ares_sysconfig_files.c at line 4, src/lib/ares_sysconfig_win.c at line 4, src/lib/ares_timeout.c at line 4, src/lib/ares_update_servers.c at line 4, src/lib/ares_version.c at line 4, src/lib/include/ares_str.h at line 4, src/lib/legacy/ares_expand_string.c at line 4, src/lib/legacy/ares_fds.c at line 4, src/lib/legacy/ares_parse_a_reply.c at line 4, src/lib/legacy/ares_parse_aaaa_reply.c at line 4, src/lib/str/ares_str.c at line 4, src/lib/windows_port.c at line 4
     License text:
         Copyright (c) 1998 Massachusetts Institute of Technology  
         Copyright (c) 2007 - 2023 Daniel Stenberg with many contributors, see AUTHORS
@@ -185,8 +197,8 @@ FILE_INCLUDE AUTHORS found in files: LICENSE.md at line 4, src/lib/ares__addrinf
         Match type      : COPYRIGHT
     Files with this license:
         LICENSE.md [3:5]
-        src/lib/ares__addrinfo2hostent.c [3:6]
-        src/lib/ares__close_sockets.c [3:4]
+        src/lib/ares_addrinfo2hostent.c [3:6]
+        src/lib/ares_close_sockets.c [3:4]
         src/lib/ares_destroy.c [3:4]
         src/lib/ares_free_hostent.c [3:4]
         src/lib/ares_freeaddrinfo.c [3:4]
@@ -196,8 +208,6 @@ FILE_INCLUDE AUTHORS found in files: LICENSE.md at line 4, src/lib/ares__addrinf
         src/lib/ares_init.c [3:4]
         src/lib/ares_library_init.c [3:4]
         src/lib/ares_options.c [3:4]
-        src/lib/ares_platform.c [3:4]
-        src/lib/ares_platform.h [3:4]
         src/lib/ares_private.h [3:4]
         src/lib/ares_process.c [3:4]
         src/lib/ares_query.c [3:4]
@@ -210,14 +220,12 @@ FILE_INCLUDE AUTHORS found in files: LICENSE.md at line 4, src/lib/ares__addrinf
         src/lib/ares_timeout.c [3:4]
         src/lib/ares_update_servers.c [3:5]
         src/lib/ares_version.c [3:4]
+        src/lib/include/ares_str.h [3:4]
         src/lib/legacy/ares_expand_string.c [3:4]
         src/lib/legacy/ares_fds.c [3:4]
         src/lib/legacy/ares_parse_a_reply.c [3:4]
         src/lib/legacy/ares_parse_aaaa_reply.c [3:5]
         src/lib/str/ares_str.c [3:4]
-        src/lib/str/ares_str.h [3:4]
-        src/lib/str/ares_strcasecmp.c [3:4]
-        src/lib/str/ares_strcasecmp.h [3:4]
         src/lib/windows_port.c [3:4]
 
 KEEP     COPYRIGHT_SERVICE_LABEL 6c49b190fc96e32ee1e8f2ea59984e79
@@ -258,7 +266,7 @@ BELONGS ya.make
         Score           : 100.00
         Match type      : COPYRIGHT
     Files with this license:
-        src/lib/ares__sortaddrinfo.c [7:10]
+        src/lib/ares_sortaddrinfo.c [7:10]
 
 KEEP     COPYRIGHT_SERVICE_LABEL 78db66be56803e72faf0c0319b5841bb
 BELONGS ya.make
@@ -272,7 +280,7 @@ BELONGS ya.make
         Score           : 100.00
         Match type      : COPYRIGHT
     Files with this license:
-        src/lib/ares__sortaddrinfo.c [7:10]
+        src/lib/ares_sortaddrinfo.c [7:10]
 
 KEEP     COPYRIGHT_SERVICE_LABEL 85865ce667770443f065d82a66073a8b
 BELONGS ya.make
@@ -286,7 +294,7 @@ BELONGS ya.make
     Files with this license:
         src/lib/ares_options.c [3:4]
         src/lib/ares_update_servers.c [3:5]
-        src/lib/util/ares__timeval.c [3:3]
+        src/lib/util/ares_timeval.c [3:3]
 
 KEEP     COPYRIGHT_SERVICE_LABEL 960dbf90fade4be8db2ae541b9662785
 BELONGS ya.make
@@ -326,7 +334,7 @@ BELONGS ya.make
         include/ares.h [3:4]
         include/ares_nameser.h [3:4]
         include/ares_version.h [3:3]
-        src/lib/ares__addrinfo_localhost.c [3:4]
+        src/lib/ares_addrinfo_localhost.c [3:4]
         src/lib/windows_port.c [3:4]
 
 KEEP     COPYRIGHT_SERVICE_LABEL a9fd87d904be8e622d0a1f64972520b3
@@ -364,7 +372,7 @@ BELONGS ya.make
         Score           : 100.00
         Match type      : COPYRIGHT
     Files with this license:
-        src/lib/ares__addrinfo2hostent.c [3:6]
+        src/lib/ares_addrinfo2hostent.c [3:6]
 
 KEEP     COPYRIGHT_SERVICE_LABEL b631dfa8a965ca744a170d01122adde3
 BELONGS ya.make
@@ -378,11 +386,11 @@ BELONGS ya.make
         Score           : 100.00
         Match type      : COPYRIGHT
     Files with this license:
-        src/lib/ares__addrinfo2hostent.c [3:6]
-        src/lib/ares__parse_into_addrinfo.c [3:4]
-        src/lib/ares__sortaddrinfo.c [7:10]
+        src/lib/ares_addrinfo2hostent.c [3:6]
         src/lib/ares_freeaddrinfo.c [3:4]
         src/lib/ares_getaddrinfo.c [3:5]
+        src/lib/ares_parse_into_addrinfo.c [3:4]
+        src/lib/ares_sortaddrinfo.c [7:10]
         src/lib/legacy/ares_parse_a_reply.c [3:4]
         src/lib/legacy/ares_parse_aaaa_reply.c [3:5]
 
@@ -418,12 +426,15 @@ BELONGS ya.make
         Score           : 100.00
         Match type      : COPYRIGHT
     Files with this license:
+        src/lib/ares_conn.h [3:3]
         src/lib/ares_cookie.c [3:3]
         src/lib/ares_metrics.c [3:3]
-        src/lib/dsa/ares__array.c [3:3]
-        src/lib/dsa/ares__array.h [3:3]
-        src/lib/dsa/ares__htable_vpvp.c [3:3]
-        src/lib/dsa/ares__htable_vpvp.h [3:3]
+        src/lib/ares_set_socket_functions.c [3:3]
+        src/lib/ares_socket.h [3:3]
+        src/lib/dsa/ares_array.c [3:3]
+        src/lib/dsa/ares_htable_dict.c [3:3]
+        src/lib/dsa/ares_htable_vpstr.c [3:3]
+        src/lib/dsa/ares_htable_vpvp.c [3:3]
         src/lib/event/ares_event_configchg.c [3:3]
         src/lib/event/ares_event_epoll.c [3:3]
         src/lib/event/ares_event_kqueue.c [3:3]
@@ -433,8 +444,16 @@ BELONGS ya.make
         src/lib/event/ares_event_wake_pipe.c [3:3]
         src/lib/event/ares_event_win32.c [3:3]
         src/lib/event/ares_event_win32.h [3:3]
+        src/lib/include/ares_array.h [3:3]
+        src/lib/include/ares_htable_dict.h [3:3]
+        src/lib/include/ares_htable_vpstr.h [3:3]
+        src/lib/include/ares_htable_vpvp.h [3:3]
         src/lib/record/ares_dns_multistring.c [3:3]
         src/lib/record/ares_dns_multistring.h [3:3]
+        src/lib/util/ares_math.h [3:3]
+        src/lib/util/ares_rand.h [3:3]
+        src/lib/util/ares_time.h [3:3]
+        src/lib/util/ares_uri.h [3:3]
 
 KEEP     COPYRIGHT_SERVICE_LABEL ce0977756b380247a8bc4bd331fcaee5
 BELONGS ya.make
@@ -448,7 +467,7 @@ BELONGS ya.make
         Score           : 100.00
         Match type      : COPYRIGHT
     Files with this license:
-        src/lib/ares__addrinfo2hostent.c [3:6]
+        src/lib/ares_addrinfo2hostent.c [3:6]
         src/lib/ares_ipv6.h [3:3]
         src/lib/legacy/ares_parse_aaaa_reply.c [3:5]
 
@@ -464,8 +483,6 @@ BELONGS ya.make
         src/lib/ares_cancel.c [3:3]
         src/lib/ares_destroy.c [3:4]
         src/lib/ares_library_init.c [3:4]
-        src/lib/ares_platform.c [3:4]
-        src/lib/ares_platform.h [3:4]
         src/lib/ares_setup.h [3:3]
         src/lib/config-win32.h [3:3]
 
@@ -518,11 +535,11 @@ BELONGS ya.make
         include/ares_build-ios.h [4:5]
         include/ares_build-linux.h [4:5]
         include/ares_dns.h [3:4]
-        src/lib/ares__close_sockets.c [3:4]
-        src/lib/ares__socket.c [3:4]
+        src/lib/ares_close_sockets.c [3:4]
         src/lib/ares_config-android.h [1:2]
         src/lib/ares_config-linux.h [1:2]
         src/lib/ares_config-osx.h [1:2]
+        src/lib/ares_conn.c [3:4]
         src/lib/ares_free_hostent.c [3:4]
         src/lib/ares_free_string.c [3:4]
         src/lib/ares_getenv.c [3:4]
@@ -532,16 +549,16 @@ BELONGS ya.make
         src/lib/ares_query.c [3:4]
         src/lib/ares_search.c [3:4]
         src/lib/ares_send.c [3:4]
+        src/lib/ares_socket.c [3:4]
         src/lib/ares_strerror.c [3:4]
         src/lib/ares_timeout.c [3:4]
         src/lib/ares_version.c [3:4]
+        src/lib/include/ares_mem.h [3:3]
+        src/lib/include/ares_str.h [3:4]
         src/lib/legacy/ares_expand_name.c [3:4]
         src/lib/legacy/ares_expand_string.c [3:4]
         src/lib/legacy/ares_fds.c [3:4]
         src/lib/str/ares_str.c [3:4]
-        src/lib/str/ares_str.h [3:4]
-        src/lib/str/ares_strcasecmp.c [3:4]
-        src/lib/str/ares_strcasecmp.h [3:4]
 
 KEEP     COPYRIGHT_SERVICE_LABEL fad8fe46bbe1d4c48e0cc175486c8a47
 BELONGS ya.make