Skip to content

Commit f5bd5c9

Browse files
malkiamalkia
committed
update packages
1 parent abc7df4 commit f5bd5c9

11 files changed

+42
-91
lines changed

‎MODULE.bazel‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ single_version_override(
99
module_name = "abseil-cpp",
1010
patch_strip = 1,
1111
patches = [
12-
"bazel/absl_win10_cache_zone.diff",
12+
"bazel/absl_win10_cache_zone.patch",
1313
],
1414
)
1515
bazel_dep(name = "aspect_bazel_lib", version = "2.9.4")
@@ -19,26 +19,21 @@ bazel_dep(name = "curl", version = "8.8.0.bcr.1")
1919
bazel_dep(name = "depend_on_what_you_use", version = "0.5.0")
2020
bazel_dep(name = "google_benchmark", version = "1.8.5")
2121
bazel_dep(name = "googletest", version = "1.15.2")
22-
bazel_dep(name = "grpc", version = "1.66.0.bcr.3")
22+
23+
bazel_dep(name = "grpc", version = "1.68.0")
2324
single_version_override(
2425
module_name = "grpc",
2526
patch_strip = 1,
2627
patches = [
27-
# https://github.com/grpc/grpc/pull/37534
28-
# https://github.com/grpc/grpc/pull/37534.diff
29-
"bazel/grpc_bzlmod.diff",
30-
# https://github.com/grpc/grpc/pull/38101/files
31-
# https://github.com/grpc/grpc/pull/38101/commits/f093af21a9bc2a27156e7cd30744844797287253/patch
32-
# https://github.com/grpc/grpc/commit/f093af21a9bc2a27156e7cd30744844797287253.diff
33-
"bazel/grpc_ares_fix_2.diff",
28+
"bazel/grpc_ares_fix.patch",
3429
],
3530
)
3631

3732
bazel_dep(name = "nlohmann_json", version = "3.11.3.bcr.1")
3833
bazel_dep(name = "platforms", version = "0.0.10")
39-
bazel_dep(name = "rules_cc", version = "0.0.13") # Issues with 0.0.14 and grpc/protobuf
34+
bazel_dep(name = "rules_cc", version = "0.0.16") # Issues with 0.1.0
4035
bazel_dep(name = "rules_pkg", version = "1.0.1")
41-
bazel_dep(name = "rules_proto", version = "6.0.2") # Issues with 7.0.0 and grpc/protobuf
36+
bazel_dep(name = "rules_proto", version = "7.0.2")
4237
bazel_dep(name = "zlib", version = "1.3.1.bcr.3")
4338
bazel_dep(name = "opentracing-cpp", version = "1.6.0")
4439
bazel_dep(name = "rules_multitool", version = "1.0.0")
@@ -61,7 +56,9 @@ archive_override(
6156
integrity = "sha256-U80yztsndi6iBgqcjYPkuCLeE9c7XV03ots89VAY1pQ=",
6257
patch_strip = 1,
6358
# Copied from https://github.com/bazelbuild/bazel-central-registry/tree/main/modules/opentelemetry-proto/1.3.1/patches
64-
patches = ["bazel/opentelemetry-proto.patch"],
59+
patches = [
60+
"bazel/opentelemetry-proto.patch",
61+
],
6562
strip_prefix = "opentelemetry-proto-1.4.0",
6663
urls = "https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/v1.4.0.tar.gz",
6764
)

‎bazel/absl_win10_cache_zone.diff‎ renamed to ‎bazel/absl_win10_cache_zone.patch‎

File renamed without changes.

‎bazel/grpc_ares_fix_2.diff‎ renamed to ‎bazel/grpc_ares_fix.patch‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
2-
index 37a8f85cc5..b319f17aaf 100644
2+
index 3bfd15537e..0d4dcd5579 100644
33
--- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
44
+++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
55
@@ -224,7 +224,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
@@ -12,15 +12,15 @@ index 37a8f85cc5..b319f17aaf 100644
1212
*from_len = recv_from_source_addr_len_;
1313
}
1414
diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
15-
index ef70bfc5b6..e8b05452c7 100644
15+
index 6f988c8710..f30826bbb4 100644
1616
--- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
1717
+++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
18-
@@ -73,7 +73,7 @@ namespace {
19-
// instantiated at the top of the virtual socket function callstack.
20-
class WSAErrorContext final {
21-
public:
22-
- explicit WSAErrorContext(){};
23-
+ explicit WSAErrorContext() {};
24-
25-
~WSAErrorContext() {
26-
if (error_ != 0) {
18+
@@ -307,7 +307,7 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
19+
// c-ares overloads this recv_from virtual socket function to receive
20+
// data on both UDP and TCP sockets, and from is nullptr for TCP.
21+
if (from != nullptr) {
22+
- CHECK(*from_len <= recv_from_source_addr_len_);
23+
+ CHECK(*from_len >= recv_from_source_addr_len_);
24+
memcpy(from, &recv_from_source_addr_, recv_from_source_addr_len_);
25+
*from_len = recv_from_source_addr_len_;
26+
}

‎bazel/grpc_ares_fix_2.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎bazel/grpc_bzlmod.diff‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎bazel/opentelemetry-proto.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,5 +167,5 @@ index 0000000..a5a5e54
167167
+ compatibility_level = 0,
168168
+)
169169
+
170-
+bazel_dep(name = "grpc", version = "1.66.0.bcr.3")
170+
+bazel_dep(name = "grpc", version = "1.68.0")
171171
+bazel_dep(name = "rules_proto", version = "6.0.2")

‎x/MODULE.bazel‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ single_version_override(
1313
module_name = "abseil-cpp",
1414
patch_strip = 1,
1515
patches = [
16-
"bazel/absl_win10_cache_zone.diff",
16+
"bazel/absl_win10_cache_zone.patch",
1717
],
1818
)
1919
bazel_dep(name = "aspect_bazel_lib", version = "2.9.4")
@@ -23,26 +23,21 @@ bazel_dep(name = "curl", version = "8.8.0.bcr.1")
2323
bazel_dep(name = "depend_on_what_you_use", version = "0.5.0")
2424
bazel_dep(name = "google_benchmark", version = "1.8.5")
2525
bazel_dep(name = "googletest", version = "1.15.2")
26-
bazel_dep(name = "grpc", version = "1.66.0.bcr.3")
26+
27+
bazel_dep(name = "grpc", version = "1.68.0")
2728
single_version_override(
2829
module_name = "grpc",
2930
patch_strip = 1,
3031
patches = [
31-
# https://github.com/grpc/grpc/pull/37534
32-
# https://github.com/grpc/grpc/pull/37534.diff
33-
"bazel/grpc_bzlmod.diff",
34-
# https://github.com/grpc/grpc/pull/38101/files
35-
# https://github.com/grpc/grpc/pull/38101/commits/f093af21a9bc2a27156e7cd30744844797287253/patch
36-
# https://github.com/grpc/grpc/commit/f093af21a9bc2a27156e7cd30744844797287253.diff
37-
"bazel/grpc_ares_fix_2.diff",
32+
"bazel/grpc_ares_fix.patch",
3833
],
3934
)
4035

4136
bazel_dep(name = "nlohmann_json", version = "3.11.3.bcr.1")
4237
bazel_dep(name = "platforms", version = "0.0.10")
43-
bazel_dep(name = "rules_cc", version = "0.0.13") # Issues with 0.0.14 and grpc/protobuf
38+
bazel_dep(name = "rules_cc", version = "0.0.16") # Issues with 0.1.0
4439
bazel_dep(name = "rules_pkg", version = "1.0.1")
45-
bazel_dep(name = "rules_proto", version = "6.0.2") # Issues with 7.0.0 and grpc/protobuf
40+
bazel_dep(name = "rules_proto", version = "7.0.2")
4641
bazel_dep(name = "zlib", version = "1.3.1.bcr.3")
4742
bazel_dep(name = "opentracing-cpp", version = "1.6.0")
4843
bazel_dep(name = "rules_multitool", version = "1.0.0")
@@ -65,7 +60,9 @@ archive_override(
6560
integrity = "sha256-U80yztsndi6iBgqcjYPkuCLeE9c7XV03ots89VAY1pQ=",
6661
patch_strip = 1,
6762
# Copied from https://github.com/bazelbuild/bazel-central-registry/tree/main/modules/opentelemetry-proto/1.3.1/patches
68-
patches = ["bazel/opentelemetry-proto.patch"],
63+
patches = [
64+
"bazel/opentelemetry-proto.patch",
65+
],
6966
strip_prefix = "opentelemetry-proto-1.4.0",
7067
urls = "https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/v1.4.0.tar.gz",
7168
)

‎x/bazel/absl_win10_cache_zone.diff‎ renamed to ‎x/bazel/absl_win10_cache_zone.patch‎

File renamed without changes.

‎x/bazel/grpc_ares_fix_2.diff‎ renamed to ‎x/bazel/grpc_ares_fix.patch‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
2-
index 37a8f85cc5..b319f17aaf 100644
2+
index 3bfd15537e..0d4dcd5579 100644
33
--- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
44
+++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
55
@@ -224,7 +224,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
@@ -12,15 +12,15 @@ index 37a8f85cc5..b319f17aaf 100644
1212
*from_len = recv_from_source_addr_len_;
1313
}
1414
diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
15-
index ef70bfc5b6..e8b05452c7 100644
15+
index 6f988c8710..f30826bbb4 100644
1616
--- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
1717
+++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
18-
@@ -73,7 +73,7 @@ namespace {
19-
// instantiated at the top of the virtual socket function callstack.
20-
class WSAErrorContext final {
21-
public:
22-
- explicit WSAErrorContext(){};
23-
+ explicit WSAErrorContext() {};
24-
25-
~WSAErrorContext() {
26-
if (error_ != 0) {
18+
@@ -307,7 +307,7 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
19+
// c-ares overloads this recv_from virtual socket function to receive
20+
// data on both UDP and TCP sockets, and from is nullptr for TCP.
21+
if (from != nullptr) {
22+
- CHECK(*from_len <= recv_from_source_addr_len_);
23+
+ CHECK(*from_len >= recv_from_source_addr_len_);
24+
memcpy(from, &recv_from_source_addr_, recv_from_source_addr_len_);
25+
*from_len = recv_from_source_addr_len_;
26+
}

‎x/bazel/grpc_bzlmod.diff‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)