Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package protobuf for openSUSE:Factory checked in at 2021-04-08 21:02:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/protobuf (Old) and /work/SRC/openSUSE:Factory/.protobuf.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "protobuf" Thu Apr 8 21:02:51 2021 rev:49 rq:883160 version:3.15.7 Changes: -------- --- /work/SRC/openSUSE:Factory/protobuf/protobuf.changes 2021-04-01 14:16:06.659878991 +0200 +++ /work/SRC/openSUSE:Factory/.protobuf.new.2401/protobuf.changes 2021-04-08 21:02:55.733950108 +0200 @@ -1,0 +2,10 @@ +Tue Apr 6 01:47:17 UTC 2021 - Dirk M??ller <[email protected]> + +- update to 3.15.7: + C++ + * Remove the ::pb namespace (alias) (#8423) + Ruby + * Fix unbounded memory growth for Ruby <2.7 (#8429) + * Fixed message equality in cases where the message type is different (#8434) + +------------------------------------------------------------------- Old: ---- protobuf-3.15.6.tar.gz New: ---- protobuf-3.15.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ protobuf.spec ++++++ --- /var/tmp/diff_new_pack.5Dw5BW/_old 2021-04-08 21:02:56.317950738 +0200 +++ /var/tmp/diff_new_pack.5Dw5BW/_new 2021-04-08 21:02:56.321950743 +0200 @@ -27,7 +27,7 @@ %bcond_without python2 %bcond_without python3 Name: protobuf -Version: 3.15.6 +Version: 3.15.7 Release: 0 Summary: Protocol Buffers - Google's data interchange format License: BSD-3-Clause ++++++ protobuf-3.15.6.tar.gz -> protobuf-3.15.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/CHANGES.txt new/protobuf-3.15.7/CHANGES.txt --- old/protobuf-3.15.6/CHANGES.txt 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/CHANGES.txt 2021-04-02 20:06:56.000000000 +0200 @@ -1,3 +1,12 @@ +2021-04-02 version 3.15.7 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript) + + C++ + * Remove the ::pb namespace (alias) (#8423) + + Ruby + * Fix unbounded memory growth for Ruby <2.7 (#8429) + * Fixed message equality in cases where the message type is different (#8434) + 2021-03-10 version 3.15.6 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript) Ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/Protobuf-C++.podspec new/protobuf-3.15.7/Protobuf-C++.podspec --- old/protobuf-3.15.6/Protobuf-C++.podspec 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/Protobuf-C++.podspec 2021-04-02 20:06:56.000000000 +0200 @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Protobuf-C++' - s.version = '3.15.6' + s.version = '3.15.7' s.summary = 'Protocol Buffers v3 runtime library for C++.' s.homepage = 'https://github.com/google/protobuf' s.license = '3-Clause BSD License' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/Protobuf.podspec new/protobuf-3.15.7/Protobuf.podspec --- old/protobuf-3.15.6/Protobuf.podspec 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/Protobuf.podspec 2021-04-02 20:06:56.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.15.6' + s.version = '3.15.7' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.homepage = 'https://github.com/protocolbuffers/protobuf' s.license = '3-Clause BSD License' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/benchmarks/download_data.sh new/protobuf-3.15.7/benchmarks/download_data.sh --- old/protobuf-3.15.6/benchmarks/download_data.sh 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/benchmarks/download_data.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -#! /bin/sh - -curl -O https://storage.googleapis.com/protobuf_opensource_benchmark_data/datasets.tar.gz -tar -zvxf datasets.tar.gz - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/configure.ac new/protobuf-3.15.7/configure.ac --- old/protobuf-3.15.6/configure.ac 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/configure.ac 2021-04-02 20:06:56.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.15.6],[[email protected]],[protobuf]) +AC_INIT([Protocol Buffers],[3.15.7],[[email protected]],[protobuf]) AM_MAINTAINER_MODE([enable]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/csharp/Google.Protobuf.Tools.nuspec new/protobuf-3.15.7/csharp/Google.Protobuf.Tools.nuspec --- old/protobuf-3.15.6/csharp/Google.Protobuf.Tools.nuspec 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/csharp/Google.Protobuf.Tools.nuspec 2021-04-02 20:06:56.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.15.6</version> + <version>3.15.7</version> <authors>Google Inc.</authors> <owners>protobuf-packages</owners> <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/csharp/src/Google.Protobuf/Google.Protobuf.csproj new/protobuf-3.15.7/csharp/src/Google.Protobuf/Google.Protobuf.csproj --- old/protobuf-3.15.6/csharp/src/Google.Protobuf/Google.Protobuf.csproj 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/csharp/src/Google.Protobuf/Google.Protobuf.csproj 2021-04-02 20:06:56.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.15.6</VersionPrefix> + <VersionPrefix>3.15.7</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-3.15.6/java/bom/pom.xml new/protobuf-3.15.7/java/bom/pom.xml --- old/protobuf-3.15.6/java/bom/pom.xml 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/java/bom/pom.xml 2021-04-02 20:06:56.000000000 +0200 @@ -4,7 +4,7 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-bom</artifactId> - <version>3.15.6</version> + <version>3.15.7</version> <packaging>pom</packaging> <name>Protocol Buffers [BOM]</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/java/core/pom.xml new/protobuf-3.15.7/java/core/pom.xml --- old/protobuf-3.15.6/java/core/pom.xml 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/java/core/pom.xml 2021-04-02 20:06:56.000000000 +0200 @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.15.6</version> + <version>3.15.7</version> </parent> <artifactId>protobuf-java</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/java/lite/pom.xml new/protobuf-3.15.7/java/lite/pom.xml --- old/protobuf-3.15.6/java/lite/pom.xml 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/java/lite/pom.xml 2021-04-02 20:06:56.000000000 +0200 @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.15.6</version> + <version>3.15.7</version> </parent> <artifactId>protobuf-javalite</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/java/pom.xml new/protobuf-3.15.7/java/pom.xml --- old/protobuf-3.15.6/java/pom.xml 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/java/pom.xml 2021-04-02 20:06:56.000000000 +0200 @@ -4,7 +4,7 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.15.6</version> + <version>3.15.7</version> <packaging>pom</packaging> <name>Protocol Buffers [Parent]</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/java/util/pom.xml new/protobuf-3.15.7/java/util/pom.xml --- old/protobuf-3.15.6/java/util/pom.xml 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/java/util/pom.xml 2021-04-02 20:06:56.000000000 +0200 @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.15.6</version> + <version>3.15.7</version> </parent> <artifactId>protobuf-java-util</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/js/package.json new/protobuf-3.15.7/js/package.json --- old/protobuf-3.15.6/js/package.json 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/js/package.json 2021-04-02 20:06:56.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "google-protobuf", - "version": "3.15.6", + "version": "3.15.7", "description": "Protocol Buffers for JavaScript", "main": "google-protobuf.js", "files": [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/kokoro/linux/benchmark/run.sh new/protobuf-3.15.7/kokoro/linux/benchmark/run.sh --- old/protobuf-3.15.6/kokoro/linux/benchmark/run.sh 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/kokoro/linux/benchmark/run.sh 2021-04-02 20:06:56.000000000 +0200 @@ -18,7 +18,6 @@ # download datasets for benchmark cd benchmarks -./download_data.sh datasets=$(for file in $(find . -type f -name "dataset.*.pb" -not -path "./tmp/*"); do echo "$(pwd)/$file"; done | xargs) echo $datasets cd $oldpwd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/php/ext/google/protobuf/package.xml new/protobuf-3.15.7/php/ext/google/protobuf/package.xml --- old/protobuf-3.15.6/php/ext/google/protobuf/package.xml 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/php/ext/google/protobuf/package.xml 2021-04-02 20:06:56.000000000 +0200 @@ -10,11 +10,11 @@ <email>[email protected]</email> <active>yes</active> </lead> - <date>2021-03-10</date> - <time>10:11:34</time> + <date>2021-04-02</date> + <time>10:01:42</time> <version> - <release>3.15.6</release> - <api>3.15.6</api> + <release>3.15.7</release> + <api>3.15.7</api> </version> <stability> <release>stable</release> @@ -22,7 +22,7 @@ </stability> <license uri="https://opensource.org/licenses/BSD-3-Clause";>3-Clause BSD License</license> <notes> - No new changes in 3.15.6 + No new changes in 3.15.7 </notes> <contents> <dir baseinstalldir="/" name="/"> @@ -886,6 +886,21 @@ <license uri="https://opensource.org/licenses/BSD-3-Clause";>3-Clause BSD License</license> <notes> </notes> + </release> + <release> + <version> + <release>3.15.7</release> + <api>3.15.7</api> + </version> + <stability> + <release>stable</release> + <api>stable</api> + </stability> + <date>2021-04-02</date> + <time>10:01:42</time> + <license uri="https://opensource.org/licenses/BSD-3-Clause";>3-Clause BSD License</license> + <notes> + </notes> </release> </changelog> </package> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/php/ext/google/protobuf/protobuf.h new/protobuf-3.15.7/php/ext/google/protobuf/protobuf.h --- old/protobuf-3.15.6/php/ext/google/protobuf/protobuf.h 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/php/ext/google/protobuf/protobuf.h 2021-04-02 20:06:56.000000000 +0200 @@ -76,7 +76,7 @@ ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() -#define PHP_PROTOBUF_VERSION "3.15.6" +#define PHP_PROTOBUF_VERSION "3.15.7" // 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-3.15.6/protoc-artifacts/pom.xml new/protobuf-3.15.7/protoc-artifacts/pom.xml --- old/protobuf-3.15.6/protoc-artifacts/pom.xml 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/protoc-artifacts/pom.xml 2021-04-02 20:06:56.000000000 +0200 @@ -8,7 +8,7 @@ </parent> <groupId>com.google.protobuf</groupId> <artifactId>protoc</artifactId> - <version>3.15.6</version> + <version>3.15.7</version> <packaging>pom</packaging> <name>Protobuf Compiler</name> <description> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/python/google/protobuf/__init__.py new/protobuf-3.15.7/python/google/protobuf/__init__.py --- old/protobuf-3.15.6/python/google/protobuf/__init__.py 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/python/google/protobuf/__init__.py 2021-04-02 20:06:56.000000000 +0200 @@ -30,4 +30,4 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '3.15.6' +__version__ = '3.15.7' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/ruby/ext/google/protobuf_c/message.c new/protobuf-3.15.7/ruby/ext/google/protobuf_c/message.c --- old/protobuf-3.15.6/ruby/ext/google/protobuf_c/message.c 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/ruby/ext/google/protobuf_c/message.c 2021-04-02 20:06:56.000000000 +0200 @@ -697,16 +697,13 @@ * field is of a primitive type). */ static VALUE Message_eq(VALUE _self, VALUE _other) { - if (TYPE(_self) != TYPE(_other)) { - return Qfalse; - } + if (CLASS_OF(_self) != CLASS_OF(_other)) return Qfalse; Message* self = ruby_to_Message(_self); Message* other = ruby_to_Message(_other); + assert(self->msgdef == other->msgdef); - return Message_Equal(self->msg, other->msg, self->msgdef) - ? Qtrue - : Qfalse; + return Message_Equal(self->msg, other->msg, self->msgdef) ? Qtrue : Qfalse; } uint64_t Message_Hash(const upb_msg* msg, const upb_msgdef* m, uint64_t seed) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/ruby/ext/google/protobuf_c/protobuf.c new/protobuf-3.15.7/ruby/ext/google/protobuf_c/protobuf.c --- old/protobuf-3.15.6/ruby/ext/google/protobuf_c/protobuf.c 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/ruby/ext/google/protobuf_c/protobuf.c 2021-04-02 20:06:56.000000000 +0200 @@ -251,14 +251,80 @@ // The object is used only for its identity; it does not contain any data. VALUE secondary_map = Qnil; +// Mutations to the map are under a mutex, because SeconaryMap_MaybeGC() +// iterates over the map which cannot happen in parallel with insertions, or +// Ruby will throw: +// can't add a new key into hash during iteration (RuntimeError) +VALUE secondary_map_mutex = Qnil; + +// Lambda that will GC entries from the secondary map that are no longer present +// in the primary map. +VALUE gc_secondary_map_lambda = Qnil; +ID length; + +extern VALUE weak_obj_cache; + static void SecondaryMap_Init() { rb_gc_register_address(&secondary_map); + rb_gc_register_address(&gc_secondary_map_lambda); + rb_gc_register_address(&secondary_map_mutex); secondary_map = rb_hash_new(); + gc_secondary_map_lambda = rb_eval_string( + "->(secondary, weak) {\n" + " secondary.delete_if { |k, v| !weak.key?(v) }\n" + "}\n"); + secondary_map_mutex = rb_mutex_new(); + length = rb_intern("length"); +} + +// The secondary map is a regular Hash, and will never shrink on its own. +// The main object cache is a WeakMap that will automatically remove entries +// when the target object is no longer reachable, but unless we manually +// remove the corresponding entries from the secondary map, it will grow +// without bound. +// +// To avoid this unbounded growth we periodically remove entries from the +// secondary map that are no longer present in the WeakMap. The logic of +// how often to perform this GC is an artbirary tuning parameter that +// represents a straightforward CPU/memory tradeoff. +// +// Requires: secondary_map_mutex is held. +static void SecondaryMap_MaybeGC() { + PBRUBY_ASSERT(rb_mutex_locked_p(secondary_map_mutex) == Qtrue); + size_t weak_len = NUM2ULL(rb_funcall(weak_obj_cache, length, 0)); + size_t secondary_len = RHASH_SIZE(secondary_map); + if (secondary_len < weak_len) { + // Logically this case should not be possible: a valid entry cannot exist in + // the weak table unless there is a corresponding entry in the secondary + // table. It should *always* be the case that secondary_len >= weak_len. + // + // However ObjectSpace::WeakMap#length (and therefore weak_len) is + // unreliable: it overreports its true length by including non-live objects. + // However these non-live objects are not yielded in iteration, so we may + // have previously deleted them from the secondary map in a previous + // invocation of SecondaryMap_MaybeGC(). + // + // In this case, we can't measure any waste, so we just return. + return; + } + size_t waste = secondary_len - weak_len; + // GC if we could remove at least 2000 entries or 20% of the table size + // (whichever is greater). Since the cost of the GC pass is O(N), we + // want to make sure that we condition this on overall table size, to + // avoid O(N^2) CPU costs. + size_t threshold = PBRUBY_MAX(secondary_len * 0.2, 2000); + if (waste > threshold) { + rb_funcall(gc_secondary_map_lambda, rb_intern("call"), 2, + secondary_map, weak_obj_cache); + } } -static VALUE SecondaryMap_Get(VALUE key) { +// Requires: secondary_map_mutex is held by this thread iff create == true. +static VALUE SecondaryMap_Get(VALUE key, bool create) { + PBRUBY_ASSERT(!create || rb_mutex_locked_p(secondary_map_mutex) == Qtrue); VALUE ret = rb_hash_lookup(secondary_map, key); - if (ret == Qnil) { + if (ret == Qnil && create) { + SecondaryMap_MaybeGC(); ret = rb_eval_string("Object.new"); rb_hash_aset(secondary_map, key, ret); } @@ -267,14 +333,15 @@ #endif -static VALUE ObjectCache_GetKey(const void* key) { +// Requires: secondary_map_mutex is held by this thread iff create == true. +static VALUE ObjectCache_GetKey(const void* key, bool create) { char buf[sizeof(key)]; memcpy(&buf, &key, sizeof(key)); intptr_t key_int = (intptr_t)key; PBRUBY_ASSERT((key_int & 3) == 0); VALUE ret = LL2NUM(key_int >> 2); #if USE_SECONDARY_MAP - ret = SecondaryMap_Get(ret); + ret = SecondaryMap_Get(ret, create); #endif return ret; } @@ -298,14 +365,20 @@ void ObjectCache_Add(const void* key, VALUE val) { PBRUBY_ASSERT(ObjectCache_Get(key) == Qnil); - VALUE key_rb = ObjectCache_GetKey(key); +#if USE_SECONDARY_MAP + rb_mutex_lock(secondary_map_mutex); +#endif + VALUE key_rb = ObjectCache_GetKey(key, true); rb_funcall(weak_obj_cache, item_set, 2, key_rb, val); +#if USE_SECONDARY_MAP + rb_mutex_unlock(secondary_map_mutex); +#endif PBRUBY_ASSERT(ObjectCache_Get(key) == val); } // Returns the cached object for this key, if any. Otherwise returns Qnil. VALUE ObjectCache_Get(const void* key) { - VALUE key_rb = ObjectCache_GetKey(key); + VALUE key_rb = ObjectCache_GetKey(key, false); return rb_funcall(weak_obj_cache, item_get, 1, key_rb); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/ruby/ext/google/protobuf_c/protobuf.h new/protobuf-3.15.7/ruby/ext/google/protobuf_c/protobuf.h --- old/protobuf-3.15.6/ruby/ext/google/protobuf_c/protobuf.h 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/ruby/ext/google/protobuf_c/protobuf.h 2021-04-02 20:06:56.000000000 +0200 @@ -106,6 +106,8 @@ #define PBRUBY_ASSERT(expr) assert(expr) #endif +#define PBRUBY_MAX(x, y) (((x) > (y)) ? (x) : (y)) + #define UPB_UNUSED(var) (void)var #endif // __GOOGLE_PROTOBUF_RUBY_PROTOBUF_H__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/ruby/google-protobuf.gemspec new/protobuf-3.15.7/ruby/google-protobuf.gemspec --- old/protobuf-3.15.6/ruby/google-protobuf.gemspec 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/ruby/google-protobuf.gemspec 2021-04-02 20:06:56.000000000 +0200 @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "google-protobuf" - s.version = "3.15.6" + s.version = "3.15.7" 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-3.15.6/ruby/tests/common_tests.rb new/protobuf-3.15.7/ruby/tests/common_tests.rb --- old/protobuf-3.15.6/ruby/tests/common_tests.rb 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/ruby/tests/common_tests.rb 2021-04-02 20:06:56.000000000 +0200 @@ -699,12 +699,13 @@ assert m.repeated_msg[0].object_id != m2.repeated_msg[0].object_id end - def test_eq + def test_message_eq m = proto_module::TestMessage.new(:optional_int32 => 42, :repeated_int32 => [1, 2, 3]) m2 = proto_module::TestMessage.new(:optional_int32 => 43, :repeated_int32 => [1, 2, 3]) assert m != m2 + assert_not_equal proto_module::TestMessage.new, proto_module::TestMessage2.new end def test_enum_lookup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/src/Makefile.am new/protobuf-3.15.7/src/Makefile.am --- old/protobuf-3.15.6/src/Makefile.am 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/src/Makefile.am 2021-04-02 20:06:56.000000000 +0200 @@ -18,7 +18,7 @@ PTHREAD_DEF = endif -PROTOBUF_VERSION = 26:6:0 +PROTOBUF_VERSION = 26:7: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-3.15.6/src/google/protobuf/any.pb.h new/protobuf-3.15.7/src/google/protobuf/any.pb.h --- old/protobuf-3.15.6/src/google/protobuf/any.pb.h 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/src/google/protobuf/any.pb.h 2021-04-02 20:06:56.000000000 +0200 @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015006 < PROTOBUF_MIN_PROTOC_VERSION +#if 3015007 < 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-3.15.6/src/google/protobuf/api.pb.h new/protobuf-3.15.7/src/google/protobuf/api.pb.h --- old/protobuf-3.15.6/src/google/protobuf/api.pb.h 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/src/google/protobuf/api.pb.h 2021-04-02 20:06:56.000000000 +0200 @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015006 < PROTOBUF_MIN_PROTOC_VERSION +#if 3015007 < 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-3.15.6/src/google/protobuf/compiler/plugin.pb.h new/protobuf-3.15.7/src/google/protobuf/compiler/plugin.pb.h --- old/protobuf-3.15.6/src/google/protobuf/compiler/plugin.pb.h 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/src/google/protobuf/compiler/plugin.pb.h 2021-04-02 20:06:56.000000000 +0200 @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015006 < PROTOBUF_MIN_PROTOC_VERSION +#if 3015007 < 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-3.15.6/src/google/protobuf/descriptor.pb.h new/protobuf-3.15.7/src/google/protobuf/descriptor.pb.h --- old/protobuf-3.15.6/src/google/protobuf/descriptor.pb.h 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/src/google/protobuf/descriptor.pb.h 2021-04-02 20:06:56.000000000 +0200 @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015006 < PROTOBUF_MIN_PROTOC_VERSION +#if 3015007 < 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-3.15.6/src/google/protobuf/duration.pb.h new/protobuf-3.15.7/src/google/protobuf/duration.pb.h --- old/protobuf-3.15.6/src/google/protobuf/duration.pb.h 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/src/google/protobuf/duration.pb.h 2021-04-02 20:06:56.000000000 +0200 @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015006 < PROTOBUF_MIN_PROTOC_VERSION +#if 3015007 < 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-3.15.6/src/google/protobuf/empty.pb.h new/protobuf-3.15.7/src/google/protobuf/empty.pb.h --- old/protobuf-3.15.6/src/google/protobuf/empty.pb.h 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/src/google/protobuf/empty.pb.h 2021-04-02 20:06:56.000000000 +0200 @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015006 < PROTOBUF_MIN_PROTOC_VERSION +#if 3015007 < 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-3.15.6/src/google/protobuf/field_mask.pb.h new/protobuf-3.15.7/src/google/protobuf/field_mask.pb.h --- old/protobuf-3.15.6/src/google/protobuf/field_mask.pb.h 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/src/google/protobuf/field_mask.pb.h 2021-04-02 20:06:56.000000000 +0200 @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015006 < PROTOBUF_MIN_PROTOC_VERSION +#if 3015007 < 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-3.15.6/src/google/protobuf/port.h new/protobuf-3.15.7/src/google/protobuf/port.h --- old/protobuf-3.15.6/src/google/protobuf/port.h 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/src/google/protobuf/port.h 2021-04-02 20:06:56.000000000 +0200 @@ -37,11 +37,4 @@ #define GOOGLE_PROTOBUF_PORT_H__ -#include <google/protobuf/stubs/port.h> - -// Protobuf intends to move into the pb:: namespace. -namespace protobuf_future_namespace_placeholder {} -namespace pb = ::protobuf_future_namespace_placeholder; - - #endif // GOOGLE_PROTOBUF_PORT_H__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/src/google/protobuf/port_def.inc new/protobuf-3.15.7/src/google/protobuf/port_def.inc --- old/protobuf-3.15.6/src/google/protobuf/port_def.inc 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/src/google/protobuf/port_def.inc 2021-04-02 20:06:56.000000000 +0200 @@ -335,7 +335,7 @@ // Shared google3/opensource definitions. ////////////////////////////////////// -#define PROTOBUF_VERSION 3015006 +#define PROTOBUF_VERSION 3015007 #define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 3015000 #define PROTOBUF_MIN_PROTOC_VERSION 3015000 #define PROTOBUF_VERSION_SUFFIX "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-3.15.6/src/google/protobuf/source_context.pb.h new/protobuf-3.15.7/src/google/protobuf/source_context.pb.h --- old/protobuf-3.15.6/src/google/protobuf/source_context.pb.h 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/src/google/protobuf/source_context.pb.h 2021-04-02 20:06:56.000000000 +0200 @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015006 < PROTOBUF_MIN_PROTOC_VERSION +#if 3015007 < 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-3.15.6/src/google/protobuf/struct.pb.h new/protobuf-3.15.7/src/google/protobuf/struct.pb.h --- old/protobuf-3.15.6/src/google/protobuf/struct.pb.h 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/src/google/protobuf/struct.pb.h 2021-04-02 20:06:56.000000000 +0200 @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015006 < PROTOBUF_MIN_PROTOC_VERSION +#if 3015007 < 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-3.15.6/src/google/protobuf/stubs/common.h new/protobuf-3.15.7/src/google/protobuf/stubs/common.h --- old/protobuf-3.15.6/src/google/protobuf/stubs/common.h 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/src/google/protobuf/stubs/common.h 2021-04-02 20:06:56.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 3015006 +#define GOOGLE_PROTOBUF_VERSION 3015007 // 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-3.15.6/src/google/protobuf/timestamp.pb.h new/protobuf-3.15.7/src/google/protobuf/timestamp.pb.h --- old/protobuf-3.15.6/src/google/protobuf/timestamp.pb.h 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/src/google/protobuf/timestamp.pb.h 2021-04-02 20:06:56.000000000 +0200 @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015006 < PROTOBUF_MIN_PROTOC_VERSION +#if 3015007 < 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-3.15.6/src/google/protobuf/type.pb.h new/protobuf-3.15.7/src/google/protobuf/type.pb.h --- old/protobuf-3.15.6/src/google/protobuf/type.pb.h 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/src/google/protobuf/type.pb.h 2021-04-02 20:06:56.000000000 +0200 @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015006 < PROTOBUF_MIN_PROTOC_VERSION +#if 3015007 < 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-3.15.6/src/google/protobuf/wrappers.pb.h new/protobuf-3.15.7/src/google/protobuf/wrappers.pb.h --- old/protobuf-3.15.6/src/google/protobuf/wrappers.pb.h 2021-03-10 23:53:26.000000000 +0100 +++ new/protobuf-3.15.7/src/google/protobuf/wrappers.pb.h 2021-04-02 20:06:56.000000000 +0200 @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015006 < PROTOBUF_MIN_PROTOC_VERSION +#if 3015007 < 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.
