From 612d11e579e20cda700ddd809cc082a54dd507d8 Mon Sep 17 00:00:00 2001 From: Michael Rebello Date: Tue, 2 Jul 2019 14:12:13 -0700 Subject: [PATCH 1/3] libevent: update to include patch on master Pulls in the change added by https://github.com/libevent/libevent/pull/849 to fix https://github.com/lyft/envoy-mobile/issues/215. Signed-off-by: Michael Rebello --- bazel/repository_locations.bzl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index f9abd071ef786..fda8e8d0532f2 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -131,11 +131,12 @@ REPOSITORY_LOCATIONS = dict( # This SHA includes the new "prepare" and "check" watchers, used for event loop performance # stats (see https://github.com/libevent/libevent/pull/793) and the fix for a race condition # in the watchers (see https://github.com/libevent/libevent/pull/802). - # This also includes the fix for https://github.com/libevent/libevent/issues/806 + # This also includes the fixes for https://github.com/libevent/libevent/issues/806 + # and https://github.com/lyft/envoy-mobile/issues/215. # TODO(mergeconflict): Update to v2.2 when it is released. - strip_prefix = "libevent-3b1864b625ec37c3051512845982f347f4cc5621", + strip_prefix = "libevent-0d7d85c2083f7a4c9efe01c061486f332b576d28", # 2019-05-16 - urls = ["https://github.com/libevent/libevent/archive/3b1864b625ec37c3051512845982f347f4cc5621.tar.gz"], + urls = ["https://github.com/libevent/libevent/archive/0d7d85c2083f7a4c9efe01c061486f332b576d28.tar.gz"], ), net_zlib = dict( # TODO(moderation): revert to com_github_madler_zlib name pending resolution of workaround From fab1dca2215d7ec35b65cf6c3b4de7e4a4e69140 Mon Sep 17 00:00:00 2001 From: Michael Rebello Date: Tue, 2 Jul 2019 14:28:00 -0700 Subject: [PATCH 2/3] fixup Signed-off-by: Michael Rebello --- bazel/repository_locations.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index fda8e8d0532f2..63fe4b1603fab 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -127,7 +127,7 @@ REPOSITORY_LOCATIONS = dict( urls = ["https://github.com/google/benchmark/archive/v1.5.0.tar.gz"], ), com_github_libevent_libevent = dict( - sha256 = "6f799dd920aab9487cb04cd40627a5d4104fbbd246ebb5c8fd5e520055af2ef5", + sha256 = "549d34065eb2485dfad6c8de638caaa6616ed130eec36dd978f73b6bdd5af113", # This SHA includes the new "prepare" and "check" watchers, used for event loop performance # stats (see https://github.com/libevent/libevent/pull/793) and the fix for a race condition # in the watchers (see https://github.com/libevent/libevent/pull/802). From a623bfbc3ed07412fbe5bf6d718e8210aa987d99 Mon Sep 17 00:00:00 2001 From: Michael Rebello Date: Tue, 2 Jul 2019 14:31:53 -0700 Subject: [PATCH 3/3] CR Signed-off-by: Michael Rebello --- bazel/repository_locations.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 63fe4b1603fab..7bbc4589f5aab 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -135,7 +135,7 @@ REPOSITORY_LOCATIONS = dict( # and https://github.com/lyft/envoy-mobile/issues/215. # TODO(mergeconflict): Update to v2.2 when it is released. strip_prefix = "libevent-0d7d85c2083f7a4c9efe01c061486f332b576d28", - # 2019-05-16 + # 2019-07-02 urls = ["https://github.com/libevent/libevent/archive/0d7d85c2083f7a4c9efe01c061486f332b576d28.tar.gz"], ), net_zlib = dict(