diff --git a/Source/santactl/Commands/SNTCommandPrintLog.mm b/Source/santactl/Commands/SNTCommandPrintLog.mm index e02d66567..df3df5442 100644 --- a/Source/santactl/Commands/SNTCommandPrintLog.mm +++ b/Source/santactl/Commands/SNTCommandPrintLog.mm @@ -67,7 +67,7 @@ + (NSString *)longHelpText { - (void)runWithArguments:(NSArray *)arguments { JsonPrintOptions options; options.always_print_enums_as_ints = false; - options.always_print_primitive_fields = true; + options.always_print_fields_with_no_presence = true; options.preserve_proto_field_names = true; options.add_whitespace = true; diff --git a/Source/santad/Logs/EndpointSecurity/Serializers/Protobuf.mm b/Source/santad/Logs/EndpointSecurity/Serializers/Protobuf.mm index d6c641d8c..175d8cfbd 100644 --- a/Source/santad/Logs/EndpointSecurity/Serializers/Protobuf.mm +++ b/Source/santad/Logs/EndpointSecurity/Serializers/Protobuf.mm @@ -381,7 +381,7 @@ static inline void EncodeCertificateInfo(::pbv1::CertificateInfo *pb_cert_info, ::pbv1::SantaMessage *Protobuf::CreateDefaultProto(Arena *arena, struct timespec event_time, struct timespec processed_time) { - ::pbv1::SantaMessage *santa_msg = Arena::CreateMessage<::pbv1::SantaMessage>(arena); + ::pbv1::SantaMessage *santa_msg = Arena::Create<::pbv1::SantaMessage>(arena); if (EnabledMachineID()) { EncodeString([santa_msg] { return santa_msg->mutable_machine_id(); }, MachineID()); @@ -415,7 +415,7 @@ static inline void EncodeCertificateInfo(::pbv1::CertificateInfo *pb_cert_info, // TODO: Profile this. It's probably not the most efficient way to do this. JsonPrintOptions options; options.always_print_enums_as_ints = false; - options.always_print_primitive_fields = true; + options.always_print_fields_with_no_presence = true; options.preserve_proto_field_names = true; std::string json; diff --git a/Source/santad/Logs/EndpointSecurity/Serializers/ProtobufTest.mm b/Source/santad/Logs/EndpointSecurity/Serializers/ProtobufTest.mm index 6cf1c620f..1fbc6a5af 100644 --- a/Source/santad/Logs/EndpointSecurity/Serializers/ProtobufTest.mm +++ b/Source/santad/Logs/EndpointSecurity/Serializers/ProtobufTest.mm @@ -81,7 +81,7 @@ JsonPrintOptions DefaultJsonPrintOptions() { JsonPrintOptions options; options.always_print_enums_as_ints = false; - options.always_print_primitive_fields = false; + options.always_print_fields_with_no_presence = false; options.preserve_proto_field_names = true; options.add_whitespace = true; return options; diff --git a/WORKSPACE b/WORKSPACE index f1178d1da..d480c9850 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -17,11 +17,9 @@ http_archive( http_archive( name = "com_google_protobuf", - patch_args = ["-p1"], - patches = ["//external_patches/com_google_protobuf:13636.patch"], - sha256 = "07d69502e58248927b58c7d7e7424135272ba5b2852a753ab6b67e62d2d29355", - strip_prefix = "protobuf-24.3", - urls = ["https://github.com/protocolbuffers/protobuf/archive/v24.3.tar.gz"], + sha256 = "4fc5ff1b2c339fb86cd3a25f0b5311478ab081e65ad258c6789359cd84d421f8", + strip_prefix = "protobuf-26.1", + urls = ["https://github.com/protocolbuffers/protobuf/archive/v26.1.tar.gz"], ) # We don't directly use rules_python but several dependencies do and they disagree diff --git a/external_patches/com_google_protobuf/13636.patch b/external_patches/com_google_protobuf/13636.patch deleted file mode 100644 index 30aa5ebe7..000000000 --- a/external_patches/com_google_protobuf/13636.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl -index ee552c13e..f0bba0385 100644 ---- a/protobuf_deps.bzl -+++ b/protobuf_deps.bzl -@@ -70,8 +70,8 @@ def protobuf_deps(): - _github_archive( - name = "utf8_range", - repo = "https://github.com/protocolbuffers/utf8_range", -- commit = "de0b4a8ff9b5d4c98108bdfe723291a33c52c54f", -- sha256 = "5da960e5e5d92394c809629a03af3c7709d2d3d0ca731dacb3a9fb4bf28f7702", -+ commit = "d863bc33e15cba6d873c878dcca9e6fe52b2f8cb", -+ sha256 = "568988b5f7261ca181468dba38849fabf59dd9200fb2ed4b2823da187ef84d8c", - ) - - if not native.existing_rule("rules_cc"): diff --git a/external_patches/com_google_protobuf/BUILD b/external_patches/com_google_protobuf/BUILD deleted file mode 100644 index d12c00360..000000000 --- a/external_patches/com_google_protobuf/BUILD +++ /dev/null @@ -1,5 +0,0 @@ -licenses(["notice"]) - -package( - default_visibility = ["//:santa_package_group"], -)