Revert "Add grpc-pr38144-fix-pick_first.patch"

This reverts commit e48c7d67ed.

ARM-Unaligned-access-fixes.patch

@@ -15,8 +15,8 @@ Subject: [PATCH] [ARM] Unaligned access fixes
 
 diff --git a/xxhash.h b/xxhash.h
 index 08ab794..4cf3f0d 100644
---- a/third_party/xxhash/xxhash.h
-+++ b/third_party/xxhash/xxhash.h
+--- a/xxhash.h
++++ b/xxhash.h
 @@ -1402,28 +1402,18 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr,
   */
  

Fix-compilation-on-RHEL-7-ppc64le-gcc-4.8.patch

@@ -9,8 +9,8 @@ Subject: [PATCH] Fix compilation on RHEL 7 ppc64le (gcc 4.8)
 
 diff --git a/xxhash.h b/xxhash.h
 index 4cf3f0d..b07de0c 100644
---- a/third_party/xxhash/xxhash.h
-+++ b/third_party/xxhash/xxhash.h
+--- a/xxhash.h
++++ b/xxhash.h
 @@ -4119,7 +4119,7 @@ XXH3_accumulate_512_vsx(  void* XXH_RESTRICT acc,
                      const void* XXH_RESTRICT secret)
  {

grpc.changes

@@ -1,69 +1,3 @@
--------------------------------------------------------------------
-Sun Jul 27 08:00:17 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
-
-- Update to version 1.74.0:
-  * Core:
-  * [OTel C++, Posix EE] Plumb TCP write timestamps and metrics
-    to OTel tracers (gh#grpc/grpc#39946).
-  * [EventEngine] Fix Python reconnect issues: use iomgr backup
-    poller when EE is disabled (gh#grpc/grpc#39894).
-  * [Python] Upgrade Pytype (Part - 1) (gh#grpc/grpc#39816).
-  * [Python] Upgrade black (gh#grpc/grpc#39774).
-  * [event_engine] Implement fork support in Posix Event Engine
-    (gh#grpc/grpc#38980).
-  * [http2] Fix GRPC_ARG_HTTP2_STREAM_LOOKAHEAD_BYTES for when
-    BDP is disabled (gh#grpc/grpc#39585).
-- Update return-values.patch with a couple more missed return
-  values from non-void functions.
-- Bump so version in shlib package name.
-- Re-base telemetry.patch for updated version.
-
--------------------------------------------------------------------
-Sun Jun  8 16:09:54 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
-
-- Update to version 1.73.0:
-  * Core: Added GPR_DISABLE_ABSEIL_SYNC (gh#grpc/grpc#39562).
-  * xds_override_host: pass through per-endpoint args when
-    creating subchannels (gh#grpc/grpc#39532).
-  * Expose GRPC_OPENSSL_CLEANUP_TIMEOUT to control shutdown grace
-    period (gh#grpc/grpc#39297).
-  * URI: fix parsing of user_info in proxy settings
-    (gh#grpc/grpc#39004).
-  * EventEngine: Fix busy loop in thread pool when shutting down
-    (gh#grpc/grpc#39258).
-  * Dep: Added a flag to build with openssl instead of boringssl
-    (gh#grpc/grpc#39188).
-  * EventEngine: Cleanup: EventEngine client, listener, and dns
-    experiments are on by default on all platforms
-    (gh#grpc/grpc#39079).
-  * C++: Mark OpenCensus and dependent APIs as deprecated
-    (gh#grpc/grpc#39554).
-- Minor rebase of patches for update:
-  * link-failure.patch.
-  * telemetry.patch.
-- Bump so version in shlib package name to 48, conforming to
-  upstream's.
-
--------------------------------------------------------------------
-Thu Jun  5 21:46:40 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 1.72.1
-  * RLS: fix use-after-free from accessing config after LB policy
-    shutdown
-  * EventEngine: Fix busy loop in thread pool when shutting down
-
--------------------------------------------------------------------
-Tue Mar 25 21:48:57 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 1.71
-  * Fix call attempt tracer lifetimes for retries
-  * Fixed a bug that caused grpc to stop triggering connection
-    attempts
-  * Added support for service "deprecated" option
-- Rework link-failure.patch to not link grpc_unsecure
-  into libgrpc(++). [boo#1237422]
-- Make build recipe POSIX sh compatible.
-
 -------------------------------------------------------------------
 Wed Feb 12 14:22:59 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
 

grpc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package grpc
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,11 +16,11 @@
 #
 
 
-%define lver 49
-%define lverp 1_74
+%define lver 45
+%define lverp 1_70
 %define src_install_dir /usr/src/%name
 Name:           grpc
-Version:        1.74.0
+Version:        1.70.1
 Release:        0
 Summary:        HTTP/2-based Remote Procedure Call implementation
 License:        Apache-2.0
@@ -130,7 +130,8 @@ BuildArch:      noarch
 This subpackage contains source code of the gRPC reference implementation.
 
 %prep
-%autosetup -p1
+%autosetup -N
+%patch -P 1 -P 2 -P 3 -P 4 -p1
 find "." -type f -exec grep -l '/usr/bin/python' {} + |
 	xargs -r perl -i -lpe \
 	's{#! ?/usr/bin/python\S*}{#!/usr/bin/python3}g;'
@@ -140,6 +141,9 @@ find "." -type f -exec grep -l '/usr/bin/env ' {} + |
 	 s{#! ?/usr/bin/env sh}{#!/bin/sh}g;
 	 s{#! ?/usr/bin/env bash}{#!/bin/bash}g;
 	 s{#! ?/usr/bin/env }{#!/usr/bin/}g;'
+pushd third_party/xxhash
+%patch -P 14 -P 15 -p1
+popd
 rm -Rf third_party/abseil-cpp/
 
 %build
@@ -156,7 +160,7 @@ cp -a /usr/src/opencensus-proto third_party/
 export CFLAGS="%optflags -Wno-error"
 export CXXFLAGS="$CFLAGS"
 find "." -type f -exec grep '/usr/bin/env ' {} + || :
-s="$PWD"
+pushd .
 %cmake -DgRPC_INSTALL=ON                  \
        -DgRPC_INSTALL_LIBDIR:PATH="%_lib" \
        -DgRPC_INSTALL_CMAKEDIR:PATH="%_libdir/cmake/grpc" \
@@ -169,24 +173,24 @@ s="$PWD"
        -DgRPC_ZLIB_PROVIDER=package \
        -DCMAKE_CXX_STANDARD=17
 %cmake_build
-cd "$s"
+popd
 find "." -type f -exec grep '/usr/bin/env ' {} + || :
 
 %install
 b="%buildroot"
 %cmake_install
 
-cd "$b/usr"
+pushd "$b/usr"
 rm -fv lib/*.a share/grpc/*.pem
-cd -
+popd
 
 # Install sources
-cd "%__builddir"
+pushd %__builddir
 rm -fv CMakeFiles/*.log
 make clean
 find . -type f "(" -name "*.so" -o -name "*.o" -o -name ".git*" -o \
 	-name "*.bin" -o -name "*.out" ")" -exec rm -Rfv {} +
-cd -
+popd
 # Don't include abseil-cpp in sources
 rm -fr third_party/abseil-cpp/*
 # Don't include non-deterministic log in sources

link-failure.patch

@@ -11,23 +11,23 @@ happened since about 1.63 (last known good 1.62.x)
  CMakeLists.txt |    2 ++
  1 file changed, 2 insertions(+)
 
-Index: grpc-1.74.0/CMakeLists.txt
+Index: grpc-1.70.1/CMakeLists.txt
 ===================================================================
---- grpc-1.74.0.orig/CMakeLists.txt
-+++ grpc-1.74.0/CMakeLists.txt
-@@ -4410,6 +4410,7 @@ add_library(upb_reflection_lib
-   third_party/upb/upb/reflection/method_def.c
-   third_party/upb/upb/reflection/oneof_def.c
-   third_party/upb/upb/reflection/service_def.c
-+  src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+--- grpc-1.70.1.orig/CMakeLists.txt
++++ grpc-1.70.1/CMakeLists.txt
+@@ -4091,6 +4091,7 @@ target_link_libraries(upb_json_lib
+   ${_gRPC_ALLTARGETS_LIBRARIES}
+   upb_mini_descriptor_lib
+   upb_wire_lib
++  grpc_unsecure
  )
  
- target_compile_features(upb_reflection_lib PUBLIC cxx_std_17)
-@@ -4464,6 +4465,7 @@ endif()
- add_library(upb_textformat_lib ${_gRPC_STATIC_WIN32}
-   third_party/upb/upb/text/encode.c
-   third_party/upb/upb/text/internal/encode.c
-+  src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+ 
+@@ -4348,6 +4349,7 @@ target_link_libraries(upb_textformat_lib
+   ${_gRPC_ALLTARGETS_LIBRARIES}
+   upb_mini_descriptor_lib
+   upb_wire_lib
++  grpc_unsecure
  )
  
- target_compile_features(upb_textformat_lib PUBLIC cxx_std_17)
+ 

return-values.patch

@@ -5,16 +5,14 @@ Fix some terrible code.
 
 [   28s] /home/abuild/rpmbuild/BUILD/grpc-1.70.1-build/grpc-1.70.1/src/core/lib/transport/call_state.h:157:3: error: control reaches end of non-void function [-Werror=return-type]
 ---
- src/core/call/call_state.h                  |    5 +++++
- src/core/channelz/channelz.h                |    1 +
- src/core/lib/promise/inter_activity_mutex.h |    2 ++
- 3 files changed, 8 insertions(+)
+ src/core/lib/transport/call_state.h |    5 +++++
+ 1 file changed, 5 insertions(+)
 
-Index: grpc-1.74.0/src/core/call/call_state.h
+Index: grpc-1.70.1/src/core/lib/transport/call_state.h
 ===================================================================
---- grpc-1.74.0.orig/src/core/call/call_state.h
-+++ grpc-1.74.0/src/core/call/call_state.h
-@@ -155,6 +155,7 @@ class CallState {
+--- grpc-1.70.1.orig/src/core/lib/transport/call_state.h
++++ grpc-1.70.1/src/core/lib/transport/call_state.h
+@@ -154,6 +154,7 @@ class CallState {
        case ClientToServerPullState::kTerminated:
          return "Terminated";
      }
@@ -22,7 +20,7 @@ Index: grpc-1.74.0/src/core/call/call_state.h
    }
    template <typename Sink>
    friend void AbslStringify(Sink& out, ClientToServerPullState state) {
-@@ -185,6 +186,7 @@ class CallState {
+@@ -184,6 +185,7 @@ class CallState {
        case ClientToServerPushState::kFinished:
          return "Finished";
      }
@@ -30,7 +28,7 @@ Index: grpc-1.74.0/src/core/call/call_state.h
    }
    template <typename Sink>
    friend void AbslStringify(Sink& out, ClientToServerPushState state) {
-@@ -235,6 +237,7 @@ class CallState {
+@@ -234,6 +236,7 @@ class CallState {
        case ServerToClientPullState::kTerminated:
          return "Terminated";
      }
@@ -38,7 +36,7 @@ Index: grpc-1.74.0/src/core/call/call_state.h
    }
    template <typename Sink>
    friend void AbslStringify(Sink& out, ServerToClientPullState state) {
-@@ -275,6 +278,7 @@ class CallState {
+@@ -274,6 +277,7 @@ class CallState {
        case ServerToClientPushState::kFinished:
          return "Finished";
      }
@@ -46,7 +44,7 @@ Index: grpc-1.74.0/src/core/call/call_state.h
    }
    template <typename Sink>
    friend void AbslStringify(Sink& out, ServerToClientPushState state) {
-@@ -305,6 +309,7 @@ class CallState {
+@@ -304,6 +308,7 @@ class CallState {
        case ServerTrailingMetadataState::kPulledCancel:
          return "PulledCancel";
      }
@@ -54,28 +52,3 @@ Index: grpc-1.74.0/src/core/call/call_state.h
    }
    template <typename Sink>
    friend void AbslStringify(Sink& out, ServerTrailingMetadataState state) {
-Index: grpc-1.74.0/src/core/channelz/channelz.h
-===================================================================
---- grpc-1.74.0.orig/src/core/channelz/channelz.h
-+++ grpc-1.74.0/src/core/channelz/channelz.h
-@@ -144,6 +144,7 @@ class BaseNode : public DualRefCounted<B
-       case EntityType::kCall:
-         return "call";
-     }
-+    return "unknown";
-   }
- 
-   static std::optional<EntityType> KindToEntityType(absl::string_view kind) {
-Index: grpc-1.74.0/src/core/lib/promise/inter_activity_mutex.h
-===================================================================
---- grpc-1.74.0.orig/src/core/lib/promise/inter_activity_mutex.h
-+++ grpc-1.74.0/src/core/lib/promise/inter_activity_mutex.h
-@@ -307,6 +307,8 @@ class InterActivityMutex {
-         case State::kMovedFrom:
-           LOG(FATAL) << "Mutex acquirer already moved from";
-       }
-+      // Control never actually reaches here
-+      return Pending{};
-     }
- 
-    private:

telemetry.patch

@@ -7,16 +7,16 @@ CMakeLists.txt is using a bundled copy of otel, so there is no .pc file to depen
  CMakeLists.txt |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: grpc-1.74.0/CMakeLists.txt
+Index: grpc-1.70.1/CMakeLists.txt
 ===================================================================
---- grpc-1.74.0.orig/CMakeLists.txt
-+++ grpc-1.74.0/CMakeLists.txt
-@@ -47374,7 +47374,7 @@ generate_pkgconfig(
+--- grpc-1.70.1.orig/CMakeLists.txt
++++ grpc-1.70.1/CMakeLists.txt
+@@ -51301,7 +51301,7 @@ generate_pkgconfig(
    "gRPC++ OpenTelemetry Plugin"
    "OpenTelemetry Plugin for gRPC C++"
    "${gRPC_CPP_VERSION}"
--  "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_btree absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_string_view absl_strings absl_synchronization absl_time absl_type_traits absl_utility gpr grpc grpc++ opentelemetry_api"
-+  "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_btree absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_string_view absl_strings absl_synchronization absl_time absl_type_traits absl_utility gpr grpc grpc++"
+-  "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc grpc++ opentelemetry_api"
++  "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc grpc++"
    "libcares openssl re2 zlib"
    "-lgrpcpp_otel_plugin"
-   "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_reflection_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mini_table_lib -lupb_hash_lib -lupb_mem_lib -lupb_base_lib -lupb_lex_lib"
+   "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"

terminate.patch

@@ -13,11 +13,11 @@ would warn, given all three cases return.
  src/core/lib/promise/party.h |    4 ++++
  1 file changed, 4 insertions(+)
 
-Index: grpc-1.74.0/src/core/lib/promise/party.h
+Index: grpc-1.61.0/src/core/lib/promise/party.h
 ===================================================================
---- grpc-1.74.0.orig/src/core/lib/promise/party.h
-+++ grpc-1.74.0/src/core/lib/promise/party.h
-@@ -533,6 +533,7 @@ class Party : public Activity, private W
+--- 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");
        }
@@ -25,7 +25,7 @@ Index: grpc-1.74.0/src/core/lib/promise/party.h
      }
  
      // Outside party poll: check whether the spawning party has completed this
-@@ -545,6 +546,7 @@ class Party : public Activity, private W
+@@ -550,6 +552,7 @@ class Party : public Activity, private W
          case State::kResult:
            return std::move(result_);
        }