From fd42206a7cb5e83350567515653807d8cb4a9220 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Sun, 22 Oct 2023 12:15:15 +0100 Subject: [PATCH 1/2] deps: Bump `com_github_grpc_grpc` -> 1.59.1 Signed-off-by: Ryan Northey --- bazel/repository_locations.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 7ac6b0af9c6e6..060f09ad2e60e 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -376,12 +376,12 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "gRPC", project_desc = "gRPC C core library", project_url = "https://grpc.io", - version = "1.56.2", - sha256 = "931f07db9d48cff6a6007c1033ba6d691fe655bea2765444bc1ad974dfc840aa", + version = "1.59.1", + sha256 = "916f88a34f06b56432611aaa8c55befee96d0a7b7d7457733b9deeacbc016f99", strip_prefix = "grpc-{version}", urls = ["https://github.com/grpc/grpc/archive/v{version}.tar.gz"], use_category = ["dataplane_core", "controlplane"], - release_date = "2023-07-14", + release_date = "2023-10-06", cpe = "cpe:2.3:a:grpc:grpc:*", license = "Apache-2.0", license_url = "https://github.com/grpc/grpc/blob/v{version}/LICENSE", From a28ecbe20dd65c2e7afe64e0abbbb062603c34e8 Mon Sep 17 00:00:00 2001 From: Akshay Gupta Date: Mon, 23 Oct 2023 12:00:21 -0700 Subject: [PATCH 2/2] safe cast int to void* Signed-off-by: Ryan Northey --- bazel/grpc.patch | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/bazel/grpc.patch b/bazel/grpc.patch index c8872879824c6..4608049f1bf8e 100644 --- a/bazel/grpc.patch +++ b/bazel/grpc.patch @@ -23,4 +23,17 @@ index 1bb970e049..81265483e9 100644 + "-layering_check", ], ) - + +diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h +index 38bb070213..b53086e680 100644 +--- a/src/core/lib/channel/channel_args.h ++++ b/src/core/lib/channel/channel_args.h +@@ -284,7 +284,7 @@ class ChannelArgs { + + class Value { + public: +- explicit Value(int n) : rep_(reinterpret_cast(n), &int_vtable_) {} ++ explicit Value(int n) : rep_(reinterpret_cast(static_cast(n)), &int_vtable_) {} + explicit Value(std::string s) + : rep_(RefCountedString::Make(s).release(), &string_vtable_) {} + explicit Value(Pointer p) : rep_(std::move(p)) {}