- Update to release 1.61

OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=180

grpc.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Jan 31 19:51:15 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 1.61
+  * SSA: change xds_override_host policy to manage subchannels
+    based on last-used time rather than EDS health state
+  * xDS: read connection idle timeout from CDS resource
+  * xDS: move CDS and EDS watchers into xds resolver
+  * alpn: Remove grpc-exp experimental ALPN protocol
+- Add terminate.patch
+
 -------------------------------------------------------------------
 Mon Jan 29 17:25:06 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

grpc.spec

@@ -16,11 +16,11 @@
 #
 
 
-%define lver 37
+%define lver 38
-%define lverp 1_60
+%define lverp 1_61
 %define src_install_dir /usr/src/%name
 Name:           grpc
-Version:        1.60.0
+Version:        1.61.0
 Release:        0
 Summary:        HTTP/2-based Remote Procedure Call implementation
 License:        Apache-2.0
@@ -28,12 +28,9 @@ Group:          Development/Tools/Building
 URL:            https://grpc.io/
 Source:         https://github.com/grpc/grpc/archive/v%version.tar.gz
 Source2:        %name-rpmlintrc
-# PATCH-FIX-UPSTREAM ARM-Unaligned-access-fixes.patch gh#Cyan4973/xxHash#651 easyaspi314@users.noreply.github.com
+Patch1:         terminate.patch
-# Fix unaligned access on ARM
+Patch4:         ARM-Unaligned-access-fixes.patch
-Patch1:         ARM-Unaligned-access-fixes.patch
+Patch5:         Fix-compilation-on-RHEL-7-ppc64le-gcc-4.8.patch
-# PATCH-FIX-UPSTREAM Fix-compilation-on-RHEL-7-ppc64le-gcc-4.8.patch gh#Cyan4973/xxHash#651 mattias.ellert@physics.uu.se
-# Fix build on ppc64le on RHEL-7 with gcc-4.8
-Patch2:         Fix-compilation-on-RHEL-7-ppc64le-gcc-4.8.patch
 BuildRequires:  abseil-cpp-devel
 BuildRequires:  cmake
 BuildRequires:  fdupes
@@ -126,6 +123,7 @@ This subpackage contains source code of the gRPC reference implementation.
 
 %prep
 %autosetup -N
+%patch -P 1 -p1
 find "." -type f -exec grep -l '/usr/bin/env ' {} + |
 	xargs -r perl -i -lpe \
 	's{#! ?/usr/bin/env python\S*}{#!/usr/bin/python3}g;
@@ -133,8 +131,7 @@ find "." -type f -exec grep -l '/usr/bin/env ' {} + |
 	 s{#! ?/usr/bin/env bash}{#!/bin/bash}g;
 	 s{#! ?/usr/bin/env }{#!/usr/bin/}g;'
 pushd third_party/xxhash
-%patch1 -p1
+%patch -P 4 -P 5 -p1
-%patch2 -p1
 popd
 rm -Rf third_party/abseil-cpp/
 

terminate.patch

@@ -0,0 +1,35 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2024-01-31 20:50:55.596208216 +0100
+
+[  221s] src/core/lib/promise/party.h: In member function 'bool grpc_core::Party::PromiseParticipantImpl<SuppliedFactory>::PollParticipantPromise() [with SuppliedFactory = grpc_core::ForwardCall(CallHandler, CallInitiator, ClientMetadataHandle)::<lambda()> mutable::<lambda(grpc_core::MessageHandle)> mutable::<lambda()>]':
+[  221s] src/core/lib/promise/party.h:541:5: error: control reaches end of non-void function [-Werror=return-type]
+[  221s] src/core/lib/promise/party.h: In member function 'grpc_core::Poll<typename grpc_core::promise_detail::OncePromiseFactory<void, F>::Promise::Result> grpc_core::Party::PromiseParticipantImpl<SuppliedFactory>::PollCompletion() [with SuppliedFactory = grpc_core::ForwardCall(CallHandler, CallInitiator, ClientMetadataHandle)::<lambda()> mutable::<lambda(grpc_core::MessageHandle)> mutable::<lambda()>]':
+[  221s] src/core/lib/promise/party.h:553:5: error: control reaches end of non-void function [-Werror=return-type]
+
+That enum class only has three numerators, and it's not clear why gcc
+would warn, given all three cases return.
+
+---
+ src/core/lib/promise/party.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: grpc-1.61.0/src/core/lib/promise/party.h
+===================================================================
+--- grpc-1.61.0.orig/src/core/lib/promise/party.h
++++ grpc-1.61.0/src/core/lib/promise/party.h
+@@ -538,6 +538,7 @@ class Party : public Activity, private W
+           Crash(
+               "unreachable: promises should not be repolled after completion");
+       }
++      std::terminate();
+     }
+ 
+     // Outside party poll: check whether the spawning party has completed this
+@@ -550,6 +552,7 @@ class Party : public Activity, private W
+         case State::kResult:
+           return std::move(result_);
+       }
++      std::terminate();
+     }
+ 
+     void Destroy() override { this->Unref(); }

v1.60.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:437068b8b777d3b339da94d3498f1dc20642ac9bfa76db43abdd522186b1542b
-size 17442762

v1.61.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aa1e25461879fa674584a9f5d5aec998845b1dfe5746c16cc16eeba5c1c83abe
+size 17401913