From 479b000ea2121b6d56726cde496cea0b7f0909e673a3f7754824187addb882db Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 23 Mar 2022 14:43:00 +0000 Subject: [PATCH] Accepting request 963078 from home:badshah400:branches:devel:tools * Update to version 1.45.0. * Add grpc-no-return-from-non-void-function.patch to return a default string from a function defined to return a string. OBS-URL: https://build.opensuse.org/request/show/963078 OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=108 --- grpc-correct-pkgconfig-path.patch | 8 +++--- grpc-cxx17.patch | 9 +++--- grpc-no-return-from-non-void-function.patch | 12 ++++++++ grpc.changes | 32 +++++++++++++++++++++ grpc.spec | 21 +++++++------- v1.44.0.tar.gz | 3 -- v1.45.0.tar.gz | 3 ++ 7 files changed, 66 insertions(+), 22 deletions(-) create mode 100644 grpc-no-return-from-non-void-function.patch delete mode 100644 v1.44.0.tar.gz create mode 100644 v1.45.0.tar.gz diff --git a/grpc-correct-pkgconfig-path.patch b/grpc-correct-pkgconfig-path.patch index de6ef95..4f98e6c 100644 --- a/grpc-correct-pkgconfig-path.patch +++ b/grpc-correct-pkgconfig-path.patch @@ -3,11 +3,11 @@ From: Atri Bhattacharya Make path for pkgconfig file installation consistent with gRPC_INSTALL_LIBDIR specification -Index: grpc-1.34.0/CMakeLists.txt +Index: grpc-1.45.0/CMakeLists.txt =================================================================== ---- grpc-1.34.0.orig/CMakeLists.txt -+++ grpc-1.34.0/CMakeLists.txt -@@ -16203,7 +16203,7 @@ function(generate_pkgconfig name descrip +--- grpc-1.45.0.orig/CMakeLists.txt ++++ grpc-1.45.0/CMakeLists.txt +@@ -17363,7 +17363,7 @@ function(generate_pkgconfig name descrip "${output_filepath}" @ONLY) install(FILES "${output_filepath}" diff --git a/grpc-cxx17.patch b/grpc-cxx17.patch index eab1ba0..129ca50 100644 --- a/grpc-cxx17.patch +++ b/grpc-cxx17.patch @@ -8,11 +8,11 @@ grpc must therefore do the sample (use standard -std=). CMakeLists.txt | 15 --------------- 1 file changed, 15 deletions(-) -Index: grpc-1.38.0/CMakeLists.txt +Index: grpc-1.45.0/CMakeLists.txt =================================================================== ---- grpc-1.38.0.orig/CMakeLists.txt -+++ grpc-1.38.0/CMakeLists.txt -@@ -189,21 +189,6 @@ if (NOT DEFINED CMAKE_C_STANDARD) +--- grpc-1.45.0.orig/CMakeLists.txt ++++ grpc-1.45.0/CMakeLists.txt +@@ -222,21 +222,6 @@ if (NOT DEFINED CMAKE_C_STANDARD) set(CMAKE_C_STANDARD 99) endif() @@ -34,4 +34,3 @@ Index: grpc-1.38.0/CMakeLists.txt if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) endif() - diff --git a/grpc-no-return-from-non-void-function.patch b/grpc-no-return-from-non-void-function.patch new file mode 100644 index 0000000..f632749 --- /dev/null +++ b/grpc-no-return-from-non-void-function.patch @@ -0,0 +1,12 @@ +Index: grpc-1.45.0/src/core/lib/transport/metadata_batch.h +=================================================================== +--- grpc-1.45.0.orig/src/core/lib/transport/metadata_batch.h ++++ grpc-1.45.0/src/core/lib/transport/metadata_batch.h +@@ -530,6 +530,7 @@ struct GrpcStreamNetworkState { + case kNotSeenByServer: + return "not seen by server"; + } ++ return "none"; + } + }; + diff --git a/grpc.changes b/grpc.changes index 3f78d35..eb5b531 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Sat Mar 19 15:08:13 UTC 2022 - Atri Bhattacharya + +- Update to version 1.45.0: + * Core: + - Backport "Include ADS stream error in XDS error updates + (#29014)" to 1.45.x [gh#grpc/grpc#29121]. + - Bump core version to 23.0.0 for upcoming release + [gh#grpc/grpc#29026]. + - Fix memory leak in HTTP request security handshake + cancellation [gh#grpc/grpc#28971]. + - CompositeChannelCredentials: Comparator implementation + [gh#grpc/grpc#28902]. + - Delete custom iomgr [gh#grpc/grpc#28816]. + - Implement transparent retries [gh#grpc/grpc#28548]. + - Uniquify channel args keys [gh#grpc/grpc#28799]. + - Set trailing_metadata_available for recv_initial_metadata + ops when generating a fake status [gh#grpc/grpc#28827]. + - Eliminate gRPC insecure build [gh#grpc/grpc#25586]. + - Fix for a racy WorkSerializer shutdown [gh#grpc/grpc#28769]. + - InsecureCredentials: singleton object [gh#grpc/grpc#28777]. + - Add http cancel api [gh#grpc/grpc#28354]. + - Memory leak fix on windows in grpc_tcp_create() + [gh#grpc/grpc#27457]. + - xDS: Rbac filter updates [gh#grpc/grpc#28568]. + * C++ + - Bump the minimum gcc to 5 [gh#grpc/grpc#28786]. + - Add experimental API for CRL checking support to gRPC C++ + TlsCredentials [gh#grpc/grpc#28407]. +- Add grpc-no-return-from-non-void-function.patch to return a + default string from a function defined to return a string. + ------------------------------------------------------------------- Tue Feb 15 21:05:18 UTC 2022 - Jan Engelhardt diff --git a/grpc.spec b/grpc.spec index 5e0e4e4..c304cec 100644 --- a/grpc.spec +++ b/grpc.spec @@ -16,11 +16,11 @@ # -%define lver 22 -%define lverp 1_44 +%define lver 23 +%define lverp 1_45 %define src_install_dir /usr/src/%name Name: grpc -Version: 1.44.0 +Version: 1.45.0 Release: 0 Summary: HTTP/2-based Remote Procedure Call implementation License: Apache-2.0 @@ -30,6 +30,7 @@ Source: https://github.com/grpc/grpc/archive/v%version.tar.gz Source2: %name-rpmlintrc Patch1: grpc-correct-pkgconfig-path.patch Patch2: grpc-cxx17.patch +Patch3: grpc-no-return-from-non-void-function.patch BuildRequires: abseil-cpp-devel BuildRequires: cmake BuildRequires: fdupes @@ -69,11 +70,11 @@ The reference implementation of the gRPC protocol, done on top of HTTP/2 with support for synchronous and asynchronous calls. gRPC uses Protocol Buffers as the Interface Definition Language by default. -%package -n libgrpc_plugin_support1_44 +%package -n libgrpc_plugin_support%lverp Summary: HTTP/2-based Remote Procedure Call implementation - plugin support Group: System/Libraries -%description -n libgrpc_plugin_support1_44 +%description -n libgrpc_plugin_support%lverp The reference implementation of the gRPC protocol, done on top of HTTP/2 with support for synchronous and asynchronous calls. gRPC uses Protocol Buffers as the Interface Definition Language by default. @@ -96,7 +97,7 @@ Summary: Development files for grpc, a HTTP/2 Remote Procedure Call imple Group: Development/Tools/Building Requires: libgrpc%lver = %version Requires: libgrpc++%lverp = %version -Requires: libgrpc_plugin_support1_44 = %version +Requires: libgrpc_plugin_support%lverp = %version Requires: libupb%lver = %version Requires: pkgconfig(libcares) Requires: pkgconfig(re2) @@ -180,8 +181,8 @@ cp -r * "%buildroot/%src_install_dir" %postun -n libgrpc%lver -p /sbin/ldconfig %post -n libgrpc++%lverp -p /sbin/ldconfig %postun -n libgrpc++%lverp -p /sbin/ldconfig -%post -n libgrpc_plugin_support1_44 -p /sbin/ldconfig -%postun -n libgrpc_plugin_support1_44 -p /sbin/ldconfig +%post -n libgrpc_plugin_support%lverp -p /sbin/ldconfig +%postun -n libgrpc_plugin_support%lverp -p /sbin/ldconfig %post -n libupb%lver -p /sbin/ldconfig %postun -n libupb%lver -p /sbin/ldconfig @@ -194,8 +195,8 @@ cp -r * "%buildroot/%src_install_dir" %_libdir/libgrpc++*.so.* %_libdir/libgrpcpp_channelz.so.* -%files -n libgrpc_plugin_support1_44 -%_libdir/libgrpc_plugin_support.so.1.44* +%files -n libgrpc_plugin_support%lverp +%_libdir/libgrpc_plugin_support.so.1.45* %files -n libupb%lver %_libdir/libupb*.so.%{lver}* diff --git a/v1.44.0.tar.gz b/v1.44.0.tar.gz deleted file mode 100644 index 9cc9f9b..0000000 --- a/v1.44.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c05641b9f91cbc92f51cc4a5b3a226788d7a63f20af4ca7aaca50d92cc94a0d -size 8580632 diff --git a/v1.45.0.tar.gz b/v1.45.0.tar.gz new file mode 100644 index 0000000..f6c6b0e --- /dev/null +++ b/v1.45.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec19657a677d49af59aa806ec299c070c882986c9fcc022b1c22c2a3caf01bcd +size 8823253