Adhere to changelog syntax requirements

* SO version bump in shlib package name
* add fixes for more missed return values from non-void functions to
  return-values.patch
* minor rebase of terminate.patch for updated version

grpc.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+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>
 

grpc.spec

@@ -16,11 +16,11 @@
 #
 
 
-%define lver 48
-%define lverp 1_73
+%define lver 49
+%define lverp 1_74
 %define src_install_dir /usr/src/%name
 Name:           grpc
-Version:        1.73.0
+Version:        1.74.0
 Release:        0
 Summary:        HTTP/2-based Remote Procedure Call implementation
 License:        Apache-2.0

link-failure.patch

@@ -11,11 +11,11 @@ happened since about 1.63 (last known good 1.62.x)
  CMakeLists.txt |    2 ++
  1 file changed, 2 insertions(+)
 
-Index: grpc-1.73.0/CMakeLists.txt
+Index: grpc-1.74.0/CMakeLists.txt
 ===================================================================
---- grpc-1.73.0.orig/CMakeLists.txt
-+++ grpc-1.73.0/CMakeLists.txt
-@@ -4328,6 +4328,7 @@ add_library(upb_reflection_lib
+--- 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
@@ -23,7 +23,7 @@ Index: grpc-1.73.0/CMakeLists.txt
  )
  
  target_compile_features(upb_reflection_lib PUBLIC cxx_std_17)
-@@ -4382,6 +4383,7 @@ endif()
+@@ -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

return-values.patch

@@ -5,14 +5,16 @@ 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/lib/transport/call_state.h |    5 +++++
- 1 file changed, 5 insertions(+)
+ 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(+)
 
-Index: grpc-1.70.1/src/core/lib/transport/call_state.h
+Index: grpc-1.74.0/src/core/call/call_state.h
 ===================================================================
---- grpc-1.70.1.orig/src/core/call/call_state.h
-+++ grpc-1.70.1/src/core/call/call_state.h
-@@ -154,6 +154,7 @@ class CallState {
+--- 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 {
        case ClientToServerPullState::kTerminated:
          return "Terminated";
      }
@@ -20,7 +22,7 @@ Index: grpc-1.70.1/src/core/lib/transport/call_state.h
    }
    template <typename Sink>
    friend void AbslStringify(Sink& out, ClientToServerPullState state) {
-@@ -184,6 +185,7 @@ class CallState {
+@@ -185,6 +186,7 @@ class CallState {
        case ClientToServerPushState::kFinished:
          return "Finished";
      }
@@ -28,7 +30,7 @@ Index: grpc-1.70.1/src/core/lib/transport/call_state.h
    }
    template <typename Sink>
    friend void AbslStringify(Sink& out, ClientToServerPushState state) {
-@@ -234,6 +236,7 @@ class CallState {
+@@ -235,6 +237,7 @@ class CallState {
        case ServerToClientPullState::kTerminated:
          return "Terminated";
      }
@@ -36,7 +38,7 @@ Index: grpc-1.70.1/src/core/lib/transport/call_state.h
    }
    template <typename Sink>
    friend void AbslStringify(Sink& out, ServerToClientPullState state) {
-@@ -274,6 +277,7 @@ class CallState {
+@@ -275,6 +278,7 @@ class CallState {
        case ServerToClientPushState::kFinished:
          return "Finished";
      }
@@ -44,7 +46,7 @@ Index: grpc-1.70.1/src/core/lib/transport/call_state.h
    }
    template <typename Sink>
    friend void AbslStringify(Sink& out, ServerToClientPushState state) {
-@@ -304,6 +308,7 @@ class CallState {
+@@ -305,6 +309,7 @@ class CallState {
        case ServerTrailingMetadataState::kPulledCancel:
          return "PulledCancel";
      }
@@ -52,3 +54,28 @@ Index: grpc-1.70.1/src/core/lib/transport/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.73.0/CMakeLists.txt
+Index: grpc-1.74.0/CMakeLists.txt
 ===================================================================
---- grpc-1.73.0.orig/CMakeLists.txt
-+++ grpc-1.73.0/CMakeLists.txt
-@@ -46148,7 +46148,7 @@ generate_pkgconfig(
+--- grpc-1.74.0.orig/CMakeLists.txt
++++ grpc-1.74.0/CMakeLists.txt
+@@ -47374,7 +47374,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_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_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_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++"
    "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"

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.61.0/src/core/lib/promise/party.h
+Index: grpc-1.74.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
+--- 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
            Crash(
                "unreachable: promises should not be repolled after completion");
        }
@@ -25,7 +25,7 @@ Index: grpc-1.61.0/src/core/lib/promise/party.h
      }
  
      // Outside party poll: check whether the spawning party has completed this
-@@ -550,6 +552,7 @@ class Party : public Activity, private W
+@@ -545,6 +546,7 @@ class Party : public Activity, private W
          case State::kResult:
            return std::move(result_);
        }