Skip to content

Commit 4c1a33f

Browse files
committed
deps: Bump com_github_grpc_grpc -> 1.66.1 (envoyproxy#41331)
resolve CVE-2024-11407 Signed-off-by: Ryan Northey <ryan@synca.io>
1 parent 401b5fa commit 4c1a33f

File tree

3 files changed

+56
-18
lines changed

3 files changed

+56
-18
lines changed

.bazelrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ build:gcc --linkopt=-fuse-ld=gold --host_linkopt=-fuse-ld=gold
9595
build:gcc --test_env=HEAPCHECK=
9696
build:gcc --action_env=BAZEL_COMPILER=gcc
9797
build:gcc --action_env=CC=gcc --action_env=CXX=g++
98+
build:gcc --copt=-Wno-error=attributes
9899

99100
# Clang-tidy
100101
# TODO(phlax): enable this, its throwing some errors as well as finding more issues

bazel/grpc.patch

Lines changed: 52 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/BUILD b/BUILD
2-
index 06b69411a8..05cd878ae8 100644
2+
index fdc12602ed..617ad884cf 100644
33
--- a/BUILD
44
+++ b/BUILD
5-
@@ -29,7 +29,7 @@ licenses(["reciprocal"])
5+
@@ -33,7 +33,7 @@ package(
66
default_visibility = ["//visibility:public"],
77
features = [
88
"-parse_headers",
@@ -11,11 +11,24 @@ index 06b69411a8..05cd878ae8 100644
1111
],
1212
)
1313

14+
diff --git a/bazel/generate_cc.bzl b/bazel/generate_cc.bzl
15+
index a2c7f3a1bb..cd023ebb06 100644
16+
--- a/bazel/generate_cc.bzl
17+
+++ b/bazel/generate_cc.bzl
18+
@@ -134,7 +134,7 @@ def generate_cc_impl(ctx):
19+
20+
# Include the output directory so that protoc puts the generated code in the
21+
# right directory.
22+
- arguments.append("--proto_path={0}{1}".format(dir_out, proto_root))
23+
+ arguments.append("--proto_path={0}".format(dir_out))
24+
arguments += [_get_srcs_file_path(proto) for proto in protos]
25+
26+
# create a list of well known proto files if the argument is non-None
1427
diff --git a/src/core/BUILD b/src/core/BUILD
15-
index 1bb970e049..81265483e9 100644
28+
index 1acce192d0..c7c92db880 100644
1629
--- a/src/core/BUILD
1730
+++ b/src/core/BUILD
18-
@@ -24,7 +24,7 @@ licenses(["reciprocal"])
31+
@@ -25,7 +25,7 @@ licenses(["reciprocal"])
1932
package(
2033
default_visibility = ["//:__subpackages__"],
2134
features = [
@@ -24,15 +37,39 @@ index 1bb970e049..81265483e9 100644
2437
],
2538
)
2639

27-
diff --git a/src/core/lib/promise/detail/promise_like.h b/src/core/lib/promise/detail/promise_like.h
28-
--- a/src/core/lib/promise/detail/promise_like.h 2024-04-18 19:47:19.524155042 +0000
29-
+++ b/src/core/lib/promise/detail/promise_like.h 2024-04-18 23:40:29.050761807 +0000
30-
@@ -71,7 +71,7 @@
31-
32-
template <typename F>
33-
class PromiseLike<F, absl::enable_if_t<!std::is_void<
34-
- typename std::result_of<F()>::type>::value>> {
35-
+ typename std::invoke_result<F>::type>::value>> {
36-
private:
37-
GPR_NO_UNIQUE_ADDRESS F f_;
40+
diff --git a/third_party/BUILD b/third_party/BUILD
41+
index 77cb52d0fc..596b348ccd 100644
42+
--- a/third_party/BUILD
43+
+++ b/third_party/BUILD
44+
@@ -18,19 +18,19 @@ package(default_visibility = ["//:__subpackages__"])
45+
46+
alias(
47+
name = "libssl",
48+
- actual = "@boringssl//:ssl",
49+
+ actual = "@envoy//bazel:boringssl",
50+
tags = ["manual"],
51+
)
52+
53+
alias(
54+
name = "libcrypto",
55+
- actual = "@boringssl//:crypto",
56+
+ actual = "@envoy//bazel:boringcrypto",
57+
tags = ["manual"],
58+
)
59+
60+
alias(
61+
name = "madler_zlib",
62+
- actual = "@zlib//:zlib",
63+
+ actual = "@envoy//bazel/foreign_cc:zlib",
64+
tags = ["manual"],
65+
)
66+
67+
@@ -61,7 +61,7 @@ alias(
68+
69+
alias(
70+
name = "cares",
71+
- actual = "@com_github_cares_cares//:ares",
72+
+ actual = "@envoy//bazel/foreign_cc:ares",
73+
tags = ["manual"],
74+
)
3875

bazel/repository_locations.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,12 +412,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
412412
project_name = "gRPC",
413413
project_desc = "gRPC C core library",
414414
project_url = "https://grpc.io",
415-
version = "1.62.1",
416-
sha256 = "c9f9ae6e4d6f40464ee9958be4068087881ed6aa37e30d0e64d40ed7be39dd01",
415+
version = "1.66.1",
416+
sha256 = "79ed4ab72fa9589b20f8b0b76c16e353e4cfec1d773d33afad605d97b5682c61",
417417
strip_prefix = "grpc-{version}",
418418
urls = ["https://github.com/grpc/grpc/archive/v{version}.tar.gz"],
419419
use_category = ["dataplane_core", "controlplane"],
420-
release_date = "2024-03-08",
420+
release_date = "2024-08-26",
421421
cpe = "cpe:2.3:a:grpc:grpc:*",
422422
license = "Apache-2.0",
423423
license_url = "https://github.com/grpc/grpc/blob/v{version}/LICENSE",

0 commit comments

Comments
 (0)