diff --git a/deps/cares/CMakeLists.txt b/deps/cares/CMakeLists.txt index 39963f1e8c3cb4..cf9a516414d1ab 100644 --- a/deps/cares/CMakeLists.txt +++ b/deps/cares/CMakeLists.txt @@ -12,7 +12,7 @@ INCLUDE (CheckCSourceCompiles) INCLUDE (CheckStructHasMember) INCLUDE (CheckLibraryExists) -PROJECT (c-ares LANGUAGES C VERSION "1.34.1" ) +PROJECT (c-ares LANGUAGES C VERSION "1.34.2" ) # Set this version before release SET (CARES_VERSION "${PROJECT_VERSION}") diff --git a/deps/cares/RELEASE-NOTES.md b/deps/cares/RELEASE-NOTES.md index fa1db666083365..cbd4788600f3ac 100644 --- a/deps/cares/RELEASE-NOTES.md +++ b/deps/cares/RELEASE-NOTES.md @@ -1,4 +1,10 @@ -## c-ares version 1.34.1 - Octover 9 2024 +## c-ares version 1.34.2 - October 15 2024 + +This release contains a fix for downstream packages detecting the c-ares +version based on the contents of the header file rather than the +distributed pkgconf or cmake files. + +## c-ares version 1.34.1 - October 9 2024 This release fixes a packaging issue. diff --git a/deps/cares/aminclude_static.am b/deps/cares/aminclude_static.am index 7cc94c822cf773..9e346c39c815a1 100644 --- a/deps/cares/aminclude_static.am +++ b/deps/cares/aminclude_static.am @@ -1,6 +1,6 @@ # aminclude_static.am generated automatically by Autoconf -# from AX_AM_MACROS_STATIC on Wed Oct 9 20:58:25 EDT 2024 +# from AX_AM_MACROS_STATIC on Tue Oct 15 06:09:51 EDT 2024 # Code coverage diff --git a/deps/cares/configure b/deps/cares/configure index 635872c9f18e1a..a6b48c9872767b 100755 --- a/deps/cares/configure +++ b/deps/cares/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72 for c-ares 1.34.1. +# Generated by GNU Autoconf 2.72 for c-ares 1.34.2. # # Report bugs to . # @@ -614,8 +614,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='c-ares' PACKAGE_TARNAME='c-ares' -PACKAGE_VERSION='1.34.1' -PACKAGE_STRING='c-ares 1.34.1' +PACKAGE_VERSION='1.34.2' +PACKAGE_STRING='c-ares 1.34.2' PACKAGE_BUGREPORT='c-ares mailing list: http://lists.haxx.se/listinfo/c-ares' PACKAGE_URL='' @@ -1423,7 +1423,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.34.1 to adapt to many kinds of systems. +'configure' configures c-ares 1.34.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1494,7 +1494,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of c-ares 1.34.1:";; + short | recursive ) echo "Configuration of c-ares 1.34.2:";; esac cat <<\_ACEOF @@ -1635,7 +1635,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -c-ares configure 1.34.1 +c-ares configure 1.34.2 generated by GNU Autoconf 2.72 Copyright (C) 2023 Free Software Foundation, Inc. @@ -2279,7 +2279,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.34.1, which was +It was created by c-ares $as_me 1.34.2, which was generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -6192,7 +6192,7 @@ fi # Define the identity of the package. PACKAGE='c-ares' - VERSION='1.34.1' + VERSION='1.34.2' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -26823,7 +26823,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.34.1, which was +This file was extended by c-ares $as_me 1.34.2, which was generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26891,7 +26891,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.34.1 +c-ares config.status 1.34.2 configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" diff --git a/deps/cares/configure.ac b/deps/cares/configure.ac index cc52c2c6c5de0a..0ebda1c63f5f5e 100644 --- a/deps/cares/configure.ac +++ b/deps/cares/configure.ac @@ -2,7 +2,7 @@ dnl Copyright (C) The c-ares project and its contributors dnl SPDX-License-Identifier: MIT AC_PREREQ([2.69]) -AC_INIT([c-ares], [1.34.1], +AC_INIT([c-ares], [1.34.2], [c-ares mailing list: http://lists.haxx.se/listinfo/c-ares]) CARES_VERSION_INFO="21:1:19" diff --git a/deps/cares/docs/Makefile.in b/deps/cares/docs/Makefile.in index 75b3f3d942bbd6..da57136dad9a88 100644 --- a/deps/cares/docs/Makefile.in +++ b/deps/cares/docs/Makefile.in @@ -386,6 +386,7 @@ MANPAGES = ares_cancel.3 \ ares_dns_rr.3 \ ares_dns_rr_add_abin.3 \ ares_dns_rr_del_abin.3 \ + ares_dns_rr_del_opt_byid.3 \ ares_dns_rr_get_abin.3 \ ares_dns_rr_get_abin_cnt.3 \ ares_dns_rr_get_addr.3 \ @@ -483,6 +484,7 @@ MANPAGES = ares_cancel.3 \ ares_set_socket_callback.3 \ ares_set_socket_configure_callback.3 \ ares_set_socket_functions.3 \ + ares_set_socket_functions_ex.3 \ ares_set_sortlist.3 \ ares_strerror.3 \ ares_svcb_param_t.3 \ diff --git a/deps/cares/docs/Makefile.inc b/deps/cares/docs/Makefile.inc index d6ad73246b3f99..b5519369aa9ea5 100644 --- a/deps/cares/docs/Makefile.inc +++ b/deps/cares/docs/Makefile.inc @@ -43,6 +43,7 @@ MANPAGES = ares_cancel.3 \ ares_dns_rr.3 \ ares_dns_rr_add_abin.3 \ ares_dns_rr_del_abin.3 \ + ares_dns_rr_del_opt_byid.3 \ ares_dns_rr_get_abin.3 \ ares_dns_rr_get_abin_cnt.3 \ ares_dns_rr_get_addr.3 \ @@ -140,6 +141,7 @@ MANPAGES = ares_cancel.3 \ ares_set_socket_callback.3 \ ares_set_socket_configure_callback.3 \ ares_set_socket_functions.3 \ + ares_set_socket_functions_ex.3 \ ares_set_sortlist.3 \ ares_strerror.3 \ ares_svcb_param_t.3 \ diff --git a/deps/cares/docs/ares_dns_rr_del_opt_byid.3 b/deps/cares/docs/ares_dns_rr_del_opt_byid.3 new file mode 100644 index 00000000000000..b93e4cd4e37fa8 --- /dev/null +++ b/deps/cares/docs/ares_dns_rr_del_opt_byid.3 @@ -0,0 +1,3 @@ +.\" Copyright (C) 2023 The c-ares project and its contributors. +.\" SPDX-License-Identifier: MIT +.so man3/ares_dns_rr.3 diff --git a/deps/cares/docs/ares_set_socket_functions_ex.3 b/deps/cares/docs/ares_set_socket_functions_ex.3 new file mode 100644 index 00000000000000..a0f02456c320cb --- /dev/null +++ b/deps/cares/docs/ares_set_socket_functions_ex.3 @@ -0,0 +1,3 @@ +.\" Copyright (C) 2024 The c-ares project and its contributors. +.\" SPDX-License-Identifier: MIT +.so man3/ares_set_socket_functions.3 diff --git a/deps/cares/include/ares_version.h b/deps/cares/include/ares_version.h index ba98e6949d53c8..d7a9c9e61e36d2 100644 --- a/deps/cares/include/ares_version.h +++ b/deps/cares/include/ares_version.h @@ -32,20 +32,16 @@ #define ARES_VERSION_MAJOR 1 #define ARES_VERSION_MINOR 34 -#define ARES_VERSION_PATCH 1 +#define ARES_VERSION_PATCH 2 +#define ARES_VERSION_STR "1.34.2" + +/* NOTE: We cannot make the version string a C preprocessor stringify operation + * due to assumptions made by integrators that aren't properly using + * pkgconf or cmake and are doing their own detection based on parsing + * this header */ #define ARES_VERSION \ ((ARES_VERSION_MAJOR << 16) | (ARES_VERSION_MINOR << 8) | \ (ARES_VERSION_PATCH)) - -/* Need a level of indirection due to argument prescan to stringify a macro - * value. */ -#define ARES_STRINGIFY_PRE(s) #s -#define ARES_STRINGIFY(s) ARES_STRINGIFY_PRE(s) - -#define ARES_VERSION_STR \ - ARES_STRINGIFY(ARES_VERSION_MAJOR) \ - "." ARES_STRINGIFY(ARES_VERSION_MINOR) "." ARES_STRINGIFY(ARES_VERSION_PATCH) - #endif diff --git a/deps/cares/src/lib/Makefile.in b/deps/cares/src/lib/Makefile.in index 6fdb27835828af..db6b17f2f53112 100644 --- a/deps/cares/src/lib/Makefile.in +++ b/deps/cares/src/lib/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # aminclude_static.am generated automatically by Autoconf -# from AX_AM_MACROS_STATIC on Wed Oct 9 20:58:25 EDT 2024 +# from AX_AM_MACROS_STATIC on Tue Oct 15 06:09:51 EDT 2024 # Copyright (C) The c-ares project and its contributors # SPDX-License-Identifier: MIT diff --git a/deps/cares/src/lib/event/ares_event_wake_pipe.c b/deps/cares/src/lib/event/ares_event_wake_pipe.c index 282d013dc62b24..d3b166a3d6cb78 100644 --- a/deps/cares/src/lib/event/ares_event_wake_pipe.c +++ b/deps/cares/src/lib/event/ares_event_wake_pipe.c @@ -92,9 +92,9 @@ static ares_pipeevent_t *ares_pipeevent_init(void) } # endif -# ifdef O_CLOEXEC - fcntl(p->filedes[0], F_SETFD, O_CLOEXEC); - fcntl(p->filedes[1], F_SETFD, O_CLOEXEC); +# ifdef FD_CLOEXEC + fcntl(p->filedes[0], F_SETFD, FD_CLOEXEC); + fcntl(p->filedes[1], F_SETFD, FD_CLOEXEC); # endif # endif