external: Update protobuf to v23.4

This corresponds to the highest current version found in popular
distros (in this case, the one in Arch Linux).

The abseil library is now a dependency of protobuf (for logging).

4 files changed, 365 insertions, 271 deletions

diff --git a/etc/defaults/CC/TARGETS.protobuf b/etc/defaults/CC/TARGETS.protobuf
index bc78b33a..2bde69ea 100644
--- a/etc/defaults/CC/TARGETS.protobuf
+++ b/etc/defaults/CC/TARGETS.protobuf
@@ -19,6 +19,7 @@
           , "case":
             { "msvc":
               [ "/wd4065"
+              , "/wd4146"
               , "/wd4244"
               , "/wd4251"
               , "/wd4267"
@@ -38,6 +39,7 @@
               , "-Wno-sign-conversion"
               , "-Wno-unused-function"
               , "-Wno-deprecated-declarations"
+              , "-Wno-nonnull"
               ]
             }
           , "default":
@@ -48,6 +50,7 @@
             , "-Wno-unused-function"
             , "-Wno-deprecated-declarations"
             , "-Wno-deprecated-enum-enum-conversion"
+            , "-Wno-nonnull"
             ]
           }
         ]
diff --git a/etc/import/src/google/protobuf/TARGETS.protobuf b/etc/import/src/google/protobuf/TARGETS.protobuf
index 80707adf..0589f938 100644
--- a/etc/import/src/google/protobuf/TARGETS.protobuf
+++ b/etc/import/src/google/protobuf/TARGETS.protobuf
@@ -22,249 +22,245 @@
   { "type": ["@", "rules", "data", "staged"]
   , "srcs":
     [ "well_known_protos"
-    , "type.pb.h"
-    , "repeated_field.h"
-    , "reflection_internal.h"
-    , "struct.pb.h"
-    , "generated_message_tctable_decl.h"
-    , "wire_format.h"
-    , "descriptor.pb.h"
-    , "generated_message_tctable_impl.h"
-    , "reflection.h"
     , "any.h"
-    , "map.h"
-    , "package_info.h"
-    , "generated_message_bases.h"
-    , "service.h"
-    , "test_util_lite.h"
-    , "port.h"
-    , "metadata_lite.h"
-    , "map_test_util.h"
-    , "arenaz_sampler.h"
-    , "map_field.h"
-    , "testing/file.h"
-    , "testing/googletest.h"
     , "any.pb.h"
-    , "map_lite_test_util.h"
-    , "field_access_listener.h"
-    , "descriptor_database.h"
-    , "extension_set_inl.h"
+    , "api.pb.h"
     , "arena.h"
-    , "timestamp.pb.h"
-    , "io/package_info.h"
-    , "io/tokenizer.h"
-    , "io/zero_copy_stream.h"
-    , "io/zero_copy_stream_impl.h"
-    , "io/strtod.h"
-    , "io/printer.h"
-    , "io/zero_copy_stream_impl_lite.h"
-    , "io/io_win32.h"
-    , "io/coded_stream.h"
-    , "io/gzip_stream.h"
-    , "has_bits.h"
-    , "source_context.pb.h"
+    , "arenastring.h"
+    , "arenaz_sampler.h"
+    , "arena_align.h"
+    , "arena_allocation_policy.h"
+    , "arena_cleanup.h"
+    , "arena_config.h"
     , "arena_test_util.h"
+    , "compiler/allowlists/allowlist.h"
+    , "compiler/allowlists/allowlists.h"
+    , "compiler/annotation_test_util.h"
     , "compiler/code_generator.h"
-    , "compiler/parser.h"
-    , "compiler/plugin.h"
-    , "compiler/scc.h"
+    , "compiler/command_line_interface.h"
+    , "compiler/cpp/cpp_generator.h"
+    , "compiler/cpp/enum.h"
+    , "compiler/cpp/extension.h"
+    , "compiler/cpp/field.h"
+    , "compiler/cpp/field_generators/generators.h"
+    , "compiler/cpp/file.h"
+    , "compiler/cpp/generator.h"
+    , "compiler/cpp/helpers.h"
+    , "compiler/cpp/message.h"
+    , "compiler/cpp/message_layout_helper.h"
+    , "compiler/cpp/names.h"
+    , "compiler/cpp/options.h"
+    , "compiler/cpp/padding_optimizer.h"
+    , "compiler/cpp/parse_function_generator.h"
+    , "compiler/cpp/service.h"
+    , "compiler/cpp/tracker.h"
+    , "compiler/cpp/unittest.h"
+    , "compiler/csharp/csharp_doc_comment.h"
     , "compiler/csharp/csharp_enum.h"
-    , "compiler/csharp/csharp_repeated_message_field.h"
     , "compiler/csharp/csharp_enum_field.h"
-    , "compiler/csharp/csharp_options.h"
-    , "compiler/csharp/csharp_message_field.h"
     , "compiler/csharp/csharp_field_base.h"
-    , "compiler/csharp/csharp_source_generator_base.h"
-    , "compiler/csharp/csharp_reflection_class.h"
+    , "compiler/csharp/csharp_generator.h"
+    , "compiler/csharp/csharp_helpers.h"
+    , "compiler/csharp/csharp_map_field.h"
+    , "compiler/csharp/csharp_message.h"
+    , "compiler/csharp/csharp_message_field.h"
+    , "compiler/csharp/csharp_options.h"
     , "compiler/csharp/csharp_primitive_field.h"
-    , "compiler/csharp/csharp_doc_comment.h"
+    , "compiler/csharp/csharp_reflection_class.h"
     , "compiler/csharp/csharp_repeated_enum_field.h"
+    , "compiler/csharp/csharp_repeated_message_field.h"
     , "compiler/csharp/csharp_repeated_primitive_field.h"
-    , "compiler/csharp/csharp_generator.h"
+    , "compiler/csharp/csharp_source_generator_base.h"
     , "compiler/csharp/csharp_wrapper_field.h"
-    , "compiler/csharp/csharp_helpers.h"
-    , "compiler/csharp/csharp_message.h"
-    , "compiler/csharp/csharp_names.h"
-    , "compiler/csharp/csharp_map_field.h"
-    , "compiler/package_info.h"
-    , "compiler/python/python_generator.h"
-    , "compiler/python/generator.h"
-    , "compiler/python/helpers.h"
-    , "compiler/python/pyi_generator.h"
-    , "compiler/cpp/extension.h"
-    , "compiler/cpp/enum.h"
-    , "compiler/cpp/generator.h"
-    , "compiler/cpp/helpers.h"
-    , "compiler/cpp/service.h"
-    , "compiler/cpp/map_field.h"
-    , "compiler/cpp/cpp_generator.h"
-    , "compiler/cpp/names.h"
-    , "compiler/cpp/string_field.h"
-    , "compiler/cpp/unittest.h"
-    , "compiler/cpp/message_layout_helper.h"
-    , "compiler/cpp/parse_function_generator.h"
-    , "compiler/cpp/primitive_field.h"
-    , "compiler/cpp/enum_field.h"
-    , "compiler/cpp/field.h"
-    , "compiler/cpp/options.h"
-    , "compiler/cpp/file.h"
-    , "compiler/cpp/message.h"
-    , "compiler/cpp/message_field.h"
-    , "compiler/cpp/padding_optimizer.h"
-    , "compiler/php/php_generator.h"
-    , "compiler/subprocess.h"
-    , "compiler/plugin.pb.h"
-    , "compiler/java/extension_lite.h"
-    , "compiler/java/extension.h"
-    , "compiler/java/shared_code_generator.h"
-    , "compiler/java/enum.h"
-    , "compiler/java/generator.h"
-    , "compiler/java/string_field_lite.h"
-    , "compiler/java/helpers.h"
-    , "compiler/java/service.h"
-    , "compiler/java/map_field.h"
-    , "compiler/java/names.h"
-    , "compiler/java/string_field.h"
-    , "compiler/java/kotlin_generator.h"
+    , "compiler/csharp/names.h"
+    , "compiler/importer.h"
     , "compiler/java/context.h"
-    , "compiler/java/generator_factory.h"
     , "compiler/java/doc_comment.h"
-    , "compiler/java/primitive_field.h"
-    , "compiler/java/enum_field_lite.h"
+    , "compiler/java/enum.h"
     , "compiler/java/enum_field.h"
-    , "compiler/java/message_lite.h"
-    , "compiler/java/message_builder_lite.h"
+    , "compiler/java/enum_field_lite.h"
+    , "compiler/java/enum_lite.h"
+    , "compiler/java/extension.h"
+    , "compiler/java/extension_lite.h"
     , "compiler/java/field.h"
-    , "compiler/java/options.h"
-    , "compiler/java/java_generator.h"
     , "compiler/java/file.h"
-    , "compiler/java/primitive_field_lite.h"
-    , "compiler/java/message.h"
-    , "compiler/java/name_resolver.h"
-    , "compiler/java/message_field.h"
+    , "compiler/java/generator.h"
+    , "compiler/java/generator_factory.h"
+    , "compiler/java/helpers.h"
+    , "compiler/java/java_generator.h"
+    , "compiler/java/kotlin_generator.h"
+    , "compiler/java/map_field.h"
     , "compiler/java/map_field_lite.h"
-    , "compiler/java/enum_lite.h"
+    , "compiler/java/message.h"
     , "compiler/java/message_builder.h"
+    , "compiler/java/message_builder_lite.h"
+    , "compiler/java/message_field.h"
     , "compiler/java/message_field_lite.h"
+    , "compiler/java/message_lite.h"
+    , "compiler/java/message_serialization.h"
+    , "compiler/java/names.h"
+    , "compiler/java/name_resolver.h"
+    , "compiler/java/options.h"
+    , "compiler/java/primitive_field.h"
+    , "compiler/java/primitive_field_lite.h"
+    , "compiler/java/service.h"
+    , "compiler/java/shared_code_generator.h"
+    , "compiler/java/string_field.h"
+    , "compiler/java/string_field_lite.h"
+    , "compiler/mock_code_generator.h"
+    , "compiler/objectivec/enum.h"
+    , "compiler/objectivec/enum_field.h"
+    , "compiler/objectivec/extension.h"
+    , "compiler/objectivec/field.h"
+    , "compiler/objectivec/file.h"
+    , "compiler/objectivec/generator.h"
+    , "compiler/objectivec/helpers.h"
+    , "compiler/objectivec/import_writer.h"
+    , "compiler/objectivec/line_consumer.h"
+    , "compiler/objectivec/map_field.h"
+    , "compiler/objectivec/message.h"
+    , "compiler/objectivec/message_field.h"
+    , "compiler/objectivec/names.h"
+    , "compiler/objectivec/nsobject_methods.h"
+    , "compiler/objectivec/oneof.h"
+    , "compiler/objectivec/options.h"
+    , "compiler/objectivec/primitive_field.h"
+    , "compiler/objectivec/text_format_decode_data.h"
+    , "compiler/package_info.h"
+    , "compiler/parser.h"
+    , "compiler/php/names.h"
+    , "compiler/php/php_generator.h"
+    , "compiler/plugin.h"
+    , "compiler/plugin.pb.h"
+    , "compiler/python/generator.h"
+    , "compiler/python/helpers.h"
+    , "compiler/python/pyi_generator.h"
+    , "compiler/python/python_generator.h"
+    , "compiler/retention.h"
     , "compiler/ruby/ruby_generator.h"
-    , "compiler/objectivec/objectivec_nsobject_methods.h"
-    , "compiler/objectivec/objectivec_enum.h"
-    , "compiler/objectivec/objectivec_primitive_field.h"
-    , "compiler/objectivec/objectivec_message_field.h"
-    , "compiler/objectivec/objectivec_message.h"
-    , "compiler/objectivec/objectivec_field.h"
-    , "compiler/objectivec/objectivec_enum_field.h"
-    , "compiler/objectivec/objectivec_map_field.h"
-    , "compiler/objectivec/objectivec_file.h"
-    , "compiler/objectivec/objectivec_generator.h"
-    , "compiler/objectivec/objectivec_helpers.h"
-    , "compiler/objectivec/objectivec_extension.h"
-    , "compiler/objectivec/objectivec_oneof.h"
+    , "compiler/rust/accessors/accessors.h"
+    , "compiler/rust/context.h"
+    , "compiler/rust/generator.h"
+    , "compiler/rust/message.h"
+    , "compiler/rust/naming.h"
+    , "compiler/scc.h"
+    , "compiler/subprocess.h"
     , "compiler/zip_writer.h"
-    , "compiler/command_line_interface.h"
-    , "compiler/mock_code_generator.h"
-    , "compiler/annotation_test_util.h"
-    , "compiler/importer.h"
-    , "dynamic_message.h"
-    , "parse_context.h"
-    , "map_entry_lite.h"
+    , "descriptor.h"
+    , "descriptor.pb.h"
+    , "descriptor_database.h"
+    , "descriptor_legacy.h"
     , "duration.pb.h"
-    , "util/time_util.h"
-    , "util/package_info.h"
-    , "util/delimited_message_util.h"
-    , "util/field_comparator.h"
-    , "util/field_mask_util.h"
-    , "util/internal/object_location_tracker.h"
-    , "util/internal/expecting_objectwriter.h"
-    , "util/internal/json_objectwriter.h"
-    , "util/internal/json_escaping.h"
-    , "util/internal/mock_error_listener.h"
-    , "util/internal/constants.h"
-    , "util/internal/field_mask_utility.h"
-    , "util/internal/json_stream_parser.h"
-    , "util/internal/protostream_objectsource.h"
-    , "util/internal/error_listener.h"
-    , "util/internal/utility.h"
-    , "util/internal/type_info.h"
-    , "util/internal/structured_objectwriter.h"
-    , "util/internal/object_source.h"
-    , "util/internal/protostream_objectwriter.h"
-    , "util/internal/type_info_test_helper.h"
-    , "util/internal/object_writer.h"
-    , "util/internal/proto_writer.h"
-    , "util/internal/default_value_objectwriter.h"
-    , "util/internal/location_tracker.h"
-    , "util/internal/datapiece.h"
-    , "util/json_util.h"
-    , "util/type_resolver.h"
-    , "util/type_resolver_util.h"
-    , "util/message_differencer.h"
-    , "repeated_ptr_field.h"
-    , "unknown_field_set.h"
+    , "dynamic_message.h"
+    , "empty.pb.h"
+    , "endian.h"
+    , "explicitly_constructed.h"
+    , "extension_set.h"
+    , "extension_set_inl.h"
+    , "field_access_listener.h"
     , "field_mask.pb.h"
-    , "test_util.h"
-    , "map_type_handler.h"
-    , "map_test_util_impl.h"
-    , "arena_impl.h"
-    , "test_util2.h"
+    , "generated_enum_reflection.h"
     , "generated_enum_util.h"
-    , "message_lite.h"
-    , "string_member_robber.h"
-    , "descriptor.h"
-    , "map_entry.h"
-    , "metadata.h"
-    , "inlined_string_field.h"
-    , "message.h"
+    , "generated_message_bases.h"
+    , "generated_message_reflection.h"
+    , "generated_message_tctable_decl.h"
+    , "generated_message_tctable_gen.h"
+    , "generated_message_tctable_impl.h"
+    , "generated_message_util.h"
+    , "has_bits.h"
     , "implicit_weak_message.h"
-    , "reflection_tester.h"
-    , "wrappers.pb.h"
+    , "inlined_string_field.h"
+    , "io/coded_stream.h"
+    , "io/gzip_stream.h"
+    , "io/io_win32.h"
+    , "io/package_info.h"
+    , "io/printer.h"
+    , "io/strtod.h"
+    , "io/test_zero_copy_stream.h"
+    , "io/tokenizer.h"
+    , "io/zero_copy_sink.h"
+    , "io/zero_copy_stream.h"
+    , "io/zero_copy_stream_impl.h"
+    , "io/zero_copy_stream_impl_lite.h"
+    , "json/internal/descriptor_traits.h"
+    , "json/internal/lexer.h"
+    , "json/internal/message_path.h"
+    , "json/internal/parser.h"
+    , "json/internal/parser_traits.h"
+    , "json/internal/test_input_stream.h"
+    , "json/internal/unparser.h"
+    , "json/internal/unparser_traits.h"
+    , "json/internal/untyped_message.h"
+    , "json/internal/writer.h"
+    , "json/internal/zero_copy_buffered_stream.h"
+    , "json/json.h"
+    , "map.h"
+    , "map_entry.h"
+    , "map_entry_lite.h"
+    , "map_field.h"
     , "map_field_inl.h"
     , "map_field_lite.h"
-    , "text_format.h"
-    , "extension_set.h"
-    , "empty.pb.h"
-    , "endian.h"
-    , "wire_format_lite.h"
-    , "generated_enum_reflection.h"
+    , "map_lite_test_util.h"
+    , "map_test_util.h"
+    , "map_test_util_impl.h"
+    , "map_type_handler.h"
+    , "message.h"
+    , "message_lite.h"
+    , "metadata.h"
+    , "metadata_lite.h"
+    , "package_info.h"
+    , "parse_context.h"
+    , "port.h"
+    , "reflection.h"
+    , "reflection_internal.h"
+    , "reflection_mode.h"
     , "reflection_ops.h"
-    , "arenastring.h"
-    , "explicitly_constructed.h"
-    , "api.pb.h"
-    , "stubs/substitute.h"
-    , "stubs/stl_util.h"
-    , "stubs/bytestream.h"
-    , "stubs/macros.h"
-    , "stubs/int128.h"
-    , "stubs/platform_macros.h"
-    , "stubs/port.h"
+    , "reflection_tester.h"
+    , "repeated_field.h"
+    , "repeated_ptr_field.h"
+    , "serial_arena.h"
+    , "service.h"
+    , "source_context.pb.h"
+    , "string_block.h"
+    , "string_member_robber.h"
+    , "struct.pb.h"
     , "stubs/callback.h"
-    , "stubs/logging.h"
-    , "stubs/template_util.h"
-    , "stubs/time.h"
-    , "stubs/casts.h"
     , "stubs/common.h"
-    , "stubs/stringpiece.h"
-    , "stubs/mathutil.h"
-    , "stubs/strutil.h"
-    , "stubs/status.h"
-    , "stubs/map_util.h"
-    , "stubs/once.h"
-    , "stubs/stringprintf.h"
-    , "stubs/statusor.h"
+    , "stubs/platform_macros.h"
+    , "stubs/port.h"
     , "stubs/status_macros.h"
-    , "stubs/hash.h"
-    , "stubs/mutex.h"
-    , "generated_message_reflection.h"
-    , "generated_message_util.h"
-    , "proto3_lite_unittest.inc"
-    , "message_unittest.inc"
+    , "testing/file.h"
+    , "testing/googletest.h"
+    , "test_util.h"
+    , "test_util2.h"
+    , "test_util_lite.h"
+    , "text_format.h"
+    , "thread_safe_arena.h"
+    , "timestamp.pb.h"
+    , "type.pb.h"
+    , "unknown_field_set.h"
+    , "util/delimited_message_util.h"
+    , "util/field_comparator.h"
+    , "util/field_mask_util.h"
+    , "util/json_util.h"
+    , "util/message_differencer.h"
+    , "util/package_info.h"
+    , "util/time_util.h"
+    , "util/type_resolver.h"
+    , "util/type_resolver_util.h"
+    , "varint_shuffle.h"
+    , "wire_format.h"
+    , "wire_format_lite.h"
+    , "wrappers.pb.h"
     , "compiler/cpp/unittest.inc"
-    , "port_undef.inc"
+    , "map_test.inc"
     , "map_test_util.inc"
+    , "message_unittest.inc"
+    , "port_def.inc"
+    , "port_undef.inc"
+    , "proto3_lite_unittest.inc"
     , "test_util.inc"
     , "wire_format_unittest.inc"
-    , "port_def.inc"
-    , "map_test.inc"
     ]
   , "stage": ["google", "protobuf"]
   }
@@ -296,6 +292,8 @@
   , "srcs":
     [ "any_lite.cc"
     , "arena.cc"
+    , "arena_align.cc"
+    , "arena_config.cc"
     , "arenastring.cc"
     , "arenaz_sampler.cc"
     , "extension_set.cc"
@@ -306,109 +304,158 @@
     , "inlined_string_field.cc"
     , "io/coded_stream.cc"
     , "io/io_win32.cc"
-    , "io/strtod.cc"
     , "io/zero_copy_stream.cc"
     , "io/zero_copy_stream_impl.cc"
     , "io/zero_copy_stream_impl_lite.cc"
     , "map.cc"
     , "message_lite.cc"
     , "parse_context.cc"
+    , "port.cc"
     , "repeated_field.cc"
     , "repeated_ptr_field.cc"
-    , "stubs/bytestream.cc"
     , "stubs/common.cc"
-    , "stubs/int128.cc"
-    , "stubs/status.cc"
-    , "stubs/statusor.cc"
-    , "stubs/stringpiece.cc"
-    , "stubs/stringprintf.cc"
-    , "stubs/structurally_valid.cc"
-    , "stubs/strutil.cc"
-    , "stubs/time.cc"
     , "wire_format_lite.cc"
     ]
+  , "deps":
+    [ ["@", "absl", "absl/container", "btree"]
+    , ["@", "absl", "absl/container", "flat_hash_set"]
+    , ["@", "absl", "absl/hash", "hash"]
+    , ["@", "absl", "absl/log", "absl_check"]
+    , ["@", "absl", "absl/log", "absl_log"]
+    , ["@", "absl", "absl/meta", "type_traits"]
+    , ["@", "absl", "absl/numeric", "bits"]
+    , ["@", "absl", "absl/status", "status"]
+    , ["@", "absl", "absl/strings", "internal"]
+    , ["@", "absl", "absl/synchronization", "synchronization"]
+    , ["@", "absl", "absl/time", "time"]
+    , ["third_party/utf8_range", "utf8_validity"]
+    ]
   }
 , "libprotobuf":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["protobuf"]
   , "hdrs": ["protobuf_headers"]
   , "srcs":
-    [ "any.cc"
-    , "any.pb.cc"
+    [ "any.pb.cc"
     , "api.pb.cc"
+    , "duration.pb.cc"
+    , "empty.pb.cc"
+    , "field_mask.pb.cc"
+    , "source_context.pb.cc"
+    , "struct.pb.cc"
+    , "timestamp.pb.cc"
+    , "type.pb.cc"
+    , "wrappers.pb.cc"
+    , "any.cc"
+    , "any_lite.cc"
+    , "arena.cc"
+    , "arena_align.cc"
+    , "arena_config.cc"
+    , "arenastring.cc"
+    , "arenaz_sampler.cc"
     , "compiler/importer.cc"
     , "compiler/parser.cc"
     , "descriptor.cc"
     , "descriptor.pb.cc"
     , "descriptor_database.cc"
-    , "duration.pb.cc"
     , "dynamic_message.cc"
-    , "empty.pb.cc"
+    , "extension_set.cc"
     , "extension_set_heavy.cc"
-    , "field_mask.pb.cc"
+    , "generated_enum_util.cc"
     , "generated_message_bases.cc"
     , "generated_message_reflection.cc"
     , "generated_message_tctable_full.cc"
+    , "generated_message_tctable_gen.cc"
+    , "generated_message_tctable_lite.cc"
+    , "generated_message_util.cc"
+    , "implicit_weak_message.cc"
+    , "inlined_string_field.cc"
+    , "io/coded_stream.cc"
     , "io/gzip_stream.cc"
+    , "io/io_win32.cc"
     , "io/printer.cc"
+    , "io/strtod.cc"
     , "io/tokenizer.cc"
+    , "io/zero_copy_sink.cc"
+    , "io/zero_copy_stream.cc"
+    , "io/zero_copy_stream_impl.cc"
+    , "io/zero_copy_stream_impl_lite.cc"
+    , "json/internal/lexer.cc"
+    , "json/internal/message_path.cc"
+    , "json/internal/parser.cc"
+    , "json/internal/unparser.cc"
+    , "json/internal/untyped_message.cc"
+    , "json/internal/writer.cc"
+    , "json/internal/zero_copy_buffered_stream.cc"
+    , "json/json.cc"
+    , "map.cc"
     , "map_field.cc"
     , "message.cc"
+    , "message_lite.cc"
+    , "parse_context.cc"
+    , "port.cc"
+    , "reflection_mode.cc"
     , "reflection_ops.cc"
+    , "repeated_field.cc"
+    , "repeated_ptr_field.cc"
     , "service.cc"
-    , "source_context.pb.cc"
-    , "struct.pb.cc"
-    , "stubs/substitute.cc"
+    , "stubs/common.cc"
     , "text_format.cc"
-    , "timestamp.pb.cc"
-    , "type.pb.cc"
     , "unknown_field_set.cc"
     , "util/delimited_message_util.cc"
     , "util/field_comparator.cc"
     , "util/field_mask_util.cc"
-    , "util/internal/datapiece.cc"
-    , "util/internal/default_value_objectwriter.cc"
-    , "util/internal/error_listener.cc"
-    , "util/internal/field_mask_utility.cc"
-    , "util/internal/json_escaping.cc"
-    , "util/internal/json_objectwriter.cc"
-    , "util/internal/json_stream_parser.cc"
-    , "util/internal/object_writer.cc"
-    , "util/internal/proto_writer.cc"
-    , "util/internal/protostream_objectsource.cc"
-    , "util/internal/protostream_objectwriter.cc"
-    , "util/internal/type_info.cc"
-    , "util/internal/utility.cc"
-    , "util/json_util.cc"
     , "util/message_differencer.cc"
     , "util/time_util.cc"
     , "util/type_resolver_util.cc"
     , "wire_format.cc"
-    , "wrappers.pb.cc"
+    , "wire_format_lite.cc"
+    ]
+  , "deps":
+    [ ["", "libprotobuf_lite"]
+    , ["@", "absl", "absl/base", "base"]
+    , ["@", "absl", "absl/base", "dynamic_annotations"]
+    , ["@", "absl", "absl/container", "btree"]
+    , ["@", "absl", "absl/container", "flat_hash_map"]
+    , ["@", "absl", "absl/container", "flat_hash_set"]
+    , ["@", "absl", "absl/hash", "hash"]
+    , ["@", "absl", "absl/log", "absl_check"]
+    , ["@", "absl", "absl/log", "absl_log"]
+    , ["@", "absl", "absl/log", "die_if_null"]
+    , ["@", "absl", "absl/status", "statusor"]
+    , ["@", "absl", "absl/strings", "internal"]
+    , ["@", "absl", "absl/synchronization", "synchronization"]
+    , ["@", "absl", "absl/time", "time"]
+    , ["third_party/utf8_range", "utf8_validity"]
+    , ["@", "zlib", "", "zlib"]
     ]
-  , "deps": [["", "libprotobuf_lite"], ["@", "zlib", "", "zlib"]]
   }
 , "libprotoc":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["libprotoc"]
   , "srcs":
-    [ "compiler/code_generator.cc"
+    [ "compiler/main.cc"
+    , "compiler/allowlists/empty_package.cc"
+    , "compiler/allowlists/weak_imports.cc"
+    , "compiler/code_generator.cc"
     , "compiler/command_line_interface.cc"
     , "compiler/cpp/enum.cc"
-    , "compiler/cpp/enum_field.cc"
     , "compiler/cpp/extension.cc"
     , "compiler/cpp/field.cc"
+    , "compiler/cpp/field_generators/cord_field.cc"
+    , "compiler/cpp/field_generators/enum_field.cc"
+    , "compiler/cpp/field_generators/map_field.cc"
+    , "compiler/cpp/field_generators/message_field.cc"
+    , "compiler/cpp/field_generators/primitive_field.cc"
+    , "compiler/cpp/field_generators/string_field.cc"
     , "compiler/cpp/file.cc"
     , "compiler/cpp/generator.cc"
     , "compiler/cpp/helpers.cc"
-    , "compiler/cpp/map_field.cc"
     , "compiler/cpp/message.cc"
-    , "compiler/cpp/message_field.cc"
     , "compiler/cpp/padding_optimizer.cc"
     , "compiler/cpp/parse_function_generator.cc"
-    , "compiler/cpp/primitive_field.cc"
     , "compiler/cpp/service.cc"
-    , "compiler/cpp/string_field.cc"
+    , "compiler/cpp/tracker.cc"
     , "compiler/csharp/csharp_doc_comment.cc"
     , "compiler/csharp/csharp_enum.cc"
     , "compiler/csharp/csharp_enum_field.cc"
@@ -425,6 +472,7 @@
     , "compiler/csharp/csharp_repeated_primitive_field.cc"
     , "compiler/csharp/csharp_source_generator_base.cc"
     , "compiler/csharp/csharp_wrapper_field.cc"
+    , "compiler/csharp/names.cc"
     , "compiler/java/context.cc"
     , "compiler/java/doc_comment.cc"
     , "compiler/java/enum.cc"
@@ -447,42 +495,55 @@
     , "compiler/java/message_field.cc"
     , "compiler/java/message_field_lite.cc"
     , "compiler/java/message_lite.cc"
+    , "compiler/java/message_serialization.cc"
     , "compiler/java/name_resolver.cc"
+    , "compiler/java/names.cc"
     , "compiler/java/primitive_field.cc"
     , "compiler/java/primitive_field_lite.cc"
     , "compiler/java/service.cc"
     , "compiler/java/shared_code_generator.cc"
     , "compiler/java/string_field.cc"
     , "compiler/java/string_field_lite.cc"
-    , "compiler/objectivec/objectivec_enum.cc"
-    , "compiler/objectivec/objectivec_enum_field.cc"
-    , "compiler/objectivec/objectivec_extension.cc"
-    , "compiler/objectivec/objectivec_field.cc"
-    , "compiler/objectivec/objectivec_file.cc"
-    , "compiler/objectivec/objectivec_generator.cc"
-    , "compiler/objectivec/objectivec_helpers.cc"
-    , "compiler/objectivec/objectivec_map_field.cc"
-    , "compiler/objectivec/objectivec_message.cc"
-    , "compiler/objectivec/objectivec_message_field.cc"
-    , "compiler/objectivec/objectivec_oneof.cc"
-    , "compiler/objectivec/objectivec_primitive_field.cc"
+    , "compiler/objectivec/enum.cc"
+    , "compiler/objectivec/enum_field.cc"
+    , "compiler/objectivec/extension.cc"
+    , "compiler/objectivec/field.cc"
+    , "compiler/objectivec/file.cc"
+    , "compiler/objectivec/generator.cc"
+    , "compiler/objectivec/helpers.cc"
+    , "compiler/objectivec/import_writer.cc"
+    , "compiler/objectivec/line_consumer.cc"
+    , "compiler/objectivec/map_field.cc"
+    , "compiler/objectivec/message.cc"
+    , "compiler/objectivec/message_field.cc"
+    , "compiler/objectivec/names.cc"
+    , "compiler/objectivec/oneof.cc"
+    , "compiler/objectivec/primitive_field.cc"
+    , "compiler/objectivec/text_format_decode_data.cc"
+    , "compiler/php/names.cc"
     , "compiler/php/php_generator.cc"
     , "compiler/plugin.cc"
     , "compiler/plugin.pb.cc"
     , "compiler/python/generator.cc"
     , "compiler/python/helpers.cc"
     , "compiler/python/pyi_generator.cc"
+    , "compiler/retention.cc"
     , "compiler/ruby/ruby_generator.cc"
+    , "compiler/rust/accessors/accessors.cc"
+    , "compiler/rust/accessors/singular_bytes.cc"
+    , "compiler/rust/accessors/singular_scalar.cc"
+    , "compiler/rust/context.cc"
+    , "compiler/rust/generator.cc"
+    , "compiler/rust/message.cc"
+    , "compiler/rust/naming.cc"
     , "compiler/subprocess.cc"
     , "compiler/zip_writer.cc"
     ]
-  , "deps": [["", "libprotobuf"]]
+  , "deps": [["", "libprotobuf"], ["@", "absl", "absl/log", "initialize"]]
   }
 , "protoc":
   { "type": ["@", "rules", "CC", "binary"]
   , "name": ["protoc"]
-  , "srcs": ["compiler/main.cc"]
   , "private-deps": [["", "libprotoc"]]
-  , "private-ldflags": ["-pthread"]
   }
 }
diff --git a/etc/import/third_party/utf8_range/TARGETS.protobuf b/etc/import/third_party/utf8_range/TARGETS.protobuf
new file mode 100644
index 00000000..44c5340a
--- /dev/null
+++ b/etc/import/third_party/utf8_range/TARGETS.protobuf
@@ -0,0 +1,29 @@
+{ "utf8_validity":
+  { "type": "export"
+  , "target": "utf8_validity_internal"
+  , "flexible_config":
+    [ "OS"
+    , "ARCH"
+    , "HOST_ARCH"
+    , "TARGET_ARCH"
+    , "COMPILER_FAMILY"
+    , "DEBUG"
+    , "CXX"
+    , "CXXFLAGS"
+    , "ADD_CXXFLAGS"
+    , "AR"
+    , "ENV"
+    , "CC"
+    , "CFLAGS"
+    , "ADD_CFLAGS"
+    , "PKG_CONFIG_ARGS"
+    ]
+  }
+, "utf8_validity_internal":
+  { "type": ["@", "rules", "CC", "library"]
+  , "name": ["utf8_validity"]
+  , "hdrs": ["utf8_validity.h"]
+  , "srcs": ["utf8_validity.cc"]
+  , "deps": [["@", "absl", "absl/strings", "strings"]]
+  }
+}
diff --git a/etc/repos.json b/etc/repos.json
index 58b6c8e7..73001b94 100644
--- a/etc/repos.json
+++ b/etc/repos.json
@@ -250,16 +250,17 @@
     }
   , "protobuf":
     { "repository":
-      { "type": "zip"
-      , "content": "5bc92c917a0714d0b37cbb9dcbbf434d132edc00"
-      , "fetch": "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.21.12.zip"
-      , "sha256": "f7042d540c969b00db92e8e1066a9b8099c8379c33f40f360eb9e1d98a36ca26"
-      , "sha512": "7f1c9a4297a4e47705d64932483f31ed25da928d24e351d94899038f852015d4a16c88c2b962ac4a0c62e6a3f6689f87fb4cef7165d327aae5381a7b975bdf2e"
-      , "subdir": "protobuf-3.21.12"
+      { "type": "archive"
+      , "content": "3e7ee8fe7138998e31bd367fdd6feaeb1d98ab39"
+      , "fetch": "https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protobuf-23.4.tar.gz"
+      , "sha256": "a700a49470d301f1190a487a923b5095bf60f08f4ae4cac9f5f7c36883d17971"
+      , "sha512": "b93a4e0339ecbe085796de5b6c61feae35229d40db9019c043090bcaa483a1cce78a99487c5638482c68832fcede5579a0e5ec731221a88359b80db9bb6dc566"
+      , "subdir": "protobuf-23.4"
       }
     , "target_root": "import targets"
     , "target_file_name": "TARGETS.protobuf"
-    , "bindings": {"rules": "rules-protobuf", "zlib": "zlib"}
+    , "bindings":
+      {"rules": "rules-protobuf", "zlib": "zlib", "absl": "com_google_absl"}
     , "pkg_bootstrap":
       { "copy":
         ["bin/protoc", "include/google/protobuf", "proto/google/protobuf"]