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-08-19 17:53:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/protobuf (Old)
and /work/SRC/openSUSE:Factory/.protobuf.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "protobuf"
Fri Aug 19 17:53:09 2022 rev:65 rq:997681 version:21.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/protobuf/protobuf.changes 2022-08-07
18:33:46.521125915 +0200
+++ /work/SRC/openSUSE:Factory/.protobuf.new.2083/protobuf.changes
2022-08-19 17:54:12.191814245 +0200
@@ -1,0 +2,10 @@
+Wed Aug 17 19:33:06 UTC 2022 - Dirk M??ller <dmuel...@suse.com>
+
+- update to 21.5:
+ PHP
+ * Added getContainingOneof and getRealContainingOneof to descriptor.
+ * fix PHP readonly legacy files for nested messages
+ Python
+ * Fixed comparison of maps in Python.
+
+-------------------------------------------------------------------
Old:
----
protobuf-21.4.tar.gz
New:
----
protobuf-21.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ protobuf.spec ++++++
--- /var/tmp/diff_new_pack.b7U1Zu/_old 2022-08-19 17:54:12.915815763 +0200
+++ /var/tmp/diff_new_pack.b7U1Zu/_new 2022-08-19 17:54:12.923815780 +0200
@@ -17,7 +17,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define sover 3_21_4
+%define sover 3_21_5
%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.4
+Version: 21.5
Release: 0
Summary: Protocol Buffers - Google's data interchange format
License: BSD-3-Clause
++++++ 10355.patch ++++++
--- /var/tmp/diff_new_pack.b7U1Zu/_old 2022-08-19 17:54:12.947815829 +0200
+++ /var/tmp/diff_new_pack.b7U1Zu/_new 2022-08-19 17:54:12.951815838 +0200
@@ -7,16 +7,16 @@
src/Makefile.am | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
-Index: protobuf-21.4/src/Makefile.am
+Index: protobuf-21.5/src/Makefile.am
===================================================================
---- protobuf-21.4.orig/src/Makefile.am
-+++ protobuf-21.4/src/Makefile.am
+--- protobuf-21.5.orig/src/Makefile.am
++++ protobuf-21.5/src/Makefile.am
@@ -18,7 +18,7 @@ else
PTHREAD_DEF =
endif
--PROTOBUF_VERSION = 32:4:0
-+PROTOBUF_VERSION = 3.21.4
+-PROTOBUF_VERSION = 32:5:0
++PROTOBUF_VERSION = 3.21.5
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.4/cmake/libprotobuf-lite.cmake
+Index: protobuf-21.5/cmake/libprotobuf-lite.cmake
===================================================================
---- protobuf-21.4.orig/cmake/libprotobuf-lite.cmake
-+++ protobuf-21.4/cmake/libprotobuf-lite.cmake
+--- protobuf-21.5.orig/cmake/libprotobuf-lite.cmake
++++ protobuf-21.5/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.4/cmake/libprotobuf.cmake
+Index: protobuf-21.5/cmake/libprotobuf.cmake
===================================================================
---- protobuf-21.4.orig/cmake/libprotobuf.cmake
-+++ protobuf-21.4/cmake/libprotobuf.cmake
+--- protobuf-21.5.orig/cmake/libprotobuf.cmake
++++ protobuf-21.5/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.4/cmake/libprotoc.cmake
+Index: protobuf-21.5/cmake/libprotoc.cmake
===================================================================
---- protobuf-21.4.orig/cmake/libprotoc.cmake
-+++ protobuf-21.4/cmake/libprotoc.cmake
+--- protobuf-21.5.orig/cmake/libprotoc.cmake
++++ protobuf-21.5/cmake/libprotoc.cmake
@@ -130,7 +130,6 @@ endif()
set_target_properties(libprotoc PROPERTIES
COMPILE_DEFINITIONS LIBPROTOC_EXPORTS
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.b7U1Zu/_old 2022-08-19 17:54:12.975815888 +0200
+++ /var/tmp/diff_new_pack.b7U1Zu/_new 2022-08-19 17:54:12.983815906 +0200
@@ -1,4 +1,4 @@
-libprotobuf3_21_4
-libprotoc3_21_4
-libprotobuf-lite3_21_4
+libprotobuf3_21_5
+libprotoc3_21_5
+libprotobuf-lite3_21_5
++++++ protobuf-21.4.tar.gz -> protobuf-21.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/CHANGES.txt
new/protobuf-21.5/CHANGES.txt
--- old/protobuf-21.4/CHANGES.txt 2022-07-25 22:22:15.000000000 +0200
+++ new/protobuf-21.5/CHANGES.txt 2022-08-09 19:12:44.000000000 +0200
@@ -1,3 +1,19 @@
+2022-08-09 version 21.5 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
+
+ PHP
+ * Added getContainingOneof and getRealContainingOneof to descriptor.
+ * fix PHP readonly legacy files for nested messages
+
+ Python
+ * Fixed comparison of maps in Python.
+
+
+2022-07-25 version 21.4 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
+
+ C++
+ * Reduce the required alignment of ArenaString from 8 to 4 (#10298)
+
+
2022-07-19 version 21.3 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
C++
* Add header search paths to Protobuf-C++.podspec (#10024)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/Protobuf-C++.podspec
new/protobuf-21.5/Protobuf-C++.podspec
--- old/protobuf-21.4/Protobuf-C++.podspec 2022-07-25 22:22:15.000000000
+0200
+++ new/protobuf-21.5/Protobuf-C++.podspec 2022-08-09 19:12:44.000000000
+0200
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Protobuf-C++'
- s.version = '3.21.4'
+ s.version = '3.21.5'
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.4/Protobuf.podspec
new/protobuf-21.5/Protobuf.podspec
--- old/protobuf-21.4/Protobuf.podspec 2022-07-25 22:22:15.000000000 +0200
+++ new/protobuf-21.5/Protobuf.podspec 2022-08-09 19:12:44.000000000 +0200
@@ -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.4'
+ s.version = '3.21.5'
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.4/configure.ac
new/protobuf-21.5/configure.ac
--- old/protobuf-21.4/configure.ac 2022-07-25 22:22:15.000000000 +0200
+++ new/protobuf-21.5/configure.ac 2022-08-09 19:12:44.000000000 +0200
@@ -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.4],[proto...@googlegroups.com],[protobuf])
+AC_INIT([Protocol Buffers],[3.21.5],[proto...@googlegroups.com],[protobuf])
AM_MAINTAINER_MODE([enable])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/csharp/Google.Protobuf.Tools.nuspec
new/protobuf-21.5/csharp/Google.Protobuf.Tools.nuspec
--- old/protobuf-21.4/csharp/Google.Protobuf.Tools.nuspec 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/csharp/Google.Protobuf.Tools.nuspec 2022-08-09
19:12:44.000000000 +0200
@@ -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.4</version>
+ <version>3.21.5</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.4/csharp/src/Google.Protobuf/Google.Protobuf.csproj
new/protobuf-21.5/csharp/src/Google.Protobuf/Google.Protobuf.csproj
--- old/protobuf-21.4/csharp/src/Google.Protobuf/Google.Protobuf.csproj
2022-07-25 22:22:15.000000000 +0200
+++ new/protobuf-21.5/csharp/src/Google.Protobuf/Google.Protobuf.csproj
2022-08-09 19:12:44.000000000 +0200
@@ -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.4</VersionPrefix>
+ <VersionPrefix>3.21.5</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.4/java/README.md
new/protobuf-21.5/java/README.md
--- old/protobuf-21.4/java/README.md 2022-07-25 22:22:15.000000000 +0200
+++ new/protobuf-21.5/java/README.md 2022-08-09 19:12:44.000000000 +0200
@@ -23,7 +23,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>3.21.4</version>
+ <version>3.21.5</version>
</dependency>
```
@@ -37,7 +37,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
- <version>3.21.4</version>
+ <version>3.21.5</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.4'
+ implementation 'com.google.protobuf:protobuf-java:3.21.5'
```
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.4/java/bom/pom.xml
new/protobuf-21.5/java/bom/pom.xml
--- old/protobuf-21.4/java/bom/pom.xml 2022-07-25 22:22:15.000000000 +0200
+++ new/protobuf-21.5/java/bom/pom.xml 2022-08-09 19:12:44.000000000 +0200
@@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
- <version>3.21.4</version>
+ <version>3.21.5</version>
<packaging>pom</packaging>
<name>Protocol Buffers [BOM]</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/java/core/pom.xml
new/protobuf-21.5/java/core/pom.xml
--- old/protobuf-21.4/java/core/pom.xml 2022-07-25 22:22:15.000000000 +0200
+++ new/protobuf-21.5/java/core/pom.xml 2022-08-09 19:12:44.000000000 +0200
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>3.21.4</version>
+ <version>3.21.5</version>
</parent>
<artifactId>protobuf-java</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/java/kotlin/pom.xml
new/protobuf-21.5/java/kotlin/pom.xml
--- old/protobuf-21.4/java/kotlin/pom.xml 2022-07-25 22:22:15.000000000
+0200
+++ new/protobuf-21.5/java/kotlin/pom.xml 2022-08-09 19:12:44.000000000
+0200
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>3.21.4</version>
+ <version>3.21.5</version>
</parent>
<artifactId>protobuf-kotlin</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/java/kotlin-lite/pom.xml
new/protobuf-21.5/java/kotlin-lite/pom.xml
--- old/protobuf-21.4/java/kotlin-lite/pom.xml 2022-07-25 22:22:15.000000000
+0200
+++ new/protobuf-21.5/java/kotlin-lite/pom.xml 2022-08-09 19:12:44.000000000
+0200
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>3.21.4</version>
+ <version>3.21.5</version>
</parent>
<artifactId>protobuf-kotlin-lite</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/java/lite/pom.xml
new/protobuf-21.5/java/lite/pom.xml
--- old/protobuf-21.4/java/lite/pom.xml 2022-07-25 22:22:15.000000000 +0200
+++ new/protobuf-21.5/java/lite/pom.xml 2022-08-09 19:12:44.000000000 +0200
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>3.21.4</version>
+ <version>3.21.5</version>
</parent>
<artifactId>protobuf-javalite</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/java/lite.md
new/protobuf-21.5/java/lite.md
--- old/protobuf-21.4/java/lite.md 2022-07-25 22:22:15.000000000 +0200
+++ new/protobuf-21.5/java/lite.md 2022-08-09 19:12:44.000000000 +0200
@@ -29,7 +29,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-javalite</artifactId>
- <version>3.21.4</version>
+ <version>3.21.5</version>
</dependency>
```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/java/pom.xml
new/protobuf-21.5/java/pom.xml
--- old/protobuf-21.4/java/pom.xml 2022-07-25 22:22:15.000000000 +0200
+++ new/protobuf-21.5/java/pom.xml 2022-08-09 19:12:44.000000000 +0200
@@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>3.21.4</version>
+ <version>3.21.5</version>
<packaging>pom</packaging>
<name>Protocol Buffers [Parent]</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/java/util/pom.xml
new/protobuf-21.5/java/util/pom.xml
--- old/protobuf-21.4/java/util/pom.xml 2022-07-25 22:22:15.000000000 +0200
+++ new/protobuf-21.5/java/util/pom.xml 2022-08-09 19:12:44.000000000 +0200
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>3.21.4</version>
+ <version>3.21.5</version>
</parent>
<artifactId>protobuf-java-util</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/php/ext/google/protobuf/def.c
new/protobuf-21.5/php/ext/google/protobuf/def.c
--- old/protobuf-21.4/php/ext/google/protobuf/def.c 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/php/ext/google/protobuf/def.c 2022-08-09
19:12:44.000000000 +0200
@@ -457,6 +457,44 @@
}
/*
+ * FieldDescriptor::getContainingOneof()
+ *
+ * Returns the OneofDescriptor for this field, or null if it is not inside
+ * a oneof.
+ */
+PHP_METHOD(FieldDescriptor, getContainingOneof) {
+ FieldDescriptor *intern = (FieldDescriptor*)Z_OBJ_P(getThis());
+ const upb_OneofDef *o = upb_FieldDef_ContainingOneof(intern->fielddef);
+ zval ret;
+
+ if (!o) {
+ RETURN_NULL();
+ }
+
+ OneofDescriptor_FromOneofDef(&ret, o);
+ RETURN_COPY_VALUE(&ret);
+}
+
+/*
+ * FieldDescriptor::getRealContainingOneof()
+ *
+ * Returns the non-synthetic OneofDescriptor for this field, or null if it is
+ * not inside a oneof.
+ */
+PHP_METHOD(FieldDescriptor, getRealContainingOneof) {
+ FieldDescriptor *intern = (FieldDescriptor*)Z_OBJ_P(getThis());
+ const upb_OneofDef *o = upb_FieldDef_RealContainingOneof(intern->fielddef);
+ zval ret;
+
+ if (!o) {
+ RETURN_NULL();
+ }
+
+ OneofDescriptor_FromOneofDef(&ret, o);
+ RETURN_COPY_VALUE(&ret);
+}
+
+/*
* FieldDescriptor::getMessageType()
*
* Returns the Descriptor for this field, which must be a message.
@@ -482,6 +520,8 @@
PHP_ME(FieldDescriptor, getType, arginfo_void, ZEND_ACC_PUBLIC)
PHP_ME(FieldDescriptor, isMap, arginfo_void, ZEND_ACC_PUBLIC)
PHP_ME(FieldDescriptor, getEnumType, arginfo_void, ZEND_ACC_PUBLIC)
+ PHP_ME(FieldDescriptor, getContainingOneof, arginfo_void, ZEND_ACC_PUBLIC)
+ PHP_ME(FieldDescriptor, getRealContainingOneof, arginfo_void,
ZEND_ACC_PUBLIC)
PHP_ME(FieldDescriptor, getMessageType, arginfo_void, ZEND_ACC_PUBLIC)
ZEND_FE_END
};
@@ -516,6 +556,7 @@
char *classname =
GetPhpClassname(upb_MessageDef_File(m), upb_MessageDef_FullName(m), false);
zend_error(E_ERROR, "Couldn't load generated class %s", classname);
+ return NULL;
}
void Descriptor_FromMessageDef(zval *val, const upb_MessageDef *m) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/php/ext/google/protobuf/package.xml
new/protobuf-21.5/php/ext/google/protobuf/package.xml
--- old/protobuf-21.4/php/ext/google/protobuf/package.xml 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/php/ext/google/protobuf/package.xml 2022-08-09
19:12:44.000000000 +0200
@@ -10,11 +10,11 @@
<email>protobuf-packa...@google.com</email>
<active>yes</active>
</lead>
- <date>2022-07-25</date>
- <time>13:21:48</time>
+ <date>2022-08-09</date>
+ <time>09:24:23</time>
<version>
- <release>3.21.4</release>
- <api>3.21.4</api>
+ <release>3.21.5</release>
+ <api>3.21.5</api>
</version>
<stability>
<release>stable</release>
@@ -1387,6 +1387,21 @@
<license
uri="https://opensource.org/licenses/BSD-3-Clause";>BSD-3-Clause</license>
<notes>
</notes>
+ </release>
+ <release>
+ <version>
+ <release>3.21.5</release>
+ <api>3.21.5</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <date>2022-08-09</date>
+ <time>09:24:23</time>
+ <license
uri="https://opensource.org/licenses/BSD-3-Clause";>BSD-3-Clause</license>
+ <notes>
+ </notes>
</release>
</changelog>
</package>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/php/ext/google/protobuf/protobuf.h
new/protobuf-21.5/php/ext/google/protobuf/protobuf.h
--- old/protobuf-21.4/php/ext/google/protobuf/protobuf.h 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/php/ext/google/protobuf/protobuf.h 2022-08-09
19:12:44.000000000 +0200
@@ -127,7 +127,7 @@
ZEND_ARG_INFO(0, value)
ZEND_END_ARG_INFO()
-#define PHP_PROTOBUF_VERSION "3.21.4"
+#define PHP_PROTOBUF_VERSION "3.21.5"
// 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.4/php/tests/DescriptorsTest.php
new/protobuf-21.5/php/tests/DescriptorsTest.php
--- old/protobuf-21.4/php/tests/DescriptorsTest.php 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/php/tests/DescriptorsTest.php 2022-08-09
19:12:44.000000000 +0200
@@ -83,10 +83,10 @@
$this->assertSame($class, $desc->getClass());
$this->assertInstanceOf('\Google\Protobuf\FieldDescriptor',
$desc->getField(0));
- $this->assertSame(7, $desc->getFieldCount());
+ $this->assertSame(8, $desc->getFieldCount());
$this->assertInstanceOf('\Google\Protobuf\OneofDescriptor',
$desc->getOneofDecl(0));
- $this->assertSame(1, $desc->getOneofDeclCount());
+ $this->assertSame(2, $desc->getOneofDeclCount());
}
public function testDescriptorForIncludedMessage()
@@ -180,6 +180,7 @@
$this->assertSame(self::GPBTYPE_MESSAGE, $fieldDesc->getType());
$this->assertInstanceOf('\Google\Protobuf\Descriptor',
$fieldDesc->getMessageType());
$this->assertFalse($fieldDesc->isMap());
+ $this->assertNull($fieldDesc->getContainingOneof());
// Oneof int field
// Tested further in testOneofDescriptor()
@@ -189,6 +190,21 @@
$this->assertSame(self::GPBLABEL_OPTIONAL, $fieldDesc->getLabel());
$this->assertSame(self::GPBTYPE_INT32, $fieldDesc->getType());
$this->assertFalse($fieldDesc->isMap());
+ $this->assertSame($fieldDesc->getContainingOneof(),
$fieldDesc->getRealContainingOneof());
+
+ $oneofDesc = $fieldDesc->getContainingOneof();
+ $this->assertSame('my_oneof', $oneofDesc->getName());
+
+ // Proto3 optional it field.
+ // Tested further in testOneofDescriptor()
+ $fieldDesc = $fieldDescMap[52];
+ $this->assertSame('proto3_optional_int32', $fieldDesc->getName());
+ $this->assertSame(52, $fieldDesc->getNumber());
+ $this->assertSame(self::GPBLABEL_OPTIONAL, $fieldDesc->getLabel());
+ $this->assertSame(self::GPBTYPE_INT32, $fieldDesc->getType());
+ $this->assertFalse($fieldDesc->isMap());
+ $this->assertNull($fieldDesc->getRealContainingOneof());
+ $this->assertNotNull($fieldDesc->getContainingOneof());
// Map int-enum field
$fieldDesc = $fieldDescMap[71];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/php/tests/GeneratedClassTest.php
new/protobuf-21.5/php/tests/GeneratedClassTest.php
--- old/protobuf-21.4/php/tests/GeneratedClassTest.php 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/php/tests/GeneratedClassTest.php 2022-08-09
19:12:44.000000000 +0200
@@ -338,6 +338,7 @@
{
$this->assertTrue(class_exists('\Upper\READONLY'));
$this->assertTrue(class_exists('\Lower\readonly'));
+
$this->assertTrue(class_exists('\Php\Test\TestNamespace\PBEmpty\ReadOnly'));
}
public function testLegacyReadOnlyEnum()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/php/tests/proto/test_descriptors.proto
new/protobuf-21.5/php/tests/proto/test_descriptors.proto
--- old/protobuf-21.4/php/tests/proto/test_descriptors.proto 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/php/tests/proto/test_descriptors.proto 2022-08-09
19:12:44.000000000 +0200
@@ -14,6 +14,7 @@
oneof my_oneof {
int32 oneof_int32 = 51;
}
+ optional int32 proto3_optional_int32 = 52;
map<int32, EnumSub> map_int32_enum = 71;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/protobuf-21.4/php/tests/proto/test_php_namespace.proto
new/protobuf-21.5/php/tests/proto/test_php_namespace.proto
--- old/protobuf-21.4/php/tests/proto/test_php_namespace.proto 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/php/tests/proto/test_php_namespace.proto 2022-08-09
19:12:44.000000000 +0200
@@ -27,5 +27,7 @@
enum NestedEnum {
ZERO = 0;
};
+ // Test previously unreserved name
+ message ReadOnly {}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/protobuf_deps.bzl
new/protobuf-21.5/protobuf_deps.bzl
--- old/protobuf-21.4/protobuf_deps.bzl 2022-07-25 22:22:15.000000000 +0200
+++ new/protobuf-21.5/protobuf_deps.bzl 2022-08-09 19:12:44.000000000 +0200
@@ -114,6 +114,6 @@
_github_archive(
name = "upb",
repo = "https://github.com/protocolbuffers/upb";,
- commit = "672d681f196f90c890a3b2e498e89d9a40541b9d",
- sha256 =
"2fcfee985893cebc4341d708eb8c2fa01d501ed97049040b7b94b2a2e6eccd25",
+ commit = "333722e94b35c26b9eb48bd7e471235374ab3737",
+ sha256 =
"f973aefa29d4191aad76cd1ba74ee3be4d2161b6c95d73c137f82560983912c6",
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/protobuf_version.bzl
new/protobuf-21.5/protobuf_version.bzl
--- old/protobuf-21.4/protobuf_version.bzl 2022-07-25 22:22:15.000000000
+0200
+++ new/protobuf-21.5/protobuf_version.bzl 2022-08-09 19:12:44.000000000
+0200
@@ -1,3 +1,3 @@
-PROTOC_VERSION = '21.4'
-PROTOBUF_JAVA_VERSION = '3.21.4'
-PROTOBUF_PYTHON_VERSION = '4.21.4'
+PROTOC_VERSION = '21.5'
+PROTOBUF_JAVA_VERSION = '3.21.5'
+PROTOBUF_PYTHON_VERSION = '4.21.5'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/protoc-artifacts/pom.xml
new/protobuf-21.5/protoc-artifacts/pom.xml
--- old/protobuf-21.4/protoc-artifacts/pom.xml 2022-07-25 22:22:15.000000000
+0200
+++ new/protobuf-21.5/protoc-artifacts/pom.xml 2022-08-09 19:12:44.000000000
+0200
@@ -8,7 +8,7 @@
</parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
- <version>3.21.4</version>
+ <version>3.21.5</version>
<packaging>pom</packaging>
<name>Protobuf Compiler</name>
<description>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/python/google/protobuf/__init__.py
new/protobuf-21.5/python/google/protobuf/__init__.py
--- old/protobuf-21.4/python/google/protobuf/__init__.py 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/python/google/protobuf/__init__.py 2022-08-09
19:12:44.000000000 +0200
@@ -30,4 +30,4 @@
# Copyright 2007 Google Inc. All Rights Reserved.
-__version__ = '4.21.4'
+__version__ = '4.21.5'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/ruby/google-protobuf.gemspec
new/protobuf-21.5/ruby/google-protobuf.gemspec
--- old/protobuf-21.4/ruby/google-protobuf.gemspec 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/ruby/google-protobuf.gemspec 2022-08-09
19:12:44.000000000 +0200
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = "google-protobuf"
- s.version = "3.21.4"
+ s.version = "3.21.5"
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.4/ruby/pom.xml
new/protobuf-21.5/ruby/pom.xml
--- old/protobuf-21.4/ruby/pom.xml 2022-07-25 22:22:15.000000000 +0200
+++ new/protobuf-21.5/ruby/pom.xml 2022-08-09 19:12:44.000000000 +0200
@@ -9,7 +9,7 @@
<groupId>com.google.protobuf.jruby</groupId>
<artifactId>protobuf-jruby</artifactId>
- <version>3.21.4</version>
+ <version>3.21.5</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.4</version>
+ <version>3.21.5</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-21.4/src/Makefile.am
new/protobuf-21.5/src/Makefile.am
--- old/protobuf-21.4/src/Makefile.am 2022-07-25 22:22:15.000000000 +0200
+++ new/protobuf-21.5/src/Makefile.am 2022-08-09 19:12:44.000000000 +0200
@@ -18,7 +18,7 @@
PTHREAD_DEF =
endif
-PROTOBUF_VERSION = 32:4:0
+PROTOBUF_VERSION = 32:5: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.4/src/google/protobuf/any.pb.h
new/protobuf-21.5/src/google/protobuf/any.pb.h
--- old/protobuf-21.4/src/google/protobuf/any.pb.h 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/src/google/protobuf/any.pb.h 2022-08-09
19:12:44.000000000 +0200
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021005 < 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.4/src/google/protobuf/api.pb.h
new/protobuf-21.5/src/google/protobuf/api.pb.h
--- old/protobuf-21.4/src/google/protobuf/api.pb.h 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/src/google/protobuf/api.pb.h 2022-08-09
19:12:44.000000000 +0200
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021005 < 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.4/src/google/protobuf/compiler/php/php_generator.cc
new/protobuf-21.5/src/google/protobuf/compiler/php/php_generator.cc
--- old/protobuf-21.4/src/google/protobuf/compiler/php/php_generator.cc
2022-07-25 22:22:15.000000000 +0200
+++ new/protobuf-21.5/src/google/protobuf/compiler/php/php_generator.cc
2022-08-09 19:12:44.000000000 +0200
@@ -421,12 +421,17 @@
}
template <typename DescriptorType>
-std::string LegacyReadOnlyGeneratedClassFileName(const DescriptorType* desc,
- const Options& options) {
- std::string php_namespace = RootPhpNamespace(desc, options);
+std::string LegacyReadOnlyGeneratedClassFileName(std::string php_namespace,
+ const DescriptorType* desc) {
if (!php_namespace.empty()) {
+ for (int i = 0; i < php_namespace.size(); i++) {
+ if (php_namespace[i] == '\\') {
+ php_namespace[i] = '/';
+ }
+ }
return php_namespace + "/" + desc->name() + ".php";
}
+
return desc->name() + ".php";
}
@@ -1316,27 +1321,39 @@
void LegacyReadOnlyGenerateClassFile(const FileDescriptor* file,
const DescriptorType* desc, const Options&
options,
GeneratorContext* generator_context) {
- std::string filename = LegacyReadOnlyGeneratedClassFileName(desc, options);
+ std::string fullname = FullClassName(desc, options);
+ std::string php_namespace;
+ std::string classname;
+ int lastindex = fullname.find_last_of("\\");
+
+ if (lastindex != std::string::npos) {
+ php_namespace = fullname.substr(0, lastindex);
+ classname = fullname.substr(lastindex + 1);
+ } else {
+ php_namespace = "";
+ classname = fullname;
+ }
+
+ std::string filename = LegacyReadOnlyGeneratedClassFileName(php_namespace,
desc);
std::unique_ptr<io::ZeroCopyOutputStream> output(
generator_context->Open(filename));
io::Printer printer(output.get(), '^');
GenerateHead(file, &printer);
- std::string php_namespace = RootPhpNamespace(desc, options);
if (!php_namespace.empty()) {
printer.Print(
"namespace ^name^;\n\n",
"name", php_namespace);
}
- std::string newname = FullClassName(desc, options);
+
printer.Print("class_exists(^new^::class); // autoload the new class, which "
"will also create an alias to the deprecated class\n",
- "new", GeneratedClassNameImpl(desc));
+ "new", classname);
printer.Print("@trigger_error(__NAMESPACE__ . '\\^old^ is deprecated and
will be removed in "
"the next major release. Use ^fullname^ instead',
E_USER_DEPRECATED);\n\n",
"old", desc->name(),
- "fullname", newname);
+ "fullname", classname);
}
void GenerateEnumFile(const FileDescriptor* file, const EnumDescriptor* en,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/protobuf-21.4/src/google/protobuf/compiler/plugin.pb.h
new/protobuf-21.5/src/google/protobuf/compiler/plugin.pb.h
--- old/protobuf-21.4/src/google/protobuf/compiler/plugin.pb.h 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/src/google/protobuf/compiler/plugin.pb.h 2022-08-09
19:12:44.000000000 +0200
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021005 < 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.4/src/google/protobuf/descriptor.pb.h
new/protobuf-21.5/src/google/protobuf/descriptor.pb.h
--- old/protobuf-21.4/src/google/protobuf/descriptor.pb.h 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/src/google/protobuf/descriptor.pb.h 2022-08-09
19:12:44.000000000 +0200
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021005 < 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.4/src/google/protobuf/duration.pb.h
new/protobuf-21.5/src/google/protobuf/duration.pb.h
--- old/protobuf-21.4/src/google/protobuf/duration.pb.h 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/src/google/protobuf/duration.pb.h 2022-08-09
19:12:44.000000000 +0200
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021005 < 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.4/src/google/protobuf/empty.pb.h
new/protobuf-21.5/src/google/protobuf/empty.pb.h
--- old/protobuf-21.4/src/google/protobuf/empty.pb.h 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/src/google/protobuf/empty.pb.h 2022-08-09
19:12:44.000000000 +0200
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021005 < 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.4/src/google/protobuf/field_mask.pb.h
new/protobuf-21.5/src/google/protobuf/field_mask.pb.h
--- old/protobuf-21.4/src/google/protobuf/field_mask.pb.h 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/src/google/protobuf/field_mask.pb.h 2022-08-09
19:12:44.000000000 +0200
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021005 < 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.4/src/google/protobuf/port_def.inc
new/protobuf-21.5/src/google/protobuf/port_def.inc
--- old/protobuf-21.4/src/google/protobuf/port_def.inc 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/src/google/protobuf/port_def.inc 2022-08-09
19:12:44.000000000 +0200
@@ -178,7 +178,7 @@
#ifdef PROTOBUF_VERSION
#error PROTOBUF_VERSION was previously defined
#endif
-#define PROTOBUF_VERSION 3021004
+#define PROTOBUF_VERSION 3021005
#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.4/src/google/protobuf/source_context.pb.h
new/protobuf-21.5/src/google/protobuf/source_context.pb.h
--- old/protobuf-21.4/src/google/protobuf/source_context.pb.h 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/src/google/protobuf/source_context.pb.h 2022-08-09
19:12:44.000000000 +0200
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021005 < 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.4/src/google/protobuf/struct.pb.h
new/protobuf-21.5/src/google/protobuf/struct.pb.h
--- old/protobuf-21.4/src/google/protobuf/struct.pb.h 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/src/google/protobuf/struct.pb.h 2022-08-09
19:12:44.000000000 +0200
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021005 < 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.4/src/google/protobuf/stubs/common.h
new/protobuf-21.5/src/google/protobuf/stubs/common.h
--- old/protobuf-21.4/src/google/protobuf/stubs/common.h 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/src/google/protobuf/stubs/common.h 2022-08-09
19:12:44.000000000 +0200
@@ -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 3021004
+#define GOOGLE_PROTOBUF_VERSION 3021005
// 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.4/src/google/protobuf/timestamp.pb.h
new/protobuf-21.5/src/google/protobuf/timestamp.pb.h
--- old/protobuf-21.4/src/google/protobuf/timestamp.pb.h 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/src/google/protobuf/timestamp.pb.h 2022-08-09
19:12:44.000000000 +0200
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021005 < 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.4/src/google/protobuf/type.pb.h
new/protobuf-21.5/src/google/protobuf/type.pb.h
--- old/protobuf-21.4/src/google/protobuf/type.pb.h 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/src/google/protobuf/type.pb.h 2022-08-09
19:12:44.000000000 +0200
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021005 < 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.4/src/google/protobuf/wrappers.pb.h
new/protobuf-21.5/src/google/protobuf/wrappers.pb.h
--- old/protobuf-21.4/src/google/protobuf/wrappers.pb.h 2022-07-25
22:22:15.000000000 +0200
+++ new/protobuf-21.5/src/google/protobuf/wrappers.pb.h 2022-08-09
19:12:44.000000000 +0200
@@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 3021004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021005 < 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.4/version.json
new/protobuf-21.5/version.json
--- old/protobuf-21.4/version.json 2022-07-25 22:22:15.000000000 +0200
+++ new/protobuf-21.5/version.json 2022-08-09 19:12:44.000000000 +0200
@@ -1,17 +1,17 @@
{
"21.x": {
- "protoc_version": "21.4",
+ "protoc_version": "21.5",
"lts": false,
- "date": "2022-07-25",
+ "date": "2022-08-09",
"languages": {
- "cpp": "3.21.4",
- "csharp": "3.21.4",
- "java": "3.21.4",
- "javascript": "3.21.4",
- "objectivec": "3.21.4",
- "php": "3.21.4",
- "python": "4.21.4",
- "ruby": "3.21.4"
+ "cpp": "3.21.5",
+ "csharp": "3.21.5",
+ "java": "3.21.5",
+ "javascript": "3.21.5",
+ "objectivec": "3.21.5",
+ "php": "3.21.5",
+ "python": "4.21.5",
+ "ruby": "3.21.5"
}
}
}
\ No newline at end of file
