Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package protobuf for openSUSE:Factory
checked in at 2022-12-17 20:36:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/protobuf (Old)
and /work/SRC/openSUSE:Factory/.protobuf.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "protobuf"
Sat Dec 17 20:36:03 2022 rev:70 rq:1043228 version:21.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/protobuf/protobuf.changes 2022-12-09
13:16:47.630687048 +0100
+++ /work/SRC/openSUSE:Factory/.protobuf.new.1835/protobuf.changes
2022-12-17 20:36:05.096453288 +0100
@@ -1,0 +2,10 @@
+Thu Dec 15 16:18:26 UTC 2022 - Dirk Müller <dmuel...@suse.com>
+
+- update to v21.12:
+ * Python
+ * Fix broken enum ranges (#11171)
+ * Stop requiring extension fields to have a sythetic oneof (#11091)
+ * Python runtime 4.21.10 not works generated code can not load valid
+ proto.
+
+-------------------------------------------------------------------
Old:
----
protobuf-21.11.tar.gz
New:
----
protobuf-21.12.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ protobuf.spec ++++++
--- /var/tmp/diff_new_pack.n96PT2/_old 2022-12-17 20:36:05.664456408 +0100
+++ /var/tmp/diff_new_pack.n96PT2/_new 2022-12-17 20:36:05.668456430 +0100
@@ -17,7 +17,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define sover 3_21_11
+%define sover 3_21_12
%define tarname protobuf
%define src_install_dir %{_prefix}/src/%{name}
%define extra_java_flags -source 7 -target 7
@@ -27,7 +27,7 @@
%bcond_without python2
%bcond_without python3
Name: protobuf
-Version: 21.11
+Version: 21.12
Release: 0
Summary: Protocol Buffers - Google's data interchange format
License: BSD-3-Clause
@@ -49,7 +49,7 @@
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: python-rpm-macros
-BuildRequires: zlib-devel
+BuildRequires: pkgconfig(zlib)
%if %{with check}
BuildRequires: libgmock-devel >= 1.7.0
%endif
++++++ 10355.patch ++++++
--- /var/tmp/diff_new_pack.n96PT2/_old 2022-12-17 20:36:05.700456606 +0100
+++ /var/tmp/diff_new_pack.n96PT2/_new 2022-12-17 20:36:05.708456650 +0100
@@ -7,16 +7,16 @@
src/Makefile.am | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
-Index: protobuf-21.11/src/Makefile.am
+Index: protobuf-21.12/src/Makefile.am
===================================================================
---- protobuf-21.11.orig/src/Makefile.am
-+++ protobuf-21.11/src/Makefile.am
+--- protobuf-21.12.orig/src/Makefile.am
++++ protobuf-21.12/src/Makefile.am
@@ -18,7 +18,7 @@ else
PTHREAD_DEF =
endif
--PROTOBUF_VERSION = 32:11:0
-+PROTOBUF_VERSION = 3.21.11
+-PROTOBUF_VERSION = 32:12:0
++PROTOBUF_VERSION = 3.21.12
if GCC
# Turn on all warnings except for sign comparison (we ignore sign comparison
@@ -47,10 +47,10 @@
if HAVE_LD_VERSION_SCRIPT
libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map
EXTRA_libprotoc_la_DEPENDENCIES = libprotoc.map
-Index: protobuf-21.11/cmake/libprotobuf-lite.cmake
+Index: protobuf-21.12/cmake/libprotobuf-lite.cmake
===================================================================
---- protobuf-21.11.orig/cmake/libprotobuf-lite.cmake
-+++ protobuf-21.11/cmake/libprotobuf-lite.cmake
+--- protobuf-21.12.orig/cmake/libprotobuf-lite.cmake
++++ protobuf-21.12/cmake/libprotobuf-lite.cmake
@@ -112,7 +112,6 @@ if(protobuf_BUILD_SHARED_LIBS)
endif()
set_target_properties(libprotobuf-lite PROPERTIES
@@ -59,10 +59,10 @@
OUTPUT_NAME ${LIB_PREFIX}protobuf-lite
DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite)
-Index: protobuf-21.11/cmake/libprotobuf.cmake
+Index: protobuf-21.12/cmake/libprotobuf.cmake
===================================================================
---- protobuf-21.11.orig/cmake/libprotobuf.cmake
-+++ protobuf-21.11/cmake/libprotobuf.cmake
+--- protobuf-21.12.orig/cmake/libprotobuf.cmake
++++ protobuf-21.12/cmake/libprotobuf.cmake
@@ -128,7 +128,6 @@ if(protobuf_BUILD_SHARED_LIBS)
endif()
set_target_properties(libprotobuf PROPERTIES
@@ -71,10 +71,10 @@
OUTPUT_NAME ${LIB_PREFIX}protobuf
DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
add_library(protobuf::libprotobuf ALIAS libprotobuf)
-Index: protobuf-21.11/cmake/libprotoc.cmake
+Index: protobuf-21.12/cmake/libprotoc.cmake
===================================================================
---- protobuf-21.11.orig/cmake/libprotoc.cmake
-+++ protobuf-21.11/cmake/libprotoc.cmake
+--- protobuf-21.12.orig/cmake/libprotoc.cmake
++++ protobuf-21.12/cmake/libprotoc.cmake
@@ -130,7 +130,6 @@ endif()
set_target_properties(libprotoc PROPERTIES
COMPILE_DEFINITIONS LIBPROTOC_EXPORTS
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.n96PT2/_old 2022-12-17 20:36:05.728456759 +0100
+++ /var/tmp/diff_new_pack.n96PT2/_new 2022-12-17 20:36:05.736456803 +0100
@@ -1,4 +1,4 @@
-libprotobuf3_21_11
-libprotoc3_21_11
-libprotobuf-lite3_21_11
+libprotobuf3_21_12
+libprotoc3_21_12
+libprotobuf-lite3_21_12
++++++ protobuf-21.11.tar.gz -> protobuf-21.12.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/CHANGES.txt
new/protobuf-21.12/CHANGES.txt
--- old/protobuf-21.11/CHANGES.txt 2022-12-08 03:41:29.000000000 +0100
+++ new/protobuf-21.12/CHANGES.txt 2022-12-13 01:03:12.000000000 +0100
@@ -1,3 +1,8 @@
+2022-12-07 version 21.11 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
+ Python
+ * Add license file to pypi wheels (#10936)
+ * Fix round-trip bug (#10158)
+
2022-11-29 version 21.10 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
Java
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/Protobuf-C++.podspec
new/protobuf-21.12/Protobuf-C++.podspec
--- old/protobuf-21.11/Protobuf-C++.podspec 2022-12-08 03:41:29.000000000
+0100
+++ new/protobuf-21.12/Protobuf-C++.podspec 2022-12-13 01:03:12.000000000
+0100
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Protobuf-C++'
- s.version = '3.21.11'
+ s.version = '3.21.12'
s.summary = 'Protocol Buffers v3 runtime library for C++.'
s.homepage = 'https://github.com/google/protobuf'
s.license = 'BSD-3-Clause'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/Protobuf.podspec
new/protobuf-21.12/Protobuf.podspec
--- old/protobuf-21.11/Protobuf.podspec 2022-12-08 03:41:29.000000000 +0100
+++ new/protobuf-21.12/Protobuf.podspec 2022-12-13 01:03:12.000000000 +0100
@@ -5,7 +5,7 @@
# dependent projects use the :git notation to refer to the library.
Pod::Spec.new do |s|
s.name = 'Protobuf'
- s.version = '3.21.11'
+ s.version = '3.21.12'
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
s.homepage = 'https://github.com/protocolbuffers/protobuf'
s.license = 'BSD-3-Clause'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/configure.ac
new/protobuf-21.12/configure.ac
--- old/protobuf-21.11/configure.ac 2022-12-08 03:41:29.000000000 +0100
+++ new/protobuf-21.12/configure.ac 2022-12-13 01:03:12.000000000 +0100
@@ -17,7 +17,7 @@
# In the SVN trunk, the version should always be the next anticipated release
# version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed
# the size of one file name in the dist tarfile over the 99-char limit.)
-AC_INIT([Protocol Buffers],[3.21.11],[proto...@googlegroups.com],[protobuf])
+AC_INIT([Protocol Buffers],[3.21.12],[proto...@googlegroups.com],[protobuf])
AM_MAINTAINER_MODE([enable])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/csharp/Google.Protobuf.Tools.nuspec
new/protobuf-21.12/csharp/Google.Protobuf.Tools.nuspec
--- old/protobuf-21.11/csharp/Google.Protobuf.Tools.nuspec 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/csharp/Google.Protobuf.Tools.nuspec 2022-12-13
01:03:12.000000000 +0100
@@ -5,7 +5,7 @@
<title>Google Protocol Buffers tools</title>
<summary>Tools for Protocol Buffers - Google's data interchange
format.</summary>
<description>See project site for more info.</description>
- <version>3.21.11</version>
+ <version>3.21.12</version>
<authors>Google Inc.</authors>
<owners>protobuf-packages</owners>
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/protobuf-21.11/csharp/src/Google.Protobuf/Google.Protobuf.csproj
new/protobuf-21.12/csharp/src/Google.Protobuf/Google.Protobuf.csproj
--- old/protobuf-21.11/csharp/src/Google.Protobuf/Google.Protobuf.csproj
2022-12-08 03:41:29.000000000 +0100
+++ new/protobuf-21.12/csharp/src/Google.Protobuf/Google.Protobuf.csproj
2022-12-13 01:03:12.000000000 +0100
@@ -4,7 +4,7 @@
<Description>C# runtime library for Protocol Buffers - Google's data
interchange format.</Description>
<Copyright>Copyright 2015, Google Inc.</Copyright>
<AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
- <VersionPrefix>3.21.11</VersionPrefix>
+ <VersionPrefix>3.21.12</VersionPrefix>
<!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence -->
<LangVersion>7.2</LangVersion>
<Authors>Google Inc.</Authors>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/java/README.md
new/protobuf-21.12/java/README.md
--- old/protobuf-21.11/java/README.md 2022-12-08 03:41:29.000000000 +0100
+++ new/protobuf-21.12/java/README.md 2022-12-13 01:03:12.000000000 +0100
@@ -23,7 +23,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>3.21.11</version>
+ <version>3.21.12</version>
</dependency>
```
@@ -37,7 +37,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
- <version>3.21.11</version>
+ <version>3.21.12</version>
</dependency>
```
@@ -45,7 +45,7 @@
If you are using Gradle, add the following to your `build.gradle` file's
dependencies:
```
- implementation 'com.google.protobuf:protobuf-java:3.21.11'
+ implementation 'com.google.protobuf:protobuf-java:3.21.12'
```
Again, be sure to check that the version number matches (or is newer than) the
version number of protoc that you are using.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/java/bom/pom.xml
new/protobuf-21.12/java/bom/pom.xml
--- old/protobuf-21.11/java/bom/pom.xml 2022-12-08 03:41:29.000000000 +0100
+++ new/protobuf-21.12/java/bom/pom.xml 2022-12-13 01:03:12.000000000 +0100
@@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
- <version>3.21.11</version>
+ <version>3.21.12</version>
<packaging>pom</packaging>
<name>Protocol Buffers [BOM]</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/java/core/pom.xml
new/protobuf-21.12/java/core/pom.xml
--- old/protobuf-21.11/java/core/pom.xml 2022-12-08 03:41:29.000000000
+0100
+++ new/protobuf-21.12/java/core/pom.xml 2022-12-13 01:03:12.000000000
+0100
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>3.21.11</version>
+ <version>3.21.12</version>
</parent>
<artifactId>protobuf-java</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/java/kotlin/pom.xml
new/protobuf-21.12/java/kotlin/pom.xml
--- old/protobuf-21.11/java/kotlin/pom.xml 2022-12-08 03:41:29.000000000
+0100
+++ new/protobuf-21.12/java/kotlin/pom.xml 2022-12-13 01:03:12.000000000
+0100
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>3.21.11</version>
+ <version>3.21.12</version>
</parent>
<artifactId>protobuf-kotlin</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/java/kotlin-lite/pom.xml
new/protobuf-21.12/java/kotlin-lite/pom.xml
--- old/protobuf-21.11/java/kotlin-lite/pom.xml 2022-12-08 03:41:29.000000000
+0100
+++ new/protobuf-21.12/java/kotlin-lite/pom.xml 2022-12-13 01:03:12.000000000
+0100
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>3.21.11</version>
+ <version>3.21.12</version>
</parent>
<artifactId>protobuf-kotlin-lite</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/java/lite/pom.xml
new/protobuf-21.12/java/lite/pom.xml
--- old/protobuf-21.11/java/lite/pom.xml 2022-12-08 03:41:29.000000000
+0100
+++ new/protobuf-21.12/java/lite/pom.xml 2022-12-13 01:03:12.000000000
+0100
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>3.21.11</version>
+ <version>3.21.12</version>
</parent>
<artifactId>protobuf-javalite</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/java/lite.md
new/protobuf-21.12/java/lite.md
--- old/protobuf-21.11/java/lite.md 2022-12-08 03:41:29.000000000 +0100
+++ new/protobuf-21.12/java/lite.md 2022-12-13 01:03:12.000000000 +0100
@@ -29,7 +29,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-javalite</artifactId>
- <version>3.21.11</version>
+ <version>3.21.12</version>
</dependency>
```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/java/pom.xml
new/protobuf-21.12/java/pom.xml
--- old/protobuf-21.11/java/pom.xml 2022-12-08 03:41:29.000000000 +0100
+++ new/protobuf-21.12/java/pom.xml 2022-12-13 01:03:12.000000000 +0100
@@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>3.21.11</version>
+ <version>3.21.12</version>
<packaging>pom</packaging>
<name>Protocol Buffers [Parent]</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/java/util/pom.xml
new/protobuf-21.12/java/util/pom.xml
--- old/protobuf-21.11/java/util/pom.xml 2022-12-08 03:41:29.000000000
+0100
+++ new/protobuf-21.12/java/util/pom.xml 2022-12-13 01:03:12.000000000
+0100
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>3.21.11</version>
+ <version>3.21.12</version>
</parent>
<artifactId>protobuf-java-util</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/php/ext/google/protobuf/php-upb.c
new/protobuf-21.12/php/ext/google/protobuf/php-upb.c
--- old/protobuf-21.11/php/ext/google/protobuf/php-upb.c 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/php/ext/google/protobuf/php-upb.c 2022-12-13
01:03:12.000000000 +0100
@@ -6143,7 +6143,6 @@
google_protobuf_EnumDescriptorProto_EnumReservedRange_start(protos[i]);
const int32_t end =
google_protobuf_EnumDescriptorProto_EnumReservedRange_end(protos[i]);
- const int32_t max = kUpb_MaxFieldNumber + 1;
// A full validation would also check that each range is disjoint, and that
// none of the fields overlap with the extension ranges, but we are just
@@ -6151,7 +6150,7 @@
// Note: Not a typo! Unlike extension ranges and message reserved ranges,
// the end value of an enum reserved range is *inclusive*!
- if (start < 1 || end < start || end > max) {
+ if (end < start) {
symtab_errf(ctx, "Reserved range (%d, %d) is invalid, enum=%s\n",
(int)start, (int)end, upb_EnumDef_FullName(e));
}
@@ -8184,7 +8183,7 @@
CHK_OOM(
upb_strtable_insert(&oneof->ntof, name.data, name.size, v,
ctx->arena));
} else {
- if (f->proto3_optional_) {
+ if (f->proto3_optional_ && !is_extension) {
symtab_errf(ctx, "field with proto3_optional was not in a oneof (%s)",
f->full_name);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/php/ext/google/protobuf/protobuf.h
new/protobuf-21.12/php/ext/google/protobuf/protobuf.h
--- old/protobuf-21.11/php/ext/google/protobuf/protobuf.h 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/php/ext/google/protobuf/protobuf.h 2022-12-13
01:03:12.000000000 +0100
@@ -127,7 +127,7 @@
ZEND_ARG_INFO(0, value)
ZEND_END_ARG_INFO()
-#define PHP_PROTOBUF_VERSION "3.21.11"
+#define PHP_PROTOBUF_VERSION "3.21.12"
// ptr -> PHP object cache. This is a weak map that caches lazily-created
// wrapper objects around upb types:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/protobuf_deps.bzl
new/protobuf-21.12/protobuf_deps.bzl
--- old/protobuf-21.11/protobuf_deps.bzl 2022-12-08 03:41:29.000000000
+0100
+++ new/protobuf-21.12/protobuf_deps.bzl 2022-12-13 01:03:12.000000000
+0100
@@ -117,6 +117,6 @@
_github_archive(
name = "upb",
repo = "https://github.com/protocolbuffers/upb";,
- commit = "969f6fdb88e94ced87953e53716893c68ec7b1ce",
- sha256 =
"6754b7f95c92f69a832a82931aea40d066cc689dbc1eb3348b84c1ed95285296",
+ commit = "20b542a767139732548f7b8cf28c4c928cdcb07b",
+ sha256 =
"c77158955326f9e9a0cf8481c118b8ad5c34df99e5db3af27f3d1662d8bedef7",
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/protobuf_version.bzl
new/protobuf-21.12/protobuf_version.bzl
--- old/protobuf-21.11/protobuf_version.bzl 2022-12-08 03:41:29.000000000
+0100
+++ new/protobuf-21.12/protobuf_version.bzl 2022-12-13 01:03:12.000000000
+0100
@@ -1,4 +1,4 @@
-PROTOC_VERSION = "21.11"
-PROTOBUF_JAVA_VERSION = "3.21.11"
-PROTOBUF_PYTHON_VERSION = "4.21.11"
-PROTOBUF_PHP_VERSION = "3.21.11"
+PROTOC_VERSION = "21.12"
+PROTOBUF_JAVA_VERSION = "3.21.12"
+PROTOBUF_PYTHON_VERSION = "4.21.12"
+PROTOBUF_PHP_VERSION = "3.21.12"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/protoc-artifacts/pom.xml
new/protobuf-21.12/protoc-artifacts/pom.xml
--- old/protobuf-21.11/protoc-artifacts/pom.xml 2022-12-08 03:41:29.000000000
+0100
+++ new/protobuf-21.12/protoc-artifacts/pom.xml 2022-12-13 01:03:12.000000000
+0100
@@ -8,7 +8,7 @@
</parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
- <version>3.21.11</version>
+ <version>3.21.12</version>
<packaging>pom</packaging>
<name>Protobuf Compiler</name>
<description>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/python/google/protobuf/__init__.py
new/protobuf-21.12/python/google/protobuf/__init__.py
--- old/protobuf-21.11/python/google/protobuf/__init__.py 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/python/google/protobuf/__init__.py 2022-12-13
01:03:12.000000000 +0100
@@ -30,4 +30,4 @@
# Copyright 2007 Google Inc. All Rights Reserved.
-__version__ = '4.21.11'
+__version__ = '4.21.12'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/ruby/ext/google/protobuf_c/ruby-upb.c
new/protobuf-21.12/ruby/ext/google/protobuf_c/ruby-upb.c
--- old/protobuf-21.11/ruby/ext/google/protobuf_c/ruby-upb.c 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/ruby/ext/google/protobuf_c/ruby-upb.c 2022-12-13
01:03:12.000000000 +0100
@@ -5814,7 +5814,6 @@
google_protobuf_EnumDescriptorProto_EnumReservedRange_start(protos[i]);
const int32_t end =
google_protobuf_EnumDescriptorProto_EnumReservedRange_end(protos[i]);
- const int32_t max = kUpb_MaxFieldNumber + 1;
// A full validation would also check that each range is disjoint, and that
// none of the fields overlap with the extension ranges, but we are just
@@ -5822,7 +5821,7 @@
// Note: Not a typo! Unlike extension ranges and message reserved ranges,
// the end value of an enum reserved range is *inclusive*!
- if (start < 1 || end < start || end > max) {
+ if (end < start) {
symtab_errf(ctx, "Reserved range (%d, %d) is invalid, enum=%s\n",
(int)start, (int)end, upb_EnumDef_FullName(e));
}
@@ -7855,7 +7854,7 @@
CHK_OOM(
upb_strtable_insert(&oneof->ntof, name.data, name.size, v,
ctx->arena));
} else {
- if (f->proto3_optional_) {
+ if (f->proto3_optional_ && !is_extension) {
symtab_errf(ctx, "field with proto3_optional was not in a oneof (%s)",
f->full_name);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/ruby/google-protobuf.gemspec
new/protobuf-21.12/ruby/google-protobuf.gemspec
--- old/protobuf-21.11/ruby/google-protobuf.gemspec 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/ruby/google-protobuf.gemspec 2022-12-13
01:03:12.000000000 +0100
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = "google-protobuf"
- s.version = "3.21.11"
+ s.version = "3.21.12"
git_tag = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts
X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag
s.licenses = ["BSD-3-Clause"]
s.summary = "Protocol Buffers"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/ruby/pom.xml
new/protobuf-21.12/ruby/pom.xml
--- old/protobuf-21.11/ruby/pom.xml 2022-12-08 03:41:29.000000000 +0100
+++ new/protobuf-21.12/ruby/pom.xml 2022-12-13 01:03:12.000000000 +0100
@@ -9,7 +9,7 @@
<groupId>com.google.protobuf.jruby</groupId>
<artifactId>protobuf-jruby</artifactId>
- <version>3.21.11</version>
+ <version>3.21.12</version>
<name>Protocol Buffer JRuby native extension</name>
<description>
Protocol Buffers are a way of encoding structured data in an efficient
yet
@@ -76,7 +76,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
- <version>3.21.11</version>
+ <version>3.21.12</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/src/Makefile.am
new/protobuf-21.12/src/Makefile.am
--- old/protobuf-21.11/src/Makefile.am 2022-12-08 03:41:29.000000000 +0100
+++ new/protobuf-21.12/src/Makefile.am 2022-12-13 01:03:12.000000000 +0100
@@ -18,7 +18,7 @@
PTHREAD_DEF =
endif
-PROTOBUF_VERSION = 32:11:0
+PROTOBUF_VERSION = 32:12:0
if GCC
# Turn on all warnings except for sign comparison (we ignore sign comparison
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/src/google/protobuf/any.pb.h
new/protobuf-21.12/src/google/protobuf/any.pb.h
--- old/protobuf-21.11/src/google/protobuf/any.pb.h 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/src/google/protobuf/any.pb.h 2022-12-13
01:03:12.000000000 +0100
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/src/google/protobuf/api.pb.h
new/protobuf-21.12/src/google/protobuf/api.pb.h
--- old/protobuf-21.11/src/google/protobuf/api.pb.h 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/src/google/protobuf/api.pb.h 2022-12-13
01:03:12.000000000 +0100
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/protobuf-21.11/src/google/protobuf/compiler/plugin.pb.h
new/protobuf-21.12/src/google/protobuf/compiler/plugin.pb.h
--- old/protobuf-21.11/src/google/protobuf/compiler/plugin.pb.h 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/src/google/protobuf/compiler/plugin.pb.h 2022-12-13
01:03:12.000000000 +0100
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/src/google/protobuf/descriptor.pb.h
new/protobuf-21.12/src/google/protobuf/descriptor.pb.h
--- old/protobuf-21.11/src/google/protobuf/descriptor.pb.h 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/src/google/protobuf/descriptor.pb.h 2022-12-13
01:03:12.000000000 +0100
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/src/google/protobuf/duration.pb.h
new/protobuf-21.12/src/google/protobuf/duration.pb.h
--- old/protobuf-21.11/src/google/protobuf/duration.pb.h 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/src/google/protobuf/duration.pb.h 2022-12-13
01:03:12.000000000 +0100
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/src/google/protobuf/empty.pb.h
new/protobuf-21.12/src/google/protobuf/empty.pb.h
--- old/protobuf-21.11/src/google/protobuf/empty.pb.h 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/src/google/protobuf/empty.pb.h 2022-12-13
01:03:12.000000000 +0100
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/src/google/protobuf/field_mask.pb.h
new/protobuf-21.12/src/google/protobuf/field_mask.pb.h
--- old/protobuf-21.11/src/google/protobuf/field_mask.pb.h 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/src/google/protobuf/field_mask.pb.h 2022-12-13
01:03:12.000000000 +0100
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/src/google/protobuf/port_def.inc
new/protobuf-21.12/src/google/protobuf/port_def.inc
--- old/protobuf-21.11/src/google/protobuf/port_def.inc 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/src/google/protobuf/port_def.inc 2022-12-13
01:03:12.000000000 +0100
@@ -178,7 +178,7 @@
#ifdef PROTOBUF_VERSION
#error PROTOBUF_VERSION was previously defined
#endif
-#define PROTOBUF_VERSION 3021011
+#define PROTOBUF_VERSION 3021012
#ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC
#error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/protobuf-21.11/src/google/protobuf/source_context.pb.h
new/protobuf-21.12/src/google/protobuf/source_context.pb.h
--- old/protobuf-21.11/src/google/protobuf/source_context.pb.h 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/src/google/protobuf/source_context.pb.h 2022-12-13
01:03:12.000000000 +0100
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/src/google/protobuf/struct.pb.h
new/protobuf-21.12/src/google/protobuf/struct.pb.h
--- old/protobuf-21.11/src/google/protobuf/struct.pb.h 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/src/google/protobuf/struct.pb.h 2022-12-13
01:03:12.000000000 +0100
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/src/google/protobuf/stubs/common.h
new/protobuf-21.12/src/google/protobuf/stubs/common.h
--- old/protobuf-21.11/src/google/protobuf/stubs/common.h 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/src/google/protobuf/stubs/common.h 2022-12-13
01:03:12.000000000 +0100
@@ -82,7 +82,7 @@
// The current version, represented as a single integer to make comparison
// easier: major * 10^6 + minor * 10^3 + micro
-#define GOOGLE_PROTOBUF_VERSION 3021011
+#define GOOGLE_PROTOBUF_VERSION 3021012
// A suffix string for alpha, beta or rc releases. Empty for stable releases.
#define GOOGLE_PROTOBUF_VERSION_SUFFIX ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/src/google/protobuf/timestamp.pb.h
new/protobuf-21.12/src/google/protobuf/timestamp.pb.h
--- old/protobuf-21.11/src/google/protobuf/timestamp.pb.h 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/src/google/protobuf/timestamp.pb.h 2022-12-13
01:03:12.000000000 +0100
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/src/google/protobuf/type.pb.h
new/protobuf-21.12/src/google/protobuf/type.pb.h
--- old/protobuf-21.11/src/google/protobuf/type.pb.h 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/src/google/protobuf/type.pb.h 2022-12-13
01:03:12.000000000 +0100
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/src/google/protobuf/wrappers.pb.h
new/protobuf-21.12/src/google/protobuf/wrappers.pb.h
--- old/protobuf-21.11/src/google/protobuf/wrappers.pb.h 2022-12-08
03:41:29.000000000 +0100
+++ new/protobuf-21.12/src/google/protobuf/wrappers.pb.h 2022-12-13
01:03:12.000000000 +0100
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.11/version.json
new/protobuf-21.12/version.json
--- old/protobuf-21.11/version.json 2022-12-08 03:41:29.000000000 +0100
+++ new/protobuf-21.12/version.json 2022-12-13 01:03:12.000000000 +0100
@@ -1,17 +1,17 @@
{
"21.x": {
- "protoc_version": "21.11",
+ "protoc_version": "21.12",
"lts": false,
- "date": "2022-12-07",
+ "date": "2022-12-12",
"languages": {
- "cpp": "3.21.11",
- "csharp": "3.21.11",
- "java": "3.21.11",
- "javascript": "3.21.11",
- "objectivec": "3.21.11",
- "php": "3.21.11",
- "python": "4.21.11",
- "ruby": "3.21.11"
+ "cpp": "3.21.12",
+ "csharp": "3.21.12",
+ "java": "3.21.12",
+ "javascript": "3.21.12",
+ "objectivec": "3.21.12",
+ "php": "3.21.12",
+ "python": "4.21.12",
+ "ruby": "3.21.12"
}
}
}
\ No newline at end of file
