From 544ede585dd1ef0b590d84a91f10db350d276c42e014b890bcb6e1293f7118ad Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Sat, 8 Nov 2025 22:42:47 +0530 Subject: [PATCH] Update to version 1.76.0. --- grpc.changes | 24 ++++++++++++++++++++++++ grpc.spec | 6 +++--- link-failure.patch | 10 +++++----- return-values.patch | 24 ++++++++++++------------ telemetry.patch | 12 ++++++------ terminate.patch | 10 +++++----- v1.74.0.tar.gz | 3 --- v1.76.0.tar.gz | 3 +++ 8 files changed, 58 insertions(+), 34 deletions(-) delete mode 100644 v1.74.0.tar.gz create mode 100644 v1.76.0.tar.gz diff --git a/grpc.changes b/grpc.changes index bb81a1d..239f446 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Sat Nov 8 17:08:46 UTC 2025 - Atri Bhattacharya + +- Update to version 1.76.0: + * Core: + - Prioritize system CA over bundled CA (gh#grpc/grpc#40583). + - [event_engine] Introduce a event_engine_poller_for_python + experiment (gh#grpc/grpc#40243). + - [metrics] add grpc.lb.backend_service label + (gh#grpc/grpc#40486). +- Changes from version 1.75.0: + * Core: + - [Security] Cherry Pick Spiffe Verification + (gh#grpc/grpc#40515). + - [Python][Typeguard] Part 3 - Add Typeguard to AIO stack in + tests (gh#grpc/grpc#40217). + - [c-ares] update version to 1.34.5 (gh#grpc/grpc#39508). + - [pick_first] fix bug that caused us to stop attempting to + connect (gh#grpc/grpc#40162). + * C++: [OTel C++] Implement retry metrics (gh#grpc/grpc#39195). +- Bump so version in shared lib package in keeping with upstream. +- Minor rebase of telemetry.patch to apply cleanly against updated + version. + ------------------------------------------------------------------- Sun Jul 27 08:00:17 UTC 2025 - Atri Bhattacharya diff --git a/grpc.spec b/grpc.spec index 601f075..29c35ea 100644 --- a/grpc.spec +++ b/grpc.spec @@ -16,11 +16,11 @@ # -%define lver 49 -%define lverp 1_74 +%define lver 51 +%define lverp 1_76 %define src_install_dir /usr/src/%name Name: grpc -Version: 1.74.0 +Version: 1.76.0 Release: 0 Summary: HTTP/2-based Remote Procedure Call implementation License: Apache-2.0 diff --git a/link-failure.patch b/link-failure.patch index 8436b3c..7fc7fc9 100644 --- a/link-failure.patch +++ b/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.74.0/CMakeLists.txt +Index: grpc-1.76.0/CMakeLists.txt =================================================================== ---- grpc-1.74.0.orig/CMakeLists.txt -+++ grpc-1.74.0/CMakeLists.txt -@@ -4410,6 +4410,7 @@ add_library(upb_reflection_lib +--- grpc-1.76.0.orig/CMakeLists.txt ++++ grpc-1.76.0/CMakeLists.txt +@@ -4479,6 +4479,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.74.0/CMakeLists.txt ) target_compile_features(upb_reflection_lib PUBLIC cxx_std_17) -@@ -4464,6 +4465,7 @@ endif() +@@ -4533,6 +4534,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 diff --git a/return-values.patch b/return-values.patch index 3c178bd..a68912c 100644 --- a/return-values.patch +++ b/return-values.patch @@ -10,10 +10,10 @@ Fix some terrible code. src/core/lib/promise/inter_activity_mutex.h | 2 ++ 3 files changed, 8 insertions(+) -Index: grpc-1.74.0/src/core/call/call_state.h +Index: grpc-1.76.0/src/core/call/call_state.h =================================================================== ---- grpc-1.74.0.orig/src/core/call/call_state.h -+++ grpc-1.74.0/src/core/call/call_state.h +--- grpc-1.76.0.orig/src/core/call/call_state.h ++++ grpc-1.76.0/src/core/call/call_state.h @@ -155,6 +155,7 @@ class CallState { case ClientToServerPullState::kTerminated: return "Terminated"; @@ -54,22 +54,22 @@ Index: grpc-1.74.0/src/core/call/call_state.h } template friend void AbslStringify(Sink& out, ServerTrailingMetadataState state) { -Index: grpc-1.74.0/src/core/channelz/channelz.h +Index: grpc-1.76.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 KindToEntityType(absl::string_view kind) { -Index: grpc-1.74.0/src/core/lib/promise/inter_activity_mutex.h +Index: grpc-1.76.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 +--- grpc-1.76.0.orig/src/core/lib/promise/inter_activity_mutex.h ++++ grpc-1.76.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"; diff --git a/telemetry.patch b/telemetry.patch index 64217cd..77ef9ac 100644 --- a/telemetry.patch +++ b/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.76.0/CMakeLists.txt =================================================================== ---- grpc-1.74.0.orig/CMakeLists.txt -+++ grpc-1.74.0/CMakeLists.txt -@@ -47374,7 +47374,7 @@ generate_pkgconfig( +--- grpc-1.76.0.orig/CMakeLists.txt ++++ grpc-1.76.0/CMakeLists.txt +@@ -52022,7 +52022,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_btree absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_dynamic_annotations absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_layout absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_node_hash_map absl_optional absl_prefetch 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_strings_internal 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_dynamic_annotations absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_layout absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_node_hash_map absl_optional absl_prefetch 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_strings_internal 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" diff --git a/terminate.patch b/terminate.patch index df330fc..27b9fdd 100644 --- a/terminate.patch +++ b/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.76.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.76.0.orig/src/core/lib/promise/party.h ++++ grpc-1.76.0/src/core/lib/promise/party.h +@@ -530,6 +530,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 +@@ -542,6 +543,7 @@ class Party : public Activity, private W case State::kResult: return std::move(result_); } diff --git a/v1.74.0.tar.gz b/v1.74.0.tar.gz deleted file mode 100644 index 2689e95..0000000 --- a/v1.74.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd6a2fa311ba8441bbefd2764c55b99136ff10f7ea42954be96006a2723d33fc -size 15014902 diff --git a/v1.76.0.tar.gz b/v1.76.0.tar.gz new file mode 100644 index 0000000..51338ba --- /dev/null +++ b/v1.76.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0af37b800953130b47c075b56683ee60bdc3eda3c37fc6004193f5b569758204 +size 15387277 -- 2.51.1