From 9841366806894b42fe375b08be20866c80f383dd Mon Sep 17 00:00:00 2001
From: AJ Heller <hork@google.com>
Date: Tue, 12 Oct 2021 15:09:15 -0700
Subject: [PATCH] Upgrade libuv to v1.37.0 (#27684)

* Upgrade libuv to v1.42.0

Also eliminates some cruft from the node implementation from 5 years ago

* sanitize.sh added a blank line?? ok then.

* pin to libuv v1.37.0
---
 bazel/grpc_deps.bzl                                       | 8 ++++----
 templates/tools/dockerfile/libuv_install.include          | 7 -------
 .../dockerfile/test/cxx_jessie_x64/Dockerfile.template    | 1 -
 third_party/libuv                                         | 2 +-
 tools/dockerfile/test/cxx_jessie_x64/Dockerfile           | 3 ---
 tools/run_tests/sanity/check_submodules.sh                | 7 +++----
 6 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 templates/tools/dockerfile/libuv_install.include

diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
index af598476714..9b03b982298 100644
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@@ -392,11 +392,11 @@ def grpc_deps():
         http_archive(
             name = "libuv",
             build_file = "@com_github_grpc_grpc//third_party:libuv.BUILD",
-            sha256 = "dfb4fe1ff0b47340978490a14bf253475159ecfcbad46ab2a350c78f9ce3360f",
-            strip_prefix = "libuv-15ae750151ac9341e5945eb38f8982d59fb99201",
+            sha256 = "7afa3c8a326b3eed02a9addb584ae7e995ae4d30516cad5e1e4af911931162a6",
+            strip_prefix = "libuv-02a9e1be252b623ee032a3137c0b0c94afbe6809",
             urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/libuv/libuv/archive/15ae750151ac9341e5945eb38f8982d59fb99201.tar.gz",
-                "https://github.com/libuv/libuv/archive/15ae750151ac9341e5945eb38f8982d59fb99201.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/libuv/libuv/archive/02a9e1be252b623ee032a3137c0b0c94afbe6809.tar.gz",
+                "https://github.com/libuv/libuv/archive/02a9e1be252b623ee032a3137c0b0c94afbe6809.tar.gz",
             ],
         )
 
diff --git a/templates/tools/dockerfile/libuv_install.include b/templates/tools/dockerfile/libuv_install.include
deleted file mode 100644
index a249c095db1..00000000000
--- a/templates/tools/dockerfile/libuv_install.include
+++ /dev/null
@@ -1,7 +0,0 @@
-#================
-# libuv
-RUN cd /tmp \
-    && wget http://dist.libuv.org/dist/v1.9.1/libuv-v1.9.1.tar.gz \
-    && tar -xf libuv-v1.9.1.tar.gz \
-    && cd libuv-v1.9.1 \
-    && sh autogen.sh && ./configure --prefix=/usr && make && make install
\ No newline at end of file
diff --git a/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template
index 8b8f18fc6bf..0577d18e21e 100644
--- a/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template
@@ -22,7 +22,6 @@
   <%include file="../../cxx_deps.include"/>
   <%include file="../../cmake_jessie_backports.include"/>
   <%include file="../../run_tests_addons.include"/>
-  <%include file="../../libuv_install.include"/>
 
   # Install gcc-4.9 and other relevant items
   RUN apt-get update && apt-get -y install gcc gcc-multilib g++ g++-multilib && apt-get clean
diff --git a/third_party/libuv b/third_party/libuv
index 15ae750151a..02a9e1be252 160000
--- a/third_party/libuv
+++ b/third_party/libuv
@@ -1 +1 @@
-Subproject commit 15ae750151ac9341e5945eb38f8982d59fb99201
+Subproject commit 02a9e1be252b623ee032a3137c0b0c94afbe6809
diff --git a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile
index 03f749416cd..90a578bcde1 100644
--- a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile
@@ -85,9 +85,6 @@ RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get cl
 
 RUN mkdir /var/local/jenkins
 
-#================
-# libuv
-RUN cd /tmp     && wget http://dist.libuv.org/dist/v1.9.1/libuv-v1.9.1.tar.gz     && tar -xf libuv-v1.9.1.tar.gz     && cd libuv-v1.9.1     && sh autogen.sh && ./configure --prefix=/usr && make && make install
 
 # Install gcc-4.9 and other relevant items
 RUN apt-get update && apt-get -y install gcc gcc-multilib g++ g++-multilib && apt-get clean
diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh
index a64f988bc99..f26f362b1e8 100755
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 set -e
 
 export TEST=true
@@ -24,8 +23,8 @@ cd "$(dirname "$0")/../../.."
 submodules=$(mktemp /tmp/submXXXXXX)
 want_submodules=$(mktemp /tmp/submXXXXXX)
 
-git submodule | awk '{ print $2 " " $1 }' | sort > "$submodules"
-cat << EOF | sort > "$want_submodules"
+git submodule | awk '{ print $2 " " $1 }' | sort >"$submodules"
+cat <<EOF | sort >"$want_submodules"
 third_party/abseil-cpp 997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 third_party/benchmark 73d4d5e8d6d449fc8663765a42aa8aeeee844489
 third_party/bloaty 73594cde8c9a52a102c4341c244c833aa61b9c06
@@ -34,7 +33,7 @@ third_party/cares/cares e982924acee7f7313b4baa4ee5ec000c5e373c30
 third_party/envoy-api 2f0d081fab0b0823f088c6e368f40e1992f46fcd
 third_party/googleapis 2f9af297c84c55c8b871ba4495e01ade42476c92
 third_party/googletest c9ccac7cb7345901884aabf5d1a786cfa6e2f397
-third_party/libuv 15ae750151ac9341e5945eb38f8982d59fb99201
+third_party/libuv 02a9e1be252b623ee032a3137c0b0c94afbe6809
 third_party/opencensus-proto 4aa53e15cbf1a47bc9087e6cfdca214c1eea4e89
 third_party/opentelemetry 60fa8754d890b5c55949a8c68dcfd7ab5c2395df
 third_party/protobuf 909a0f36a10075c4b4bc70fdee2c7e32dd612a72