Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/protobuf.git#21c6d24bb08e405ddf767f98aaae8c824e056a13

.gitignore

@@ -18,3 +18,4 @@ protobuf-2.3.0.tar.bz2
 /protobuf-3.11.4-all.tar.gz
 /protobuf-3.12.3-all.tar.gz
 /protobuf-3.13.0-all.tar.gz
+/protobuf-3.14.0-all.tar.gz

protobuf-3.14-disable-IoTest.LargeOutput.patch

@@ -0,0 +1,25 @@
+--- a/src/google/protobuf/io/zero_copy_stream_unittest.cc.orig	2021-01-12 12:25:18.471517830 +0100
++++ b/src/google/protobuf/io/zero_copy_stream_unittest.cc	2021-01-12 12:25:42.022696126 +0100
+@@ -712,22 +712,6 @@
+   }
+ }
+ 
+-// Verifies that outputs up to kint32max can be created.
+-TEST_F(IoTest, LargeOutput) {
+-  std::string str;
+-  StringOutputStream output(&str);
+-  void* unused_data;
+-  int size;
+-  // Repeatedly calling Next should eventually grow the buffer to kint32max.
+-  do {
+-    EXPECT_TRUE(output.Next(&unused_data, &size));
+-  } while (str.size() < std::numeric_limits<int>::max());
+-  // Further increases should be possible.
+-  output.Next(&unused_data, &size);
+-  EXPECT_GT(size, 0);
+-}
+-
+-
+ // To test files, we create a temporary file, write, read, truncate, repeat.
+ TEST_F(IoTest, FileIo) {
+   std::string filename = TestTempDir() + "/zero_copy_stream_test_file";

protobuf.spec

@@ -7,7 +7,7 @@
 
 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
-Version:        3.13.0
+Version:        3.14.0
 Release:        1%{?dist}
 License:        BSD
 URL:            https://github.com/protocolbuffers/protobuf
@@ -17,6 +17,10 @@ Source2:        protobuf-init.el
 # For tests (using exactly the same version as the release)
 Source3:        https://github.com/google/googletest/archive/5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081.zip
 
+# https://github.com/protocolbuffers/protobuf/issues/8082
+Patch1:         protobuf-3.14-disable-IoTest.LargeOutput.patch
+
+BuildRequires:  make
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  emacs
@@ -189,7 +193,11 @@ Protocol Buffer BOM POM.
 
 %prep
 %setup -q -n %{name}-%{version}%{?rcver} -a 3
-%autopatch -p1
+%ifarch %{ix86} armv7hl
+# IoTest.LargeOutput fails on 32bit arches
+# https://github.com/protocolbuffers/protobuf/issues/8082
+%patch1 -p1
+%endif
 mv googletest-5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081/* third_party/googletest/
 find -name \*.cc -o -name \*.h | xargs chmod -x
 chmod 644 examples/*
@@ -205,6 +213,7 @@ rm java/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java
 rm java/core/src/test/java/com/google/protobuf/BoundedByteStringTest.java
 rm java/core/src/test/java/com/google/protobuf/RopeByteStringTest.java
 rm java/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
+rm java/core/src/test/java/com/google/protobuf/TextFormatTest.java
 rm -r java/util/src/test/java/com/google/protobuf/util
 rm -r java/util/src/main/java/com/google/protobuf/util
 
@@ -298,13 +307,13 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}
 %files
 %doc CHANGES.txt CONTRIBUTORS.txt README.md
 %license LICENSE
-%{_libdir}/libprotobuf.so.24*
+%{_libdir}/libprotobuf.so.25*
 
 %files compiler
 %doc README.md
 %license LICENSE
 %{_bindir}/protoc
-%{_libdir}/libprotoc.so.24*
+%{_libdir}/libprotoc.so.25*
 %{_emacs_sitelispdir}/%{name}/
 %{_emacs_sitestartdir}/protobuf-init.el
 
@@ -321,7 +330,7 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}
 %{_libdir}/libprotoc.a
 
 %files lite
-%{_libdir}/libprotobuf-lite.so.24*
+%{_libdir}/libprotobuf-lite.so.25*
 
 %files lite-devel
 %{_libdir}/libprotobuf-lite.so
@@ -367,6 +376,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}
 
 
 %changelog
+* Mon Jan 04 2021 Adrian Reber <adrian@lisas.de> - 3.14.0-1
+- Update to 3.14.0
+
 * Wed Aug 26 2020 Charalampos Stratakis <cstratak@redhat.com> - 3.13.0-1
 - Update to 3.13.0
 

sources

@@ -1,2 +1,2 @@
 SHA512 (5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081.zip) = ba904f3a0b606357873db938986b0abf37425a65501340fe81f73f9c5d05f542429662fe71c0b10e4796cb6335ae9a687fc9fb21084f2f5bfd2ede79977f5821
-SHA512 (protobuf-3.13.0-all.tar.gz) = 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
+SHA512 (protobuf-3.14.0-all.tar.gz) = 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11