Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package protobuf for openSUSE:Factory checked in at 2024-03-13 22:16:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/protobuf (Old) and /work/SRC/openSUSE:Factory/.protobuf.new.1770 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "protobuf" Wed Mar 13 22:16:25 2024 rev:80 rq:1156838 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/protobuf/protobuf.changes 2024-03-09 20:55:06.795530431 +0100 +++ /work/SRC/openSUSE:Factory/.protobuf.new.1770/protobuf.changes 2024-03-13 22:16:45.456252373 +0100 @@ -1,0 +2,12 @@ +Sat Mar 9 20:36:14 UTC 2024 - Andreas Stieger <andreas.stie...@gmx.de> + +- update to 25.3: + * Possibly breaking changes to: C++, Java, PHP, Python, Ruby + * message.UnknownFields() is deprecated in pure Python and C++ + extensions, it will be removed in v26. Use the new + UnknownFieldSet(message) support in unknown_fields.py as a + replacement +- make python and java packages noarch +- drop add-missing-stdint-header.patch no longer required + +------------------------------------------------------------------- Old: ---- add-missing-stdint-header.patch protobuf-25.2.tar.gz New: ---- protobuf-25.3.tar.gz BETA DEBUG BEGIN: Old:- make python and java packages noarch - drop add-missing-stdint-header.patch no longer required BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ protobuf.spec ++++++ --- /var/tmp/diff_new_pack.2HJRYE/_old 2024-03-13 22:16:47.824339491 +0100 +++ /var/tmp/diff_new_pack.2HJRYE/_new 2024-03-13 22:16:47.844340226 +0100 @@ -24,17 +24,16 @@ %bcond_without python3 %{?sle15_python_module_pythons} Name: protobuf -Version: 25.2 -%global sover 25_2_0 +Version: 25.3 +%global sover 25_3_0 Release: 0 Summary: Protocol Buffers - Google's data interchange format License: BSD-3-Clause Group: Development/Libraries/C and C++ URL: https://github.com/protocolbuffers/protobuf -Source0: https://github.com/protocolbuffers/protobuf/archive/v%{version}.tar.gz#/%{tarname}-%{version}.tar.gz +Source0: https://github.com/protocolbuffers/protobuf/releases/download/v%{version}/%{tarname}-%{version}.tar.gz Source1: manifest.txt.in Source2: baselibs.conf -Patch0: add-missing-stdint-header.patch BuildRequires: %{python_module abseil} BuildRequires: %{python_module devel >= 3.7} BuildRequires: %{python_module python-dateutil} @@ -118,6 +117,7 @@ Version: 4.%{VERSION} Summary: Python Bindings for Google Protocol Buffers Group: Development/Libraries/Python +BuildArch: noarch %description -n python-%{name} This package contains the Python bindings for Google Protocol Buffers. @@ -128,6 +128,7 @@ Version: 4.%{VERSION} Summary: Python3 Bindings for Google Protocol Buffers Group: Development/Libraries/Python +BuildArch: noarch %description -n python3-%{name} This package contains the Python bindings for Google Protocol Buffers. @@ -137,6 +138,7 @@ Summary: Java Bindings for Google Protocol Buffers Group: Development/Libraries/Java Requires: java >= 1.6.0 +BuildArch: noarch %description -n %{name}-java This package contains the Java bindings for Google Protocol Buffers. ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.2HJRYE/_old 2024-03-13 22:16:48.040347437 +0100 +++ /var/tmp/diff_new_pack.2HJRYE/_new 2024-03-13 22:16:48.064348320 +0100 @@ -1,4 +1,4 @@ -libprotobuf25_2_0 -libprotoc25_2_0 -libprotobuf-lite25_2_0 +libprotobuf25_3_0 +libprotoc25_3_0 +libprotobuf-lite25_3_0 ++++++ protobuf-25.2.tar.gz -> protobuf-25.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/.github/workflows/test_cpp.yml new/protobuf-25.3/.github/workflows/test_cpp.yml --- old/protobuf-25.2/.github/workflows/test_cpp.yml 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/.github/workflows/test_cpp.yml 2024-02-15 19:57:05.000000000 +0100 @@ -367,7 +367,7 @@ vsversion: '2019' cache-prefix: windows-2019-cmake # windows-2019 has python3.7 installed, which is incompatible with the latest gcloud - python-version: '3.8' + python-version: '3.9' - name: Windows CMake 32-bit os: windows-2022 flags: >- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/.github/workflows/test_ruby.yml new/protobuf-25.3/.github/workflows/test_ruby.yml --- old/protobuf-25.2/.github/workflows/test_ruby.yml 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/.github/workflows/test_ruby.yml 2024-02-15 19:57:05.000000000 +0100 @@ -25,6 +25,7 @@ - { name: Ruby 3.0, ruby: ruby-3.0.2 } - { name: Ruby 3.1, ruby: ruby-3.1.0 } - { name: Ruby 3.2, ruby: ruby-3.2.0, ffi: NATIVE } + - { name: Ruby 3.3, ruby: ruby-3.3.0, ffi: NATIVE } # TODO Re-enable these once flakes are fixed #- { name: Ruby 3.2, ruby: ruby-3.2.0, ffi: FFI } - { name: JRuby 9.4, ruby: jruby-9.4.3.0, ffi: NATIVE } @@ -40,7 +41,7 @@ - name: Run tests uses: protocolbuffers/protobuf-ci/bazel-docker@v2 with: - image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:{0}-6.3.0-66964dc8b07b6d1fc73a5cc14e59e84c1c534cea', matrix.ruby) }} + image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:{0}-6.3.0-904cad5249547845454998ca3837a34c71fabf96', matrix.ruby) }} credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} bazel-cache: ruby_linux/${{ matrix.ruby }}_${{ matrix.bazel }} bazel: test //ruby/... //ruby/tests:ruby_version --test_env=KOKORO_RUBY_VERSION --test_env=BAZEL=true ${{ matrix.ffi == 'FFI' && '--//ruby:ffi=enabled --test_env=PROTOCOL_BUFFERS_RUBY_IMPLEMENTATION=FFI' || '' }} @@ -67,9 +68,10 @@ with: image: i386/ruby:2.7.3-buster credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} + # Pin to Ruby 2.7 compatible bundler version. command: >- /bin/bash -cex ' - gem install bundler; + gem install bundler -v 2.4.22; cd /workspace/ruby; bundle; PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }} rake; @@ -98,9 +100,10 @@ with: image: arm64v8/ruby:2.7.3-buster credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} + # Pin to Ruby 2.7 compatible bundler version. command: >- /bin/bash -cex ' - gem install bundler; + gem install bundler -v 2.4.22; cd /workspace/ruby; bundle; PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }} rake; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/CMakeLists.txt new/protobuf-25.3/CMakeLists.txt --- old/protobuf-25.2/CMakeLists.txt 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/CMakeLists.txt 2024-02-15 19:57:05.000000000 +0100 @@ -79,7 +79,7 @@ endif () # Version metadata -set(protobuf_VERSION_STRING "4.25.2") +set(protobuf_VERSION_STRING "4.25.3") set(protobuf_DESCRIPTION "Protocol Buffers") set(protobuf_CONTACT "proto...@googlegroups.com") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/PrivacyInfo.xcprivacy new/protobuf-25.3/PrivacyInfo.xcprivacy --- old/protobuf-25.2/PrivacyInfo.xcprivacy 1970-01-01 01:00:00.000000000 +0100 +++ new/protobuf-25.3/PrivacyInfo.xcprivacy 2024-02-15 19:57:05.000000000 +0100 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>NSPrivacyTracking</key> + <false/> + <key>NSPrivacyTrackingDomains</key> + <array/> + <key>NSPrivacyCollectedDataTypes</key> + <array/> + <key>NSPrivacyAccessedAPITypes</key> + <array/> +</dict> +</plist> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/Protobuf-C++.podspec new/protobuf-25.3/Protobuf-C++.podspec --- old/protobuf-25.2/Protobuf-C++.podspec 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/Protobuf-C++.podspec 2024-02-15 19:57:05.000000000 +0100 @@ -1,11 +1,14 @@ Pod::Spec.new do |s| s.name = 'Protobuf-C++' - s.version = '4.25.2' + s.version = '4.25.3' s.summary = 'Protocol Buffers v3 runtime library for C++.' s.homepage = 'https://github.com/google/protobuf' s.license = 'BSD-3-Clause' s.authors = { 'The Protocol Buffers contributors' => 'proto...@googlegroups.com' } - s.cocoapods_version = '>= 1.0' + + # Ensure developers won't hit CocoaPods/CocoaPods#11402 with the resource + # bundle for the privacy manifest. + s.cocoapods_version = '>= 1.12.0' s.source = { :git => 'https://github.com/google/protobuf.git', :tag => "v#{s.version}" } @@ -23,6 +26,10 @@ 'src/google/protobuf/map_test_util*.{h,cc,inc}', 'src/google/protobuf/reflection_tester.{h,cc}' + s.resource_bundle = { + "Protobuf-C++_Privacy" => "PrivacyInfo.xcprivacy" + } + s.header_mappings_dir = 'src' s.ios.deployment_target = '12.0' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/Protobuf.podspec new/protobuf-25.3/Protobuf.podspec --- old/protobuf-25.2/Protobuf.podspec 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/Protobuf.podspec 2024-02-15 19:57:05.000000000 +0100 @@ -5,12 +5,15 @@ # dependent projects use the :git notation to refer to the library. Pod::Spec.new do |s| s.name = 'Protobuf' - s.version = '3.25.2' + s.version = '3.25.3' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.homepage = 'https://github.com/protocolbuffers/protobuf' s.license = 'BSD-3-Clause' s.authors = { 'The Protocol Buffers contributors' => 'proto...@googlegroups.com' } - s.cocoapods_version = '>= 1.0' + + # Ensure developers won't hit CocoaPods/CocoaPods#11402 with the resource + # bundle for the privacy manifest. + s.cocoapods_version = '>= 1.12.0' s.source = { :git => 'https://github.com/protocolbuffers/protobuf.git', :tag => "v#{s.version}" } @@ -30,6 +33,10 @@ # left out, as it's an umbrella implementation file. s.exclude_files = 'objectivec/GPBProtocolBuffers.m' + s.resource_bundle = { + "Protobuf_Privacy" => "PrivacyInfo.xcprivacy" + } + # Set a CPP symbol so the code knows to use framework imports. s.user_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1' } s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1' } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/csharp/Google.Protobuf.Tools.nuspec new/protobuf-25.3/csharp/Google.Protobuf.Tools.nuspec --- old/protobuf-25.2/csharp/Google.Protobuf.Tools.nuspec 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/csharp/Google.Protobuf.Tools.nuspec 2024-02-15 19:57:05.000000000 +0100 @@ -5,7 +5,7 @@ <title>Google Protocol Buffers tools</title> <summary>Tools for Protocol Buffers - Google's data interchange format.</summary> <description>See project site for more info.</description> - <version>3.25.2</version> + <version>3.25.3</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-25.2/csharp/src/Google.Protobuf/Google.Protobuf.csproj new/protobuf-25.3/csharp/src/Google.Protobuf/Google.Protobuf.csproj --- old/protobuf-25.2/csharp/src/Google.Protobuf/Google.Protobuf.csproj 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/csharp/src/Google.Protobuf/Google.Protobuf.csproj 2024-02-15 19:57:05.000000000 +0100 @@ -5,7 +5,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.25.2</VersionPrefix> + <VersionPrefix>3.25.3</VersionPrefix> <LangVersion>10.0</LangVersion> <Authors>Google Inc.</Authors> <TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/java/README.md new/protobuf-25.3/java/README.md --- old/protobuf-25.2/java/README.md 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/java/README.md 2024-02-15 19:57:05.000000000 +0100 @@ -23,7 +23,7 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>3.25.2</version> + <version>3.25.3</version> </dependency> ``` @@ -37,14 +37,14 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java-util</artifactId> - <version>3.25.2</version> + <version>3.25.3</version> </dependency> ``` ### Gradle If you are using Gradle, add the following to your `build.gradle` file's -dependencies: `implementation 'com.google.protobuf:protobuf-java:3.25.2'` Again, +dependencies: `implementation 'com.google.protobuf:protobuf-java:3.25.3'` 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-25.2/java/bom/pom.xml new/protobuf-25.3/java/bom/pom.xml --- old/protobuf-25.2/java/bom/pom.xml 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/java/bom/pom.xml 2024-02-15 19:57:05.000000000 +0100 @@ -4,7 +4,7 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-bom</artifactId> - <version>3.25.2</version> + <version>3.25.3</version> <packaging>pom</packaging> <name>Protocol Buffers [BOM]</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/java/core/pom.xml new/protobuf-25.3/java/core/pom.xml --- old/protobuf-25.2/java/core/pom.xml 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/java/core/pom.xml 2024-02-15 19:57:05.000000000 +0100 @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.25.2</version> + <version>3.25.3</version> </parent> <artifactId>protobuf-java</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/java/kotlin/pom.xml new/protobuf-25.3/java/kotlin/pom.xml --- old/protobuf-25.2/java/kotlin/pom.xml 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/java/kotlin/pom.xml 2024-02-15 19:57:05.000000000 +0100 @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.25.2</version> + <version>3.25.3</version> </parent> <artifactId>protobuf-kotlin</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/java/kotlin-lite/pom.xml new/protobuf-25.3/java/kotlin-lite/pom.xml --- old/protobuf-25.2/java/kotlin-lite/pom.xml 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/java/kotlin-lite/pom.xml 2024-02-15 19:57:05.000000000 +0100 @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.25.2</version> + <version>3.25.3</version> </parent> <artifactId>protobuf-kotlin-lite</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/java/lite/pom.xml new/protobuf-25.3/java/lite/pom.xml --- old/protobuf-25.2/java/lite/pom.xml 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/java/lite/pom.xml 2024-02-15 19:57:05.000000000 +0100 @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.25.2</version> + <version>3.25.3</version> </parent> <artifactId>protobuf-javalite</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/java/lite.md new/protobuf-25.3/java/lite.md --- old/protobuf-25.2/java/lite.md 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/java/lite.md 2024-02-15 19:57:05.000000000 +0100 @@ -29,7 +29,7 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-javalite</artifactId> - <version>3.25.2</version> + <version>3.25.3</version> </dependency> ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/java/pom.xml new/protobuf-25.3/java/pom.xml --- old/protobuf-25.2/java/pom.xml 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/java/pom.xml 2024-02-15 19:57:05.000000000 +0100 @@ -4,7 +4,7 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.25.2</version> + <version>3.25.3</version> <packaging>pom</packaging> <name>Protocol Buffers [Parent]</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/java/protoc/pom.xml new/protobuf-25.3/java/protoc/pom.xml --- old/protobuf-25.2/java/protoc/pom.xml 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/java/protoc/pom.xml 2024-02-15 19:57:05.000000000 +0100 @@ -8,7 +8,7 @@ </parent> <groupId>com.google.protobuf</groupId> <artifactId>protoc</artifactId> - <version>3.25.2</version> + <version>3.25.3</version> <packaging>pom</packaging> <name>Protobuf Compiler</name> <description> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/java/util/pom.xml new/protobuf-25.3/java/util/pom.xml --- old/protobuf-25.2/java/util/pom.xml 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/java/util/pom.xml 2024-02-15 19:57:05.000000000 +0100 @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.25.2</version> + <version>3.25.3</version> </parent> <artifactId>protobuf-java-util</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/objectivec/GPBCodedInputStream.m new/protobuf-25.3/objectivec/GPBCodedInputStream.m --- old/protobuf-25.2/objectivec/GPBCodedInputStream.m 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/objectivec/GPBCodedInputStream.m 2024-02-15 19:57:05.000000000 +0100 @@ -219,7 +219,8 @@ if (size == 0) { result = @""; } else { - CheckSize(state, size); + size_t size2 = (size_t)size; // Cast safe on 32bit because of CheckFieldSize() above. + CheckSize(state, size2); result = [[NSString alloc] initWithBytes:&state->bytes[state->bufferPos] length:ns_size encoding:NSUTF8StringEncoding]; @@ -239,8 +240,9 @@ NSData *GPBCodedInputStreamReadRetainedBytes(GPBCodedInputStreamState *state) { uint64_t size = GPBCodedInputStreamReadUInt64(state); CheckFieldSize(size); + size_t size2 = (size_t)size; // Cast safe on 32bit because of CheckFieldSize() above. + CheckSize(state, size2); NSUInteger ns_size = (NSUInteger)size; - CheckSize(state, size); NSData *result = [[NSData alloc] initWithBytes:state->bytes + state->bufferPos length:ns_size]; state->bufferPos += size; return result; @@ -249,8 +251,9 @@ NSData *GPBCodedInputStreamReadRetainedBytesNoCopy(GPBCodedInputStreamState *state) { uint64_t size = GPBCodedInputStreamReadUInt64(state); CheckFieldSize(size); + size_t size2 = (size_t)size; // Cast safe on 32bit because of CheckFieldSize() above. + CheckSize(state, size2); NSUInteger ns_size = (NSUInteger)size; - CheckSize(state, size); // Cast is safe because freeWhenDone is NO. NSData *result = [[NSData alloc] initWithBytesNoCopy:(void *)(state->bytes + state->bufferPos) length:ns_size @@ -338,7 +341,8 @@ case GPBWireFormatLengthDelimited: { uint64_t size = GPBCodedInputStreamReadUInt64(&state_); CheckFieldSize(size); - SkipRawData(&state_, size); + size_t size2 = (size_t)size; // Cast safe on 32bit because of CheckFieldSize() above. + SkipRawData(&state_, size2); return YES; } case GPBWireFormatStartGroup: @@ -441,7 +445,8 @@ CheckRecursionLimit(&state_); uint64_t length = GPBCodedInputStreamReadUInt64(&state_); CheckFieldSize(length); - size_t oldLimit = GPBCodedInputStreamPushLimit(&state_, length); + size_t length2 = (size_t)length; // Cast safe on 32bit because of CheckFieldSize() above. + size_t oldLimit = GPBCodedInputStreamPushLimit(&state_, length2); ++state_.recursionDepth; [message mergeFromCodedInputStream:self extensionRegistry:extensionRegistry]; GPBCodedInputStreamCheckLastTagWas(&state_, 0); @@ -456,7 +461,8 @@ CheckRecursionLimit(&state_); uint64_t length = GPBCodedInputStreamReadUInt64(&state_); CheckFieldSize(length); - size_t oldLimit = GPBCodedInputStreamPushLimit(&state_, length); + size_t length2 = (size_t)length; // Cast safe on 32bit because of CheckFieldSize() above. + size_t oldLimit = GPBCodedInputStreamPushLimit(&state_, length2); ++state_.recursionDepth; GPBDictionaryReadEntry(mapDictionary, self, extensionRegistry, field, parentMessage); GPBCodedInputStreamCheckLastTagWas(&state_, 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/php/ext/google/protobuf/protobuf.h new/protobuf-25.3/php/ext/google/protobuf/protobuf.h --- old/protobuf-25.2/php/ext/google/protobuf/protobuf.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/php/ext/google/protobuf/protobuf.h 2024-02-15 19:57:05.000000000 +0100 @@ -32,7 +32,7 @@ ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() -#define PHP_PROTOBUF_VERSION "3.25.2" +#define PHP_PROTOBUF_VERSION "3.25.3" // 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-25.2/protobuf_version.bzl new/protobuf-25.3/protobuf_version.bzl --- old/protobuf-25.2/protobuf_version.bzl 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/protobuf_version.bzl 2024-02-15 19:57:05.000000000 +0100 @@ -1,6 +1,6 @@ """ Contains version numbers to be used in other bzl files """ -PROTOC_VERSION = "25.2" -PROTOBUF_JAVA_VERSION = "3.25.2" -PROTOBUF_PYTHON_VERSION = "4.25.2" -PROTOBUF_PHP_VERSION = "3.25.2" -PROTOBUF_RUBY_VERSION = "3.25.2" +PROTOC_VERSION = "25.3" +PROTOBUF_JAVA_VERSION = "3.25.3" +PROTOBUF_PYTHON_VERSION = "4.25.3" +PROTOBUF_PHP_VERSION = "3.25.3" +PROTOBUF_RUBY_VERSION = "3.25.3" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/python/google/protobuf/__init__.py new/protobuf-25.3/python/google/protobuf/__init__.py --- old/protobuf-25.2/python/google/protobuf/__init__.py 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/python/google/protobuf/__init__.py 2024-02-15 19:57:05.000000000 +0100 @@ -7,4 +7,4 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '4.25.2' +__version__ = '4.25.3' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/ruby/google-protobuf.gemspec new/protobuf-25.3/ruby/google-protobuf.gemspec --- old/protobuf-25.2/ruby/google-protobuf.gemspec 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/ruby/google-protobuf.gemspec 2024-02-15 19:57:05.000000000 +0100 @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "google-protobuf" - s.version = "3.25.2" + s.version = "3.25.3" 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-25.2/ruby/pom.xml new/protobuf-25.3/ruby/pom.xml --- old/protobuf-25.2/ruby/pom.xml 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/ruby/pom.xml 2024-02-15 19:57:05.000000000 +0100 @@ -9,7 +9,7 @@ <groupId>com.google.protobuf.jruby</groupId> <artifactId>protobuf-jruby</artifactId> - <version>3.25.2</version> + <version>3.25.3</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.25.2</version> + <version>3.25.3</version> </dependency> <dependency> <groupId>org.jruby</groupId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/src/google/protobuf/any.pb.h new/protobuf-25.3/src/google/protobuf/any.pb.h --- old/protobuf-25.2/src/google/protobuf/any.pb.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/any.pb.h 2024-02-15 19:57:05.000000000 +0100 @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/any.proto -// Protobuf C++ Version: 4.25.2 +// Protobuf C++ Version: 4.25.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025003 < 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-25.2/src/google/protobuf/api.pb.h new/protobuf-25.3/src/google/protobuf/api.pb.h --- old/protobuf-25.2/src/google/protobuf/api.pb.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/api.pb.h 2024-02-15 19:57:05.000000000 +0100 @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/api.proto -// Protobuf C++ Version: 4.25.2 +// Protobuf C++ Version: 4.25.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025003 < 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-25.2/src/google/protobuf/compiler/java/java_features.pb.h new/protobuf-25.3/src/google/protobuf/compiler/java/java_features.pb.h --- old/protobuf-25.2/src/google/protobuf/compiler/java/java_features.pb.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/compiler/java/java_features.pb.h 2024-02-15 19:57:05.000000000 +0100 @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/compiler/java/java_features.proto -// Protobuf C++ Version: 4.25.2 +// Protobuf C++ Version: 4.25.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025003 < 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-25.2/src/google/protobuf/compiler/plugin.pb.h new/protobuf-25.3/src/google/protobuf/compiler/plugin.pb.h --- old/protobuf-25.2/src/google/protobuf/compiler/plugin.pb.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/compiler/plugin.pb.h 2024-02-15 19:57:05.000000000 +0100 @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/compiler/plugin.proto -// Protobuf C++ Version: 4.25.2 +// Protobuf C++ Version: 4.25.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025003 < 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-25.2/src/google/protobuf/compiler/versions.h new/protobuf-25.3/src/google/protobuf/compiler/versions.h --- old/protobuf-25.2/src/google/protobuf/compiler/versions.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/compiler/versions.h 2024-02-15 19:57:05.000000000 +0100 @@ -46,8 +46,8 @@ // // Please avoid changing them manually, as they should be updated automatically // by Protobuf release process. -#define PROTOBUF_CPP_VERSION_STRING "4.25.2" PROTOBUF_GENCODE_VERSION_SUFFIX -#define PROTOBUF_JAVA_VERSION_STRING "3.25.2" PROTOBUF_GENCODE_VERSION_SUFFIX -#define PROTOBUF_PYTHON_VERSION_STRING "4.25.2" PROTOBUF_GENCODE_VERSION_SUFFIX +#define PROTOBUF_CPP_VERSION_STRING "4.25.3" PROTOBUF_GENCODE_VERSION_SUFFIX +#define PROTOBUF_JAVA_VERSION_STRING "3.25.3" PROTOBUF_GENCODE_VERSION_SUFFIX +#define PROTOBUF_PYTHON_VERSION_STRING "4.25.3" PROTOBUF_GENCODE_VERSION_SUFFIX #endif // GOOGLE_PROTOBUF_VERSIONS_H__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/src/google/protobuf/cpp_features.pb.h new/protobuf-25.3/src/google/protobuf/cpp_features.pb.h --- old/protobuf-25.2/src/google/protobuf/cpp_features.pb.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/cpp_features.pb.h 2024-02-15 19:57:05.000000000 +0100 @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/cpp_features.proto -// Protobuf C++ Version: 4.25.2 +// Protobuf C++ Version: 4.25.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025003 < 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-25.2/src/google/protobuf/descriptor.pb.h new/protobuf-25.3/src/google/protobuf/descriptor.pb.h --- old/protobuf-25.2/src/google/protobuf/descriptor.pb.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/descriptor.pb.h 2024-02-15 19:57:05.000000000 +0100 @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/descriptor.proto -// Protobuf C++ Version: 4.25.2 +// Protobuf C++ Version: 4.25.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025003 < 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-25.2/src/google/protobuf/duration.pb.h new/protobuf-25.3/src/google/protobuf/duration.pb.h --- old/protobuf-25.2/src/google/protobuf/duration.pb.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/duration.pb.h 2024-02-15 19:57:05.000000000 +0100 @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/duration.proto -// Protobuf C++ Version: 4.25.2 +// Protobuf C++ Version: 4.25.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025003 < 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-25.2/src/google/protobuf/empty.pb.h new/protobuf-25.3/src/google/protobuf/empty.pb.h --- old/protobuf-25.2/src/google/protobuf/empty.pb.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/empty.pb.h 2024-02-15 19:57:05.000000000 +0100 @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/empty.proto -// Protobuf C++ Version: 4.25.2 +// Protobuf C++ Version: 4.25.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025003 < 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-25.2/src/google/protobuf/field_mask.pb.h new/protobuf-25.3/src/google/protobuf/field_mask.pb.h --- old/protobuf-25.2/src/google/protobuf/field_mask.pb.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/field_mask.pb.h 2024-02-15 19:57:05.000000000 +0100 @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/field_mask.proto -// Protobuf C++ Version: 4.25.2 +// Protobuf C++ Version: 4.25.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025003 < 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-25.2/src/google/protobuf/map.h new/protobuf-25.3/src/google/protobuf/map.h --- old/protobuf-25.2/src/google/protobuf/map.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/map.h 2024-02-15 19:57:05.000000000 +0100 @@ -25,7 +25,7 @@ #include <utility> #if !defined(GOOGLE_PROTOBUF_NO_RDTSC) && defined(__APPLE__) -#include <mach/mach_time.h> +#include <time.h> #endif #include "google/protobuf/stubs/common.h" @@ -691,7 +691,7 @@ #if defined(__APPLE__) // Use a commpage-based fast time function on Apple environments (MacOS, // iOS, tvOS, watchOS, etc). - s += mach_absolute_time(); + s = clock_gettime_nsec_np(CLOCK_UPTIME_RAW); #elif defined(__x86_64__) && defined(__GNUC__) uint32_t hi, lo; asm volatile("rdtsc" : "=a"(lo), "=d"(hi)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-25.2/src/google/protobuf/port_def.inc new/protobuf-25.3/src/google/protobuf/port_def.inc --- old/protobuf-25.2/src/google/protobuf/port_def.inc 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/port_def.inc 2024-02-15 19:57:05.000000000 +0100 @@ -204,7 +204,7 @@ #ifdef PROTOBUF_VERSION #error PROTOBUF_VERSION was previously defined #endif -#define PROTOBUF_VERSION 4025002 +#define PROTOBUF_VERSION 4025003 #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-25.2/src/google/protobuf/source_context.pb.h new/protobuf-25.3/src/google/protobuf/source_context.pb.h --- old/protobuf-25.2/src/google/protobuf/source_context.pb.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/source_context.pb.h 2024-02-15 19:57:05.000000000 +0100 @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/source_context.proto -// Protobuf C++ Version: 4.25.2 +// Protobuf C++ Version: 4.25.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025003 < 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-25.2/src/google/protobuf/struct.pb.h new/protobuf-25.3/src/google/protobuf/struct.pb.h --- old/protobuf-25.2/src/google/protobuf/struct.pb.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/struct.pb.h 2024-02-15 19:57:05.000000000 +0100 @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/struct.proto -// Protobuf C++ Version: 4.25.2 +// Protobuf C++ Version: 4.25.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025003 < 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-25.2/src/google/protobuf/stubs/common.h new/protobuf-25.3/src/google/protobuf/stubs/common.h --- old/protobuf-25.2/src/google/protobuf/stubs/common.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/stubs/common.h 2024-02-15 19:57:05.000000000 +0100 @@ -44,7 +44,7 @@ // The current version, represented as a single integer to make comparison // easier: major * 10^6 + minor * 10^3 + micro -#define GOOGLE_PROTOBUF_VERSION 4025002 +#define GOOGLE_PROTOBUF_VERSION 4025003 // 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-25.2/src/google/protobuf/timestamp.pb.h new/protobuf-25.3/src/google/protobuf/timestamp.pb.h --- old/protobuf-25.2/src/google/protobuf/timestamp.pb.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/timestamp.pb.h 2024-02-15 19:57:05.000000000 +0100 @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/timestamp.proto -// Protobuf C++ Version: 4.25.2 +// Protobuf C++ Version: 4.25.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025003 < 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-25.2/src/google/protobuf/type.pb.h new/protobuf-25.3/src/google/protobuf/type.pb.h --- old/protobuf-25.2/src/google/protobuf/type.pb.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/type.pb.h 2024-02-15 19:57:05.000000000 +0100 @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/type.proto -// Protobuf C++ Version: 4.25.2 +// Protobuf C++ Version: 4.25.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025003 < 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-25.2/src/google/protobuf/wrappers.pb.h new/protobuf-25.3/src/google/protobuf/wrappers.pb.h --- old/protobuf-25.2/src/google/protobuf/wrappers.pb.h 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/src/google/protobuf/wrappers.pb.h 2024-02-15 19:57:05.000000000 +0100 @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/wrappers.proto -// Protobuf C++ Version: 4.25.2 +// Protobuf C++ Version: 4.25.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025003 < 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-25.2/version.json new/protobuf-25.3/version.json --- old/protobuf-25.2/version.json 2024-01-08 22:55:28.000000000 +0100 +++ new/protobuf-25.3/version.json 2024-02-15 19:57:05.000000000 +0100 @@ -1,17 +1,17 @@ { "25.x": { - "protoc_version": "25.2", + "protoc_version": "25.3", "lts": false, - "date": "2024-01-08", + "date": "2024-02-15", "languages": { - "cpp": "4.25.2", - "csharp": "3.25.2", - "java": "3.25.2", - "javascript": "3.25.2", - "objectivec": "3.25.2", - "php": "3.25.2", - "python": "4.25.2", - "ruby": "3.25.2" + "cpp": "4.25.3", + "csharp": "3.25.3", + "java": "3.25.3", + "javascript": "3.25.3", + "objectivec": "3.25.3", + "php": "3.25.3", + "python": "4.25.3", + "ruby": "3.25.3" } } } \ No newline at end of file