Skip to content

Commit e0db9ed

Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update c-ares to v1.34.3
PR-URL: #55803 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
1 parent c210335 commit e0db9ed

24 files changed

+2523
-3476
lines changed

‎deps/cares/CMakeLists.txt

+3-3
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.34.2" )
15+
PROJECT (c-ares LANGUAGES C VERSION "1.34.3" )
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:1:19")
33+
SET (CARES_LIB_VERSIONINFO "21:2:19")
3434

3535

3636
OPTION (CARES_STATIC "Build as a static library" OFF)
@@ -263,7 +263,7 @@ ENDIF ()
263263
# Set system-specific compiler flags
264264
IF (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
265265
LIST (APPEND SYSFLAGS -D_DARWIN_C_SOURCE)
266-
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
266+
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
267267
LIST (APPEND SYSFLAGS -D_GNU_SOURCE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700)
268268
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "SunOS")
269269
LIST (APPEND SYSFLAGS -D__EXTENSIONS__ -D_REENTRANT -D_XOPEN_SOURCE=600)

‎deps/cares/Makefile.in

+17-30
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.17 from Makefile.am.
1+
# Makefile.in generated by automake 1.16.5 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2024 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -91,8 +91,6 @@ am__make_running_with_option = \
9191
test $$has_opt = yes
9292
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
9393
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
94-
am__rm_f = rm -f $(am__rm_f_notfound)
95-
am__rm_rf = rm -rf $(am__rm_f_notfound)
9694
pkgdatadir = $(datadir)/@PACKAGE@
9795
pkgincludedir = $(includedir)/@PACKAGE@
9896
pkglibdir = $(libdir)/@PACKAGE@
@@ -196,9 +194,10 @@ am__base_list = \
196194
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
197195
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
198196
am__uninstall_files_from_dir = { \
199-
{ test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
200-
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
201-
$(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
197+
test -z "$$files" \
198+
|| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
199+
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
200+
$(am__cd) "$$dir" && rm -f $$files; }; \
202201
}
203202
am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
204203
DATA = $(pkgconfig_DATA)
@@ -239,8 +238,8 @@ distdir = $(PACKAGE)-$(VERSION)
239238
top_distdir = $(distdir)
240239
am__remove_distdir = \
241240
if test -d "$(distdir)"; then \
242-
find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \
243-
; rm -rf "$(distdir)" \
241+
find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
242+
&& rm -rf "$(distdir)" \
244243
|| { sleep 5 && rm -rf "$(distdir)"; }; \
245244
else :; fi
246245
am__post_remove_distdir = $(am__remove_distdir)
@@ -270,16 +269,14 @@ am__relativize = \
270269
done; \
271270
reldir="$$dir2"
272271
DIST_ARCHIVES = $(distdir).tar.gz
273-
GZIP_ENV = -9
272+
GZIP_ENV = --best
274273
DIST_TARGETS = dist-gzip
275274
# Exists only to be overridden by the user if desired.
276275
AM_DISTCHECK_DVI_TARGET = dvi
277276
distuninstallcheck_listfiles = find . -type f -print
278277
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
279278
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
280-
distcleancheck_listfiles = \
281-
find . \( -type f -a \! \
282-
\( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
279+
distcleancheck_listfiles = find . -type f -print
283280
ACLOCAL = @ACLOCAL@
284281
AMTAR = @AMTAR@
285282
AM_CFLAGS = @AM_CFLAGS@
@@ -325,7 +322,6 @@ EGREP = @EGREP@
325322
ETAGS = @ETAGS@
326323
EXEEXT = @EXEEXT@
327324
FGREP = @FGREP@
328-
FILECMD = @FILECMD@
329325
GCOV = @GCOV@
330326
GENHTML = @GENHTML@
331327
GMOCK112_CFLAGS = @GMOCK112_CFLAGS@
@@ -392,10 +388,8 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
392388
am__include = @am__include@
393389
am__leading_dot = @am__leading_dot@
394390
am__quote = @am__quote@
395-
am__rm_f_notfound = @am__rm_f_notfound@
396391
am__tar = @am__tar@
397392
am__untar = @am__untar@
398-
am__xargs_n = @am__xargs_n@
399393
ax_pthread_config = @ax_pthread_config@
400394
bindir = @bindir@
401395
build = @build@
@@ -641,7 +635,7 @@ distdir: $(BUILT_SOURCES)
641635

642636
distdir-am: $(DISTFILES)
643637
$(am__remove_distdir)
644-
$(AM_V_at)$(MKDIR_P) "$(distdir)"
638+
test -d "$(distdir)" || mkdir "$(distdir)"
645639
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
646640
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
647641
list='$(DISTFILES)'; \
@@ -755,7 +749,7 @@ dist dist-all:
755749
distcheck: dist
756750
case '$(DIST_ARCHIVES)' in \
757751
*.tar.gz*) \
758-
eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
752+
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
759753
*.tar.bz2*) \
760754
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
761755
*.tar.lz*) \
@@ -765,7 +759,7 @@ distcheck: dist
765759
*.tar.Z*) \
766760
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
767761
*.shar.gz*) \
768-
eval GZIP= gzip -dc $(distdir).shar.gz | unshar ;;\
762+
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
769763
*.zip*) \
770764
unzip $(distdir).zip ;;\
771765
*.tar.zst*) \
@@ -866,12 +860,12 @@ install-strip:
866860
mostlyclean-generic:
867861

868862
clean-generic:
869-
-$(am__rm_f) $(CLEANFILES)
863+
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
870864

871865
distclean-generic:
872-
-$(am__rm_f) $(CONFIG_CLEAN_FILES)
873-
-test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
874-
-$(am__rm_f) $(DISTCLEANFILES)
866+
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
867+
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
868+
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
875869

876870
maintainer-clean-generic:
877871
@echo "This command is intended for maintainers to use"
@@ -980,10 +974,3 @@ dist-hook:
980974
# Tell versions [3.59,3.63) of GNU make to not export all variables.
981975
# Otherwise a system limit (for SysV at least) may be exceeded.
982976
.NOEXPORT:
983-
984-
# Tell GNU make to disable its built-in pattern rules.
985-
%:: %,v
986-
%:: RCS/%,v
987-
%:: RCS/%
988-
%:: s.%
989-
%:: SCCS/s.%

‎deps/cares/RELEASE-NOTES.md

+31
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
## c-ares version 1.34.3 - November 9 2024
2+
3+
This is a bugfix release.
4+
5+
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)
9+
10+
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)
24+
25+
Thanks go to these friendly people for their efforts and contributions for this
26+
release:
27+
28+
* Brad House (@bradh352)
29+
* Jiwoo Park (@jimmy-park)
30+
31+
132
## c-ares version 1.34.2 - October 15 2024
233

334
This release contains a fix for downstream packages detecting the c-ares

0 commit comments

Comments
 (0)