Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit b4ebe6d

Browse filesBrowse files
targosBethGriggs
targos
authored and
BethGriggs
committed
deps: update c-ares to 1.19.0
Refs: https://c-ares.org/changelog.html#1_19_0 PR-URL: #46415 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent de6dd67 commit b4ebe6d
Copy full SHA for b4ebe6d

File tree

Expand file treeCollapse file tree

91 files changed

+4381
-3659
lines changed
Open diff view settings
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

91 files changed

+4381
-3659
lines changed
Open diff view settings
Collapse file

‎deps/cares/CHANGES‎

Copy file name to clipboardExpand all lines: deps/cares/CHANGES
+443-164Lines changed: 443 additions & 164 deletions
Large diffs are not rendered by default.
Collapse file

‎deps/cares/CMakeLists.txt‎

Copy file name to clipboardExpand all lines: deps/cares/CMakeLists.txt
+15-4Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ INCLUDE (CheckCSourceCompiles)
88
INCLUDE (CheckStructHasMember)
99
INCLUDE (CheckLibraryExists)
1010

11-
PROJECT (c-ares LANGUAGES C VERSION "1.18.0" )
11+
PROJECT (c-ares LANGUAGES C VERSION "1.19.0" )
1212

1313
# Set this version before release
14-
SET (CARES_VERSION "1.18.1")
14+
SET (CARES_VERSION "1.19.0")
1515

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

@@ -26,7 +26,7 @@ INCLUDE (GNUInstallDirs) # include this *AFTER* PROJECT(), otherwise paths are w
2626
# For example, a version of 4:0:2 would generate output such as:
2727
# libname.so -> libname.so.2
2828
# libname.so.2 -> libname.so.2.2.0
29-
SET (CARES_LIB_VERSIONINFO "7:1:5")
29+
SET (CARES_LIB_VERSIONINFO "8:0:6")
3030

3131

3232
OPTION (CARES_STATIC "Build as a static library" OFF)
@@ -82,9 +82,14 @@ SET (TARGETS_INST_DEST
8282

8383
# Function in Library
8484
# CHECK_LIBRARY_EXISTS can't be used as it will return true if the function
85-
# is found in a different dependent library.
85+
# is found in a different required/dependent library.
8686
MACRO (CARES_FUNCTION_IN_LIBRARY func lib var)
87+
88+
SET (_ORIG_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
89+
SET (CMAKE_REQUIRED_LIBRARIES )
8790
CHECK_FUNCTION_EXISTS ("${func}" "_CARES_FUNC_IN_LIB_GLOBAL_${func}")
91+
SET (CMAKE_REQUIRED_LIBRARIES "${_ORIG_CMAKE_REQUIRED_LIBRARIES}")
92+
8893
IF ("${_CARES_FUNC_IN_LIB_GLOBAL_${func}}")
8994
SET (${var} FALSE)
9095
ELSE ()
@@ -689,6 +694,12 @@ IF (CARES_INSTALL)
689694
if( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
690695

691696
if ( "${CPACK_PACKAGE_ARCHITECTURE}" STREQUAL "" )
697+
set( CPACK_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}" )
698+
endif()
699+
if ( "${CPACK_PACKAGE_ARCHITECTURE}" STREQUAL "" )
700+
if ( "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows" )
701+
message( FATAL_ERROR "Failed to determine CPACK_PACKAGE_ARCHITECTURE. Is CMAKE_SYSTEM_PROCESSOR set?" )
702+
endif()
692703
# Note: the architecture should default to the local architecture, but it
693704
# in fact comes up empty. We call `uname -m` to ask the kernel instead.
694705
EXECUTE_PROCESS( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE )
Collapse file

‎deps/cares/INSTALL.md‎

Copy file name to clipboardExpand all lines: deps/cares/INSTALL.md
+14Lines changed: 14 additions & 0 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,20 @@ sure that the var `OSTYPE` contains the string 'linux'; set the var
382382
`NDKBASE` to point to the base of your Novell NDK; and then type
383383
`make -f Makefile.netware` from the top source directory;
384384

385+
VCPKG
386+
=====
387+
388+
You can build and install c-ares using [vcpkg](https://github.com/Microsoft/vcpkg/) dependency manager:
389+
390+
```sh or powershell
391+
git clone https://github.com/Microsoft/vcpkg.git
392+
cd vcpkg
393+
./bootstrap-vcpkg.sh
394+
./vcpkg integrate install
395+
./vcpkg install c-ares
396+
```
397+
398+
The c-ares port in vcpkg is kept up to date by Microsoft team members and community contributors. If the version is out of date, please [create an issue or pull request](https://github.com/Microsoft/vcpkg) on the vcpkg repository.
385399

386400
PORTS
387401
=====
Collapse file

‎deps/cares/Makefile.in‎

Copy file name to clipboardExpand all lines: deps/cares/Makefile.in
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ EGREP = @EGREP@
297297
ETAGS = @ETAGS@
298298
EXEEXT = @EXEEXT@
299299
FGREP = @FGREP@
300+
FILECMD = @FILECMD@
300301
GCOV = @GCOV@
301302
GENHTML = @GENHTML@
302303
GREP = @GREP@
Collapse file

‎deps/cares/README.md‎

Copy file name to clipboardExpand all lines: deps/cares/README.md
+1-1Lines changed: 1 addition & 1 deletion
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ c-ares
33

44
[![Build Status](https://api.cirrus-ci.com/github/c-ares/c-ares.svg)](https://cirrus-ci.com/github/c-ares/c-ares)
55
[![Windows Build Status](https://ci.appveyor.com/api/projects/status/aevgc5914tm72pvs/branch/master?svg=true)](https://ci.appveyor.com/project/c-ares/c-ares/branch/master)
6-
[![Coverage Status](https://coveralls.io/repos/c-ares/c-ares/badge.svg?branch=master&service=github)](https://coveralls.io/github/c-ares/c-ares?branch=master)
6+
[![Coverage Status](https://coveralls.io/repos/github/c-ares/c-ares/badge.svg)](https://coveralls.io/github/c-ares/c-ares)
77
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/291/badge)](https://bestpractices.coreinfrastructure.org/projects/291)
88
[![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)
99
[![Releases](https://coderelease.io/badge/c-ares/c-ares)](https://coderelease.io/github/repository/c-ares/c-ares)
Collapse file

‎deps/cares/RELEASE-NOTES‎

Copy file name to clipboard
+78-72Lines changed: 78 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,91 @@
1-
c-ares version 1.18.1
2-
3-
This is an urgent bugfix release for a regression made in 1.18.0.
4-
5-
Bug fixes:
6-
o ares_getaddrinfo() would return ai_addrlen of 16 for ipv6
7-
adddresses rather than the sizeof(struct sockaddr_in6)
8-
9-
10-
11-
c-ares version 1.18.0
1+
c-ares version 1.19.0
122

133
This is a feature and bugfix release. It addresses a couple of new feature
144
requests as well as a couple of bug fixes.
155

6+
Security:
7+
o Low. Stack overflow in ares_set_sortlist() which is used during c-ares
8+
initialization and typically provided by an administrator and not an
9+
end user. [24]
10+
1611
Changes:
17-
o Add support for URI(Uniform Resource Identifier) records via
18-
ares_parse_uri_reply() [1]
19-
o Provide ares_nameser.h as a public interface as needed by NodeJS [5]
20-
o Update URLs from c-ares.haxx.se to c-ares.org [9]
21-
o During a domain search, treat ARES_ENODATA as ARES_NXDOMAIN so that the
22-
search process will continue to the next domain in the search. [11]
23-
o Turn ares_gethostbyname() into a wrapper for ares_getaddrinfo() as they
24-
followed very similar code paths and ares_gethostbyaddr() has some more
25-
desirable features such as priority sorting and parallel queries for
26-
AF_UNSPEC. [12]
27-
o ares_getaddrinfo() now contains a name element in the address info
28-
structure as the last element. This is not an API or ABI break due to
29-
the structure always being internally allocated and it being the last
30-
element. [12]
31-
o ares_parse_a_reply() and ares_parse_aaaa_reply() were nearly identical, those
32-
now use the same helper functions for parsing rather than having their own
33-
code. [12]
34-
o RFC6761 Section 6.3 says "localhost" lookups need to be special cased to
35-
return loopback addresses, and not forward queries to recursive dns servers.
36-
On Windows this now returns all loopback addresses, on other systems it
37-
returns 127.0.0.1 or ::1 always, and will never forward a request for
38-
"localhost" to outside DNS servers. [13]
39-
o Haiki: port [14]
12+
o Windows: Drop support for XP and derivatives which greatly cleans up
13+
initialization code. [3]
14+
o Add ARES_OPT_HOSTS_FILE similar to ARES_OPT_RESOLVCONF for specifying a
15+
custom hosts file location. [10]
16+
o Add vcpkg installation instructions [13]
4017

4118
Bug fixes:
42-
o add build to .gitignore [2]
43-
o z/OS minor update, add missing semicolon in ares_init.c [3]
44-
o Fix building when latest ax_code_coverage.m4 is imported [4]
45-
o Work around autotools 'error: too many loops' and other newer autotools
46-
import related bugs.
47-
o MinGW cross builds need advapi32 link as lower case [6]
48-
o Cygwin build fix due to containing both socket.h and winsock2.h [7]
49-
o ares_expand_name should allow underscores (_) as SRV records legitimately use
50-
them [8]
51-
o Allow '/' as a valid character for a returned name for CNAME in-addr.arpa
52-
delegation [10]
53-
o ares_getaddrinfo() was not honoring HOSTALIASES [12]
54-
o ares_getaddrinfo() had some test cases disabled due to a bug in the test
55-
framework itself which has now been resolved [12]
56-
o Due to Travis-CI becoming unfriendly to open-source, Cirrus-CI has now been
57-
brought online for automated unit testing.
19+
o Fix cross-compilation from Windows to Linux due to CPACK logic. [1]
20+
o Fix memory leak in reading /etc/hosts when using localhost fallback. [2]
21+
o Fix chain building c-ares when libresolv is already included by another
22+
project [4]
23+
o File lookup should not immediately abort as there may be other tries due to
24+
search criteria.
25+
o Asterisks should be allowed in host validation as CNAMEs may reference
26+
wildcard domains [5]
27+
o AutoTools build system referenced bad STDC_HEADERS macro [6]
28+
o Even if one address class returns a failure for ares_getaddrinfo() we should
29+
still return the results we have
30+
o CMake Windows: DLLs did not include resource file to include versions [7] [8]
31+
o CMake: Guard target creation in exported config [9]
32+
o Fix ares_getaddrinfo() numerical address resolution with AF_UNSPEC [11]
33+
o Apple: fix libresolv configured query times. [12]
34+
o Fix tools and help information [14] [15]
35+
o Various documentation fixes and cleanups [16] [22] [25]
36+
o Add include guards to ares_data.h [17]
37+
o c-ares could try to exceed maximum number of iovec entries supported by
38+
system [18]
39+
o CMake package config generation allow for absolute install paths [19]
40+
o Intel compiler fixes [20]
41+
o ares_strsplit bugs [21] [23]
42+
o The RFC6761 6.3 states localhost subdomains must be offline too. [26]
5843

5944
Thanks go to these friendly people for their efforts and contributions:
60-
Biswapriyo Nath (@Biswa96)
45+
Boby Reynolds (@reynoldsbd)
6146
Brad House (@bradh352)
62-
Daniel Bevenius (@danbev)
47+
Brad Spencer (@b-spencer)
48+
@bsergean
6349
Daniel Stenberg (@bagder)
64-
Dhrumil Rana (@dhrumilrana)
65-
Felix Yan (@felixonmars)
66-
Jérôme Duval (@korli)
67-
Martin Holeš (@martin-256)
68-
Sinan Kaya
69-
(9 contributors)
50+
Dmitry Karpov
51+
@FrankXie05
52+
@hopper-vul
53+
Jonathan Ringer (@jonringer)
54+
Kai Pastor (@dg0yt)
55+
@lifenjoiner
56+
Manish Mehra (@mmehra)
57+
@marc-groundctl
58+
Nikolaos Chatzikonstantinou (@createyourpersonalaccount)
59+
Ridge Kennedy (@ridgek)
60+
Sam James (@thesamesam)
61+
Stephen Sachs (@stephenmsachs)
62+
Thomas Dreibholz (@dreibh)
63+
(18 contributors)
7064

7165
References to bug reports and discussions on issues:
72-
[1] = https://github.com/c-ares/c-ares/pull/411
73-
[2] = https://github.com/c-ares/c-ares/pull/410
74-
[3] = https://github.com/c-ares/c-ares/pull/414
75-
[4] = https://github.com/c-ares/c-ares/pull/418
76-
[5] = https://github.com/c-ares/c-ares/pull/417
77-
[6] = https://github.com/c-ares/c-ares/pull/420
78-
[7] = https://github.com/c-ares/c-ares/pull/422
79-
[8] = https://github.com/c-ares/c-ares/issues/424
80-
[9] = https://github.com/c-ares/c-ares/issues/423
81-
[10] = https://github.com/c-ares/c-ares/issues/427
82-
[11] = https://github.com/c-ares/c-ares/issues/426
83-
[12] = https://github.com/c-ares/c-ares/pull/428
84-
[13] = https://github.com/c-ares/c-ares/pull/430
85-
[14] = https://github.com/c-ares/c-ares/pull/431
66+
[1] = https://github.com/c-ares/c-ares/pull/436
67+
[2] = https://github.com/c-ares/c-ares/issues/439
68+
[3] = https://github.com/c-ares/c-ares/pull/445
69+
[4] = https://github.com/c-ares/c-ares/pull/451
70+
[5] = https://github.com/c-ares/c-ares/issues/457
71+
[6] = https://github.com/c-ares/c-ares/pull/459
72+
[7] = https://github.com/c-ares/c-ares/issues/460
73+
[8] = https://github.com/c-ares/c-ares/pull/468
74+
[9] = https://github.com/c-ares/c-ares/pull/464
75+
[10] = https://github.com/c-ares/c-ares/pull/465
76+
[11] = https://github.com/c-ares/c-ares/pull/469
77+
[12] = https://github.com/c-ares/c-ares/pull/467
78+
[13] = https://github.com/c-ares/c-ares/pull/478
79+
[14] = https://github.com/c-ares/c-ares/pull/479
80+
[15] = https://github.com/c-ares/c-ares/pull/481
81+
[16] = https://github.com/c-ares/c-ares/pull/490
82+
[17] = https://github.com/c-ares/c-ares/pull/491
83+
[18] = https://github.com/c-ares/c-ares/pull/489
84+
[19] = https://github.com/c-ares/c-ares/pull/486
85+
[20] = https://github.com/c-ares/c-ares/pull/485
86+
[21] = https://github.com/c-ares/c-ares/pull/492
87+
[22] = https://github.com/c-ares/c-ares/pull/494
88+
[23] = https://github.com/c-ares/c-ares/pull/495
89+
[24] = https://github.com/c-ares/c-ares/pull/497
90+
[25] = https://github.com/c-ares/c-ares/issues/487
91+
[26] = https://github.com/c-ares/c-ares/issues/477
Collapse file

‎deps/cares/aminclude_static.am‎

Copy file name to clipboardExpand all lines: deps/cares/aminclude_static.am
+1-1Lines 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 Wed Oct 27 08:06:13 CEST 2021
3+
# from AX_AM_MACROS_STATIC on Sat Jan 28 22:07:59 CET 2023
44

55

66
# Code coverage
Collapse file

‎deps/cares/c-ares-config.cmake.in‎

Copy file name to clipboardExpand all lines: deps/cares/c-ares-config.cmake.in
+8-5Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,17 @@ include("${CMAKE_CURRENT_LIST_DIR}/c-ares-targets.cmake")
88
set(c-ares_LIBRARY c-ares::cares)
99

1010
if(@CARES_SHARED@)
11-
add_library(c-ares::cares_shared INTERFACE IMPORTED)
12-
set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares")
11+
if(NOT TARGET c-ares::cares_shared)
12+
add_library(c-ares::cares_shared INTERFACE IMPORTED)
13+
set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares")
14+
endif()
1315
set(c-ares_SHARED_LIBRARY c-ares::cares_shared)
14-
elseif(@CARES_STATIC@)
15-
add_library(c-ares::cares_static INTERFACE IMPORTED)
16-
set_target_properties(c-ares::cares_static PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares")
1716
endif()
1817

1918
if(@CARES_STATIC@)
19+
if(NOT TARGET c-ares::cares_static)
20+
add_library(c-ares::cares_static INTERFACE IMPORTED)
21+
set_target_properties(c-ares::cares_static PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares")
22+
endif()
2023
set(c-ares_STATIC_LIBRARY c-ares::cares_static)
2124
endif()

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.