Skip to content

Commit

Permalink
protobuf: Autospec creation for update from version 3.11.2 to version…
Browse files Browse the repository at this point in the history
… 3.12.4

Adam Cozzette (4):
      Allocated a custom option number for Analyze Re Graphene
      Attempt to mitigate "docker pull" failures
      Allocated extension number 1079 for grpc-graphql-gateway
      Allocated option number 1086 for ADLINK EdgeSDK

Andres Valdes (1):
      Correct @return in Any.unpack docblock (#7089)

Artem Kustikov (1):
      Fix js message pivot selection (#6813)

Asra Ali (1):
      fix ubsan warnings

Bo Yang (1):
      Remove add_proto_enumdesc and get_proto_enumdesc

Brian Wignall (1):
      Fix typos (#7050)

Charlie Jiang (1):
      Force to use U.S. English for Win32 error messages (#4317)

Christian Maurer (2):
      remove win32/64 conversion warning in generated code
      treat enum,bool as 32bit; shrink ReadVarint32

Chuck Atkins (2):
      Intel compiler: ifdef out an incorrectly evaluated is_pod type trait
      Intel compiler: silence noisy warning for incorrectly evaluated inlining

Daniel Azuma (1):
      Restore binary builds of Ruby 2.3 and 2.4 (#7529) (#7531)

Daniel G. Taylor (1):
      docs: add python-betterproto

Daniel Kurka (1):
      Project import generated by Copybara

Dave MacLachlan (6):
      Use references to Objective C classes instead of looking classes up by name.
      Change Objective C class references to using macros.
      Update pddm to work with clang-format
      Clean up some warning messages.
      Block subclassing
      Update GOOGLE_PROTOBUF_OBJC_VERSION to 30003

David L. Jones (9):
      Fix typo in Makefile.am.
      Make sure setup.py has a valid path.
      Don't expect to include Python ReadTheDocs metadata in the distribution.
      Change dependencies in the Conda environment.
      Update docs so we can generate better output from Sphinx. (#7295)
      Generate documentation for internal.container. (#7294)
      Add Ruby tests for oneof cases. (#7385)
      Add application note for explicit presence tracking. (#7390)
      Update protobuf version

Egor Pugin (1):
      bug: #7076 adds ERROR to windows portability files

Elliotte Rusty Harold (6):
      Update to 3.11.0 in docs
      deps: update guava to 28.2-android
      deps: update errorprone to 2.3.4 (#7125)
      Update JUnit and Truth (#7149)
      deps: update errorprone to 2.3.4 (#7125) (#7157)
      deps: update Guava to 29.0

Eric Walker (1):
      Rails2.7 segfaults (#7091)

Falko Axmann (1):
      cmake: extended protobuf_generate

Florian Enner (1):
      Added 3rd party Java library (QuickBuffers)

Greg Steuck (1):
      Typo in 'disciplines' (#7423)

James Roper (1):
      Add Cloudstate extensions

Jan Tattermusch (12):
      simpler fix
      Revert "Revert "C# upgrade dotnet SDK (#6877)" (#6888)" (#6920)
      enforce recursion depth checking for unknown fields
      enforce recursion depth checking for unknown fields (#7210)
      add benchmark for measuring raw primitive parsing speed
      address review comments
      Remove unnecessary branch from ReadTag (#7289)
      serialization benchmark improvements
      refactor WrapperBechmark
      improve ParseMessageBenchmark maintainability
      update Makefile.am
      Merge pull request #7434 from jtattermusch/csharp_expose_options

Jan-Gerd Tenberge (2):
      Add explicit cast to silence clang warning
      Add generate_descriptor_proto.sh output

Jesse Wilson (2):
      Reserve 1076, 1077 for Wire since and until
      Fix mergeable docs to be consistent with checks (#7021)

Jie Luo (4):
      add python38 (#7009)
      Add python3.8 in build_artifacts for linux and macos (#7019)
      Fix python release breakages by set MB_PYTHON_OSX_VER (#7038)
      Update README.md (#7329)

Jingwen Chen (2):
      Migrate from maven_jar to jvm_maven_import_external to prepare for Bazel 2.0
      Migrate from maven_jar to jvm_maven_import_external to prepare for Bazel 2.0

Joe Tsai (1):
      Add license header to benchmark/datasets .proto files

Jon Skeet (10):
      Register that the C# compiler supports proto3 presence.
      Support proto3 optional fields in the C# generator
      Regenerate C# code with the new generator, adding unittest_proto3_optional.proto
      Add unit tests for proto3 optional fields
      Add reflection support for proto3 optional fields
      Add new files into Makefile.am
      Don't generate Has/Clear members for proto2 message fields.
      Regenerate C# code based on the previous commit
      Fix to C# support library code
      Implement HasPresence for C#

Joshua Haberman (38):
      Fix for wrappers with a zero value (#7195)
      Fix for JSON serialization of 0/empty-valued wrapper types (#7198)
      Removed unnecessary includes of well-known types from PHP generator. (#7311)
      Sync from Piper @304070343
      Regenerated protos with ./generate_descriptor_proto.sh
      Revert mistake in the previous integration.
      Some fixes to make the tests pass on Bazel.
      Fixed build errors on MacOS.
      Set execute bit on files if and only if they begin with (#!). (#7347)
      Sync from Piper @305505267
      Fixed compile errors from lack of "override" keyword.
      Update to new upb version (#7372)
      Sync from Piper @306496510
      Sync from Piper @307316823
      Ruby: assigning 'nil' to submessage should clear the field. (#7397)
      Implemented proto3 presence for Ruby. (#7406)
      Howto doc for implementing proto3 presence in a code generator. (#7407)
      Added some info about Reflection, and a note about timeline. (#7416)
      Sync from Piper @308829107
      Added changelog for 3.12.x. (#7442)
      Updated version to 3.12.0-rc1. (#7449)
      Stop building binary gems for ruby <2.5. (#7453)
      Added changelog entry for removing binary gems for Ruby <2.5. (#7454)
      Cherry-pick the fix for protocolbuffers/protobuf#7463.
      Cherry-pick the fix to #7480 from #7485.
      Update protobuf version
      Updated Changelog for 3.12.0-rc2.
      Added background information about proto3 presence. (#7501)
      Fixed bug in map key sorting for Java TextFormat. (#7508)
      Update protobuf version
      Added a changelog entry about the Java fix. (#7516)
      Update protobuf version (#7535)
      Added changelog entry for 3.12.1.
      Switch to using git@ for clone, to avoid having to enter password. (#7556)
      Update protobuf version (#7557)
      Updated the changelog for the 3.12.2 release.
      Fixed Python release script to upload using twine instead of distutils. (#7571)
      Updated version to 3.12.3 and updated CHANGES.txt. (#7580)

Luca Santarella (1):
      Refactored ulong to zend_ulong for php7.4 compatibility (#7147)

Mark Schaller (1):
      Reserve extension for Bazel failure detail metadata

Martin Pärtel (2):
      Made protoc --descriptor_set_out deterministic.
      Destruct CodedOutputStream instead of using Trim()

Masaki Hara (2):
      Build extensions for Ruby 2.7 (#7027)
      Test in Ruby 2.7 (#7386)

Maxime Guerreiro (1):
      Cleanup the RPC Implementations section

Nick Presta (1):
      Update shell format in installation instructions.

Paul Yang (11):
      Persistent Descriptor Pool (#6899)
      Implement lazy loading of php class for proto messages (#6911)
      Add php 7.4 to docker image (#6971)
      Maven requires https connection (#7110)
      Call register_class before getClass from desc (#7077)
      Maven requires https connection (#7110) (#7114)
      Add continuous test for php7.4 on mac (#7153)
      Aggregate Metadata Files (#7155)
      Aggregate Metadata Files (#7155) (#7194)
      Drop 3.3, 3.4 and use single version docker images for all python tests (#7396)
      Ignore unknown enum value when ignore_unknown specified (#7455) (#7462)

Penelope Phippen (1):
      Call "Class#new" over rb_class_new_instance in decoding (#7352)

Protobuf Team (3):
      Project import generated by Copybara.
      Project import generated by Copybara
      Project import generated by Copybara

Rafi Kamal (33):
      Update protobuf version (#6898)
      Merge 3.11.0-rc1 changes to master (#6917)
      Add a proto_lang_toolchain for javalite (#6882)
      Remove duplicate license header from test protos (#7011)
      Remove the section for uploading protoc packages to the GitHub release page (#6805)
      Install RubyGem bundler version specified in Gemfile.lock to fix release failure (#7144)
      Install RubyGem bundler version specified in Gemfile.lock to fix release failure (#7144) (#7156)
      Update protobuf version (#7143)
      Update CHANGES.txt for 3.11.3 release (#7162)
      Changed the maven URL to use https when building dist artifacts
      Add js files added in #7176 to Makefiles (#7189)
      Merge pull request #6938 from ObsidianMinor/csharp/fix/6936 (#7188)
      Update the Xcode version number in Kokoro (#7202)
      Update the Xcode version number in Kokoro (#7202) (#7203)
      Fix for wrappers with a zero value (#7195) (#7201)
      Update CHANGES.txt for 3.11.4 release
      Fix for JSON serialization of 0/empty-valued wrapper types (#7198) (#7204)
      Update protobuf version (#7206)
      Remove protoc release for 32-bit Macs (#7209)
      Update CHANGES.txt to include the description of #7210 (#7212)
      Skip building distribution tar files for 32 bit Mac (#7214)
      Remove 32-bit Mac binary from csharp build tools (#7215)
      Update Google.Protobuf.Tools.nuspec to remove 32-bit Mac protoc reference (#7227)
      Remove 32-bit Mac protoc reference from collect_all_artifacts (#7228)
      Project import generated by Copybara
      Project import generated by Copybara
      Add bazel to the list of acceptable mergeable tags
      Update mergeable.yml
      Project import generated by Copybara
      Project import generated by Copybara
      Project import generated by Copybara
      Project import generated by Copybara
      Update missing/renamed kernel files (#7310)

Robert Morris (1):
      Request SummaFT extension (#7314)

Scott Hart (2):
      bug: #7076 adds OUT and OPTIONAL to windows portability files (#7087)
      bug: #7076 adds OUT and OPTIONAL to windows portability files (#7088)

Stanley Cheung (2):
      Cherry-pick of df719723: Simplify template exporting macros (#7539)
      Fix :protobuf_objc bazel target (#7538)

Stephan Hartmann (1):
      Fix GCC build with PROTOBUF_USE_DLLS enabled

Sydney Acksman (14):
      Add some missing null-checks
      Fix conformance test failures for Google.Protobuf
      Fix exception message on unsupported request output format
      Fix formatting
      Fix readability.
      Add test for not throwing on missing required
      Use Distinct on depended extensions to filter duplicate extensions
      Add tests
      Improve test to make sure the extensions are actually loaded for CustomOptions
      Adjust based on review feedback
      Add comment and Assert.DoesNotThrow to RequiredFieldsNoThrow
      Use explicit comparer for extension identifiers
      Make test comment a summary
      Rename files and revert changes to generate protos script

Thomas Van Lenten (19):
      Remove use of VLA.
      Make the unittest proto file generation handle additions better.
      Move a few more `size() > 0` calls over to `!empty()`.
      Revisit how the WKTs are bundled with ObjC.
      Update the build/test script for newer Xcode 11 versions
      [ObjC] Fix some tests checking the wrong Message class.
      [ObjC] Remove helper to avoid extra lookups.
      [ObjC] Improve validation on public apis.
      Move to constexpr.
      [ObjC] Move over some custom logic to Descriptor provided info.
      [ObjC] Update oneof generation for proto3 optional.
      [ObjC] Runtime support for proto3 optional.
      [ObjC] Update some library internals to not pass syntax versions.
      [ObjC] Update oneof clearing internals.
      [ObjC] Generation changes around proto3 optional.
      [ObjC] Add tests for proto3 optional behaviors.
      [ObjC] Typos and comment improvements.
      Use the new helpers from Descriptor.
      Tweak the union used for Extensions to support old generated code.

Tim Swast (3):
      python: add sphinx docs (#6525)
      python: publish sphinx docs to googleapis.dev
      python: publish sphinx docs to read the docs

Tomo Suzuki (1):
      Simplifying linkage monitor test setup (#6855)

William A Rowe Jr (2):
      Correct interpretation of utf-8 0xf8-0xff
      Treat F5-FF octets as single (invalid) characters

Yannic (10):
      Add --<lang>_opt flag for all built-in generators
      Blacklist .proto source files if Bazel allows us to (#7065)
      Blacklist .proto source files if Bazel allows us to (#7065)
      [bazel] Fix blacklisted_protos in cc_toolchain and add test (#7096)
      [bazel] Fix blacklisted_protos in cc_toolchain and add test (#7075)
      [bazel] Move Java runtime/toolchains into //java (#7190)
      [bazel] Update gtest and deprecate //external:{gtest,gtest_main} (#7237)
      Add compile-time tests for RTTI to port_def.inc
      Fix typo
      Remove check that C++ version is at least C++98

Yannic Bonenberger (2):
      Use PROTOBUF_RTTI from port_def.inc macro instead of checking for absence of GOOGLE_PROTOBUF_NO_RTTI macro
      [bazel] Remove bootstrap hack from cc_proto_library and add interop with proto_library

Zhao Junwang (1):
      add `-std=c++11` to make it compile

afshinpir (2):
      Incorrect selection of base name
      Correcting import path selection for protoc

dmaclach (3):
      Fix up parameter name so decl matches defn
      Clean up use of size() > 0 to !empty()
      Move min Xcode version to 10.3

rafikamal (3):
      Project import generated by Copybara
      Project import generated by Copybara
      Project import generated by Copybara

salamaniibm (1):
      correcting the s390x Arch name

summerCol (1):
      fix typos in benchmarks/README.md

wsw2016 (1):
      Improves performance of json_stream_parser.cc by factor 1000
  • Loading branch information
phmccarty authored and clrpackages committed Aug 5, 2020
1 parent efd6285 commit 4a2f4f1
Show file tree
Hide file tree
Showing 8 changed files with 5,756 additions and 6,004 deletions.
2 changes: 1 addition & 1 deletion Makefile
@@ -1,5 +1,5 @@
PKG_NAME := protobuf
URL = https://github.com/protocolbuffers/protobuf/releases/download/v3.11.2/protobuf-all-3.11.2.tar.gz
URL = https://github.com/protocolbuffers/protobuf/releases/download/v3.12.4/protobuf-all-3.12.4.tar.gz
ARCHIVES =

include ../common/Makefile.common
5 changes: 4 additions & 1 deletion options.conf
@@ -1,9 +1,10 @@
[package]
name = protobuf
url = https://github.com/protocolbuffers/protobuf/releases/download/v3.11.2/protobuf-all-3.11.2.tar.gz
url = https://github.com/protocolbuffers/protobuf/releases/download/v3.12.4/protobuf-all-3.12.4.tar.gz
archives =
giturl = https://github.com/google/protobuf.git
domain =
alias =

[autospec]
# build 32 bit libraries
Expand Down Expand Up @@ -38,6 +39,8 @@ no_autostart = false
nodebug = false
# disable stripping binaries
nostrip = false
# configure build also for openmpi
openmpi = false
# optimize build for size over speed
optimize_size = false
# set profile for pgo
Expand Down
53 changes: 23 additions & 30 deletions protobuf.spec
Expand Up @@ -3,11 +3,11 @@
# Generated by: autospec.py
#
Name : protobuf
Version : 3.11.2
Release : 61
URL : https://github.com/protocolbuffers/protobuf/releases/download/v3.11.2/protobuf-all-3.11.2.tar.gz
Source0 : https://github.com/protocolbuffers/protobuf/releases/download/v3.11.2/protobuf-all-3.11.2.tar.gz
Summary : Protocol Buffers - Google's data interchange format
Version : 3.12.4
Release : 62
URL : https://github.com/protocolbuffers/protobuf/releases/download/v3.12.4/protobuf-all-3.12.4.tar.gz
Source0 : https://github.com/protocolbuffers/protobuf/releases/download/v3.12.4/protobuf-all-3.12.4.tar.gz
Summary : Google's Data Interchange Format
Group : Development/Tools
License : Apache-2.0 BSD-3-Clause
Requires: protobuf-bin = %{version}-%{release}
Expand All @@ -28,13 +28,8 @@ Patch2: 0002-Ensure-everything-can-build-in-tree.patch
Patch3: 0003-Add-gtest-symlink-to-account-for-the-rest-of-the-bro.patch

%description
This directory contains the Protocol Buffers runtime implementation via both a
pure PHP package and a native c extension. The pure PHP package is intended to
provide usability to wider range of PHP platforms, while the c extension is
intended to provide higher performance. Both implementations provide the same
runtime APIs and share the same generated code. Users don’t need to re-generate
code for the same proto definition when they want to switch the implementation
later.
The Google Mock class generator is an application that is part of cppclean.
For more information about cppclean, visit http://code.google.com/p/cppclean/

%package bin
Summary: bin components for the protobuf package.
Expand All @@ -52,7 +47,6 @@ Requires: protobuf-lib = %{version}-%{release}
Requires: protobuf-bin = %{version}-%{release}
Provides: protobuf-devel = %{version}-%{release}
Requires: protobuf = %{version}-%{release}
Requires: protobuf = %{version}-%{release}

%description dev
dev components for the protobuf package.
Expand Down Expand Up @@ -94,8 +88,8 @@ python3 components for the protobuf package.


%prep
%setup -q -n protobuf-3.11.2
cd %{_builddir}/protobuf-3.11.2
%setup -q -n protobuf-3.12.4
cd %{_builddir}/protobuf-3.12.4
%patch1 -p1
%patch2 -p1
%patch3 -p1
Expand All @@ -105,24 +99,23 @@ export http_proxy=http://127.0.0.1:9/
export https_proxy=http://127.0.0.1:9/
export no_proxy=localhost,127.0.0.1,0.0.0.0
export LANG=C.UTF-8
export SOURCE_DATE_EPOCH=1583203784
# -Werror is for werrorists
export SOURCE_DATE_EPOCH=1596513564
export GCC_IGNORE_WERROR=1
export CFLAGS="$CFLAGS -fno-lto "
export FCFLAGS="$CFLAGS -fno-lto "
export FFLAGS="$CFLAGS -fno-lto "
export FCFLAGS="$FFLAGS -fno-lto "
export FFLAGS="$FFLAGS -fno-lto "
export CXXFLAGS="$CXXFLAGS -fno-lto "
%reconfigure --disable-static
make %{?_smp_mflags}

%install
export SOURCE_DATE_EPOCH=1583203784
export SOURCE_DATE_EPOCH=1596513564
rm -rf %{buildroot}
mkdir -p %{buildroot}/usr/share/package-licenses/protobuf
cp %{_builddir}/protobuf-3.11.2/LICENSE %{buildroot}/usr/share/package-licenses/protobuf/1b5a14d06dd784e88dadc5c68344be2dc13875b6
cp %{_builddir}/protobuf-3.11.2/third_party/googletest/googlemock/LICENSE %{buildroot}/usr/share/package-licenses/protobuf/5a2314153eadadc69258a9429104cd11804ea304
cp %{_builddir}/protobuf-3.11.2/third_party/googletest/googlemock/scripts/generator/LICENSE %{buildroot}/usr/share/package-licenses/protobuf/1d4719e04eaa4909ab5a59ef5cb04d2a5517716e
cp %{_builddir}/protobuf-3.11.2/third_party/googletest/googletest/LICENSE %{buildroot}/usr/share/package-licenses/protobuf/5a2314153eadadc69258a9429104cd11804ea304
cp %{_builddir}/protobuf-3.12.4/LICENSE %{buildroot}/usr/share/package-licenses/protobuf/1b5a14d06dd784e88dadc5c68344be2dc13875b6
cp %{_builddir}/protobuf-3.12.4/third_party/googletest/googlemock/LICENSE %{buildroot}/usr/share/package-licenses/protobuf/5a2314153eadadc69258a9429104cd11804ea304
cp %{_builddir}/protobuf-3.12.4/third_party/googletest/googlemock/scripts/generator/LICENSE %{buildroot}/usr/share/package-licenses/protobuf/1d4719e04eaa4909ab5a59ef5cb04d2a5517716e
cp %{_builddir}/protobuf-3.12.4/third_party/googletest/googletest/LICENSE %{buildroot}/usr/share/package-licenses/protobuf/5a2314153eadadc69258a9429104cd11804ea304
%make_install
## install_append content
pushd python
Expand Down Expand Up @@ -264,12 +257,12 @@ popd

%files lib
%defattr(-,root,root,-)
/usr/lib64/libprotobuf-lite.so.22
/usr/lib64/libprotobuf-lite.so.22.0.2
/usr/lib64/libprotobuf.so.22
/usr/lib64/libprotobuf.so.22.0.2
/usr/lib64/libprotoc.so.22
/usr/lib64/libprotoc.so.22.0.2
/usr/lib64/libprotobuf-lite.so.23
/usr/lib64/libprotobuf-lite.so.23.0.4
/usr/lib64/libprotobuf.so.23
/usr/lib64/libprotobuf.so.23.0.4
/usr/lib64/libprotoc.so.23
/usr/lib64/libprotoc.so.23.0.4

%files license
%defattr(0644,root,root,0755)
Expand Down
2 changes: 1 addition & 1 deletion release
@@ -1 +1 @@
61
62

0 comments on commit 4a2f4f1

Please sign in to comment.