From 33000ff880c8fe07b8b3ca4bb81d1d468c421823f334a35b6849500b47efacb1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 31 Jan 2024 22:28:04 +0000 Subject: [PATCH] - Update to release 1.61 OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=180 --- grpc.changes | 11 +++++++++++ grpc.spec | 19 ++++++++----------- terminate.patch | 35 +++++++++++++++++++++++++++++++++++ v1.60.0.tar.gz | 3 --- v1.61.0.tar.gz | 3 +++ 5 files changed, 57 insertions(+), 14 deletions(-) create mode 100644 terminate.patch delete mode 100644 v1.60.0.tar.gz create mode 100644 v1.61.0.tar.gz diff --git a/grpc.changes b/grpc.changes index 8298f81..831cb08 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jan 31 19:51:15 UTC 2024 - Jan Engelhardt + +- 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 diff --git a/grpc.spec b/grpc.spec index 2f31317..271ec04 100644 --- a/grpc.spec +++ b/grpc.spec @@ -16,11 +16,11 @@ # -%define lver 37 -%define lverp 1_60 +%define lver 38 +%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 -# Fix unaligned access on ARM -Patch1: ARM-Unaligned-access-fixes.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 +Patch1: terminate.patch +Patch4: ARM-Unaligned-access-fixes.patch +Patch5: 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 -%patch2 -p1 +%patch -P 4 -P 5 -p1 popd rm -Rf third_party/abseil-cpp/ diff --git a/terminate.patch b/terminate.patch new file mode 100644 index 0000000..9803eeb --- /dev/null +++ b/terminate.patch @@ -0,0 +1,35 @@ +From: Jan Engelhardt +Date: 2024-01-31 20:50:55.596208216 +0100 + +[ 221s] src/core/lib/promise/party.h: In member function 'bool grpc_core::Party::PromiseParticipantImpl::PollParticipantPromise() [with SuppliedFactory = grpc_core::ForwardCall(CallHandler, CallInitiator, ClientMetadataHandle):: mutable:: mutable::]': +[ 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::Promise::Result> grpc_core::Party::PromiseParticipantImpl::PollCompletion() [with SuppliedFactory = grpc_core::ForwardCall(CallHandler, CallInitiator, ClientMetadataHandle):: mutable:: mutable::]': +[ 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(); } diff --git a/v1.60.0.tar.gz b/v1.60.0.tar.gz deleted file mode 100644 index 09c7869..0000000 --- a/v1.60.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:437068b8b777d3b339da94d3498f1dc20642ac9bfa76db43abdd522186b1542b -size 17442762 diff --git a/v1.61.0.tar.gz b/v1.61.0.tar.gz new file mode 100644 index 0000000..df147cc --- /dev/null +++ b/v1.61.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa1e25461879fa674584a9f5d5aec998845b1dfe5746c16cc16eeba5c1c83abe +size 17401913