mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 19:25:27 +08:00
[c-ares] Update to 1.19.1 (#32993)
This commit is contained in:
parent
774a8776e6
commit
df7782523e
@ -20,8 +20,8 @@ index 7940ecd..aacfa52 100644
|
|||||||
unsigned short port,
|
unsigned short port,
|
||||||
struct ares_addrinfo_node **nodes)
|
struct ares_addrinfo_node **nodes)
|
||||||
{
|
{
|
||||||
-#if defined(_WIN32) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600
|
-#if defined(_WIN32) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600 && !defined(__WATCOMC__)
|
||||||
+#if defined(_WIN32) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600 && !defined(WINRT)
|
+#if defined(_WIN32) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600 && !defined(__WATCOMC__) && !defined(WINRT)
|
||||||
PMIB_UNICASTIPADDRESS_TABLE table;
|
PMIB_UNICASTIPADDRESS_TABLE table;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
int status;
|
int status;
|
||||||
@ -74,21 +74,12 @@ diff --git a/src/lib/ares_init.c b/src/lib/ares_init.c
|
|||||||
index 3f9cec6..63143e0 100644
|
index 3f9cec6..63143e0 100644
|
||||||
--- a/src/lib/ares_init.c
|
--- a/src/lib/ares_init.c
|
||||||
+++ b/src/lib/ares_init.c
|
+++ b/src/lib/ares_init.c
|
||||||
@@ -745,6 +745,9 @@ static ULONG getBestRouteMetric(IF_LUID * const luid, /* Can't be const :( */
|
@@ -745,7 +745,7 @@ static ULONG getBestRouteMetric(IF_LUID * const luid, /* Can't be const :( */
|
||||||
const SOCKADDR_INET * const dest,
|
|
||||||
const ULONG interfaceMetric)
|
const ULONG interfaceMetric)
|
||||||
{
|
{
|
||||||
+#ifdef WINRT
|
|
||||||
+ return (ULONG)-1;
|
|
||||||
+#else
|
|
||||||
/* On this interface, get the best route to that destination. */
|
/* On this interface, get the best route to that destination. */
|
||||||
MIB_IPFORWARD_ROW2 row;
|
-#if defined(__WATCOMC__)
|
||||||
SOCKADDR_INET ignored;
|
+#if defined(__WATCOMC__) || defined(WINRT)
|
||||||
@@ -778,6 +781,7 @@ static ULONG getBestRouteMetric(IF_LUID * const luid, /* Can't be const :( */
|
/* OpenWatcom's builtin Windows SDK does not have a definition for
|
||||||
* which describes the combination as a "sum".
|
* MIB_IPFORWARD_ROW2, and also does not allow the usage of SOCKADDR_INET
|
||||||
*/
|
* as a variable. Let's work around this by returning the worst possible
|
||||||
return row.Metric + interfaceMetric;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
|
@ -1,8 +1,13 @@
|
|||||||
|
string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" _c_ares_version "${VERSION}")
|
||||||
|
set(_c_ares_version_major "${CMAKE_MATCH_1}")
|
||||||
|
set(_c_ares_version_minor "${CMAKE_MATCH_2}")
|
||||||
|
set(_c_ares_version_patch "${CMAKE_MATCH_3}")
|
||||||
|
|
||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO c-ares/c-ares
|
REPO c-ares/c-ares
|
||||||
REF cares-1_19_0
|
REF "cares-${_c_ares_version_major}_${_c_ares_version_minor}_${_c_ares_version_patch}"
|
||||||
SHA512 d6bd7183b9ddf418222357ca61e3ffe0a3e49cbd5d83046bb76146e23bb578b5c7e4a5d89e1c427e7163880323de8ee0962ba75c571102efdf8c0b5742e28f82
|
SHA512 73b5ee9d7e5ada6dd95dc32606821ea1307f30552242491e738f673d1ab9de1fdb3360d7a67c66a4a801b0e81ffb7382bfd93dbca836460dae515dd631ec6b91
|
||||||
HEAD_REF main
|
HEAD_REF main
|
||||||
PATCHES
|
PATCHES
|
||||||
avoid-docs.patch
|
avoid-docs.patch
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "c-ares",
|
"name": "c-ares",
|
||||||
"version-semver": "1.19.0",
|
"version-semver": "1.19.1",
|
||||||
"description": "A C library for asynchronous DNS requests",
|
"description": "A C library for asynchronous DNS requests",
|
||||||
"homepage": "https://github.com/c-ares/c-ares",
|
"homepage": "https://github.com/c-ares/c-ares",
|
||||||
"license": "MIT-CMU",
|
"license": "MIT-CMU",
|
||||||
|
@ -1345,7 +1345,7 @@
|
|||||||
"port-version": 5
|
"port-version": 5
|
||||||
},
|
},
|
||||||
"c-ares": {
|
"c-ares": {
|
||||||
"baseline": "1.19.0",
|
"baseline": "1.19.1",
|
||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"c-dbg-macro": {
|
"c-dbg-macro": {
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "55836d9576708f8126f2070e2a698afe72f5f948",
|
||||||
|
"version-semver": "1.19.1",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "a38a19b569f3763e2e63957687d4af9dcf19bd3e",
|
"git-tree": "a38a19b569f3763e2e63957687d4af9dcf19bd3e",
|
||||||
"version-semver": "1.19.0",
|
"version-semver": "1.19.0",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user