protobuf: Update to version 30.2

- Update from version 29.3 to 30.2
- Update of rootfile
- Changes in protobuf required changes in protobuf-c to prevent build crashes. An update
   for protobuf-c is combined in this patch set.
- protobuf, protobuf-c and frr (which depends on those) all built successfully.
- Changelog
    30.2
	Compiler
	    Restore generator headers in cmake install until the next breaking C++
	     release (#20749) (b69f653)
	C++
	    Remove dllexport attribute on variable definition. (#20833) (7831669)
	    Restore generator headers in cmake install until the next breaking C++
	     release (#20749) (b69f653)
	    Change how we decide which empty string implementation to use. (#20708)
	     (221b2a0)
	Java
	    Remove dllexport attribute on variable definition. (#20833) (7831669)
	    Add protobuf_maven artifacts to protobuf_maven_dev as well so they can
	     still be referenced correctly using the dev namespace for dev-only
	     targets. (#20771) (09b5078)
	    Add volatile to featuresResolved (#20766) (b7f06f1)
	    Restore generator headers in cmake install until the next breaking C++
	     release (#20749) (b69f653)
	    Restore custom protobuf maven namespaces to avoid polluting main maven
	     namespace for non-dev dependencies as well. (#20739) (f4b0a79)
	    Fix Java concurrency issue in feature resolution for old <=3.25.x gencode
	     using lazy feature resolution. (#20751) (2dc9f35)
	    Fix lite classes in the protobuf-java Maven release to be JDK8 compatible.
	     (#20843) (7a4c63b)
	Kotlin
	    Restore custom protobuf maven namespaces to avoid polluting main maven
	     namespace for non-dev dependencies as well. (#20739) (f4b0a79)
	Csharp
	    Restore generator headers in cmake install until the next breaking C++
	     release (#20749) (b69f653)
	Objective-C
	    Restore generator headers in cmake install until the next breaking C++
	     release (#20749) (b69f653)
	Python
	    Restore generator headers in cmake install until the next breaking C++
	     release (#20749) (b69f653)
	Ruby
	    Restore generator headers in cmake install until the next breaking C++
	     release (#20749) (b69f653)
	Other
	    Restore JDK8 compatibility in Bazel for libraries with dependencies from
	     Maven (e.g. //java/util) (#20832) (da9cadc)
    30.1
	Bazel
	    Loosen py_proto_library check to be on the import path instead of full
	     directory (i.e. excluding external/module-name prefix). (#20569) (3576a1f)
	Compiler
	    Fix python codegen crash when C++ features are used. (#20577) (250c550)
	C++
	    Fix python codegen crash when C++ features are used. (#20577) (250c550)
	Java
	    Remove Java runtime classes from kotlin release. (#20607) (4747628)
	Kotlin
	    Remove Java runtime classes from kotlin release. (#20607) (4747628)
	Python
	    Fix python codegen crash when C++ features are used. (#20577) (250c550)
	Other
	    Re-add system_python repo alias to MODULE.bazel (#20662) (ebb5224)
    30.0
	Announcements
	    This version includes breaking changes to: Objective-C, Python, C++.
	        [Objective-C] Remove legacy WKT headers. (d9caebc)
	        [Objective-C] Remove deprecated apis. (2a52b90)
	        [Objective-C] Remove support for older generated code. (cffa590)
	        [Objective-C] Remove GPBUnknownFieldSet. (2b93422)
	        [Python] Fix closed enum validation under editions (72b3eda)
	        [Python] Remove deprecated GetDebugString() from protobuf python cpp
		 extension. (721a452)
	        [Python] Remove deprecated reflection methods (292f964)
	        [Python] Remove deprecated GetPrototype MessageFactory.GetPrototype(),
		 (c261b49)
	        [Python] Python nested message class qualname now contains the outer
		 message name. (Previous qualname has the same result with name for
		 nested message that outer message name was not included) (0720536)
	        [Python] Remove deprecated Python RPC Service Interfaces (5ba74b1)
	        [Python] Python setdefault behavior change for map field. (81da6b9)
	        [Python] Remove deprecated py_proto_library macro.
	        [C++] Prohibit using Bazel+MSVC to build protobuf (117e7bb)
	        [C++] Remove deprecated Arena::CreateMessage. (d83a536)
	        [C++] Remove CMake submodule support in favor of fetched or installed
		 dependencies. (3f06ca4)
	        [C++] Flip default behavior for handling cmake dependencies. (9cc685e)
	        [C++] Add ASAN poisoning after clearing oneof messages on arena.
		 (54d068e)
	        [C++] Upgrade return type of type_name() and cpp_type_name() from
		 const char* to absl::string_view. (a9ad51f)
	        [C++] Remove deprecated RepeatedPtrField::ClearedCount(). (e8e3253)
	        [C++] Upgrade return type of several string returning functions to
		 absl::string_view. (d1990d9)
	        [C++] Strip ctype from options in C++ (aebf8b9)
	        [C++] Remove MutableRepeatedFieldRef::Reserve() in reflection (913f7b0)
	        [C++] Remove deprecated JsonOptions alias. (e2eb0a1)
	        [C++] Remove deprecated Arena::GetArena. (30ed452)
	Bazel
	    Remove reference to cc_proto_aspect (fa02f76)
	    Remove deprecated bazel/system_python.bzl alias. (00f108c)
	Compiler
	    Add notices.h with information about our dependencies' licenses and add
	     --notices flag to protoc to print the contents of that file. (a7df327)
	    Have the protoc CLI properly report any parser warnings. (cafeaa4)
	    Split protoc apart from libprotoc in our cmake configs. (b4b93b3)
	    Begin adding extension numbers to SourceCodeInfo and FileDescriptorSet for
	     tooling purposes. (9d7236b)
	    Fix various unsigned to signed comparison warnings. (#17212) (67de087)
	C++
	    Fixing staleness tests (6abaf77)
	    Add notices.h with information about our dependencies' licenses and add
	     --notices flag to protoc to print the contents of that file. (a7df327)
	    Backport: Remove if_constexpr usage for future Abseil compatibility
	     (#20488) (450ee76)
	    Add tests for older gcc versions we still support (#20463) (0778473)
	    Fix a bug in handling of implicit-presence string_view fields. (#20403)
	     (81196ac)
	    Remove rules_rust dependency from MODULE.bazel for 30.x (#20310) (b8248f6)
	    Upgrade abseil-cpp to 20250127 and use @com_google_absl -> @abseil-cpp and
	     com_google_googletest -> @googletest canonical BCR names. (#20295) (df849cc)
	    Replace std::any with a custom solution. (#20251) (6250d09)
	    Make DebugString print debug output, enable debug markers for debug output
	     (9a03332)
	    Fix missing port_undef (#20052) (0644388)
	    Use __builtin_expect_with_probability for proto field presence checks.
	     (e958419)
	    Enable meta-tagging for redaction purposes (1f48795)
	    Breaking change: Prohibit using Bazel+MSVC to build protobuf (117e7bb)
	    Breaking change: Upgrade return type of several string returning functions
	     to absl::string_view. (d1990d9)
	    Print the presence probability when analysis is enabled. (d4ba7ff)
	    Split protoc apart from libprotoc in our cmake configs. (b4b93b3)
	    Breaking change: Strip ctype from options in C++ (aebf8b9)
	    Breaking change: Remove MutableRepeatedFieldRef::Reserve() in reflection
	     (913f7b0)
	    Remove stale references to C++14. (f4cc92c)
	    Breaking change: Upgrade return type of type_name() and cpp_type_name()
	     from const char* to absl::string_view. (a9ad51f)
	    Update cmake minimum version to >=3.16. (21f535c)
	    Migrate coded output stream arguments from const std::string& to
	     absl::string_view. (0361a59)
	    Breaking change: Remove deprecated Arena::GetArena. (30ed452)
	    Remove the time (or time-based) entropy being added to Map's seed. (a7875bb)
	    Don't use CLOCK_UPTIME_RAW if it won't be defined (#16951) (097dcda)
	    Fix DEPENDENCIES in protobuf_generate() to accept multiple values instead
	     of silently dropping (52887e1)
	    Use ABSL_PREDICT_TRUE|FALSE instead of PROTOBUF_PREDICT_TRUE|FALSE. (fd47730)
	    Breaking change: Flip default behavior for handling cmake dependencies.
	     (9cc685edf867acf5...

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/protobuf b/config/rootfiles/common/protobuf
index db247dfeba3d26ccaa69558072f2f596a2eb8f0d..897f8cc33c873e09d5e12bf77dae12ce95886914 100644 (file)
--- a/config/rootfiles/common/protobuf
+++ b/config/rootfiles/common/protobuf
@@ -1,11 +1,11 @@
 #usr/bin/protoc
-#usr/bin/protoc-29.3.0
+usr/bin/protoc-30.2.0
 #usr/bin/protoc-gen-upb
-#usr/bin/protoc-gen-upb-29.3.0
+usr/bin/protoc-gen-upb-30.2.0
 #usr/bin/protoc-gen-upb_minitable
-#usr/bin/protoc-gen-upb_minitable-29.3.0
+usr/bin/protoc-gen-upb_minitable-30.2.0
 #usr/bin/protoc-gen-upbdefs
-#usr/bin/protoc-gen-upbdefs-29.3.0
+usr/bin/protoc-gen-upbdefs-30.2.0
 #usr/include/google
 #usr/include/google/protobuf
 #usr/include/google/protobuf/any.h
@@ -24,110 +24,31 @@
 #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/enum.h
-#usr/include/google/protobuf/compiler/cpp/extension.h
-#usr/include/google/protobuf/compiler/cpp/field.h
-#usr/include/google/protobuf/compiler/cpp/field_generators
-#usr/include/google/protobuf/compiler/cpp/field_generators/generators.h
-#usr/include/google/protobuf/compiler/cpp/file.h
 #usr/include/google/protobuf/compiler/cpp/generator.h
 #usr/include/google/protobuf/compiler/cpp/helpers.h
-#usr/include/google/protobuf/compiler/cpp/ifndef_guard.h
-#usr/include/google/protobuf/compiler/cpp/message.h
-#usr/include/google/protobuf/compiler/cpp/message_layout_helper.h
 #usr/include/google/protobuf/compiler/cpp/names.h
-#usr/include/google/protobuf/compiler/cpp/namespace_printer.h
 #usr/include/google/protobuf/compiler/cpp/options.h
-#usr/include/google/protobuf/compiler/cpp/padding_optimizer.h
-#usr/include/google/protobuf/compiler/cpp/parse_function_generator.h
-#usr/include/google/protobuf/compiler/cpp/service.h
-#usr/include/google/protobuf/compiler/cpp/tracker.h
 #usr/include/google/protobuf/compiler/csharp
-#usr/include/google/protobuf/compiler/csharp/csharp_doc_comment.h
-#usr/include/google/protobuf/compiler/csharp/csharp_enum.h
-#usr/include/google/protobuf/compiler/csharp/csharp_enum_field.h
-#usr/include/google/protobuf/compiler/csharp/csharp_field_base.h
 #usr/include/google/protobuf/compiler/csharp/csharp_generator.h
-#usr/include/google/protobuf/compiler/csharp/csharp_helpers.h
-#usr/include/google/protobuf/compiler/csharp/csharp_map_field.h
-#usr/include/google/protobuf/compiler/csharp/csharp_message.h
-#usr/include/google/protobuf/compiler/csharp/csharp_message_field.h
-#usr/include/google/protobuf/compiler/csharp/csharp_options.h
-#usr/include/google/protobuf/compiler/csharp/csharp_primitive_field.h
-#usr/include/google/protobuf/compiler/csharp/csharp_reflection_class.h
-#usr/include/google/protobuf/compiler/csharp/csharp_repeated_enum_field.h
-#usr/include/google/protobuf/compiler/csharp/csharp_repeated_message_field.h
-#usr/include/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h
-#usr/include/google/protobuf/compiler/csharp/csharp_source_generator_base.h
-#usr/include/google/protobuf/compiler/csharp/csharp_wrapper_field.h
 #usr/include/google/protobuf/compiler/csharp/names.h
 #usr/include/google/protobuf/compiler/importer.h
 #usr/include/google/protobuf/compiler/java
 #usr/include/google/protobuf/compiler/java/context.h
 #usr/include/google/protobuf/compiler/java/doc_comment.h
-#usr/include/google/protobuf/compiler/java/field_common.h
-#usr/include/google/protobuf/compiler/java/file.h
-#usr/include/google/protobuf/compiler/java/full
-#usr/include/google/protobuf/compiler/java/full/enum.h
-#usr/include/google/protobuf/compiler/java/full/enum_field.h
-#usr/include/google/protobuf/compiler/java/full/extension.h
-#usr/include/google/protobuf/compiler/java/full/field_generator.h
-#usr/include/google/protobuf/compiler/java/full/generator_factory.h
-#usr/include/google/protobuf/compiler/java/full/make_field_gens.h
-#usr/include/google/protobuf/compiler/java/full/map_field.h
-#usr/include/google/protobuf/compiler/java/full/message.h
-#usr/include/google/protobuf/compiler/java/full/message_builder.h
-#usr/include/google/protobuf/compiler/java/full/message_field.h
-#usr/include/google/protobuf/compiler/java/full/primitive_field.h
-#usr/include/google/protobuf/compiler/java/full/service.h
-#usr/include/google/protobuf/compiler/java/full/string_field.h
 #usr/include/google/protobuf/compiler/java/generator.h
-#usr/include/google/protobuf/compiler/java/generator_common.h
-#usr/include/google/protobuf/compiler/java/generator_factory.h
 #usr/include/google/protobuf/compiler/java/helpers.h
-#usr/include/google/protobuf/compiler/java/internal_helpers.h
 #usr/include/google/protobuf/compiler/java/java_features.pb.h
-#usr/include/google/protobuf/compiler/java/lite
-#usr/include/google/protobuf/compiler/java/lite/enum.h
-#usr/include/google/protobuf/compiler/java/lite/enum_field.h
-#usr/include/google/protobuf/compiler/java/lite/extension.h
-#usr/include/google/protobuf/compiler/java/lite/field_generator.h
-#usr/include/google/protobuf/compiler/java/lite/generator_factory.h
-#usr/include/google/protobuf/compiler/java/lite/make_field_gens.h
-#usr/include/google/protobuf/compiler/java/lite/map_field.h
-#usr/include/google/protobuf/compiler/java/lite/message.h
-#usr/include/google/protobuf/compiler/java/lite/message_builder.h
-#usr/include/google/protobuf/compiler/java/lite/message_field.h
-#usr/include/google/protobuf/compiler/java/lite/primitive_field.h
-#usr/include/google/protobuf/compiler/java/lite/string_field.h
-#usr/include/google/protobuf/compiler/java/message_serialization.h
 #usr/include/google/protobuf/compiler/java/name_resolver.h
 #usr/include/google/protobuf/compiler/java/names.h
 #usr/include/google/protobuf/compiler/java/options.h
-#usr/include/google/protobuf/compiler/java/shared_code_generator.h
 #usr/include/google/protobuf/compiler/kotlin
-#usr/include/google/protobuf/compiler/kotlin/file.h
 #usr/include/google/protobuf/compiler/kotlin/generator.h
-#usr/include/google/protobuf/compiler/kotlin/message.h
+#usr/include/google/protobuf/compiler/notices.h
 #usr/include/google/protobuf/compiler/objectivec
-#usr/include/google/protobuf/compiler/objectivec/enum.h
-#usr/include/google/protobuf/compiler/objectivec/enum_field.h
-#usr/include/google/protobuf/compiler/objectivec/extension.h
-#usr/include/google/protobuf/compiler/objectivec/field.h
-#usr/include/google/protobuf/compiler/objectivec/file.h
 #usr/include/google/protobuf/compiler/objectivec/generator.h
-#usr/include/google/protobuf/compiler/objectivec/helpers.h
-#usr/include/google/protobuf/compiler/objectivec/import_writer.h
 #usr/include/google/protobuf/compiler/objectivec/line_consumer.h
-#usr/include/google/protobuf/compiler/objectivec/map_field.h
-#usr/include/google/protobuf/compiler/objectivec/message.h
-#usr/include/google/protobuf/compiler/objectivec/message_field.h
 #usr/include/google/protobuf/compiler/objectivec/names.h
 #usr/include/google/protobuf/compiler/objectivec/nsobject_methods.h
-#usr/include/google/protobuf/compiler/objectivec/oneof.h
-#usr/include/google/protobuf/compiler/objectivec/options.h
-#usr/include/google/protobuf/compiler/objectivec/primitive_field.h
-#usr/include/google/protobuf/compiler/objectivec/tf_decode_data.h
 #usr/include/google/protobuf/compiler/parser.h
 #usr/include/google/protobuf/compiler/php
 #usr/include/google/protobuf/compiler/php/names.h
@@ -137,29 +58,10 @@
 #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/helpers.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/rust
-#usr/include/google/protobuf/compiler/rust/accessors
-#usr/include/google/protobuf/compiler/rust/accessors/accessor_case.h
-#usr/include/google/protobuf/compiler/rust/accessors/accessors.h
-#usr/include/google/protobuf/compiler/rust/accessors/default_value.h
-#usr/include/google/protobuf/compiler/rust/accessors/generator.h
-#usr/include/google/protobuf/compiler/rust/accessors/with_presence.h
-#usr/include/google/protobuf/compiler/rust/context.h
-#usr/include/google/protobuf/compiler/rust/crate_mapping.h
-#usr/include/google/protobuf/compiler/rust/enum.h
-#usr/include/google/protobuf/compiler/rust/generator.h
-#usr/include/google/protobuf/compiler/rust/message.h
-#usr/include/google/protobuf/compiler/rust/naming.h
-#usr/include/google/protobuf/compiler/rust/oneof.h
-#usr/include/google/protobuf/compiler/rust/relative_path.h
-#usr/include/google/protobuf/compiler/rust/rust_field_type.h
-#usr/include/google/protobuf/compiler/rust/rust_keywords.h
-#usr/include/google/protobuf/compiler/rust/upb_helpers.h
 #usr/include/google/protobuf/compiler/scc.h
 #usr/include/google/protobuf/compiler/subprocess.h
 #usr/include/google/protobuf/compiler/versions.h
@@ -264,8 +166,6 @@
 #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/testing
-#usr/include/google/protobuf/testing/file.h
 #usr/include/google/protobuf/text_format.h
 #usr/include/google/protobuf/thread_safe_arena.h
 #usr/include/google/protobuf/timestamp.pb.h
@@ -408,6 +308,7 @@
 #usr/include/upb/reflection/oneof_def.h
 #usr/include/upb/reflection/service_def.h
 #usr/include/upb/text
+#usr/include/upb/text/debug_string.h
 #usr/include/upb/text/encode.h
 #usr/include/upb/text/internal
 #usr/include/upb/text/internal/encode.h
@@ -424,12 +325,6 @@
 #usr/include/upb/wire/internal/decode_fast.h
 #usr/include/upb/wire/reader.h
 #usr/include/upb/wire/types.h
-#usr/include/upb_generator
-#usr/include/upb_generator/common
-#usr/include/upb_generator/common/names.h
-#usr/include/upb_generator/minitable
-#usr/include/upb_generator/minitable/names.h
-#usr/include/upb_generator/minitable/names_internal.h
 #usr/include/utf8_range.h
 #usr/include/utf8_validity.h
 #usr/lib/cmake/protobuf
@@ -445,14 +340,16 @@
 #usr/lib/cmake/utf8_range/utf8_range-targets-noconfig.cmake
 #usr/lib/cmake/utf8_range/utf8_range-targets.cmake
 #usr/lib/libprotobuf-lite.so
-usr/lib/libprotobuf-lite.so.29.3.0
+usr/lib/libprotobuf-lite.so.30.2.0
 #usr/lib/libprotobuf.so
-usr/lib/libprotobuf.so.29.3.0
+usr/lib/libprotobuf.so.30.2.0
 #usr/lib/libprotoc.so
-usr/lib/libprotoc.so.29.3.0
+usr/lib/libprotoc.so.30.2.0
 #usr/lib/libupb.a
 usr/lib/libutf8_range.so
+usr/lib/libutf8_range.so.30.2.0
 usr/lib/libutf8_validity.so
+usr/lib/libutf8_validity.so.30.2.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 92d19de38f4989b74f341c99315ba335d05ac87e..664ac3a11ac7819fa507b15f6f71d6870e5d9306 100644 (file)
--- a/lfs/protobuf
+++ b/lfs/protobuf
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 29.3
+VER        = 30.2
 
 THISAPP    = protobuf-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 8d37daac6f0d832e5bff5c56b9be73fce1fe016ca4e905f4c66d8fea20fabbee54a6be2c824f503d40f8492a4ec6280a539c454de9a118b69ebc57f2afe3d965
+$(DL_FILE)_BLAKE2 = 3a7d6bfa38500b16b1ce52b244fd9448fe7be2933a77224a1423a67e3ae3155846c0974ee1b6c579f6050f60b7784ace21b149b3cbdff2ef1e6bf954acbb1b51
 
 install : $(TARGET)
 
@@ -71,10 +71,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && cmake . \
-                       -D CMAKE_INSTALL_PREFIX=/usr \
-                       -D protobuf_BUILD_TESTS=OFF \
-                       -D protobuf_BUILD_SHARED_LIBS=ON \
-                       -D protobuf_ABSL_PROVIDER=package
+                               -D CMAKE_INSTALL_PREFIX=/usr \
+                               -D protobuf_BUILD_TESTS=OFF \
+                               -D protobuf_BUILD_SHARED_LIBS=ON \
+                               -D protobuf_ABSL_PROVIDER=package
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)