diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile index 07fb0d8c87c2..fb5bac6eaedf 100644 --- a/devel/grpc/Makefile +++ b/devel/grpc/Makefile @@ -1,67 +1,65 @@ PORTNAME= grpc -PORTVERSION= 1.50.1 +PORTVERSION= 1.51.1 DISTVERSIONPREFIX= v PORTEPOCH= 2 CATEGORIES= devel MAINTAINER= sunpoet@FreeBSD.org COMMENT= HTTP/2-based RPC framework WWW= https://grpc.io/ \ https://github.com/grpc/grpc LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/xxhash.h:devel/xxhash LIB_DEPENDS= libabsl_base.so:devel/abseil \ libbenchmark.so:devel/benchmark \ libcares.so:dns/c-ares \ - libgflags.so:devel/gflags \ libprotobuf.so:devel/protobuf \ libre2.so:devel/re2 USES= cmake compiler:c++17-lang cpe localbase:ldflags pkgconfig ssl USE_GITHUB= yes -GH_TUPLE= census-instrumentation:opencensus-proto:v0.3.0:census_instrumentation_opencensus_proto/third_party/opencensus-proto/src \ - cncf:xds:1e77728:cncf_xds/third_party/xds +GH_TUPLE= census-instrumentation:opencensus-proto:v0.4.1:census_instrumentation_opencensus_proto/third_party/opencensus-proto/src \ + cncf:xds:46e39c7:cncf_xds/third_party/xds CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17 \ -DgRPC_ABSL_PROVIDER=package \ -DgRPC_BENCHMARK_PROVIDER=package \ -DgRPC_CARES_PROVIDER=package \ - -DgRPC_GFLAGS_PROVIDER=package \ -DgRPC_PROTOBUF_PROVIDER=package \ -DgRPC_RE2_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package CMAKE_OFF= gRPC_BACKWARDS_COMPATIBILITY_MODE gRPC_BUILD_TESTS CMAKE_ON= BUILD_SHARED_LIBS gRPC_BUILD_CODEGEN gRPC_BUILD_CSHARP_EXT gRPC_BUILD_GRPC_CPP_PLUGIN gRPC_BUILD_GRPC_CSHARP_PLUGIN gRPC_BUILD_GRPC_NODE_PLUGIN gRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN gRPC_BUILD_GRPC_PHP_PLUGIN gRPC_BUILD_GRPC_PYTHON_PLUGIN gRPC_BUILD_GRPC_RUBY_PLUGIN USE_CSTD= c11 USE_CXXSTD= c++17 USE_LDCONFIG= yes PLIST_SUB= SHLIB_MAJOR=${PORTVERSION:R} \ SHLIB_MINOR=${PORTVERSION:E} -CONFLICTS_INSTALL= grpc130 grpc134 grpc142 +CONFLICTS_INSTALL= grpc[0-9][0-9][0-9] .include # Remove openssl from grpc.pc because we do not ship openssl.pc in base system .if ${SSL_DEFAULT} == base EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openssl .endif post-patch: # Clean up bundled libraries @${RM} -r ${WRKSRC}/third_party/abseil-cpp/ @${RM} -r ${WRKSRC}/third_party/benchmark/ @${RM} -r ${WRKSRC}/third_party/boringssl-with-bazel/ @${RM} -r ${WRKSRC}/third_party/cares/ @${RM} -r ${WRKSRC}/third_party/protobuf/ @${RM} -r ${WRKSRC}/third_party/re2/ @${RM} -r ${WRKSRC}/third_party/xxhash/ @${RM} -r ${WRKSRC}/third_party/zlib/ .include diff --git a/devel/grpc/distinfo b/devel/grpc/distinfo index 3f9072f8f124..d74dc976b473 100644 --- a/devel/grpc/distinfo +++ b/devel/grpc/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1669057520 -SHA256 (grpc-grpc-v1.50.1_GH0.tar.gz) = fb1ed98eb3555877d55eb2b948caca44bc8601c6704896594de81558639709ef -SIZE (grpc-grpc-v1.50.1_GH0.tar.gz) = 8434595 -SHA256 (census-instrumentation-opencensus-proto-v0.3.0_GH0.tar.gz) = b7e13f0b4259e80c3070b583c2f39e53153085a6918718b1c710caf7037572b0 -SIZE (census-instrumentation-opencensus-proto-v0.3.0_GH0.tar.gz) = 163404 -SHA256 (cncf-xds-1e77728_GH0.tar.gz) = 6d1ca5e2641488aa69e9ea11dd3547afaaf43d01108cb8618db1f164f2532042 -SIZE (cncf-xds-1e77728_GH0.tar.gz) = 103444 +TIMESTAMP = 1674306306 +SHA256 (grpc-grpc-v1.51.1_GH0.tar.gz) = b55696fb249669744de3e71acc54a9382bea0dce7cd5ba379b356b12b82d4229 +SIZE (grpc-grpc-v1.51.1_GH0.tar.gz) = 8550112 +SHA256 (census-instrumentation-opencensus-proto-v0.4.1_GH0.tar.gz) = e3d89f7f9ed84c9b6eee818c2e9306950519402bf803698b15c310b77ca2f0f3 +SIZE (census-instrumentation-opencensus-proto-v0.4.1_GH0.tar.gz) = 164379 +SHA256 (cncf-xds-46e39c7_GH0.tar.gz) = f49388ea0b3798e25b9cdca2982246a5beca7a32be56cf9ef7c7f3bd02ff36ca +SIZE (cncf-xds-46e39c7_GH0.tar.gz) = 103751 diff --git a/devel/grpc/files/extra-patch-openssl b/devel/grpc/files/extra-patch-openssl index 60b296e06ecd..e4be36fac303 100644 --- a/devel/grpc/files/extra-patch-openssl +++ b/devel/grpc/files/extra-patch-openssl @@ -1,11 +1,11 @@ ---- CMakeLists.txt.orig 2022-09-14 01:34:30 UTC +--- CMakeLists.txt.orig 2022-11-22 23:31:21 UTC +++ CMakeLists.txt -@@ -21945,7 +21945,7 @@ generate_pkgconfig( +@@ -23185,7 +23185,7 @@ generate_pkgconfig( "gRPC" "high performance general RPC framework" "${gRPC_CORE_VERSION}" -- "gpr openssl absl_any_invocable absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional 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 absl_any_invocable absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional 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 openssl absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional 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 absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional 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" "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz" "" "grpc.pc") diff --git a/devel/grpc/pkg-plist b/devel/grpc/pkg-plist index 5bc5e250aaf8..7ba3b9fd7345 100644 --- a/devel/grpc/pkg-plist +++ b/devel/grpc/pkg-plist @@ -1,318 +1,322 @@ bin/grpc_cpp_plugin bin/grpc_csharp_plugin bin/grpc_node_plugin bin/grpc_objective_c_plugin bin/grpc_php_plugin bin/grpc_python_plugin bin/grpc_ruby_plugin include/grpc++/alarm.h include/grpc++/channel.h include/grpc++/client_context.h include/grpc++/completion_queue.h include/grpc++/create_channel.h include/grpc++/create_channel_posix.h include/grpc++/ext/health_check_service_server_builder_option.h include/grpc++/ext/proto_server_reflection_plugin.h include/grpc++/generic/async_generic_service.h include/grpc++/generic/generic_stub.h include/grpc++/grpc++.h include/grpc++/health_check_service_interface.h include/grpc++/impl/call.h include/grpc++/impl/channel_argument_option.h include/grpc++/impl/client_unary_call.h include/grpc++/impl/codegen/async_stream.h include/grpc++/impl/codegen/async_unary_call.h include/grpc++/impl/codegen/byte_buffer.h include/grpc++/impl/codegen/call.h include/grpc++/impl/codegen/call_hook.h include/grpc++/impl/codegen/channel_interface.h include/grpc++/impl/codegen/client_context.h include/grpc++/impl/codegen/client_unary_call.h include/grpc++/impl/codegen/completion_queue.h include/grpc++/impl/codegen/completion_queue_tag.h include/grpc++/impl/codegen/config.h include/grpc++/impl/codegen/config_protobuf.h include/grpc++/impl/codegen/core_codegen.h include/grpc++/impl/codegen/core_codegen_interface.h include/grpc++/impl/codegen/create_auth_context.h include/grpc++/impl/codegen/grpc_library.h include/grpc++/impl/codegen/metadata_map.h include/grpc++/impl/codegen/method_handler_impl.h include/grpc++/impl/codegen/proto_utils.h include/grpc++/impl/codegen/rpc_method.h include/grpc++/impl/codegen/rpc_service_method.h include/grpc++/impl/codegen/security/auth_context.h include/grpc++/impl/codegen/serialization_traits.h include/grpc++/impl/codegen/server_context.h include/grpc++/impl/codegen/server_interface.h include/grpc++/impl/codegen/service_type.h include/grpc++/impl/codegen/slice.h include/grpc++/impl/codegen/status.h include/grpc++/impl/codegen/status_code_enum.h include/grpc++/impl/codegen/string_ref.h include/grpc++/impl/codegen/stub_options.h include/grpc++/impl/codegen/sync_stream.h include/grpc++/impl/codegen/time.h include/grpc++/impl/grpc_library.h include/grpc++/impl/method_handler_impl.h include/grpc++/impl/rpc_method.h include/grpc++/impl/rpc_service_method.h include/grpc++/impl/serialization_traits.h include/grpc++/impl/server_builder_option.h include/grpc++/impl/server_builder_plugin.h include/grpc++/impl/server_initializer.h include/grpc++/impl/service_type.h include/grpc++/resource_quota.h include/grpc++/security/auth_context.h include/grpc++/security/auth_metadata_processor.h include/grpc++/security/credentials.h include/grpc++/security/server_credentials.h include/grpc++/server.h include/grpc++/server_builder.h include/grpc++/server_context.h include/grpc++/server_posix.h include/grpc++/support/async_stream.h include/grpc++/support/async_unary_call.h include/grpc++/support/byte_buffer.h include/grpc++/support/channel_arguments.h include/grpc++/support/config.h include/grpc++/support/error_details.h include/grpc++/support/slice.h include/grpc++/support/status.h include/grpc++/support/status_code_enum.h include/grpc++/support/string_ref.h include/grpc++/support/stub_options.h include/grpc++/support/sync_stream.h include/grpc++/support/time.h include/grpc/byte_buffer.h include/grpc/byte_buffer_reader.h include/grpc/census.h include/grpc/compression.h include/grpc/event_engine/endpoint_config.h include/grpc/event_engine/event_engine.h include/grpc/event_engine/internal/memory_allocator_impl.h include/grpc/event_engine/memory_allocator.h include/grpc/event_engine/memory_request.h include/grpc/event_engine/port.h include/grpc/event_engine/slice.h include/grpc/event_engine/slice_buffer.h include/grpc/fork.h include/grpc/grpc.h include/grpc/grpc_posix.h include/grpc/grpc_security.h include/grpc/grpc_security_constants.h include/grpc/impl/codegen/atm.h include/grpc/impl/codegen/atm_gcc_atomic.h include/grpc/impl/codegen/atm_gcc_sync.h include/grpc/impl/codegen/atm_windows.h include/grpc/impl/codegen/byte_buffer.h include/grpc/impl/codegen/byte_buffer_reader.h include/grpc/impl/codegen/compression_types.h include/grpc/impl/codegen/connectivity_state.h include/grpc/impl/codegen/fork.h include/grpc/impl/codegen/gpr_slice.h include/grpc/impl/codegen/gpr_types.h include/grpc/impl/codegen/grpc_types.h include/grpc/impl/codegen/log.h include/grpc/impl/codegen/port_platform.h include/grpc/impl/codegen/propagation_bits.h include/grpc/impl/codegen/slice.h include/grpc/impl/codegen/status.h include/grpc/impl/codegen/sync.h include/grpc/impl/codegen/sync_abseil.h include/grpc/impl/codegen/sync_custom.h include/grpc/impl/codegen/sync_generic.h include/grpc/impl/codegen/sync_posix.h include/grpc/impl/codegen/sync_windows.h include/grpc/load_reporting.h include/grpc/slice.h include/grpc/slice_buffer.h include/grpc/status.h include/grpc/support/alloc.h include/grpc/support/atm.h include/grpc/support/atm_gcc_atomic.h include/grpc/support/atm_gcc_sync.h include/grpc/support/atm_windows.h include/grpc/support/cpu.h include/grpc/support/log.h include/grpc/support/log_windows.h include/grpc/support/port_platform.h include/grpc/support/string_util.h include/grpc/support/sync.h include/grpc/support/sync_abseil.h include/grpc/support/sync_custom.h include/grpc/support/sync_generic.h include/grpc/support/sync_posix.h include/grpc/support/sync_windows.h include/grpc/support/thd_id.h include/grpc/support/time.h include/grpc/support/workaround_list.h include/grpcpp/alarm.h include/grpcpp/channel.h include/grpcpp/client_context.h include/grpcpp/completion_queue.h include/grpcpp/create_channel.h include/grpcpp/create_channel_binder.h include/grpcpp/create_channel_posix.h include/grpcpp/ext/call_metric_recorder.h include/grpcpp/ext/channelz_service_plugin.h include/grpcpp/ext/health_check_service_server_builder_option.h include/grpcpp/ext/proto_server_reflection_plugin.h include/grpcpp/generic/async_generic_service.h include/grpcpp/generic/generic_stub.h include/grpcpp/grpcpp.h include/grpcpp/health_check_service_interface.h include/grpcpp/impl/call.h include/grpcpp/impl/call_hook.h +include/grpcpp/impl/call_op_set.h include/grpcpp/impl/call_op_set_interface.h include/grpcpp/impl/channel_argument_option.h +include/grpcpp/impl/channel_interface.h include/grpcpp/impl/client_unary_call.h include/grpcpp/impl/codegen/async_generic_service.h include/grpcpp/impl/codegen/async_stream.h include/grpcpp/impl/codegen/async_unary_call.h include/grpcpp/impl/codegen/byte_buffer.h include/grpcpp/impl/codegen/call.h include/grpcpp/impl/codegen/call_hook.h include/grpcpp/impl/codegen/call_op_set.h include/grpcpp/impl/codegen/call_op_set_interface.h include/grpcpp/impl/codegen/callback_common.h include/grpcpp/impl/codegen/channel_interface.h include/grpcpp/impl/codegen/client_callback.h include/grpcpp/impl/codegen/client_context.h include/grpcpp/impl/codegen/client_interceptor.h include/grpcpp/impl/codegen/client_unary_call.h include/grpcpp/impl/codegen/completion_queue.h include/grpcpp/impl/codegen/completion_queue_tag.h include/grpcpp/impl/codegen/config.h include/grpcpp/impl/codegen/config_protobuf.h include/grpcpp/impl/codegen/core_codegen.h include/grpcpp/impl/codegen/core_codegen_interface.h include/grpcpp/impl/codegen/create_auth_context.h include/grpcpp/impl/codegen/delegating_channel.h include/grpcpp/impl/codegen/grpc_library.h include/grpcpp/impl/codegen/intercepted_channel.h include/grpcpp/impl/codegen/interceptor.h include/grpcpp/impl/codegen/interceptor_common.h include/grpcpp/impl/codegen/message_allocator.h include/grpcpp/impl/codegen/metadata_map.h include/grpcpp/impl/codegen/method_handler.h include/grpcpp/impl/codegen/method_handler_impl.h include/grpcpp/impl/codegen/proto_buffer_reader.h include/grpcpp/impl/codegen/proto_buffer_writer.h include/grpcpp/impl/codegen/proto_utils.h include/grpcpp/impl/codegen/rpc_method.h include/grpcpp/impl/codegen/rpc_service_method.h include/grpcpp/impl/codegen/security/auth_context.h include/grpcpp/impl/codegen/serialization_traits.h include/grpcpp/impl/codegen/server_callback.h include/grpcpp/impl/codegen/server_callback_handlers.h include/grpcpp/impl/codegen/server_context.h include/grpcpp/impl/codegen/server_interceptor.h include/grpcpp/impl/codegen/server_interface.h include/grpcpp/impl/codegen/service_type.h include/grpcpp/impl/codegen/slice.h include/grpcpp/impl/codegen/status.h include/grpcpp/impl/codegen/status_code_enum.h include/grpcpp/impl/codegen/string_ref.h include/grpcpp/impl/codegen/stub_options.h include/grpcpp/impl/codegen/sync.h include/grpcpp/impl/codegen/sync_stream.h include/grpcpp/impl/codegen/time.h include/grpcpp/impl/grpc_library.h include/grpcpp/impl/method_handler_impl.h include/grpcpp/impl/rpc_method.h include/grpcpp/impl/rpc_service_method.h include/grpcpp/impl/serialization_traits.h include/grpcpp/impl/server_builder_option.h include/grpcpp/impl/server_builder_plugin.h include/grpcpp/impl/server_initializer.h include/grpcpp/impl/service_type.h include/grpcpp/resource_quota.h include/grpcpp/security/alts_context.h include/grpcpp/security/alts_util.h include/grpcpp/security/auth_context.h include/grpcpp/security/auth_metadata_processor.h include/grpcpp/security/authorization_policy_provider.h include/grpcpp/security/binder_credentials.h include/grpcpp/security/binder_security_policy.h include/grpcpp/security/credentials.h include/grpcpp/security/server_credentials.h include/grpcpp/security/tls_certificate_provider.h include/grpcpp/security/tls_certificate_verifier.h include/grpcpp/security/tls_credentials_options.h include/grpcpp/server.h include/grpcpp/server_builder.h include/grpcpp/server_context.h include/grpcpp/server_posix.h include/grpcpp/support/async_stream.h include/grpcpp/support/async_unary_call.h include/grpcpp/support/byte_buffer.h +include/grpcpp/support/callback_common.h include/grpcpp/support/channel_arguments.h include/grpcpp/support/client_callback.h include/grpcpp/support/client_interceptor.h include/grpcpp/support/config.h include/grpcpp/support/error_details.h include/grpcpp/support/interceptor.h include/grpcpp/support/message_allocator.h include/grpcpp/support/method_handler.h include/grpcpp/support/proto_buffer_reader.h include/grpcpp/support/proto_buffer_writer.h include/grpcpp/support/server_callback.h include/grpcpp/support/server_interceptor.h include/grpcpp/support/slice.h include/grpcpp/support/status.h include/grpcpp/support/status_code_enum.h include/grpcpp/support/string_ref.h include/grpcpp/support/stub_options.h include/grpcpp/support/sync_stream.h include/grpcpp/support/time.h include/grpcpp/support/validate_service_config.h +include/grpcpp/version_info.h include/grpcpp/xds_server_builder.h lib/cmake/grpc/gRPCConfig.cmake lib/cmake/grpc/gRPCConfigVersion.cmake lib/cmake/grpc/gRPCTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/grpc/gRPCTargets.cmake lib/cmake/grpc/modules/Findc-ares.cmake lib/cmake/grpc/modules/Findre2.cmake lib/libaddress_sorting.so -lib/libaddress_sorting.so.28 -lib/libaddress_sorting.so.28.0.0 +lib/libaddress_sorting.so.29 +lib/libaddress_sorting.so.29.0.0 lib/libgpr.so -lib/libgpr.so.28 -lib/libgpr.so.28.0.0 +lib/libgpr.so.29 +lib/libgpr.so.29.0.0 lib/libgrpc++.so lib/libgrpc++.so.%%SHLIB_MAJOR%% lib/libgrpc++.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% lib/libgrpc++_alts.so lib/libgrpc++_alts.so.%%SHLIB_MAJOR%% lib/libgrpc++_alts.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% lib/libgrpc++_error_details.so lib/libgrpc++_error_details.so.%%SHLIB_MAJOR%% lib/libgrpc++_error_details.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% lib/libgrpc++_reflection.so lib/libgrpc++_reflection.so.%%SHLIB_MAJOR%% lib/libgrpc++_reflection.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% lib/libgrpc++_unsecure.so lib/libgrpc++_unsecure.so.%%SHLIB_MAJOR%% lib/libgrpc++_unsecure.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% lib/libgrpc.so -lib/libgrpc.so.28 -lib/libgrpc.so.28.0.0 +lib/libgrpc.so.29 +lib/libgrpc.so.29.0.0 lib/libgrpc_plugin_support.so lib/libgrpc_plugin_support.so.%%SHLIB_MAJOR%% lib/libgrpc_plugin_support.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% lib/libgrpc_unsecure.so -lib/libgrpc_unsecure.so.28 -lib/libgrpc_unsecure.so.28.0.0 +lib/libgrpc_unsecure.so.29 +lib/libgrpc_unsecure.so.29.0.0 lib/libgrpcpp_channelz.so lib/libgrpcpp_channelz.so.%%SHLIB_MAJOR%% lib/libgrpcpp_channelz.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% lib/libupb.so -lib/libupb.so.28 -lib/libupb.so.28.0.0 +lib/libupb.so.29 +lib/libupb.so.29.0.0 libdata/pkgconfig/gpr.pc libdata/pkgconfig/grpc++.pc libdata/pkgconfig/grpc++_unsecure.pc libdata/pkgconfig/grpc.pc libdata/pkgconfig/grpc_unsecure.pc %%DATADIR%%/roots.pem