FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

deps: update c-ares to v1.32.1 · nodejs/node@832328e · GitHub

/ node Public

Commit 832328e

Browse files
nodejs-github-bot
authored and
marco-ippolito
committed
deps: update c-ares to v1.32.1
PR-URL: #53753 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent 878e9a4 commit 832328e

8 files changed

Lines changed: 42 additions & 20 deletions

File tree

‎deps/cares/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ INCLUDE (CheckCSourceCompiles)
1212
INCLUDE (CheckStructHasMember)
1313
INCLUDE (CheckLibraryExists)
1414

15-
PROJECT (c-ares LANGUAGES C VERSION "1.32.0" )
15+
PROJECT (c-ares LANGUAGES C VERSION "1.32.1" )
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 "19:0:17")
33+
SET (CARES_LIB_VERSIONINFO "19:1:17")
3434

3535

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

‎deps/cares/RELEASE-NOTES.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## c-ares version 1.32.1 - July 7 2024
2+
3+
This is a bugfix release.
4+
5+
Bugfixes:
6+
* Channel lock needs to be recursive to ensure calls into c-ares functions can
7+
be made from callbacks otherwise deadlocks will occur. This regression was
8+
introduced in 1.32.0.
9+
10+
111
## c-ares version 1.32.0 - July 4 2024
212

313
This is a feature and bugfix release.

‎deps/cares/aminclude_static.am‎

Lines changed: 1 addition & 1 deletion
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 Thu Jul 4 07:03:12 EDT 2024
3+
# from AX_AM_MACROS_STATIC on Sun Jul 7 10:45:53 EDT 2024
44

55

66
# Code coverage

‎deps/cares/configure‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.72 for c-ares 1.32.0.
3+
# Generated by GNU Autoconf 2.72 for c-ares 1.32.1.
44
#
55
# Report bugs to <c-ares mailing list: http://lists.haxx.se/listinfo/c-ares>.
66
#
@@ -614,8 +614,8 @@ MAKEFLAGS=
614614
# Identity of this package.
615615
PACKAGE_NAME='c-ares'
616616
PACKAGE_TARNAME='c-ares'
617-
PACKAGE_VERSION='1.32.0'
618-
PACKAGE_STRING='c-ares 1.32.0'
617+
PACKAGE_VERSION='1.32.1'
618+
PACKAGE_STRING='c-ares 1.32.1'
619619
PACKAGE_BUGREPORT='c-ares mailing list: http://lists.haxx.se/listinfo/c-ares'
620620
PACKAGE_URL=''
621621

@@ -1415,7 +1415,7 @@ if test "$ac_init_help" = "long"; then
14151415
# Omit some internal or obsolete options to make the list less imposing.
14161416
# This message is too long to be a string in the A/UX 3.1 sh.
14171417
cat <<_ACEOF
1418-
'configure' configures c-ares 1.32.0 to adapt to many kinds of systems.
1418+
'configure' configures c-ares 1.32.1 to adapt to many kinds of systems.
14191419

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

@@ -1486,7 +1486,7 @@ fi
14861486

14871487
if test -n "$ac_init_help"; then
14881488
case $ac_init_help in
1489-
short | recursive ) echo "Configuration of c-ares 1.32.0:";;
1489+
short | recursive ) echo "Configuration of c-ares 1.32.1:";;
14901490
esac
14911491
cat <<\_ACEOF
14921492

@@ -1623,7 +1623,7 @@ fi
16231623
test -n "$ac_init_help" && exit $ac_status
16241624
if $ac_init_version; then
16251625
cat <<\_ACEOF
1626-
c-ares configure 1.32.0
1626+
c-ares configure 1.32.1
16271627
generated by GNU Autoconf 2.72
16281628

16291629
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2267,7 +2267,7 @@ cat >config.log <<_ACEOF
22672267
This file contains any messages produced by compilers while
22682268
running configure, to aid debugging if configure makes a mistake.
22692269

2270-
It was created by c-ares $as_me 1.32.0, which was
2270+
It was created by c-ares $as_me 1.32.1, which was
22712271
generated by GNU Autoconf 2.72. Invocation command line was
22722272

22732273
$ $0$ac_configure_args_raw
@@ -3259,7 +3259,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
32593259

32603260

32613261

3262-
CARES_VERSION_INFO="19:0:17"
3262+
CARES_VERSION_INFO="19:1:17"
32633263

32643264

32653265

@@ -5999,7 +5999,7 @@ fi
59995999

60006000
# Define the identity of the package.
60016001
PACKAGE='c-ares'
6002-
VERSION='1.32.0'
6002+
VERSION='1.32.1'
60036003

60046004

60056005
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -26339,7 +26339,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2633926339
# report actual input values of CONFIG_FILES etc. instead of their
2634026340
# values after options handling.
2634126341
ac_log="
26342-
This file was extended by c-ares $as_me 1.32.0, which was
26342+
This file was extended by c-ares $as_me 1.32.1, which was
2634326343
generated by GNU Autoconf 2.72. Invocation command line was
2634426344

2634526345
CONFIG_FILES = $CONFIG_FILES
@@ -26407,7 +26407,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
2640726407
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2640826408
ac_cs_config='$ac_cs_config_escaped'
2640926409
ac_cs_version="\\
26410-
c-ares config.status 1.32.0
26410+
c-ares config.status 1.32.1
2641126411
configured by $0, generated by GNU Autoconf 2.72,
2641226412
with options \\"\$ac_cs_config\\"
2641326413

‎deps/cares/configure.ac‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ dnl Copyright (C) The c-ares project and its contributors
22
dnl SPDX-License-Identifier: MIT
33
AC_PREREQ([2.69])
44

5-
AC_INIT([c-ares], [1.32.0],
5+
AC_INIT([c-ares], [1.32.1],
66
[c-ares mailing list: http://lists.haxx.se/listinfo/c-ares])
77

8-
CARES_VERSION_INFO="19:0:17"
8+
CARES_VERSION_INFO="19:1:17"
99
dnl This flag accepts an argument of the form current[:revision[:age]]. So,
1010
dnl passing -version-info 3:12:1 sets current to 3, revision to 12, and age to
1111
dnl 1.

‎deps/cares/include/ares_version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232

3333
#define ARES_VERSION_MAJOR 1
3434
#define ARES_VERSION_MINOR 32
35-
#define ARES_VERSION_PATCH 0
35+
#define ARES_VERSION_PATCH 1
3636
#define ARES_VERSION \
3737
((ARES_VERSION_MAJOR << 16) | (ARES_VERSION_MINOR << 8) | \
3838
(ARES_VERSION_PATCH))
39-
#define ARES_VERSION_STR "1.32.0"
39+
#define ARES_VERSION_STR "1.32.1"
4040

4141
#define CARES_HAVE_ARES_LIBRARY_INIT 1
4242
#define CARES_HAVE_ARES_LIBRARY_CLEANUP 1

‎deps/cares/src/lib/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@SET_MAKE@
1616

1717
# aminclude_static.am generated automatically by Autoconf
18-
# from AX_AM_MACROS_STATIC on Thu Jul 4 07:03:12 EDT 2024
18+
# from AX_AM_MACROS_STATIC on Sun Jul 7 10:45:53 EDT 2024
1919

2020
# Copyright (C) The c-ares project and its contributors
2121
# SPDX-License-Identifier: MIT

‎deps/cares/src/lib/ares__threads.c‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,19 +217,31 @@ struct ares__thread_mutex {
217217

218218
ares__thread_mutex_t *ares__thread_mutex_create(void)
219219
{
220+
pthread_mutexattr_t attr;
220221
ares__thread_mutex_t *mut = ares_malloc_zero(sizeof(*mut));
221222
if (mut == NULL) {
222223
return NULL;
223224
}
224225

225-
if (pthread_mutex_init(&mut->mutex, NULL) != 0) {
226+
if (pthread_mutexattr_init(&attr) != 0) {
227+
ares_free(mut); /* LCOV_EXCL_LINE: UntestablePath */
228+
return NULL; /* LCOV_EXCL_LINE: UntestablePath */
229+
}
230+
231+
if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) != 0) {
232+
goto fail; /* LCOV_EXCL_LINE: UntestablePath */
233+
}
234+
235+
if (pthread_mutex_init(&mut->mutex, &attr) != 0) {
226236
goto fail; /* LCOV_EXCL_LINE: UntestablePath */
227237
}
228238

239+
pthread_mutexattr_destroy(&attr);
229240
return mut;
230241

231242
/* LCOV_EXCL_START: UntestablePath */
232243
fail:
244+
pthread_mutexattr_destroy(&attr);
233245
ares_free(mut);
234246
return NULL;
235247
/* LCOV_EXCL_STOP */

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL