From: Michael Tremer Date: Thu, 9 Jul 2026 14:23:33 +0000 (+0000) Subject: protobuf: Update to 35.1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a1db091bb09049918c44a30d41b2461e1a25ce4;p=ipfire-2.x.git protobuf: Update to 35.1 This also enables release mode when compiling so that we won't add any superfluous debugging code which makes the build of protobuf-c crash on riscv64. Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/common/protobuf b/config/rootfiles/common/protobuf index 182ffd7bd..04491f21f 100644 --- a/config/rootfiles/common/protobuf +++ b/config/rootfiles/common/protobuf @@ -1,11 +1,11 @@ #usr/bin/protoc -usr/bin/protoc-33.0.0 +#usr/bin/protoc-35.1.0 #usr/bin/protoc-gen-upb -usr/bin/protoc-gen-upb-33.0.0 +#usr/bin/protoc-gen-upb-35.1.0 #usr/bin/protoc-gen-upb_minitable -usr/bin/protoc-gen-upb_minitable-33.0.0 +#usr/bin/protoc-gen-upb_minitable-35.1.0 #usr/bin/protoc-gen-upbdefs -usr/bin/protoc-gen-upbdefs-33.0.0 +#usr/bin/protoc-gen-upbdefs-35.1.0 #usr/include/google #usr/include/google/protobuf #usr/include/google/protobuf/any.h @@ -19,17 +19,16 @@ usr/bin/protoc-gen-upbdefs-33.0.0 #usr/include/google/protobuf/arena_cleanup.h #usr/include/google/protobuf/arenastring.h #usr/include/google/protobuf/arenaz_sampler.h +#usr/include/google/protobuf/c_sharp_features.proto #usr/include/google/protobuf/compiler #usr/include/google/protobuf/compiler/code_generator.h #usr/include/google/protobuf/compiler/code_generator_lite.h #usr/include/google/protobuf/compiler/command_line_interface.h #usr/include/google/protobuf/compiler/cpp -#usr/include/google/protobuf/compiler/cpp/generator.h #usr/include/google/protobuf/compiler/cpp/helpers.h #usr/include/google/protobuf/compiler/cpp/names.h #usr/include/google/protobuf/compiler/cpp/options.h #usr/include/google/protobuf/compiler/csharp -#usr/include/google/protobuf/compiler/csharp/csharp_generator.h #usr/include/google/protobuf/compiler/csharp/names.h #usr/include/google/protobuf/compiler/importer.h #usr/include/google/protobuf/compiler/java @@ -41,27 +40,18 @@ usr/bin/protoc-gen-upbdefs-33.0.0 #usr/include/google/protobuf/compiler/java/names.h #usr/include/google/protobuf/compiler/java/names_internal.h #usr/include/google/protobuf/compiler/java/options.h -#usr/include/google/protobuf/compiler/kotlin -#usr/include/google/protobuf/compiler/kotlin/generator.h #usr/include/google/protobuf/compiler/notices.h #usr/include/google/protobuf/compiler/objectivec -#usr/include/google/protobuf/compiler/objectivec/generator.h #usr/include/google/protobuf/compiler/objectivec/line_consumer.h #usr/include/google/protobuf/compiler/objectivec/names.h #usr/include/google/protobuf/compiler/objectivec/nsobject_methods.h #usr/include/google/protobuf/compiler/parser.h #usr/include/google/protobuf/compiler/php #usr/include/google/protobuf/compiler/php/names.h -#usr/include/google/protobuf/compiler/php/php_generator.h #usr/include/google/protobuf/compiler/plugin.h #usr/include/google/protobuf/compiler/plugin.pb.h #usr/include/google/protobuf/compiler/plugin.proto -#usr/include/google/protobuf/compiler/python -#usr/include/google/protobuf/compiler/python/generator.h -#usr/include/google/protobuf/compiler/python/pyi_generator.h #usr/include/google/protobuf/compiler/retention.h -#usr/include/google/protobuf/compiler/ruby -#usr/include/google/protobuf/compiler/ruby/ruby_generator.h #usr/include/google/protobuf/compiler/scc.h #usr/include/google/protobuf/compiler/subprocess.h #usr/include/google/protobuf/compiler/versions.h @@ -91,6 +81,7 @@ usr/bin/protoc-gen-upbdefs-33.0.0 #usr/include/google/protobuf/field_access_listener.h #usr/include/google/protobuf/field_mask.pb.h #usr/include/google/protobuf/field_mask.proto +#usr/include/google/protobuf/field_with_arena.h #usr/include/google/protobuf/generated_enum_reflection.h #usr/include/google/protobuf/generated_enum_util.h #usr/include/google/protobuf/generated_message_bases.h @@ -104,6 +95,7 @@ usr/bin/protoc-gen-upbdefs-33.0.0 #usr/include/google/protobuf/implicit_weak_message.h #usr/include/google/protobuf/inlined_string_field.h #usr/include/google/protobuf/internal_feature_helper.h +#usr/include/google/protobuf/internal_metadata_locator.h #usr/include/google/protobuf/internal_visibility.h #usr/include/google/protobuf/io #usr/include/google/protobuf/io/coded_stream.h @@ -154,6 +146,9 @@ usr/bin/protoc-gen-upbdefs-33.0.0 #usr/include/google/protobuf/reflection_visit_field_info.h #usr/include/google/protobuf/reflection_visit_fields.h #usr/include/google/protobuf/repeated_field.h +#usr/include/google/protobuf/repeated_field_proxy.h +#usr/include/google/protobuf/repeated_field_proxy_iterator.h +#usr/include/google/protobuf/repeated_field_proxy_traits.h #usr/include/google/protobuf/repeated_ptr_field.h #usr/include/google/protobuf/runtime_version.h #usr/include/google/protobuf/serial_arena.h @@ -169,6 +164,7 @@ usr/bin/protoc-gen-upbdefs-33.0.0 #usr/include/google/protobuf/stubs/platform_macros.h #usr/include/google/protobuf/stubs/port.h #usr/include/google/protobuf/stubs/status_macros.h +#usr/include/google/protobuf/symbol_checker.h #usr/include/google/protobuf/text_format.h #usr/include/google/protobuf/thread_safe_arena.h #usr/include/google/protobuf/timestamp.pb.h @@ -194,6 +190,7 @@ usr/bin/protoc-gen-upbdefs-33.0.0 #usr/include/upb #usr/include/upb/base #usr/include/upb/base/descriptor_constants.h +#usr/include/upb/base/error_handler.h #usr/include/upb/base/internal #usr/include/upb/base/internal/endian.h #usr/include/upb/base/internal/log2.h @@ -204,6 +201,7 @@ usr/bin/protoc-gen-upbdefs-33.0.0 #usr/include/upb/generated_code_support.h #usr/include/upb/hash #usr/include/upb/hash/common.h +#usr/include/upb/hash/ext_table.h #usr/include/upb/hash/int_table.h #usr/include/upb/hash/str_table.h #usr/include/upb/json @@ -236,13 +234,11 @@ usr/bin/protoc-gen-upbdefs-33.0.0 #usr/include/upb/message/internal/map_entry.h #usr/include/upb/message/internal/map_sorter.h #usr/include/upb/message/internal/message.h -#usr/include/upb/message/internal/tagged_ptr.h #usr/include/upb/message/internal/types.h #usr/include/upb/message/map.h #usr/include/upb/message/map_gencode_util.h #usr/include/upb/message/merge.h #usr/include/upb/message/message.h -#usr/include/upb/message/tagged_ptr.h #usr/include/upb/message/value.h #usr/include/upb/mini_descriptor #usr/include/upb/mini_descriptor/build_enum.h @@ -256,16 +252,20 @@ usr/bin/protoc-gen-upbdefs-33.0.0 #usr/include/upb/mini_descriptor/internal/wire_constants.h #usr/include/upb/mini_descriptor/link.h #usr/include/upb/mini_table +#usr/include/upb/mini_table/compat.h +#usr/include/upb/mini_table/debug_string.h #usr/include/upb/mini_table/enum.h #usr/include/upb/mini_table/extension.h #usr/include/upb/mini_table/extension_registry.h #usr/include/upb/mini_table/field.h #usr/include/upb/mini_table/file.h +#usr/include/upb/mini_table/generated_registry.h #usr/include/upb/mini_table/internal #usr/include/upb/mini_table/internal/enum.h #usr/include/upb/mini_table/internal/extension.h #usr/include/upb/mini_table/internal/field.h #usr/include/upb/mini_table/internal/file.h +#usr/include/upb/mini_table/internal/generated_registry.h #usr/include/upb/mini_table/internal/message.h #usr/include/upb/mini_table/internal/size_log2.h #usr/include/upb/mini_table/internal/sub.h @@ -332,6 +332,7 @@ usr/bin/protoc-gen-upbdefs-33.0.0 #usr/include/upb/wire/eps_copy_input_stream.h #usr/include/upb/wire/internal #usr/include/upb/wire/internal/decoder.h +#usr/include/upb/wire/internal/eps_copy_input_stream.h #usr/include/upb/wire/internal/reader.h #usr/include/upb/wire/reader.h #usr/include/upb/wire/types.h @@ -344,23 +345,23 @@ usr/bin/protoc-gen-upbdefs-33.0.0 #usr/lib/cmake/protobuf/protobuf-generate.cmake #usr/lib/cmake/protobuf/protobuf-module.cmake #usr/lib/cmake/protobuf/protobuf-options.cmake -#usr/lib/cmake/protobuf/protobuf-targets-noconfig.cmake +#usr/lib/cmake/protobuf/protobuf-targets-release.cmake #usr/lib/cmake/protobuf/protobuf-targets.cmake #usr/lib/cmake/utf8_range #usr/lib/cmake/utf8_range/utf8_range-config.cmake -#usr/lib/cmake/utf8_range/utf8_range-targets-noconfig.cmake +#usr/lib/cmake/utf8_range/utf8_range-targets-release.cmake #usr/lib/cmake/utf8_range/utf8_range-targets.cmake #usr/lib/libprotobuf-lite.so -usr/lib/libprotobuf-lite.so.33.0.0 +usr/lib/libprotobuf-lite.so.35.1.0 #usr/lib/libprotobuf.so -usr/lib/libprotobuf.so.33.0.0 +usr/lib/libprotobuf.so.35.1.0 #usr/lib/libprotoc.so -usr/lib/libprotoc.so.33.0.0 +usr/lib/libprotoc.so.35.1.0 #usr/lib/libupb.a usr/lib/libutf8_range.so -usr/lib/libutf8_range.so.33.0.0 +usr/lib/libutf8_range.so.35.1.0 usr/lib/libutf8_validity.so -usr/lib/libutf8_validity.so.33.0.0 +usr/lib/libutf8_validity.so.35.1.0 #usr/lib/pkgconfig/protobuf-lite.pc #usr/lib/pkgconfig/protobuf.pc #usr/lib/pkgconfig/upb.pc diff --git a/lfs/protobuf b/lfs/protobuf index 8f40dc2fb..81e84ebb3 100644 --- a/lfs/protobuf +++ b/lfs/protobuf @@ -24,7 +24,7 @@ include Config -VER = 33.0 +VER = 35.1 THISAPP = protobuf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 5d456c000117b590dea5b7e721a8b8d00d9e7067ba2156f082e4959a17fcf8d4f2e306f90335aad97e1a94dfd2491544d67cb29670f0022034fde574140a8066 +$(DL_FILE)_BLAKE2 = d18d5c73537c0c08a729ebc91039d77a6e939c17f41c2a73c14cd165eb10113758e0dee812482045c19d34a1e839f6a316801ca367d971d43d13cb4403a27997 install : $(TARGET) @@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && cmake . \ -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_BUILD_TYPE=Release \ -D protobuf_BUILD_TESTS=OFF \ -D protobuf_BUILD_SHARED_LIBS=ON \ -D protobuf_ABSL_PROVIDER=package