Skip to content

Commit db6aba1

Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update c-ares to v1.34.4
PR-URL: #56256 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
1 parent 445c8c7 commit db6aba1

40 files changed

+1099
-588
lines changed

‎deps/cares/CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright (C) The c-ares project and its contributors
22
# SPDX-License-Identifier: MIT
3-
CMAKE_MINIMUM_REQUIRED (VERSION 3.5.0)
3+
CMAKE_MINIMUM_REQUIRED (VERSION 3.5.0...3.10.0)
44

55
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
66

@@ -12,7 +12,7 @@ INCLUDE (CheckCSourceCompiles)
1212
INCLUDE (CheckStructHasMember)
1313
INCLUDE (CheckLibraryExists)
1414

15-
PROJECT (c-ares LANGUAGES C VERSION "1.34.3" )
15+
PROJECT (c-ares LANGUAGES C VERSION "1.34.4" )
1616

1717
# Set this version before release
1818
SET (CARES_VERSION "${PROJECT_VERSION}")
@@ -30,7 +30,7 @@ INCLUDE (GNUInstallDirs) # include this *AFTER* PROJECT(), otherwise paths are w
3030
# For example, a version of 4:0:2 would generate output such as:
3131
# libname.so -> libname.so.2
3232
# libname.so.2 -> libname.so.2.2.0
33-
SET (CARES_LIB_VERSIONINFO "21:2:19")
33+
SET (CARES_LIB_VERSIONINFO "21:3:19")
3434

3535

3636
OPTION (CARES_STATIC "Build as a static library" OFF)
@@ -271,6 +271,8 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "AIX")
271271
LIST (APPEND SYSFLAGS -D_ALL_SOURCE -D_XOPEN_SOURCE=700 -D_USE_IRS)
272272
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
273273
# Don't define _XOPEN_SOURCE on FreeBSD, it actually reduces visibility instead of increasing it
274+
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "QNX")
275+
LIST (APPEND SYSFLAGS -D_QNX_SOURCE)
274276
ELSEIF (WIN32)
275277
LIST (APPEND SYSFLAGS -DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_WIN32_WINNT=0x0602)
276278
ENDIF ()
@@ -406,6 +408,7 @@ ENDIF ()
406408

407409
CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6" sin6_scope_id "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID LANGUAGE C)
408410

411+
CHECK_SYMBOL_EXISTS (strnlen "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_STRNLEN)
409412
CHECK_SYMBOL_EXISTS (memmem "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_MEMMEM)
410413
CHECK_SYMBOL_EXISTS (closesocket "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CLOSESOCKET)
411414
CHECK_SYMBOL_EXISTS (CloseSocket "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CLOSESOCKET_CAMEL)

‎deps/cares/Makefile.am

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,24 @@
33
# Copyright (C) the Massachusetts Institute of Technology.
44
# Copyright (C) Daniel Stenberg
55
#
6-
# Permission to use, copy, modify, and distribute this
7-
# software and its documentation for any purpose and without
8-
# fee is hereby granted, provided that the above copyright
9-
# notice appear in all copies and that both that copyright
10-
# notice and this permission notice appear in supporting
11-
# documentation, and that the name of M.I.T. not be used in
12-
# advertising or publicity pertaining to distribution of the
13-
# software without specific, written prior permission.
14-
# M.I.T. makes no representations about the suitability of
15-
# this software for any purpose. It is provided "as is"
16-
# without express or implied warranty.
6+
# Permission is hereby granted, free of charge, to any person obtaining a copy
7+
# of this software and associated documentation files (the "Software"), to deal
8+
# in the Software without restriction, including without limitation the rights
9+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
# copies of the Software, and to permit persons to whom the Software is
11+
# furnished to do so, subject to the following conditions:
12+
#
13+
# The above copyright notice and this permission notice (including the next
14+
# paragraph) shall be included in all copies or substantial portions of the
15+
# Software.
16+
#
17+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
23+
# SOFTWARE.
1724
#
1825
# SPDX-License-Identifier: MIT
1926
#

‎deps/cares/Makefile.in

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,24 @@
1919
# Copyright (C) the Massachusetts Institute of Technology.
2020
# Copyright (C) Daniel Stenberg
2121
#
22-
# Permission to use, copy, modify, and distribute this
23-
# software and its documentation for any purpose and without
24-
# fee is hereby granted, provided that the above copyright
25-
# notice appear in all copies and that both that copyright
26-
# notice and this permission notice appear in supporting
27-
# documentation, and that the name of M.I.T. not be used in
28-
# advertising or publicity pertaining to distribution of the
29-
# software without specific, written prior permission.
30-
# M.I.T. makes no representations about the suitability of
31-
# this software for any purpose. It is provided "as is"
32-
# without express or implied warranty.
22+
# Permission is hereby granted, free of charge, to any person obtaining a copy
23+
# of this software and associated documentation files (the "Software"), to deal
24+
# in the Software without restriction, including without limitation the rights
25+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
26+
# copies of the Software, and to permit persons to whom the Software is
27+
# furnished to do so, subject to the following conditions:
28+
#
29+
# The above copyright notice and this permission notice (including the next
30+
# paragraph) shall be included in all copies or substantial portions of the
31+
# Software.
32+
#
33+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
# SOFTWARE.
3340
#
3441
# SPDX-License-Identifier: MIT
3542
#
@@ -111,7 +118,9 @@ build_triplet = @build@
111118
host_triplet = @host@
112119
subdir = .
113120
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
114-
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_ac_append_to_file.m4 \
121+
am__aclocal_m4_deps = $(top_srcdir)/m4/ares_check_user_namespace.m4 \
122+
$(top_srcdir)/m4/ares_check_uts_namespace.m4 \
123+
$(top_srcdir)/m4/ax_ac_append_to_file.m4 \
115124
$(top_srcdir)/m4/ax_ac_print_to_file.m4 \
116125
$(top_srcdir)/m4/ax_add_am_macro_static.m4 \
117126
$(top_srcdir)/m4/ax_am_macros_static.m4 \
@@ -121,8 +130,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_ac_append_to_file.m4 \
121130
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
122131
$(top_srcdir)/m4/ax_check_gnu_make.m4 \
123132
$(top_srcdir)/m4/ax_check_link_flag.m4 \
124-
$(top_srcdir)/m4/ax_check_user_namespace.m4 \
125-
$(top_srcdir)/m4/ax_check_uts_namespace.m4 \
126133
$(top_srcdir)/m4/ax_code_coverage.m4 \
127134
$(top_srcdir)/m4/ax_compiler_vendor.m4 \
128135
$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \

‎deps/cares/Makefile.msvc

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11

22
# Copyright (C) 2009-2013 by Daniel Stenberg
33
#
4-
# Permission to use, copy, modify, and distribute this
5-
# software and its documentation for any purpose and without
6-
# fee is hereby granted, provided that the above copyright
7-
# notice appear in all copies and that both that copyright
8-
# notice and this permission notice appear in supporting
9-
# documentation, and that the name of M.I.T. not be used in
10-
# advertising or publicity pertaining to distribution of the
11-
# software without specific, written prior permission.
12-
# M.I.T. makes no representations about the suitability of
13-
# this software for any purpose. It is provided "as is"
14-
# without express or implied warranty.
4+
# Permission is hereby granted, free of charge, to any person obtaining a copy
5+
# of this software and associated documentation files (the "Software"), to deal
6+
# in the Software without restriction, including without limitation the rights
7+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
# copies of the Software, and to permit persons to whom the Software is
9+
# furnished to do so, subject to the following conditions:
10+
#
11+
# The above copyright notice and this permission notice (including the next
12+
# paragraph) shall be included in all copies or substantial portions of the
13+
# Software.
14+
#
15+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
# SOFTWARE.
1522
#
1623
# SPDX-License-Identifier: MIT
1724

‎deps/cares/RELEASE-NOTES.md

Lines changed: 14 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,25 @@
1-
## c-ares version 1.34.3 - November 9 2024
1+
## c-ares version 1.34.4 - December 14 2024
22

33
This is a bugfix release.
44

55
Changes:
6-
* Build the release package in an automated way so we can provide
7-
provenance as per [SLSA3](https://slsa.dev/).
8-
[PR #906](https://github.com/c-ares/c-ares/pull/906)
6+
* QNX Port: Port to QNX 8, add primary config reading support, add CI build. [PR #934](https://github.com/c-ares/c-ares/pull/934), [PR #937](https://github.com/c-ares/c-ares/pull/937), [PR #938](https://github.com/c-ares/c-ares/pull/938)
97

108
Bugfixes:
11-
* Some upstream servers are non-compliant with EDNS options, resend queries
12-
without EDNS. [Issue #911](https://github.com/c-ares/c-ares/issues/911)
13-
* Android: <=7 needs sys/system_properties.h
14-
[a70637c](https://github.com/c-ares/c-ares/commit/a70637c)
15-
* Android: CMake needs `-D_GNU_SOURCE` and others.
16-
[PR #915](https://github.com/c-ares/c-ares/pull/914)
17-
* TSAN warns on missing lock, but lock isn't actually necessary.
18-
[PR #915](https://github.com/c-ares/c-ares/pull/915)
19-
* `ares_getaddrinfo()` for `AF_UNSPEC` should retry IPv4 if only IPv6 is
20-
received. [765d558](https://github.com/c-ares/c-ares/commit/765d558)
21-
* `ares_send()` shouldn't return `ARES_EBADRESP`, its `ARES_EBADQUERY`.
22-
[91519e7](https://github.com/c-ares/c-ares/commit/91519e7)
23-
* Fix typos in man pages. [PR #905](https://github.com/c-ares/c-ares/pull/905)
9+
* Empty TXT records were not being preserved. [PR #922](https://github.com/c-ares/c-ares/pull/922)
10+
* docs: update deprecation notices for `ares_create_query()` and `ares_mkquery()`. [PR #910](https://github.com/c-ares/c-ares/pull/910)
11+
* license: some files weren't properly updated. [PR #920](https://github.com/c-ares/c-ares/pull/920)
12+
* Fix bind local device regression from 1.34.0. [PR #929](https://github.com/c-ares/c-ares/pull/929), [PR #931](https://github.com/c-ares/c-ares/pull/931), [PR #935](https://github.com/c-ares/c-ares/pull/935)
13+
* CMake: set policy version to prevent deprecation warnings. [PR #932](https://github.com/c-ares/c-ares/pull/932)
14+
* CMake: shared and static library names should be the same on unix platforms like autotools uses. [PR #933](https://github.com/c-ares/c-ares/pull/933)
15+
* Update to latest autoconf archive macros for enhanced system compatibility. [PR #936](https://github.com/c-ares/c-ares/pull/936)
2416

2517
Thanks go to these friendly people for their efforts and contributions for this
2618
release:
2719

2820
* Brad House (@bradh352)
29-
* Jiwoo Park (@jimmy-park)
30-
31-
32-
## c-ares version 1.34.2 - October 15 2024
33-
34-
This release contains a fix for downstream packages detecting the c-ares
35-
version based on the contents of the header file rather than the
36-
distributed pkgconf or cmake files.
37-
38-
## c-ares version 1.34.1 - October 9 2024
39-
40-
This release fixes a packaging issue.
41-
42-
43-
## c-ares version 1.34.0 - October 9 2024
44-
45-
This is a feature and bugfix release.
46-
47-
Features:
48-
* adig: read arguments from adigrc.
49-
[PR #856](https://github.com/c-ares/c-ares/pull/856)
50-
* Add new pending write callback optimization via `ares_set_pending_write_cb`.
51-
[PR #857](https://github.com/c-ares/c-ares/pull/857)
52-
* New function `ares_process_fds()`.
53-
[PR #875](https://github.com/c-ares/c-ares/pull/875)
54-
* Failed servers should be probed rather than redirecting queries which could
55-
cause unexpected latency.
56-
[PR #877](https://github.com/c-ares/c-ares/pull/877)
57-
* adig: rework command line arguments to mimic dig from bind.
58-
[PR #890](https://github.com/c-ares/c-ares/pull/890)
59-
* Add new method for overriding network functions
60-
`ares_set_socket_function_ex()` to properly support all new functionality.
61-
[PR #894](https://github.com/c-ares/c-ares/pull/894)
62-
* Fix regression with custom socket callbacks due to DNS cookie support.
63-
[PR #895](https://github.com/c-ares/c-ares/pull/895)
64-
* ares_socket: set IP_BIND_ADDRESS_NO_PORT on ares_set_local_ip* tcp sockets
65-
[PR #887](https://github.com/c-ares/c-ares/pull/887)
66-
* URI parser/writer for ares_set_servers_csv()/ares_get_servers_csv().
67-
[PR #882](https://github.com/c-ares/c-ares/pull/882)
68-
69-
Changes:
70-
* Connection handling modularization.
71-
[PR #857](https://github.com/c-ares/c-ares/pull/857),
72-
[PR #876](https://github.com/c-ares/c-ares/pull/876)
73-
* Expose library/utility functions to tools.
74-
[PR #860](https://github.com/c-ares/c-ares/pull/860)
75-
* Remove `ares__` prefix, just use `ares_` for internal functions.
76-
[PR #872](https://github.com/c-ares/c-ares/pull/872)
77-
78-
79-
Bugfixes:
80-
* fix: potential WIN32_LEAN_AND_MEAN redefinition.
81-
[PR #869](https://github.com/c-ares/c-ares/pull/869)
82-
* Fix googletest v1.15 compatibility.
83-
[PR #874](https://github.com/c-ares/c-ares/pull/874)
84-
* Fix pkgconfig thread dependencies.
85-
[PR #884](https://github.com/c-ares/c-ares/pull/884)
86-
87-
88-
Thanks go to these friendly people for their efforts and contributions for this
89-
release:
90-
91-
* Brad House (@bradh352)
92-
* Cristian Rodríguez (@crrodriguez)
93-
* Georg (@tacerus)
94-
* @lifenjoiner
95-
* Shelley Vohr (@codebytere)
96-
* 前进，前进，进 (@leleliu008)
97-
21+
* Daniel Stenberg (@bagder)
22+
* Gregor Jasny (@gjasny)
23+
* @marcovsz
24+
* Nikolaos Chatzikonstantinou (@createyourpersonalaccount)
25+
* @vlasovsoft1979

‎deps/cares/aclocal.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,6 +1221,8 @@ AC_SUBST([am__tar])
12211221
AC_SUBST([am__untar])
12221222
]) # _AM_PROG_TAR
12231223

1224+
m4_include([m4/ares_check_user_namespace.m4])
1225+
m4_include([m4/ares_check_uts_namespace.m4])
12241226
m4_include([m4/ax_ac_append_to_file.m4])
12251227
m4_include([m4/ax_ac_print_to_file.m4])
12261228
m4_include([m4/ax_add_am_macro_static.m4])
@@ -1231,8 +1233,6 @@ m4_include([m4/ax_append_link_flags.m4])
12311233
m4_include([m4/ax_check_compile_flag.m4])
12321234
m4_include([m4/ax_check_gnu_make.m4])
12331235
m4_include([m4/ax_check_link_flag.m4])
1234-
m4_include([m4/ax_check_user_namespace.m4])
1235-
m4_include([m4/ax_check_uts_namespace.m4])
12361236
m4_include([m4/ax_code_coverage.m4])
12371237
m4_include([m4/ax_compiler_vendor.m4])
12381238
m4_include([m4/ax_cxx_compile_stdcxx.m4])

‎deps/cares/aminclude_static.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
# aminclude_static.am generated automatically by Autoconf
3-
# from AX_AM_MACROS_STATIC on Sat Nov 9 17:40:37 UTC 2024
3+
# from AX_AM_MACROS_STATIC on Sat Dec 14 15:15:44 UTC 2024
44

55

66
# Code coverage
@@ -66,7 +66,7 @@ code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY))
6666
code_coverage_v_lcov_cap_0 = @echo " LCOV --capture" $(CODE_COVERAGE_OUTPUT_FILE);
6767
code_coverage_v_lcov_ign = $(code_coverage_v_lcov_ign_$(V))
6868
code_coverage_v_lcov_ign_ = $(code_coverage_v_lcov_ign_$(AM_DEFAULT_VERBOSITY))
69-
code_coverage_v_lcov_ign_0 = @echo " LCOV --remove /tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN);
69+
code_coverage_v_lcov_ign_0 = @echo " LCOV --remove" "$(CODE_COVERAGE_OUTPUT_FILE).tmp" $(CODE_COVERAGE_IGNORE_PATTERN);
7070
code_coverage_v_genhtml = $(code_coverage_v_genhtml_$(V))
7171
code_coverage_v_genhtml_ = $(code_coverage_v_genhtml_$(AM_DEFAULT_VERBOSITY))
7272
code_coverage_v_genhtml_0 = @echo " GEN " "$(CODE_COVERAGE_OUTPUT_DIRECTORY)";
@@ -85,7 +85,7 @@ check-code-coverage:
8585
# Capture code coverage data
8686
code-coverage-capture: code-coverage-capture-hook
8787
$(code_coverage_v_lcov_cap)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(call code_coverage_sanitize,$(PACKAGE_NAME)-$(PACKAGE_VERSION))" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_OPTIONS)
88-
$(code_coverage_v_lcov_ign)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_RMOPTS)
88+
$(code_coverage_v_lcov_ign)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_RMOPTS)
8989
-@rm -f "$(CODE_COVERAGE_OUTPUT_FILE).tmp"
9090
$(code_coverage_v_genhtml)LANG=C $(GENHTML) $(code_coverage_quiet) $(addprefix --prefix ,$(CODE_COVERAGE_DIRECTORY)) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS)
9191
@echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy