Skip to content

Commit

Permalink
deps: update c-ares to 1.20.1
Browse files Browse the repository at this point in the history
  • Loading branch information
nodejs-github-bot committed Oct 11, 2023
1 parent 0c65551 commit 3b5c76a
Show file tree
Hide file tree
Showing 10 changed files with 85 additions and 61 deletions.
69 changes: 40 additions & 29 deletions deps/cares/CHANGES
Original file line number Diff line number Diff line change
@@ -1,5 +1,45 @@
Changelog for the c-ares project. Generated with git2changes.pl

Version 1.20.1 (8 Oct 2023)

GitHub (8 Oct 2023)
- [Daniel Stenberg brought this change]

ares-test: silence warning (#564)

warning: comparison of integer expressions of different signedness

Fix By: Daniel Stenberg (@bagder)

Brad House (8 Oct 2023)
- fix README.md

GitHub (8 Oct 2023)
- [Brad House brought this change]

1.20.1 release (#563)

- [Brad House brought this change]

fix reference to freed memory (#562)

Issue #561 shows free'd memory could be accessed in some error conditions.

Fixes Issue #561
Fix By: Brad House (@bradh352)

Brad House (8 Oct 2023)
- reported build/test systems may timeout on intensive tests. reduce test case to still be relevant but to reduce false positive errors

GitHub (8 Oct 2023)
- [Gregor Jasny brought this change]

Regression: Fix typo in fuzzcheck target name (#559)

This seems to be a vim'esque typo introduced with c1b00c41.

Fix By: Gregor Jasny (@gjasny)

Version 1.20.0 (6 Oct 2023)

Brad House (6 Oct 2023)
Expand Down Expand Up @@ -5665,32 +5705,3 @@ Ben Greear (30 Jul 2010)
- ipv6: Fix some build issues related to the local-bind feature.

Signed-off-by: Ben Greear <greearb@candelatech.com>

Guenter Knauf (29 Jul 2010)
- Replaced uint32_t with unsigned int to fix broken builds on a couple of platforms.

Daniel Stenberg (18 Jul 2010)
- [Ben Greear brought this change]

local-bind: Support binding to local interface/IPs

Add 3 new functions to set the local binding for the out-going
socket connection, and add ares_set_servers_csv() to set a
list of servers at once as a comma-separated string.

Signed-off-by: Ben Greear <greearb@candelatech.com>

- version: now start on 1.7.4

- [Andrew C. Morrow brought this change]

fix memory leak in ares_getnameinfo

Version 1.7.3 (11 Jun 2010)

Daniel Stenberg (11 Jun 2010)
- changelogs: updated for 1.7.3

- [BogDan Vatra brought this change]

init: allow c-ares to work on Android OS
6 changes: 3 additions & 3 deletions deps/cares/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ INCLUDE (CheckCSourceCompiles)
INCLUDE (CheckStructHasMember)
INCLUDE (CheckLibraryExists)

PROJECT (c-ares LANGUAGES C VERSION "1.20.0" )
PROJECT (c-ares LANGUAGES C VERSION "1.20.1" )

# Set this version before release
SET (CARES_VERSION "1.20.0")
SET (CARES_VERSION "1.20.1")

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

Expand All @@ -28,7 +28,7 @@ INCLUDE (GNUInstallDirs) # include this *AFTER* PROJECT(), otherwise paths are w
# For example, a version of 4:0:2 would generate output such as:
# libname.so -> libname.so.2
# libname.so.2 -> libname.so.2.2.0
SET (CARES_LIB_VERSIONINFO "9:0:7")
SET (CARES_LIB_VERSIONINFO "9:1:7")


OPTION (CARES_STATIC "Build as a static library" OFF)
Expand Down
4 changes: 1 addition & 3 deletions deps/cares/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ c-ares
[![Coverage Status](https://coveralls.io/repos/github/c-ares/c-ares/badge.svg)](https://coveralls.io/github/c-ares/c-ares)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/291/badge)](https://bestpractices.coreinfrastructure.org/projects/291)
[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/c-ares.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:c-ares)
[![Releases](https://coderelease.io/badge/c-ares/c-ares)](https://coderelease.io/github/repository/c-ares/c-ares)

This is c-ares, an asynchronous resolver library. It is intended for
applications which need to perform DNS queries without blocking, or need to
Expand All @@ -22,8 +21,7 @@ If you find bugs, correct flaws, have questions or have comments in general in
regard to c-ares (or by all means the original ares too), get in touch with us
on the c-ares mailing list: https://lists.haxx.se/listinfo/c-ares

c-ares is of course distributed under the same MIT-style license as the
original ares.
c-ares is distributed the MIT license.

You'll find all c-ares details and news here:
https://c-ares.org/
Expand Down
16 changes: 15 additions & 1 deletion deps/cares/RELEASE-NOTES
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
c-ares version 1.20.0
c-ares version 1.20.1

This release resolves a significant issue in the 1.20.0 release.

Bug fixes:
o Resolve use-after-free issue when TCP connection is terminated before a
response is returned [17]
o Reduce number of queries for a load test case to prevent overloading some
build systems
o Fix fuzz test build target [18]


c-ares 1.20.0 notes below:

This is a feature and bugfix release with some significant internal changes.

Expand Down Expand Up @@ -58,3 +70,5 @@ References to bug reports and discussions on issues:
[14] = https://github.com/c-ares/c-ares/pull/526
[15] = https://github.com/c-ares/c-ares/pull/525
[16] = https://github.com/c-ares/c-ares/pull/524
[17] = https://github.com/c-ares/c-ares/pull/562
[18] = https://github.com/c-ares/c-ares/pull/559
2 changes: 1 addition & 1 deletion deps/cares/aminclude_static.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# aminclude_static.am generated automatically by Autoconf
# from AX_AM_MACROS_STATIC on Sat Oct 7 13:50:28 CEST 2023
# from AX_AM_MACROS_STATIC on Sun Oct 8 23:23:39 CEST 2023


# Code coverage
Expand Down
22 changes: 11 additions & 11 deletions deps/cares/configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for c-ares 1.20.0.
# Generated by GNU Autoconf 2.71 for c-ares 1.20.1.
#
# Report bugs to <c-ares mailing list: http://lists.haxx.se/listinfo/c-ares>.
#
Expand Down Expand Up @@ -855,8 +855,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='c-ares'
PACKAGE_TARNAME='c-ares'
PACKAGE_VERSION='1.20.0'
PACKAGE_STRING='c-ares 1.20.0'
PACKAGE_VERSION='1.20.1'
PACKAGE_STRING='c-ares 1.20.1'
PACKAGE_BUGREPORT='c-ares mailing list: http://lists.haxx.se/listinfo/c-ares'
PACKAGE_URL=''

Expand Down Expand Up @@ -1650,7 +1650,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures c-ares 1.20.0 to adapt to many kinds of systems.
\`configure' configures c-ares 1.20.1 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1721,7 +1721,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of c-ares 1.20.0:";;
short | recursive ) echo "Configuration of c-ares 1.20.1:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1861,7 +1861,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
c-ares configure 1.20.0
c-ares configure 1.20.1
generated by GNU Autoconf 2.71

Copyright (C) 2021 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2453,7 +2453,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by c-ares $as_me 1.20.0, which was
It was created by c-ares $as_me 1.20.1, which was
generated by GNU Autoconf 2.71. Invocation command line was

$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -3426,7 +3426,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



CARES_VERSION_INFO="9:0:7"
CARES_VERSION_INFO="9:1:7"



Expand Down Expand Up @@ -7060,7 +7060,7 @@ fi

# Define the identity of the package.
PACKAGE='c-ares'
VERSION='1.20.0'
VERSION='1.20.1'


printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
Expand Down Expand Up @@ -35354,7 +35354,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by c-ares $as_me 1.20.0, which was
This file was extended by c-ares $as_me 1.20.1, which was
generated by GNU Autoconf 2.71. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -35422,7 +35422,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
c-ares config.status 1.20.0
c-ares config.status 1.20.1
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"

Expand Down
4 changes: 2 additions & 2 deletions deps/cares/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
#############################################################
AC_PREREQ([2.60])

AC_INIT([c-ares], [1.20.0],
AC_INIT([c-ares], [1.20.1],
[c-ares mailing list: http://lists.haxx.se/listinfo/c-ares])

CARES_VERSION_INFO="9:0:7"
CARES_VERSION_INFO="9:1:7"
dnl This flag accepts an argument of the form current[:revision[:age]]. So,
dnl passing -version-info 3:12:1 sets current to 3, revision to 12, and age to
dnl 1.
Expand Down
4 changes: 2 additions & 2 deletions deps/cares/include/ares_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@

#define ARES_VERSION_MAJOR 1
#define ARES_VERSION_MINOR 20
#define ARES_VERSION_PATCH 0
#define ARES_VERSION_PATCH 1
#define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
(ARES_VERSION_MINOR<<8)|\
(ARES_VERSION_PATCH))
#define ARES_VERSION_STR "1.20.0"
#define ARES_VERSION_STR "1.20.1"

#if (ARES_VERSION >= 0x010700)
# define CARES_HAVE_ARES_LIBRARY_INIT 1
Expand Down
13 changes: 7 additions & 6 deletions deps/cares/src/lib/ares_process.c
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ static void read_udp_packets_fd(ares_channel channel,
continue;

handle_error(conn, now);

return;
#ifdef HAVE_RECVFROM
} else if (!same_address(&from.sa, &conn->server->addr)) {
/* The address the response comes from does not match the address we
Expand Down Expand Up @@ -682,9 +682,10 @@ static void process_answer(ares_channel channel, const unsigned char *abuf,
static void handle_error(struct server_connection *conn,
struct timeval *now)
{
ares_channel channel = conn->server->channel;
ares__llist_t *list_copy;
ares__llist_node_t *node;
ares_channel channel = conn->server->channel;
struct server_state *server = conn->server;
ares__llist_t *list_copy;
ares__llist_node_t *node;

/* We steal the list from the connection then close the connection, then
* iterate across the list to requeue any inflight queries with the broken
Expand All @@ -697,8 +698,8 @@ static void handle_error(struct server_connection *conn,
while ((node = ares__llist_node_first(list_copy)) != NULL) {
struct query *query = ares__llist_node_val(node);

assert(query->server == (int)conn->server->idx);
skip_server(channel, query, conn->server);
assert(query->server == (int)server->idx);
skip_server(channel, query, server);
/* next_server will remove the current node from the list */
next_server(channel, query, now);
}
Expand Down
6 changes: 3 additions & 3 deletions doc/contributing/maintaining/maintaining-dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This a list of all the dependencies:
* [ada 2.6.10][]
* [base64 0.5.0][]
* [brotli 1.0.9][]
* [c-ares 1.20.0][]
* [c-ares 1.20.1][]
* [cjs-module-lexer 1.2.2][]
* [corepack][]
* [googletest 2dd1c13][]
Expand Down Expand Up @@ -167,7 +167,7 @@ length-delimited strings.
The [brotli](https://github.com/google/brotli) dependency is
used for the homonym generic-purpose lossless compression algorithm.

### c-ares 1.20.0
### c-ares 1.20.1

The [c-ares](https://github.com/c-ares/c-ares) is a C library
for asynchronous DNS requests.
Expand Down Expand Up @@ -322,7 +322,7 @@ performance improvements not currently available in standard zlib.
[ada 2.6.10]: #ada-2610
[base64 0.5.0]: #base64-050
[brotli 1.0.9]: #brotli-109
[c-ares 1.20.0]: #c-ares-1200
[c-ares 1.20.1]: #c-ares-1201
[cjs-module-lexer 1.2.2]: #cjs-module-lexer-122
[corepack]: #corepack
[dependency-update-action]: ../../../.github/workflows/tools.yml
Expand Down

0 comments on commit 3b5c76a

Please sign in to comment.