Skip to content

Commit bf891bf

Browse files
nodejs-github-bottargos
authored andcommitted
deps: update c-ares to v1.30.0
PR-URL: #53416 Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com>
1 parent fe85e05 commit bf891bf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+2709
-25185
lines changed

deps/cares/CHANGES

+5-6,482
Large diffs are not rendered by default.

deps/cares/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ INCLUDE (CheckCSourceCompiles)
1212
INCLUDE (CheckStructHasMember)
1313
INCLUDE (CheckLibraryExists)
1414

15-
PROJECT (c-ares LANGUAGES C VERSION "1.29.0" )
15+
PROJECT (c-ares LANGUAGES C VERSION "1.30.0" )
1616

1717
# Set this version before release
18-
SET (CARES_VERSION "1.29.0")
18+
SET (CARES_VERSION "${PROJECT_VERSION}")
1919

2020
INCLUDE (GNUInstallDirs) # include this *AFTER* PROJECT(), otherwise paths are wrong.
2121

@@ -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 "16:0:14")
33+
SET (CARES_LIB_VERSIONINFO "17:0:15")
3434

3535

3636
OPTION (CARES_STATIC "Build as a static library" OFF)

deps/cares/CONTRIBUTING.md

+2-8
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ Contributing to c-ares
44
To contribute patches to c-ares, please generate a GitHub pull request
55
and follow these guidelines:
66

7-
- Check that the Travis builds are green for your pull request.
7+
- Check that the CI/CD builds are green for your pull request.
88
- Please update the test suite to add a test case for any new functionality.
9-
- Build the library with `./configure --enable-debug --enable-maintainer-mode` and
10-
ensure there are no new warnings.
11-
12-
To improve the chances of the c-ares maintainers responding to your request:
13-
14-
- Also send an email to the mailing list at `c-ares@lists.haxx.se` describing your change.
15-
- To follow any associated discussion, please subscribe to the [mailing list](http://lists.haxx.se/listinfo/c-ares).
9+
- Build the library on your own machine and ensure there are no new warnings.

deps/cares/DEVELOPER-NOTES.md

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
Developer Notes
2+
===============
3+
4+
* The distributed `ares_build.h` in the official release tarballs is only
5+
intended to be used on systems which can also not run the also distributed
6+
`configure` or `CMake` scripts. It is generated as a copy of
7+
`ares_build.h.dist` as can be seen in the code repository.
8+
9+
* If you check out from git on a non-`configure` or `CMake` platform, you must run
10+
the appropriate `buildconf*` script to set up `ares_build.h` and other local
11+
files before being able to compile the library. There are pre-made makefiles
12+
for a subset of such systems such as Watcom, NMake, and MinGW Makefiles.
13+
14+
* On systems capable of running the `configure` or `CMake` scripts, the process
15+
will overwrite the distributed `ares_build.h` file with one that is suitable
16+
and specific to the library being configured and built, this new file is
17+
generated from the `ares_build.h.in` and `ares_build.h.cmake` template files.
18+
19+
* If you intend to distribute an already compiled c-ares library you **MUST**
20+
also distribute along with it the generated `ares_build.h` which has been
21+
used to compile it. Otherwise, the library will be of no use for the users of
22+
the library that you have built. It is **your** responsibility to provide this
23+
file. No one at the c-ares project can know how you have built the library.
24+
The generated file includes platform and configuration dependent info,
25+
and must not be modified by anyone.
26+
27+
* We support both the AutoTools `configure` based build system as well as the
28+
`CMake` build system. Any new code changes must work with both.
29+
30+
* The files that get compiled and are present in the distribution are referenced
31+
in the `Makefile.inc` in the current directory. This file gets included in
32+
every build system supported by c-ares so that the list of files doesn't need
33+
to be maintained per build system. Don't forget to reference new header files
34+
otherwise they won't be included in the official release tarballs.
35+
36+
* We cannot assume anything else but very basic C89 compiler features being
37+
present. The lone exception is the requirement for 64bit integers which is
38+
not a requirement for C89 compilers to support. Please do not use any extended
39+
features released by later standards.
40+
41+
* Newlines must remain unix-style for older compilers' sake.
42+
43+
* Comments must be written in the old-style `/* unnested C-fashion */`
44+
45+
* Try to keep line lengths below 80 columns and formatted as the existing code.
46+
There is a `.clang-format` in the repository that can be used to run the
47+
automated code formatter as such: `clang-format -i */*.c */*.h */*/*.c */*/*.h`

deps/cares/LICENSE.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
MIT License
44

5-
6-
Copyright (c) 1998 Massachusetts Institute of Technology
5+
Copyright (c) 1998 Massachusetts Institute of Technology
76
Copyright (c) 2007 - 2023 Daniel Stenberg with many contributors, see AUTHORS
87
file.
98

deps/cares/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ EXTRA_DIST = AUTHORS CHANGES README.cares $(man_MANS) RELEASE-NOTES.md \
3030
c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf get_ver.awk \
3131
maketgz TODO README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
3232
CMakeLists.txt Makefile.dj Makefile.m32 Makefile.netware Makefile.msvc \
33-
Makefile.Watcom AUTHORS CONTRIBUTING.md SECURITY.md TODO \
33+
Makefile.Watcom AUTHORS CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md TODO \
3434
cmake/EnableWarnings.cmake
3535

3636
CLEANFILES = $(PDFPAGES) $(HTMLPAGES)

deps/cares/Makefile.in

+3-5
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libcares.pc.in \
231231
$(top_srcdir)/config/config.sub \
232232
$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
233233
$(top_srcdir)/config/missing AUTHORS INSTALL.md NEWS README.md \
234-
TODO compile config.guess config.sub config/compile \
235-
config/config.guess config/config.sub config/install-sh \
236-
config/ltmain.sh config/missing depcomp install-sh ltmain.sh \
237-
missing
234+
TODO config/compile config/config.guess config/config.sub \
235+
config/install-sh config/ltmain.sh config/missing
238236
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
239237
distdir = $(PACKAGE)-$(VERSION)
240238
top_distdir = $(distdir)
@@ -445,7 +443,7 @@ EXTRA_DIST = AUTHORS CHANGES README.cares $(man_MANS) RELEASE-NOTES.md \
445443
c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf get_ver.awk \
446444
maketgz TODO README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
447445
CMakeLists.txt Makefile.dj Makefile.m32 Makefile.netware Makefile.msvc \
448-
Makefile.Watcom AUTHORS CONTRIBUTING.md SECURITY.md TODO \
446+
Makefile.Watcom AUTHORS CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md TODO \
449447
cmake/EnableWarnings.cmake
450448

451449
CLEANFILES = $(PDFPAGES) $(HTMLPAGES)

deps/cares/README.md

+74-38
Original file line numberDiff line numberDiff line change
@@ -8,58 +8,94 @@
88
[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=c-ares_c-ares&metric=bugs)](https://sonarcloud.io/summary/new_code?id=c-ares_c-ares)
99
[![Coverity Scan Status](https://scan.coverity.com/projects/c-ares/badge.svg)](https://scan.coverity.com/projects/c-ares)
1010

11-
This is c-ares, an asynchronous resolver library. It is intended for
11+
## Overview
12+
[c-ares](https://c-ares.org) is a modern DNS (stub) resolver library, written in
13+
C. It provides interfaces for asynchronous queries while trying to abstract the
14+
intricacies of the underlying DNS protocol. It was originally intended for
1215
applications which need to perform DNS queries without blocking, or need to
13-
perform multiple DNS queries in parallel. The primary examples of such
14-
applications are servers which communicate with multiple clients and programs
15-
with graphical user interfaces.
16+
perform multiple DNS queries in parallel.
1617

17-
The full source code is available in the ['c-ares' release archives](https://c-ares.org/download/),
18-
and in a git repository: https://github.com/c-ares/c-ares. See the
19-
[INSTALL.md](INSTALL.md) file for build information.
18+
One of the goals of c-ares is to be a better DNS resolver than is provided by
19+
your system, regardless of which system you use. We recommend using
20+
the c-ares library in all network applications even if the initial goal of
21+
asynchronous resolution is not necessary to your application.
2022

21-
If you find bugs, correct flaws, have questions or have comments in general in
22-
regard to c-ares (or by all means the original ares too), get in touch with us
23-
on the c-ares mailing list: https://lists.haxx.se/listinfo/c-ares
23+
c-ares will build with any C89 compiler and is [MIT licensed](LICENSE.md),
24+
which makes it suitable for both free and commercial software. c-ares runs on
25+
Linux, FreeBSD, OpenBSD, MacOS, Solaris, AIX, Windows, Android, iOS and many
26+
more operating systems.
2427

25-
c-ares is distributed under the MIT license.
28+
c-ares has a strong focus on security, implementing safe parsers and data
29+
builders used throughout the code, thus avoiding many of the common pitfalls
30+
of other C libraries. Through automated testing with our extensive testing
31+
framework, c-ares is constantly validated with a range of static and dynamic
32+
analyzers, as well as being constantly fuzzed by [OSS Fuzz](https://github.com/google/oss-fuzz).
2633

27-
You'll find all c-ares details and news here:
28-
https://c-ares.org/
34+
While c-ares has been around for over 20 years, it has been actively maintained
35+
both in regards to the latest DNS RFCs as well as updated to follow the latest
36+
best practices in regards to C coding standards.
2937

38+
## Code
3039

31-
## Notes for c-ares hackers
40+
The full source code and revision history is available in our
41+
[GitHub repository](https://github.com/c-ares/c-ares). Our signed releases
42+
are available in the ['c-ares' release archives](https://c-ares.org/download/).
3243

33-
* The distributed `ares_build.h` file is only intended to be used on systems
34-
which can not run the also distributed configure script.
3544

36-
* The distributed `ares_build.h` file is generated as a copy of `ares_build.h.dist`
37-
when the c-ares source code distribution archive file is originally created.
45+
See the [INSTALL.md](INSTALL.md) file for build information.
3846

39-
* If you check out from git on a non-configure platform, you must run the
40-
appropriate `buildconf*` script to set up `ares_build.h` and other local files
41-
before being able to compile the library.
47+
## Communication
4248

43-
* On systems capable of running the `configure` script, the `configure` process
44-
will overwrite the distributed `ares_build.h` file with one that is suitable
45-
and specific to the library being configured and built, this new file is
46-
generated from the `ares_build.h.in` template file.
49+
**Issues** and **Feature Requests** should be reported to our
50+
[GitHub Issues](https://github.com/c-ares/c-ares/issues) page.
4751

48-
* If you intend to distribute an already compiled c-ares library you **MUST**
49-
also distribute along with it the generated `ares_build.h` which has been
50-
used to compile it. Otherwise, the library will be of no use for the users of
51-
the library that you have built. It is **your** responsibility to provide this
52-
file. No one at the c-ares project can know how you have built the library.
52+
**Discussions** around c-ares and its use, are held on
53+
[GitHub Discussions](https://github.com/c-ares/c-ares/discussions/categories/q-a)
54+
or the [Mailing List](https://lists.haxx.se/mailman/listinfo/c-ares). Mailing
55+
List archive [here](https://lists.haxx.se/pipermail/c-ares/).
56+
Please, do not mail volunteers privately about c-ares.
5357

54-
* File `ares_build.h` includes platform and configuration dependent info,
55-
and must not be modified by anyone. Configure script generates it for you.
58+
**Security vulnerabilities** are treated according to our
59+
[Security Procedure](SECURITY.md), please email c-ares-security at
60+
haxx.se if you suspect one.
5661

57-
* We cannot assume anything else but very basic compiler features being
58-
present. While c-ares requires an ANSI C compiler to build, some of the
59-
earlier ANSI compilers clearly can't deal with some preprocessor operators.
6062

61-
* Newlines must remain unix-style for older compilers' sake.
63+
## Release keys
6264

63-
* Comments must be written in the old-style /* unnested C-fashion */
65+
Primary GPG keys for c-ares Releasers (some Releasers sign with subkeys):
6466

65-
* Try to keep line lengths below 80 columns.
67+
* **Daniel Stenberg** <<daniel@haxx.se>>
68+
`27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2`
69+
* **Brad House** <<brad@brad-house.com>>
70+
`DA7D64E4C82C6294CB73A20E22E3D13B5411B7CA`
71+
72+
To import the full set of trusted release keys (including subkeys possibly used
73+
to sign releases):
74+
75+
```bash
76+
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 # Daniel Stenberg
77+
gpg --keyserver hkps://keys.openpgp.org --recv-keys DA7D64E4C82C6294CB73A20E22E3D13B5411B7CA # Brad House
78+
```
79+
80+
### Verifying signatures
81+
82+
For each release `c-ares-X.Y.Z.tar.gz` there is a corresponding
83+
`c-ares-X.Y.Z.tar.gz.asc` file which contains the detached signature for the
84+
release.
85+
86+
After fetching all of the possible valid signing keys and loading into your
87+
keychain as per the prior section, you can simply run the command below on
88+
the downloaded package and detached signature:
89+
90+
```bash
91+
% gpg -v --verify c-ares-1.29.0.tar.gz.asc c-ares-1.29.0.tar.gz
92+
gpg: enabled compatibility flags:
93+
gpg: Signature made Fri May 24 02:50:38 2024 EDT
94+
gpg: using RSA key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
95+
gpg: using pgp trust model
96+
gpg: Good signature from "Daniel Stenberg <daniel@haxx.se>" [unknown]
97+
gpg: WARNING: This key is not certified with a trusted signature!
98+
gpg: There is no indication that the signature belongs to the owner.
99+
Primary key fingerprint: 27ED EAF2 2F3A BCEB 50DB 9A12 5CC9 08FD B71E 12C2
100+
gpg: binary signature, digest algorithm SHA512, key algorithm rsa2048
101+
```

deps/cares/RELEASE-NOTES.md

+15-24
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,33 @@
1-
## c-ares version 1.29.0 - May 24 2024
1+
## c-ares version 1.30.0 - June 7 2024
22

3-
This is a feature and bugfix release.
3+
This is a maintenance and bugfix release.
44

55
Features:
66

7-
* When using `ARES_OPT_EVENT_THREAD`, automatically reload system configuration
8-
when network conditions change. [PR #759](https://github.com/c-ares/c-ares/pull/759)
9-
* Apple: reimplement DNS configuration reading to more accurately pull DNS
10-
settings. [PR #750](https://github.com/c-ares/c-ares/pull/750)
11-
* Add observability into DNS server health via a server state callback, invoked
12-
whenever a query finishes. [PR #744](https://github.com/c-ares/c-ares/pull/744)
13-
* Add server failover retry behavior, where failed servers are retried with
14-
small probability after a minimum delay. [PR #731](https://github.com/c-ares/c-ares/pull/731)
7+
* Basic support for SIG RR record (RFC 2931 / RFC 2535) [PR #773](https://github.com/c-ares/c-ares/pull/773)
158

169
Changes:
1710

18-
* Mark `ares_channel_t *` as const in more places in the public API. [PR #758](https://github.com/c-ares/c-ares/pull/758)
11+
* Validation that DNS strings can only consist of printable ascii characters
12+
otherwise will trigger a parse failure.
13+
[75de16c](https://github.com/c-ares/c-ares/commit/75de16c) and
14+
[40fb125](https://github.com/c-ares/c-ares/commit/40fb125)
15+
* Windows: use `GetTickCount64()` for a monotonic timer that does not wrap. [1dff8f6](https://github.com/c-ares/c-ares/commit/1dff8f6)
1916

2017
Bugfixes:
2118

22-
* Due to a logic flaw dns name compression writing was not properly implemented
23-
which would result in the name prefix not being written for a partial match.
24-
This could cause issues in various record types such as MX records when using
25-
the deprecated API. Regression introduced in 1.28.0. [Issue #757](https://github.com/c-ares/c-ares/issues/757)
26-
* Revert OpenBSD `SOCK_DNS` flag, it doesn't do what the docs say it does and
27-
causes c-ares to become non-functional. [PR #754](https://github.com/c-ares/c-ares/pull/754)
28-
* `ares_getnameinfo()`: loosen validation on `salen` parameter. [Issue #752](https://github.com/c-ares/c-ares/issues/752)
29-
* cmake: Android requires C99. [PR #748](https://github.com/c-ares/c-ares/pull/748)
30-
* `ares_queue_wait_empty()` does not honor timeout_ms >= 0. [Issue #742](https://github.com/c-ares/c-ares/pull/742)
19+
* QueryCache: Fix issue where purging on server changes wasn't working. [a6c8fe6](https://github.com/c-ares/c-ares/commit/a6c8fe6)
20+
* Windows: Fix Y2K38 issue by creating our own `ares_timeval_t` datatype. [PR #772](https://github.com/c-ares/c-ares/pull/772)
21+
* Fix packaging issue affecting MacOS due to a missing header. [55afad6](https://github.com/c-ares/c-ares/commit/55afad6)
22+
* MacOS: Fix UBSAN warnings that are likely meaningless due to alignment issues
23+
in new MacOS config reader.
24+
* Android: arm 32bit build failure due to missing symbol. [d1722e6](https://github.com/c-ares/c-ares/commit/d1722e6)
3125

3226
Thanks go to these friendly people for their efforts and contributions for this
3327
release:
3428

3529
* Brad House (@bradh352)
3630
* Daniel Stenberg (@bagder)
37-
* David Hotham (@dimbleby)
38-
* Jiwoo Park (@jimmy-park)
39-
* Oliver Welsh (@oliverwelsh)
40-
* Volker Schlecht (@VlkrS)
31+
4132

4233

deps/cares/aclocal.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
1515
m4_ifndef([AC_AUTOCONF_VERSION],
1616
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17-
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
18-
[m4_warning([this file was generated for autoconf 2.71.
17+
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72],,
18+
[m4_warning([this file was generated for autoconf 2.72.
1919
You have another version of autoconf. It may work, but is not guaranteed to.
2020
If you have problems, you may need to regenerate the build system entirely.
2121
To do so, use the procedure documented by the package, typically 'autoreconf'.])])

deps/cares/aminclude_static.am

+1-1
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 Fri May 24 08:50:03 CEST 2024
3+
# from AX_AM_MACROS_STATIC on Fri Jun 7 06:50:45 EDT 2024
44

55

66
# Code coverage

0 commit comments

Comments
 (0)