Accepting request 1294971 from devel:tools:building

OBS-URL: https://build.opensuse.org/request/show/1294971
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/protobuf?expand=0&rev=88

_multibuild

@@ -1,4 +1,5 @@
 <multibuild>
+  <package>python-protobuf</package>
   <package>protobuf-java</package>
 </multibuild>
 

baselibs.conf

@@ -1,4 +1,4 @@
-libprotobuf29_3_0
-libprotoc29_3_0
-libprotobuf-lite29_3_0
-libutf8_range-29_3_0
+libprotobuf31_1_0
+libprotoc31_1_0
+libprotobuf-lite31_1_0
+libutf8_range-31_1_0

protobuf-31.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:12bfd76d27b9ac3d65c00966901609e020481b9474ef75c7ff4601ac06fa0b82
+size 9583956

protobuf-6.31.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d8cac4c982f0b957a4dc73a80e2ea24fab08e679c0de9deb835f4a12d69aca9a
+size 441797

protobuf-fix-google-imports.patch

@@ -0,0 +1,45 @@
+From 8351926380c7cc91aae6df5695c91426e209f958 Mon Sep 17 00:00:00 2001
+From: Ge Yunxi <141423244+gyx47@users.noreply.github.com>
+Date: Fri, 11 Jul 2025 11:04:58 -0700
+Subject: [PATCH] drop-deprecated-pkg-resources-declare (#22442)
+
+# Description
+As of setuptools 81, pkg_resources.declare_namespace has been marked as deprecated (scheduled to be removed after 2025-11-30) so I remove it from init.py
+
+# Environment:
+a virtual machine of arch riscv64
+
+# procedure
+I got this problem when running a test that applied this package.
+```
+src/certbot_dns_google/_internal/tests/dns_google_test.py:9: in <module>
+    from google.auth import exceptions as googleauth_exceptions
+/usr/lib/python3.13/site-packages/google/__init__.py:2: in <module>
+    __import__('pkg_resources').declare_namespace(__name__)
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+/usr/lib/python3.13/site-packages/pkg_resources/__init__.py:98: in <module>
+    warnings.warn(
+E   UserWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html. The pkg_resources package is slated for removal as early as 2025-11-30. Refrain from using this package or pin to Setuptools<81.
+```
+[certbot-dns-google-4.1.1-1-riscv64-check.log](https://github.com/user-attachments/files/20976539/certbot-dns-google-4.1.1-1-riscv64-check.log)
+
+Closes #22442
+
+COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/22442 from gyx47:patch-1 6aef5c9df150cce444910d224fe90b2a514c7868
+PiperOrigin-RevId: 782041935
+---
+ python/google/__init__.py | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/python/google/__init__.py b/python/google/__init__.py
+index 5585614122997..b36383a61027f 100644
+--- a/python/google/__init__.py
++++ b/python/google/__init__.py
+@@ -1,4 +1,3 @@
+-try:
+-  __import__('pkg_resources').declare_namespace(__name__)
+-except ImportError:
+-  __path__ = __import__('pkgutil').extend_path(__path__, __name__)
++from pkgutil import extend_path
++
++__path__ = extend_path(__path__, __name__)

protobuf-java-4.31.1.pom

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>4.29.3</version>
+    <version>4.31.1</version>
   </parent>
 
   <artifactId>protobuf-java</artifactId>

protobuf-java-util-4.31.1.pom

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>4.29.3</version>
+    <version>4.31.1</version>
   </parent>
 
   <artifactId>protobuf-java-util</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>4.29.3</version>
+      <version>4.31.1</version>
     </dependency>
             <dependency>
             <groupId>com.google.code.findbugs</groupId>

protobuf-java.changes

@@ -1,3 +1,166 @@
+-------------------------------------------------------------------
+Mon Jul 21 10:01:22 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Cherry-pick protobuf-fix-google-imports.patch to fix import issues of
+  reverse-dependency packages within the google namespace (bsc#1244918)
+
+-------------------------------------------------------------------
+Wed Jun 18 07:25:22 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Update to 31.1
+  * Support allowing late injection of language feature set
+    defaults from FeatureSet extensions while getting feature
+    set extension values.
+  * Support allowing late injection of language feature set
+    defaults from FeatureSet extensions while getting feature
+    set extension values.
+  * Add missing copts attribute (#21982)
+  * Support allowing late injection of language feature set
+    defaults from FeatureSet extensions while getting feature
+    set extension values.
+  * Support allowing late injection of language feature set
+    defaults from FeatureSet extensions while getting feature
+    set extension values.
+  * Python pyi print "import datetime" for Duration/Timestamp
+    field
+  * Add recursion depth limits to pure python (#bsc1244663, CVE-2025-4565)
+  * Fix cmake staleness test
+- from version 31.0
+  * Loosen py_proto_library check to be on the import path instead
+    of full directory (i.e. excluding external/module-name prefix).
+  * Add support for import option for protoc.
+  * Add notices.h with information about our dependencies' licenses
+    and add --notices flag to protoc to print the contents of that file.
+  * Move upb minitable code generator into protoc
+  * Upgrade abseil-cpp to 20250127 and use @com_google_absl -> @abseil-cpp
+    and com_google_googletest -> @googletest canonical BCR names.
+  * Remove fast-path check for non-clang compilers in MessageCreator.
+  * Add missing include.
+  * Add weak attribute to GetClassData to speed up clang builds.
+  * Add nontemporal software prefetcher to repeated ptr field dtor
+    to improve performance.
+  * Warn on unused RepeatedPtrField.
+  * Add notices.h with information about our dependencies' licenses and
+    add --notices flag to protoc to print the contents of that file.
+  * Fix a bug in handling of implicit-presence string_view fields.
+  * Control bounds checks via BUILD flags.
+  * Upgrade abseil-cpp to 20250127 and use @com_google_absl -> @abseil-cpp
+    and com_google_googletest -> @googletest canonical BCR names.
+  * Create hardened versions of Get and Mutable for repeated_field.
+  * Add weak attribute to GetClassData to speed up clang builds.
+  * Use ProtobufToStringOutput to control the output format of
+    AbstractMessage.Builder.toString.
+  * Implement Protobuf Java Immutable API nest_in_file_class feature
+    for Edition 2024.
+  * Introduce a Generated annotation to eventually replace
+    javax.annotation.Generated
+  * Add volatile to featuresResolved
+  * Fix Java concurrency issue in feature resolution for old <=3.25.x
+    gencode using lazy feature resolution.
+  * Remove Java runtime classes from kotlin release.
+  * Split maven dependencies into dev vs local
+  * Improve error messaging when detecting and erroring out on integer
+    overflow of byte count limit variables.
+  * Remove Java runtime classes from kotlin release.
+  * Remove "experimental API" warnings from members in the .NET protobuf runtime.
+  * Improve performace of repeated packed fixedSize fields (#19667)
+  * [ObjC] Deprecate GPBFieldDescriptor.isOptional.
+  * [ObjC] Raise the library version and enable new generated code.
+  * Cherry-pick Rust fix to 31.x (#21617)
+  * Add upb_Map_GetMutable API to upb
+  * See also UPB changes below, which may affect Rust.
+  * Update GetCurrentTime to use datetime.datetime.now
+  * Make Py JSON float_precision apply to both float and double fields.
+  * -Add '+' and '-' annotations for Timestamp and Duration in Python
+  * Bug fix for FieldMask.MergeFrom() with unset fields.
+  * Make python text_format able to skip unknown fields for repeated messages
+  * Fix segment fault for UPB Pyhon 'in' method of empty repeated extensions
+  * Fix upb to escape DefinitelyNeedsEscape (like " and ') for bytes field
+  * Check with fallback descriptorDB for FindExtensionByNumber()/
+    FindAllExtensions in UPB python pool.
+  * Add clear() method to repeated fields in Python.
+  * Register Scalar/MessageMapContainerTypes as virtual subclasses of
+  * Fix python codegen crash when C++ features are used.
+  * Add more detail to the comment for GetMessageClassesForFiles
+  * Add constructing unpack routine to Python Protobuf Any API.
+  * Implement typing for proto Timestamp/Duration assignments.
+  * Deprecate Descriptor Label. As an alternative, add helper methods
+    for checking whether a field is required or repeated.
+  * Feat(php): improve return typehint when repeatedfield (#11734)
+  * Automated rollback of commit f9863df. (#21355)
+  * Deprecate Descriptor Label. As an alternative, add helper methods
+    for checking whether a field is required or repeated.
+  * Ruby: Allow to get a file descriptor by a file name (#20287)
+  * Feat(php): improve return typehint when repeatedfield (#11734)
+  * See also UPB changes below, which may affect PHP C-Extension.
+  * Fix silent failure of rb_test rules to run test (#21733)
+  * Ruby | Add support for a protobuf debug build (#21060)
+  * Ruby | Support installing the gem via git and some other
+    small build tweaks (#21061)
+  * Deprecate Descriptor Label. As an alternative, add helper methods
+    for checking whether a field is required or repeated.
+  * [Ruby]Implement #to_hash for message classes (#20866)
+  * Drop Ruby 3.0
+  * Fixes #18726 by backslash escaping descriptor data containing #
+    if the hashmark appears immediately before any of $, {, or @.
+  * Ruby: Allow to get a file descriptor by a file name (#20287)
+  * Ruby: fix bug in Map.hash
+  * Ruby | Add support for a protobuf debug build (#21060)
+  * Deprecate Descriptor Label. As an alternative, add helper methods
+    for checking whether a field is required or repeated.
+  * Ruby: Allow to get a file descriptor by a file name (#20287)
+  * Ruby: fix bug in Map.hash
+  * See also UPB changes below, which may affect Ruby C-Extension.
+  * Fixed LTO-only linker error in upb linker arrays.
+  * Deprecate Descriptor Label. As an alternative, add helper methods
+    for checking whether a field is required or repeated.
+  * Add upb_Map_GetMutable API to upb (dd5bf5e)
+  * Fix upb to escape DefinitelyNeedsEscape (like " and ') for bytes field
+  * Upb: delete functions in map_gencode_util. They're unused
+    after the Map iterator API change.
+  * Upb: Update _upb_map_next signature to return a boolean
+    and remove the _nextmutable Map iterator API.
+  * Change upb C generated map iteration function to not
+    hand out MapEntry pointers.
+  * Ruby: Allow to get a file descriptor by a file name (#20287)
+  * Expose the upb_ByteSize function to upb clients. Note that the
+    current naive implementation is no more efficient than serializing
+    the message yourself and noting the resulting size.
+  * Move upb minitable code generator into protoc
+  * Tolerate message set extensions encoded as normal deliminited submessages
+  * Automated rollback of commit 6bde8c4.
+  * Fix UPB fast table build.
+  * Patch rules_ruby to apply neverlink = True to the jars
+    rule (#21416) (#21505)
+  * Restore JDK8 compatibility in Bazel for libraries with
+    dependencies from Maven (e.g. //java/util)
+  * Protobuf: add //:go_features_proto Bazel alias (f79be3e)
+  * Fixes -lpthread problem when building with android_arm64 config (#20337)
+- Bump abseil_min_version to 20250127.0
+- Bump sover to 31_1_0
+- Update list of Java sources for lite build
+
+-------------------------------------------------------------------
+Sun May 25 16:38:17 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 30.2:
+  * return types in descriptor (such as full_name) to be
+    absl::string_view. This opens up memory savings in descriptors.
+  * stop exposing the ctype from FieldDescriptor options.
+  * debug API redacts sensitive fields
+  * Remove MutableRepeatedFieldRef<T>::Reserve().
+  * Removal of previously deprecated API, for replacements see
+    https://protobuf.dev/news/v30/#remove-deprecated
+  * C++17 support required
+  * Python 3.8 support dropped
+  * Python deprecated API sremoved, for replacements see
+    https://protobuf.dev/news/v30/#python-remove-apis
+  * compatibility with abseil-cpp: Remove if_constexpr usage
+- drop versionize-shlibs.patch, related change included upstream
+- includes changes from 29.4:
+  * Fix Java concurrency issue in feature resolution for old
+    <=3.25.x gencode using lazy feature resolution
+
 -------------------------------------------------------------------
 Thu May  1 09:05:08 UTC 2025 - Antonello Tartamo <antonello.tartamo@suse.com>
 
@@ -35,6 +198,7 @@ Fri Oct 25 15:24:11 UTC 2024 - Dirk Müller <dmueller@suse.com>
     .com/protocolbuffers/protobuf/commit/3ea568a9b6107ebf0d617c47
     6f53a31490fd3182)
   * Mute the minor version warning
+  * fixed (bsc#1230778, CVE-2024-7254)
 
 -------------------------------------------------------------------
 Thu Oct 24 20:56:51 UTC 2024 - Fridrich Strba <fstrba@suse.com>

protobuf-java.spec

@@ -2,7 +2,7 @@
 # spec file for package protobuf-java
 #
 # Copyright (c) 2025 SUSE LLC
-# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
+# Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %define tarname protobuf
 %define patchjuname protobuf-java-util-removescope.patch
 Name:           protobuf-java
-Version:        29.3
+Version:        31.1
 Release:        0
 Summary:        Java Bindings for Google Protocol Buffers
 License:        BSD-3-Clause
@@ -179,6 +179,7 @@ cp \
   core/src/main/java/com/google/protobuf/FloatArrayList.java \
   core/src/main/java/com/google/protobuf/GeneratedMessageInfoFactory.java \
   core/src/main/java/com/google/protobuf/GeneratedMessageLite.java \
+  core/src/main/java/com/google/protobuf/Generated.java \
   core/src/main/java/com/google/protobuf/InlineMe.java \
   core/src/main/java/com/google/protobuf/IntArrayList.java \
   core/src/main/java/com/google/protobuf/Internal.java \

protobuf-javalite-4.31.1.pom

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>4.29.3</version>
+    <version>4.31.1</version>
   </parent>
 
   <artifactId>protobuf-javalite</artifactId>

protobuf.changes

@@ -1,3 +1,166 @@
+-------------------------------------------------------------------
+Mon Jul 21 10:01:22 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Cherry-pick protobuf-fix-google-imports.patch to fix import issues of
+  reverse-dependency packages within the google namespace (bsc#1244918)
+
+-------------------------------------------------------------------
+Wed Jun 18 07:25:22 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Update to 31.1
+  * Support allowing late injection of language feature set
+    defaults from FeatureSet extensions while getting feature
+    set extension values.
+  * Support allowing late injection of language feature set
+    defaults from FeatureSet extensions while getting feature
+    set extension values.
+  * Add missing copts attribute (#21982)
+  * Support allowing late injection of language feature set
+    defaults from FeatureSet extensions while getting feature
+    set extension values.
+  * Support allowing late injection of language feature set
+    defaults from FeatureSet extensions while getting feature
+    set extension values.
+  * Python pyi print "import datetime" for Duration/Timestamp
+    field
+  * Add recursion depth limits to pure python (#bsc1244663, CVE-2025-4565)
+  * Fix cmake staleness test
+- from version 31.0
+  * Loosen py_proto_library check to be on the import path instead
+    of full directory (i.e. excluding external/module-name prefix).
+  * Add support for import option for protoc.
+  * Add notices.h with information about our dependencies' licenses
+    and add --notices flag to protoc to print the contents of that file.
+  * Move upb minitable code generator into protoc
+  * Upgrade abseil-cpp to 20250127 and use @com_google_absl -> @abseil-cpp
+    and com_google_googletest -> @googletest canonical BCR names.
+  * Remove fast-path check for non-clang compilers in MessageCreator.
+  * Add missing include.
+  * Add weak attribute to GetClassData to speed up clang builds.
+  * Add nontemporal software prefetcher to repeated ptr field dtor
+    to improve performance.
+  * Warn on unused RepeatedPtrField.
+  * Add notices.h with information about our dependencies' licenses and
+    add --notices flag to protoc to print the contents of that file.
+  * Fix a bug in handling of implicit-presence string_view fields.
+  * Control bounds checks via BUILD flags.
+  * Upgrade abseil-cpp to 20250127 and use @com_google_absl -> @abseil-cpp
+    and com_google_googletest -> @googletest canonical BCR names.
+  * Create hardened versions of Get and Mutable for repeated_field.
+  * Add weak attribute to GetClassData to speed up clang builds.
+  * Use ProtobufToStringOutput to control the output format of
+    AbstractMessage.Builder.toString.
+  * Implement Protobuf Java Immutable API nest_in_file_class feature
+    for Edition 2024.
+  * Introduce a Generated annotation to eventually replace
+    javax.annotation.Generated
+  * Add volatile to featuresResolved
+  * Fix Java concurrency issue in feature resolution for old <=3.25.x
+    gencode using lazy feature resolution.
+  * Remove Java runtime classes from kotlin release.
+  * Split maven dependencies into dev vs local
+  * Improve error messaging when detecting and erroring out on integer
+    overflow of byte count limit variables.
+  * Remove Java runtime classes from kotlin release.
+  * Remove "experimental API" warnings from members in the .NET protobuf runtime.
+  * Improve performace of repeated packed fixedSize fields (#19667)
+  * [ObjC] Deprecate GPBFieldDescriptor.isOptional.
+  * [ObjC] Raise the library version and enable new generated code.
+  * Cherry-pick Rust fix to 31.x (#21617)
+  * Add upb_Map_GetMutable API to upb
+  * See also UPB changes below, which may affect Rust.
+  * Update GetCurrentTime to use datetime.datetime.now
+  * Make Py JSON float_precision apply to both float and double fields.
+  * -Add '+' and '-' annotations for Timestamp and Duration in Python
+  * Bug fix for FieldMask.MergeFrom() with unset fields.
+  * Make python text_format able to skip unknown fields for repeated messages
+  * Fix segment fault for UPB Pyhon 'in' method of empty repeated extensions
+  * Fix upb to escape DefinitelyNeedsEscape (like " and ') for bytes field
+  * Check with fallback descriptorDB for FindExtensionByNumber()/
+    FindAllExtensions in UPB python pool.
+  * Add clear() method to repeated fields in Python.
+  * Register Scalar/MessageMapContainerTypes as virtual subclasses of
+  * Fix python codegen crash when C++ features are used.
+  * Add more detail to the comment for GetMessageClassesForFiles
+  * Add constructing unpack routine to Python Protobuf Any API.
+  * Implement typing for proto Timestamp/Duration assignments.
+  * Deprecate Descriptor Label. As an alternative, add helper methods
+    for checking whether a field is required or repeated.
+  * Feat(php): improve return typehint when repeatedfield (#11734)
+  * Automated rollback of commit f9863df. (#21355)
+  * Deprecate Descriptor Label. As an alternative, add helper methods
+    for checking whether a field is required or repeated.
+  * Ruby: Allow to get a file descriptor by a file name (#20287)
+  * Feat(php): improve return typehint when repeatedfield (#11734)
+  * See also UPB changes below, which may affect PHP C-Extension.
+  * Fix silent failure of rb_test rules to run test (#21733)
+  * Ruby | Add support for a protobuf debug build (#21060)
+  * Ruby | Support installing the gem via git and some other
+    small build tweaks (#21061)
+  * Deprecate Descriptor Label. As an alternative, add helper methods
+    for checking whether a field is required or repeated.
+  * [Ruby]Implement #to_hash for message classes (#20866)
+  * Drop Ruby 3.0
+  * Fixes #18726 by backslash escaping descriptor data containing #
+    if the hashmark appears immediately before any of $, {, or @.
+  * Ruby: Allow to get a file descriptor by a file name (#20287)
+  * Ruby: fix bug in Map.hash
+  * Ruby | Add support for a protobuf debug build (#21060)
+  * Deprecate Descriptor Label. As an alternative, add helper methods
+    for checking whether a field is required or repeated.
+  * Ruby: Allow to get a file descriptor by a file name (#20287)
+  * Ruby: fix bug in Map.hash
+  * See also UPB changes below, which may affect Ruby C-Extension.
+  * Fixed LTO-only linker error in upb linker arrays.
+  * Deprecate Descriptor Label. As an alternative, add helper methods
+    for checking whether a field is required or repeated.
+  * Add upb_Map_GetMutable API to upb (dd5bf5e)
+  * Fix upb to escape DefinitelyNeedsEscape (like " and ') for bytes field
+  * Upb: delete functions in map_gencode_util. They're unused
+    after the Map iterator API change.
+  * Upb: Update _upb_map_next signature to return a boolean
+    and remove the _nextmutable Map iterator API.
+  * Change upb C generated map iteration function to not
+    hand out MapEntry pointers.
+  * Ruby: Allow to get a file descriptor by a file name (#20287)
+  * Expose the upb_ByteSize function to upb clients. Note that the
+    current naive implementation is no more efficient than serializing
+    the message yourself and noting the resulting size.
+  * Move upb minitable code generator into protoc
+  * Tolerate message set extensions encoded as normal deliminited submessages
+  * Automated rollback of commit 6bde8c4.
+  * Fix UPB fast table build.
+  * Patch rules_ruby to apply neverlink = True to the jars
+    rule (#21416) (#21505)
+  * Restore JDK8 compatibility in Bazel for libraries with
+    dependencies from Maven (e.g. //java/util)
+  * Protobuf: add //:go_features_proto Bazel alias (f79be3e)
+  * Fixes -lpthread problem when building with android_arm64 config (#20337)
+- Bump abseil_min_version to 20250127.0
+- Bump sover to 31_1_0
+- Update list of Java sources for lite build
+
+-------------------------------------------------------------------
+Sun May 25 16:38:17 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 30.2:
+  * return types in descriptor (such as full_name) to be
+    absl::string_view. This opens up memory savings in descriptors.
+  * stop exposing the ctype from FieldDescriptor options.
+  * debug API redacts sensitive fields
+  * Remove MutableRepeatedFieldRef<T>::Reserve().
+  * Removal of previously deprecated API, for replacements see
+    https://protobuf.dev/news/v30/#remove-deprecated
+  * C++17 support required
+  * Python 3.8 support dropped
+  * Python deprecated API sremoved, for replacements see
+    https://protobuf.dev/news/v30/#python-remove-apis
+  * compatibility with abseil-cpp: Remove if_constexpr usage
+- drop versionize-shlibs.patch, related change included upstream
+- includes changes from 29.4:
+  * Fix Java concurrency issue in feature resolution for old
+    <=3.25.x gencode using lazy feature resolution
+
 -------------------------------------------------------------------
 Thu May  1 09:05:08 UTC 2025 - Antonello Tartamo <antonello.tartamo@suse.com>
 

protobuf.spec

@@ -2,7 +2,7 @@
 # spec file for package protobuf
 #
 # Copyright (c) 2025 SUSE LLC
-# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
+# Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,8 +19,8 @@
 
 %define tarname protobuf
 # see cmake/abseil-cpp.cmake and src/google/protobuf/port_def.inc
-%define abseil_min_version 20230125.3
-%global         sover 29_3_0
+%define abseil_min_version 20250127.0
+%global         sover 31_1_0
 %if 0%{?gcc_version} < 11
 %define with_gcc 11
 %endif
@@ -66,7 +66,7 @@
 %global protoc_arch sparc_64
 %endif
 Name:           protobuf
-Version:        29.3
+Version:        31.1
 Release:        0
 Summary:        Protocol Buffers - Google's data interchange format
 License:        BSD-3-Clause
@@ -74,7 +74,6 @@ Group:          Development/Libraries/C and C++
 URL:            https://github.com/protocolbuffers/protobuf
 Source0:        https://github.com/protocolbuffers/protobuf/releases/download/v%{version}/%{tarname}-%{version}.tar.gz
 Source1:        baselibs.conf
-Patch1:         versionize-shlibs.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc%{?with_gcc}-c++
@@ -100,12 +99,15 @@ BuildRequires:  pkgconfig(absl_flat_hash_set) >= %{abseil_min_version}
 BuildRequires:  pkgconfig(absl_function_ref) >= %{abseil_min_version}
 BuildRequires:  pkgconfig(absl_hash) >= %{abseil_min_version}
 BuildRequires:  pkgconfig(absl_layout) >= %{abseil_min_version}
+BuildRequires:  pkgconfig(absl_log_globals) >= %{abseil_min_version}
 BuildRequires:  pkgconfig(absl_log_initialize) >= %{abseil_min_version}
 BuildRequires:  pkgconfig(absl_log_severity) >= %{abseil_min_version}
 BuildRequires:  pkgconfig(absl_memory) >= %{abseil_min_version}
 BuildRequires:  pkgconfig(absl_node_hash_map) >= %{abseil_min_version}
 BuildRequires:  pkgconfig(absl_node_hash_set) >= %{abseil_min_version}
 BuildRequires:  pkgconfig(absl_optional) >= %{abseil_min_version}
+BuildRequires:  pkgconfig(absl_random_distributions) >= %{abseil_min_version}
+BuildRequires:  pkgconfig(absl_random_random) >= %{abseil_min_version}
 BuildRequires:  pkgconfig(absl_span) >= %{abseil_min_version}
 BuildRequires:  pkgconfig(absl_status) >= %{abseil_min_version}
 BuildRequires:  pkgconfig(absl_statusor) >= %{abseil_min_version}
@@ -203,9 +205,6 @@ export CC=gcc-%{with_gcc}
 %install
 %cmake_install
 install -Dm 0644 editors/proto.vim %{buildroot}%{_datadir}/vim/site/syntax/proto.vim
-# manual ln that we could not manage to get into versionize-shlibs.patch
-ln -s libutf8_range-%{version}.0.so %{buildroot}/%{_libdir}/libutf8_range.so
-ln -s libutf8_validity-%{version}.0.so %{buildroot}/%{_libdir}/libutf8_validity.so
 install -D java/core/src/main/resources/google/protobuf/java_features.proto %{buildroot}%{_includedir}/java/core/src/main/resources/google/protobuf/java_features.proto
 
 # create maven metadata for the protoc executable
@@ -258,8 +257,8 @@ __PROTOBUF__
 
 %files -n libutf8_range-%{sover}
 %license LICENSE
-%{_libdir}/libutf8_range-%{version}.0.so
-%{_libdir}/libutf8_validity-%{version}.0.so
+%{_libdir}/libutf8_range.so.%{version}.0
+%{_libdir}/libutf8_validity.so.%{version}.0
 
 %files devel
 %license LICENSE
@@ -276,7 +275,6 @@ __PROTOBUF__
 %dir %{_includedir}/java/core/src/main/resources/google/protobuf
 %{_includedir}/java/core/src/main/resources/google/protobuf/java_features.proto
 %{_includedir}/upb
-%{_includedir}/upb_generator
 %{_includedir}/*.h
 %{_libdir}/cmake/protobuf
 %{_libdir}/cmake/utf8_range

python-protobuf.spec

@@ -0,0 +1,71 @@
+#
+# spec file for package python-protobuf
+#
+# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%define baseversion 31.1
+%{?sle15_python_module_pythons}
+Name:           python-protobuf
+Version:        6.%{baseversion}
+Release:        0
+Summary:        Python Bindings for Google Protocol Buffers
+License:        BSD-3-Clause
+Group:          Development/Libraries/Python
+URL:            https://github.com/protocolbuffers/protobuf
+Source0:        https://files.pythonhosted.org/packages/source/p/protobuf/protobuf-%{version}.tar.gz
+Patch0:         https://github.com/protocolbuffers/protobuf/commit/8351926380c7cc91aae6df5695c91426e209f958.patch#/protobuf-fix-google-imports.patch
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module python-dateutil}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
+BuildRequires:  fdupes
+%python_subpackages
+
+%description
+Protocol Buffers are a way of encoding structured data in an efficient yet
+extensible format. Google uses Protocol Buffers for almost all of its internal
+RPC protocols and file formats.
+
+This package contains the Python bindings for Google Protocol Buffers.
+
+%prep
+%autosetup -p2 -n protobuf-%{version}
+
+# The previous blank line is crucial for older system being able
+# to use the autosetup macro
+
+grep -qF "'%{version}'" google/protobuf/__init__.py
+
+# kill shebang that we do not really want
+sed -i -e '/env python/d' google/protobuf/internal/*.py
+
+%build
+%pyproject_wheel
+
+%install
+%pyproject_install
+%python_expand %fdupes %{buildroot}%{$python_sitearch}
+
+%fdupes %{buildroot}%{_prefix}
+
+%files %{python_files}
+%license LICENSE
+%{python_sitearch}/google
+%{python_sitearch}/protobuf-%{version}.dist-info
+
+%changelog

versionize-shlibs.patch

@@ -1,32 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2024-10-28 10:10:20.918922623 +0100
-References: https://github.com/protocolbuffers/protobuf/pull/19009
-
-Unversioned libraries are strongly discouraged. Use
-https://en.opensuse.org/openSUSE:Shared_library_packaging_policy#When_there_is_no_versioning
-method 1 to remedy. Though utf8_range has a version of its own ("1.0"
-visible through the .pc file) and gets third_party/-like treatment,
-protobuf is the authoritative repository for it, using the protobuf
-version for our SONAME seems acceptable.
-
-This openSUSE patch follows SLPP's naming provisions and so is
-slightly different from PR19009 while the PR is unmerged.
-
----
- third_party/utf8_range/CMakeLists.txt |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
-Index: protobuf-29.3/third_party/utf8_range/CMakeLists.txt
-===================================================================
---- protobuf-29.3.orig/third_party/utf8_range/CMakeLists.txt
-+++ protobuf-29.3/third_party/utf8_range/CMakeLists.txt
-@@ -19,6 +19,9 @@ add_library (utf8_range
- # A heavier-weight C++ wrapper that supports Abseil.
- add_library (utf8_validity utf8_validity.cc utf8_range.c)
- 
-+set_target_properties(utf8_range PROPERTIES OUTPUT_NAME ${LIB_PREFIX}utf8_range-${protobuf_VERSION})
-+set_target_properties(utf8_validity PROPERTIES OUTPUT_NAME ${LIB_PREFIX}utf8_validity-${protobuf_VERSION})
-+
- # Load Abseil dependency.
- if (NOT TARGET absl::strings)
-   if (NOT ABSL_ROOT_DIR)