Skip to content

Commit 575d44b

Browse files
authored
deps: Bump com_google_protobuf -> 23.4 (#28754)
Signed-off-by: Ryan Northey <[email protected]>
1 parent eccaa0c commit 575d44b

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

bazel/protobuf.patch

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ index 0f6e41e3a..c0d2bbccf 100644
55
@@ -454,14 +454,79 @@ cc_library(
66
visibility = ["//visibility:public"],
77
)
8-
8+
99
+# Envoy: Patch
1010
+
1111
cc_binary(
@@ -16,7 +16,7 @@ index 0f6e41e3a..c0d2bbccf 100644
1616
visibility = ["//visibility:public"],
1717
deps = ["//src/google/protobuf/compiler:protoc_lib"],
1818
)
19-
19+
2020
+# Lifted from `rules_proto`
2121
+config_setting(
2222
+ name = "linux-aarch_64",
@@ -89,8 +89,8 @@ index e7555ee10..a93beb1c5 100644
8989
+++ b/python/google/protobuf/__init__.py
9090
@@ -31,3 +31,10 @@
9191
# Copyright 2007 Google Inc. All Rights Reserved.
92-
93-
__version__ = '4.23.1'
92+
93+
__version__ = '4.23.4'
9494
+
9595
+
9696
+if __name__ != '__main__':
@@ -109,7 +109,7 @@ diff --git a/src/google/protobuf/io/BUILD.bazel b/src/google/protobuf/io/BUILD.b
109109
+ "//conditions:default": ["//external:zlib"],
110110
}),
111111
)
112-
112+
113113
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
114114
--- a/src/google/protobuf/port_def.inc 2023-06-27 01:17:34.917105764 +0000
115115
+++ b/src/google/protobuf/port_def.inc 2023-06-27 01:18:12.069060142 +0000
@@ -138,12 +138,12 @@ diff --git a/src/google/protobuf/map_field.h b/src/google/protobuf/map_field.h
138138
--- a/src/google/protobuf/map_field.h 2023-06-30 17:14:18.934528580 +0000
139139
+++ b/src/google/protobuf/map_field.h 2023-06-30 17:14:52.098500807 +0000
140140
@@ -345,7 +345,7 @@
141-
141+
142142
protected:
143143
// "protected" stops users from deleting a `MapFieldBase *`
144144
- ~MapFieldBase();
145145
+ virtual ~MapFieldBase();
146-
146+
147147
public:
148148
// Returns reference to internal repeated field. Data written using
149149
diff --git a/src/google/protobuf/compiler/BUILD.bazel b/src/google/protobuf/compiler/BUILD.bazel
@@ -166,7 +166,7 @@ index 1c6a24945..c27d0bf2a 100644
166166
@@ -1062,6 +1062,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
167167
#pragma warning(disable: 4125)
168168
#endif
169-
169+
170170
+#pragma GCC diagnostic ignored "-Wundef"
171171
#if PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII
172172
#define PROTOBUF_DEBUG true

bazel/repository_locations.bzl

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
# This should match the schema defined in external_deps.bzl.
22

3-
PROTOBUF_VERSION = "23.1"
3+
PROTOBUF_VERSION = "23.4"
44

55
# These names of these deps *must* match the names used in `/bazel/protobuf.patch`,
66
# and both must match the names from the protobuf releases (see
77
# https://github.com/protocolbuffers/protobuf/releases).
88
# The names change in upcoming versions.
99
# The shas are calculated from the downloads on the releases page.
1010
PROTOC_VERSIONS = dict(
11-
linux_aarch_64 = "f174eb3a6bd812e9946be3a9ef3fb8f8ac4a6f8acd0a01c928fb2fecb22b6fb0",
12-
linux_x86_64 = "031f8e7504eb359df58389b31752f8081c01b01132a2f3f768a3792ac4b06f3f",
13-
osx_aarch_64 = "8d0af9adbbde1a9791d10125f4742a4c9fa84f85ee46fe69adde6bf5e8a4a428",
14-
osx_x86_64 = "5d0367dfd58ea894f87d1d6efbd800bf52820842e9151d265db17471bc69fe94",
15-
win64 = "420cd7a1548a9c3ef5b5a7e969b6fcf8ee6a5a09cec99d7a3209406f028e5dce",
11+
linux_aarch_64 = "1c7750b6e038305b5a7fc3d0cda1ebefdf106a4f30a787bf826ed2fc47c3967d",
12+
linux_x86_64 = "0502f286ac9ed860b629a7965a14527b1f2dd131e4283fa23c2d7f184672aa9a",
13+
osx_aarch_64 = "8c7afae8626b6811e7b5897d16d940c2dbf50b1e135ed958a01db6566bdda726",
14+
osx_x86_64 = "07e5fdcf1b0708d3367dc5e6eb8d135de7e407d75316c93155cfd8ab362eec80",
15+
win64 = "a309c39442fb75f0db343cb22c111a00f91cdf0767f332e170644b9378e2bcc6",
1616
)
1717

1818
REPOSITORY_LOCATIONS_SPEC = dict(
@@ -825,11 +825,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
825825
# test/common/json:gen_excluded_unicodes to recompute the ranges
826826
# excluded from differential fuzzing that are populated in
827827
# test/common/json/json_sanitizer_test_util.cc.
828-
sha256 = "72bae766561149f8507a81647f91fc519d2a60309613f004ed307cb5f9b1242b",
828+
sha256 = "a700a49470d301f1190a487a923b5095bf60f08f4ae4cac9f5f7c36883d17971",
829829
strip_prefix = "protobuf-{version}",
830830
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v{version}/protobuf-{version}.tar.gz"],
831831
use_category = ["dataplane_core", "controlplane"],
832-
release_date = "2023-05-17",
832+
release_date = "2023-07-06",
833833
cpe = "cpe:2.3:a:google:protobuf:*",
834834
license = "Protocol Buffers",
835835
license_url = "https://github.com/protocolbuffers/protobuf/blob/v{version}/LICENSE",
@@ -1460,7 +1460,7 @@ def _compiled_protoc_deps(locations, versions):
14601460
sha256 = sha,
14611461
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v{version}/protoc-{version}-%s.zip" % platform.replace("_", "-", 1)],
14621462
use_category = ["dataplane_core", "controlplane"],
1463-
release_date = "2023-05-17",
1463+
release_date = "2023-07-06",
14641464
cpe = "N/A",
14651465
license = "Protocol Buffers",
14661466
license_url = "https://github.com/protocolbuffers/protobuf/blob/v{version}/LICENSE",

0 commit comments

Comments
 (0)