From 113e84b8dd78b0a4438dc40a2ffaac125e35d690 Mon Sep 17 00:00:00 2001
From: Fabian Holler <fabian.holler@simplesurance.de>
Date: Tue, 12 Feb 2019 17:35:48 +0100
Subject: [PATCH] update cares to version cares-1_15_0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes the issue: https://github.com/grpc/grpc/issues/16688

Which causes that grpc can not be build because of the following
compiler error:
  third_party/cares/cares/ares_init.c: In function ‘ares_dup’:
  third_party/cares/cares/ares_init.c:301:17: error: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination? [-Werror=sizeof-pointer- memaccess] sizeof(src->local_dev_name));
---
 bazel/grpc_deps.bzl                        | 4 ++--
 test/distrib/cpp/run_distrib_test_cmake.sh | 2 +-
 third_party/cares/cares                    | 2 +-
 tools/run_tests/sanity/check_submodules.sh | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
index 50d12981e4f..891783b2da3 100644
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@@ -162,8 +162,8 @@ def grpc_deps():
         http_archive(
             name = "com_github_cares_cares",
             build_file = "@com_github_grpc_grpc//third_party:cares/cares.BUILD",
-            strip_prefix = "c-ares-3be1924221e1326df520f8498d704a5c4c8d0cce",
-            url = "https://github.com/c-ares/c-ares/archive/3be1924221e1326df520f8498d704a5c4c8d0cce.tar.gz",
+            strip_prefix = "c-ares-e982924acee7f7313b4baa4ee5ec000c5e373c30",
+            url = "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
         )
 
     if "com_google_absl" not in native.existing_rules():
diff --git a/test/distrib/cpp/run_distrib_test_cmake.sh b/test/distrib/cpp/run_distrib_test_cmake.sh
index 6ec3cab6024..bada14d81c4 100755
--- a/test/distrib/cpp/run_distrib_test_cmake.sh
+++ b/test/distrib/cpp/run_distrib_test_cmake.sh
@@ -24,7 +24,7 @@ apt-get install -t jessie-backports -y libssl-dev
 # Install c-ares
 cd third_party/cares/cares
 git fetch origin
-git checkout cares-1_13_0
+git checkout cares-1_15_0
 mkdir -p cmake/build
 cd cmake/build
 cmake -DCMAKE_BUILD_TYPE=Release ../..
diff --git a/third_party/cares/cares b/third_party/cares/cares
index 3be1924221e..e982924acee 160000
--- a/third_party/cares/cares
+++ b/third_party/cares/cares
@@ -1 +1 @@
-Subproject commit 3be1924221e1326df520f8498d704a5c4c8d0cce
+Subproject commit e982924acee7f7313b4baa4ee5ec000c5e373c30
diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh
index a95f524ac1c..b15b8d3b077 100755
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@@ -31,7 +31,7 @@ cat << EOF | awk '{ print $1 }' | sort > "$want_submodules"
  73594cde8c9a52a102c4341c244c833aa61b9c06 third_party/bloaty (remotes/origin/wide-14-g73594cd)
  b29b21a81b32ec273f118f589f46d56ad3332420 third_party/boringssl (remotes/origin/chromium-stable)
  afc30d43eef92979b05776ec0963c9cede5fb80f third_party/boringssl-with-bazel (fips-20180716-116-gafc30d43e)
- 3be1924221e1326df520f8498d704a5c4c8d0cce third_party/cares/cares (cares-1_13_0)
+ e982924acee7f7313b4baa4ee5ec000c5e373c30 third_party/cares/cares (cares-1_15_0)
  911001cdca003337bdb93fab32740cde61bafee3 third_party/data-plane-api (heads/master)
  28f50e0fed19872e0fd50dd23ce2ee8cd759338e third_party/gflags (v2.2.0-5-g30dbc81)
  80ed4d0bbf65d57cc267dfc63bd2584557f11f9b third_party/googleapis (common-protos-1_3_1-915-g80ed4d0bb)