[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     84d5bb0c3d44c52ad0ad966799fe1c2b2eeb252a
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Thu Jul 18 19:56:00 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 07:36:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d5bb0c

net-libs/grpc: add 1.65.1, drop 1.65.0

1.65.0 was yanked, move to 1.65.1

Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37608
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-libs/grpc/Manifest                             |   2 +-
 net-libs/grpc/files/grpc-1.65.0-system-gtest.patch |  14 +-
 .../{grpc-1.65.0.ebuild => grpc-1.65.1.ebuild}     | 164 +++++++++++++++++----
 3 files changed, 146 insertions(+), 34 deletions(-)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 9f1f912d579f..15bd602fc31c 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -4,4 +4,4 @@ DIST grpc-1.56.1.tar.gz 11750628 BLAKE2B 52ea088d3d19fa7c1d1dc44899cd67bfd0132df
 DIST grpc-1.57.0.tar.gz 17337863 BLAKE2B 10c6fb35f606806aeb25cd55dd993d9af168eb8b1db64b4515830e2144dc44f35ce8f8329316a38d933b8032a0eff386591a0ddb87f2e405c5deaba012db2824 SHA512 b323de7c1f35b9de3fb7bf02ff4db6993abb0eee6860bbf2082818dda405fbe3a19fad91c5b48565cb65c6318de739bb91e47b5095801c078c6cbf3e8c73600c
 DIST grpc-1.60.0.tar.gz 17442762 BLAKE2B 35cc0ea938deb848ca91e3d5f8879b85b80f94ac09b582600f05fee1f55c162ae98f2f744480f69d78e78da0c0f2d9e198f812101daaa1f1959869f26ba7d97a SHA512 91c2406ed4198509ac0d5360b3da6898fa4f40f459eb6fff541faa44cc238eed98fd7489e7ef7a80a6f4a318bc5b9130eaa0ba1beaa358d1c074fc82825648ff
 DIST grpc-1.62.1.tar.gz 22384671 BLAKE2B 134e40732e784e52d518cde6e518e4c08e2f67a025754d88b92a9a314f86e53bee33ee793395b9e225c0895c6ac8b9c036892c82c19d0fddf69909a22eac4b78 SHA512 3224ad2617c18156f90c54c1ebf1f2015e405a6f12546e8709e0c905f52508c9f1a13b4d5a6cc7a35abf58b429985b5b504c9062f50c0d3d6aa163180a61047a
-DIST grpc-1.65.0.tar.gz 22537894 BLAKE2B 08b53b515b6e80c19aae6b9d3af969f79cc0f25413bc60106276030cd45df677bc67a94327da1439a2c469d49ed71043cf852f38e7fa5a36c2cb875a71bd3aa5 SHA512 18fbce2f77caca6bd21374db2234411ec37d27e5b171b1008aac6810f1a98e3f51826b9dc5e8bd29a746e4f2f31b2a87d6f1bbf988e72e321ca81e7b14f1a4b5
+DIST grpc-1.65.1.tar.gz 22539865 BLAKE2B f044305a1817c46d12b96d65a7d70e4342921d372bbeb127840ccbf5cda1f5a34daf7319cd8564a7d327f6abfbac67e4300f80cfe9e66dd49d65d77d30fd3402 SHA512 ca8ebe71fb88a0fc605706c3c81c349e79c40b347081a06795fa64550720bc745373ac5d167263d098e98553077cfda141e4f4be2eefa5f345ede9b0ddec4f54

diff --git a/net-libs/grpc/files/grpc-1.65.0-system-gtest.patch b/net-libs/grpc/files/grpc-1.65.0-system-gtest.patch
index 47be90892893..878ce10f8ffd 100644
--- a/net-libs/grpc/files/grpc-1.65.0-system-gtest.patch
+++ b/net-libs/grpc/files/grpc-1.65.0-system-gtest.patch
@@ -1,14 +1,11 @@
-https://bugs.gentoo.org/927403
-
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7a55616fb6..ee62502267 100644
+index d4d798f..824c4ed 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -3442,79 +3442,6 @@ if(gRPC_INSTALL)
-   )
+@@ -3504,77 +3504,8 @@ if(gRPC_INSTALL)
  endif()
  
--if(gRPC_BUILD_TESTS)
+ if(gRPC_BUILD_TESTS)
 -
 -add_library(gtest
 -  third_party/googletest/googlemock/src/gmock-cardinalities.cc
@@ -80,7 +77,8 @@ index 7a55616fb6..ee62502267 100644
 -)
 -
 -
--endif()
++  find_package(GTest REQUIRED)
++  enable_testing()
+ endif()
  
  add_library(upb_base_lib
-   third_party/upb/upb/base/status.c

diff --git a/net-libs/grpc/grpc-1.65.0.ebuild b/net-libs/grpc/grpc-1.65.1.ebuild
similarity index 57%
rename from net-libs/grpc/grpc-1.65.0.ebuild
rename to net-libs/grpc/grpc-1.65.1.ebuild
index b5a31691fd7d..448a008c7796 100644
--- a/net-libs/grpc/grpc-1.65.0.ebuild
+++ b/net-libs/grpc/grpc-1.65.1.ebuild
@@ -54,7 +54,9 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.65.0-system-gtest.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.65.0-system-gtest.patch"
+)
 
 python_check_deps() {
 	if use test; then
@@ -83,21 +85,23 @@ src_prepare() {
 	# implicitly picked up and linked to the test binaries.  However removing
 	# the vendored gtest to use the system one also removes these dependencies,
 	# so we have to redeclare them as dependencies of the test binaries individually.
-	local extra_libs=("gtest"
-					"gmock"
-					"\${_gRPC_RE2_LIBRARIES}"
-					"absl::flat_hash_set"
-					"absl::failure_signal_handler"
-					"absl::stacktrace"
-					"absl::symbolize"
-					"absl::flags"
-					"absl::flags_parse"
-					"absl::flags_reflection"
-					"absl::flags_usage"
-					"absl::strings"
-					"absl::any"
-					"absl::optional"
-					"absl::variant")
+	local extra_libs=(
+		"GTest::gtest"
+		"GTest::gmock"
+		"\${_gRPC_RE2_LIBRARIES}"
+		"absl::flat_hash_set"
+		"absl::failure_signal_handler"
+		"absl::stacktrace"
+		"absl::symbolize"
+		"absl::flags"
+		"absl::flags_parse"
+		"absl::flags_reflection"
+		"absl::flags_usage"
+		"absl::strings"
+		"absl::any"
+		"absl::optional"
+		"absl::variant"
+	)
 	: "$(echo "${extra_libs[@]}" | "${EPYTHON}" -c 'import sys;print("\\n\\1".join(sys.stdin.read().split()))')"
 	local rstring="${_}"
 	sed -i -E "s/( +)gtest/\1${rstring}/g" "CMakeLists.txt" || die
@@ -108,7 +112,6 @@ src_prepare() {
 		import json, pathlib
 
 		print("if(gRPC_BUILD_TESTS)")
-		print("  ENABLE_TESTING()")
 		for line in [
 		  json.dumps([t["name"], "./" + t["name"], *t["args"]]).translate(
 		  str.maketrans(dict.fromkeys("[],", None))
@@ -147,6 +150,7 @@ src_configure() {
 	filter-lto
 
 	local mycmakeargs=(
+		-DgRPC_DOWNLOAD_ARCHIVES=OFF
 		-DgRPC_INSTALL=ON
 		-DgRPC_ABSL_PROVIDER=package
 		-DgRPC_CARES_PROVIDER=package
@@ -157,8 +161,8 @@ src_configure() {
 		-DgRPC_SSL_PROVIDER=package
 		-DgRPC_ZLIB_PROVIDER=package
 		-DgRPC_BUILD_TESTS=$(usex test)
+		-DgRPC_USE_SYSTEMD=$(usex systemd ON OFF)
 		-DCMAKE_CXX_STANDARD=17
-		-DCMAKE_DISABLE_FIND_PACKAGE_systemd=$(usex !systemd)
 		$(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '')
 	)
 	cmake_src_configure
@@ -176,13 +180,123 @@ src_test() {
 		--fail --silent --output /dev/null "http://localhost:32766/get" || die
 
 	CMAKE_SKIP_TESTS=(
-		no_logging_test # hangs everywhere, no output
-		grpc_tool_test # fails everywhere
-		examine_stack_test # fails on amd64 only
-		stack_tracer_test # fails on amd64 only
-		endpoint_pair_test # fails on alpha
-		event_poller_posix_test # fails on alpha
-		tcp_posix_test # fails on alpha
+		# CallCommandWithTimeoutDeadlineSet has a timeout set to 5000.25 seconds
+		^grpc_tool_test$
+
+		# Need network access
+		^posix_event_engine_native_dns_test$
+		^posix_event_engine_test$
+		^resolve_address_using_ares_resolver_test$
+		^resolve_address_using_native_resolver_test$
+	)
+
+	use amd64 && CMAKE_SKIP_TESTS+=(
+		^examine_stack_test$ # fails on amd64 only
+		^stack_tracer_test$ # fails on amd64 only
+	)
+
+	use alpha && CMAKE_SKIP_TESTS+=(
+		^endpoint_pair_test$ # fails on alpha
+		^event_poller_posix_test$ # fails on alpha
+		^tcp_posix_test$ # fails on alpha
+	)
+
+	# NOTE breaks with shared linking because the metric is twice initialised in a static function in a anonymous namespace
+	# metrics.cc:49] Metric name grpc.lb.pick_first.disconnections has already been registered.
+	# https://bugs.gentoo.org/935787 Leave the bug open until we fixed the underlying issue
+	CMAKE_SKIP_TESTS+=(
+		^bad_ping_test$
+		^binary_metadata_test$
+		^call_creds_test$
+		^call_host_override_test$
+		^cancel_after_accept_test$
+		^cancel_after_client_done_test$
+		^cancel_after_invoke_test$
+		^cancel_after_round_trip_test$
+		^cancel_before_invoke_test$
+		^cancel_in_a_vacuum_test$
+		^cancel_with_status_test$
+		^client_streaming_test$
+		^compressed_payload_test$
+		^connectivity_test$
+		^default_host_test$
+		^disappearing_server_test$
+		^empty_batch_test$
+		^filter_causes_close_test$
+		^filter_init_fails_test$
+		^filter_test_test$
+		^filtered_metadata_test$
+		^graceful_server_shutdown_test$
+		^grpc_authz_test$
+		^high_initial_seqno_test$
+		^hpack_size_test$
+		^http2_stats_test$
+		^invoke_large_request_test$
+		^keepalive_timeout_test$
+		^large_metadata_test$
+		^max_concurrent_streams_test$
+		^max_connection_age_test$
+		^max_connection_idle_test$
+		^max_message_length_test$
+		^negative_deadline_test$
+		^no_logging_test$
+		^no_op_test$
+		^payload_test$
+		^ping_pong_streaming_test$
+		^ping_test$
+		^proxy_auth_test$
+		^registered_call_test$
+		^request_with_flags_test$
+		^request_with_payload_test$
+		^resource_quota_server_test$
+		^retry_cancel_after_first_attempt_starts_test$
+		^retry_cancel_during_delay_test$
+		^retry_cancel_with_multiple_send_batches_test$
+		^retry_cancellation_test$
+		^retry_disabled_test$
+		^retry_exceeds_buffer_size_in_delay_test$
+		^retry_exceeds_buffer_size_in_initial_batch_test$
+		^retry_exceeds_buffer_size_in_subsequent_batch_test$
+		^retry_lb_drop_test$
+		^retry_lb_fail_test$
+		^retry_non_retriable_status_before_trailers_test$
+		^retry_non_retriable_status_test$
+		^retry_per_attempt_recv_timeout_on_last_attempt_test$
+		^retry_per_attempt_recv_timeout_test$
+		^retry_recv_initial_metadata_test$
+		^retry_recv_message_replay_test$
+		^retry_recv_message_test$
+		^retry_recv_trailing_metadata_error_test$
+		^retry_send_initial_metadata_refs_test$
+		^retry_send_op_fails_test$
+		^retry_send_recv_batch_test$
+		^retry_server_pushback_delay_test$
+		^retry_server_pushback_disabled_test$
+		^retry_streaming_after_commit_test$
+		^retry_streaming_succeeds_before_replay_finished_test$
+		^retry_streaming_test$
+		^retry_test$
+		^retry_throttled_test$
+		^retry_too_many_attempts_test$
+		^retry_transparent_goaway_test$
+		^retry_transparent_max_concurrent_streams_test$
+		^retry_transparent_not_sent_on_wire_test$
+		^retry_unref_before_finish_test$
+		^retry_unref_before_recv_test$
+		^server_finishes_request_test$
+		^server_streaming_test$
+		^shutdown_finishes_calls_test$
+		^shutdown_finishes_tags_test$
+		^simple_delayed_request_test$
+		^simple_metadata_test$
+		^simple_request_test$
+		^streaming_error_response_test$
+		^test_core_end2end_channelz_test$
+		^thread_pool_test$
+		^timeout_before_request_call_test$
+		^trailing_metadata_test$
+		^write_buffering_at_end_test$
+		^write_buffering_test$
 	)
 
 	# BUG this should be nonfatal and we kill the server even when tests fail