Received: by mail.netbsd.org (Postfix, from userid 605) id F184284D8E; Sun, 25 Aug 2019 18:52:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7369B84CDF for ; Sun, 25 Aug 2019 18:52:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id bCeGjqbFffN9 for ; Sun, 25 Aug 2019 18:52:37 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 672CF84C85 for ; Sun, 25 Aug 2019 18:52:37 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 60CC1FBF4; Sun, 25 Aug 2019 18:52:37 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1566759157158560" MIME-Version: 1.0 Date: Sun, 25 Aug 2019 18:52:37 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/net/grpc To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20190825185237.60CC1FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1566759157158560 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Sun Aug 25 18:52:37 UTC 2019 Modified Files: pkgsrc/net/grpc: Makefile PLIST distinfo pkgsrc/net/grpc/patches: patch-CMakeLists.txt Log Message: grpc: updated to 1.23.0 Release v1.23.0 Core Add missing APP callback context for custom iomgr. Increase lower bound on DNS re-resolution period to 30 seconds. Make sure there is at least a header in the frame storge of H2. Fix segfault when forking while using gevent. Mpmcqueue. Disable the backup poller when using the background poller. Clearly callout the behavior for listening ports. Enable CFStream by default on iOS. Fix DNS resolver cooldown. Simplify and fix c-ares TCP path on Windows. Modify codegen to use grpc_impl namespace and other cleanup. C++ Channel idleness. Threadpool. Bump min CMake to 3.5.1 to match Google benchmark. Migrate from dep.proto. to dep[ProtoInfo] provider. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/grpc/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/grpc/PLIST cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/grpc/distinfo cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/grpc/patches/patch-CMakeLists.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1566759157158560 Content-Disposition: inline Content-Length: 12621 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/grpc/Makefile diff -u pkgsrc/net/grpc/Makefile:1.13 pkgsrc/net/grpc/Makefile:1.14 --- pkgsrc/net/grpc/Makefile:1.13 Wed Jul 3 20:06:42 2019 +++ pkgsrc/net/grpc/Makefile Sun Aug 25 18:52:37 2019 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2019/07/03 20:06:42 adam Exp $ +# $NetBSD: Makefile,v 1.14 2019/08/25 18:52:37 adam Exp $ -DISTNAME= grpc-1.22.0 +DISTNAME= grpc-1.23.0 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=grpc/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -15,6 +15,7 @@ USE_LANGUAGES+= c c++11 USE_TOOLS+= pkg-config CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON +# use cmake's find_package() to locate a pre-installed dependency CMAKE_ARGS+= -DgRPC_BENCHMARK_PROVIDER=package CMAKE_ARGS+= -DgRPC_CARES_PROVIDER=package CMAKE_ARGS+= -DgRPC_GFLAGS_PROVIDER=package Index: pkgsrc/net/grpc/PLIST diff -u pkgsrc/net/grpc/PLIST:1.8 pkgsrc/net/grpc/PLIST:1.9 --- pkgsrc/net/grpc/PLIST:1.8 Wed Jul 3 20:06:42 2019 +++ pkgsrc/net/grpc/PLIST Sun Aug 25 18:52:37 2019 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2019/07/03 20:06:42 adam Exp $ +@comment $NetBSD: PLIST,v 1.9 2019/08/25 18:52:37 adam Exp $ bin/grpc_cpp_plugin bin/grpc_csharp_plugin bin/grpc_node_plugin @@ -145,6 +145,7 @@ include/grpcpp/channel.h include/grpcpp/channel_impl.h include/grpcpp/client_context.h include/grpcpp/completion_queue.h +include/grpcpp/completion_queue_impl.h include/grpcpp/create_channel.h include/grpcpp/create_channel_impl.h include/grpcpp/create_channel_posix.h @@ -165,7 +166,9 @@ include/grpcpp/impl/channel_argument_opt 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_stream_impl.h include/grpcpp/impl/codegen/async_unary_call.h +include/grpcpp/impl/codegen/async_unary_call_impl.h include/grpcpp/impl/codegen/byte_buffer.h include/grpcpp/impl/codegen/call.h include/grpcpp/impl/codegen/call_hook.h @@ -174,6 +177,7 @@ include/grpcpp/impl/codegen/call_op_set_ 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_callback_impl.h include/grpcpp/impl/codegen/client_context.h include/grpcpp/impl/codegen/client_context_impl.h include/grpcpp/impl/codegen/client_interceptor.h @@ -201,6 +205,7 @@ include/grpcpp/impl/codegen/rpc_service_ 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_impl.h include/grpcpp/impl/codegen/server_context.h include/grpcpp/impl/codegen/server_context_impl.h include/grpcpp/impl/codegen/server_interceptor.h @@ -213,6 +218,7 @@ 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/sync_stream_impl.h include/grpcpp/impl/codegen/time.h include/grpcpp/impl/grpc_library.h include/grpcpp/impl/method_handler_impl.h @@ -242,11 +248,14 @@ include/grpcpp/server_impl.h include/grpcpp/server_posix.h include/grpcpp/server_posix_impl.h include/grpcpp/support/async_stream.h +include/grpcpp/support/async_stream_impl.h include/grpcpp/support/async_unary_call.h +include/grpcpp/support/async_unary_call_impl.h include/grpcpp/support/byte_buffer.h include/grpcpp/support/channel_arguments.h include/grpcpp/support/channel_arguments_impl.h include/grpcpp/support/client_callback.h +include/grpcpp/support/client_callback_impl.h include/grpcpp/support/client_interceptor.h include/grpcpp/support/config.h include/grpcpp/support/error_details.h @@ -256,6 +265,7 @@ include/grpcpp/support/message_allocator include/grpcpp/support/proto_buffer_reader.h include/grpcpp/support/proto_buffer_writer.h include/grpcpp/support/server_callback.h +include/grpcpp/support/server_callback_impl.h include/grpcpp/support/server_interceptor.h include/grpcpp/support/slice.h include/grpcpp/support/status.h @@ -263,6 +273,7 @@ include/grpcpp/support/status_code_enum. include/grpcpp/support/string_ref.h include/grpcpp/support/stub_options.h include/grpcpp/support/sync_stream.h +include/grpcpp/support/sync_stream_impl.h include/grpcpp/support/time.h include/grpcpp/support/validate_service_config.h lib/cmake/grpc/gRPCConfig.cmake @@ -300,8 +311,8 @@ lib/libgrpc_csharp_ext.so lib/libgrpc_csharp_ext.so.${PKGVERSION} lib/libgrpc_csharp_ext.so.1 lib/libgrpc_plugin_support.so -lib/libgrpc_plugin_support.so.2 -lib/libgrpc_plugin_support.so.2.0.0 +lib/libgrpc_plugin_support.so.${PKGVERSION} +lib/libgrpc_plugin_support.so.1 lib/libgrpc_unsecure.so lib/libgrpc_unsecure.so.${PKGVERSION} lib/libgrpc_unsecure.so.1 Index: pkgsrc/net/grpc/distinfo diff -u pkgsrc/net/grpc/distinfo:1.14 pkgsrc/net/grpc/distinfo:1.15 --- pkgsrc/net/grpc/distinfo:1.14 Wed Jul 3 20:06:42 2019 +++ pkgsrc/net/grpc/distinfo Sun Aug 25 18:52:37 2019 @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.14 2019/07/03 20:06:42 adam Exp $ +$NetBSD: distinfo,v 1.15 2019/08/25 18:52:37 adam Exp $ -SHA1 (grpc-1.22.0.tar.gz) = 7c1977175c8d6ec12dbd699beccb678b38517f0a -RMD160 (grpc-1.22.0.tar.gz) = 9dfba68909877252b3dd577646a2363f8f53730a -SHA512 (grpc-1.22.0.tar.gz) = e8181f01bc44dc7e7a9e8c74c0a9c3f25960bb9c88c239e7c75764105ca24ac173bab663130fb6349c7fa43cd57f35dd7927a369482b1e6a73224cb2174bd336 -Size (grpc-1.22.0.tar.gz) = 15082718 bytes -SHA1 (patch-CMakeLists.txt) = f3cf27ec59109a8a0a6fa8aebd2ffa1871c29442 +SHA1 (grpc-1.23.0.tar.gz) = b311c7facf262eba32ea9fc1ec4fe5a9569d32d2 +RMD160 (grpc-1.23.0.tar.gz) = 937933c3ce0f9933b761718cdb606685b426b36d +SHA512 (grpc-1.23.0.tar.gz) = 4770651bd73b71735152155327c44d59125442b405157ffea8fb80b6f16406dd388474394e44ef620e2a777018121988a3a7a552a42141650d7cac263ab499a0 +Size (grpc-1.23.0.tar.gz) = 15212436 bytes +SHA1 (patch-CMakeLists.txt) = 0b046300aac3ffb48eca4a8943e5877b6a3a8c55 SHA1 (patch-cmake_benchmark.cmake) = 031873ba9a8cd93d491693feb4d58e52a715cc64 SHA1 (patch-include_grpc_impl_codegen_port__platform.h) = b8d07e5bbf04694df00d0d19884844b791eb002c SHA1 (patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc) = aff0ff2ff52753c3a169d1f7b939b894dda013f9 Index: pkgsrc/net/grpc/patches/patch-CMakeLists.txt diff -u pkgsrc/net/grpc/patches/patch-CMakeLists.txt:1.5 pkgsrc/net/grpc/patches/patch-CMakeLists.txt:1.6 --- pkgsrc/net/grpc/patches/patch-CMakeLists.txt:1.5 Fri Apr 19 07:15:36 2019 +++ pkgsrc/net/grpc/patches/patch-CMakeLists.txt Sun Aug 25 18:52:37 2019 @@ -1,10 +1,10 @@ -$NetBSD: patch-CMakeLists.txt,v 1.5 2019/04/19 07:15:36 adam Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.6 2019/08/25 18:52:37 adam Exp $ Add version number to shared libraries. ---- CMakeLists.txt.orig 2019-04-15 22:38:24.000000000 +0000 +--- CMakeLists.txt.orig 2019-08-14 21:29:55.000000000 +0000 +++ CMakeLists.txt -@@ -203,7 +203,7 @@ function(protobuf_generate_grpc_cpp) +@@ -205,7 +205,7 @@ function(protobuf_generate_grpc_cpp) "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}_mock.grpc.pb.h" "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc" "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h" @@ -13,107 +13,26 @@ Add version number to shared libraries. ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR} --cpp_out=${_gRPC_PROTO_GENS_DIR} --plugin=protoc-gen-grpc=${_gRPC_CPP_PLUGIN} -@@ -741,6 +741,7 @@ add_library(address_sorting - third_party/address_sorting/address_sorting_posix.c - third_party/address_sorting/address_sorting_windows.c - ) -+set_target_properties(address_sorting PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(address_sorting PROPERTIES COMPILE_PDB_NAME "address_sorting" -@@ -874,6 +875,7 @@ add_library(gpr - src/core/lib/profiling/basic_timers.cc - src/core/lib/profiling/stap_timers.cc - ) -+set_target_properties(gpr PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr" -@@ -1295,6 +1297,7 @@ add_library(grpc - src/core/ext/filters/workarounds/workaround_utils.cc - src/core/plugin_registry/grpc_plugin_registry.cc - ) -+set_target_properties(grpc PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc" -@@ -1687,6 +1690,7 @@ add_library(grpc_cronet - src/core/tsi/transport_security_grpc.cc - src/core/plugin_registry/grpc_cronet_plugin_registry.cc - ) -+set_target_properties(grpc_cronet PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(grpc_cronet PROPERTIES COMPILE_PDB_NAME "grpc_cronet" -@@ -2679,6 +2683,7 @@ add_library(grpc_unsecure - src/core/ext/filters/workarounds/workaround_utils.cc - src/core/plugin_registry/grpc_unsecure_plugin_registry.cc - ) -+set_target_properties(grpc_unsecure PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure" -@@ -2912,6 +2917,7 @@ add_library(grpc++ - third_party/nanopb/pb_encode.c - src/cpp/codegen/codegen_init.cc - ) -+set_target_properties(grpc++ PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++" -@@ -3505,6 +3511,7 @@ add_library(grpc++_cronet - src/core/ext/transport/chttp2/server/chttp2_server.cc - src/core/ext/filters/census/grpc_context.cc - ) -+set_target_properties(grpc++_cronet PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(grpc++_cronet PROPERTIES COMPILE_PDB_NAME "grpc++_cronet" -@@ -3792,6 +3799,7 @@ add_library(grpc++_error_details - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/status/status.grpc.pb.h - src/cpp/util/error_details.cc - ) -+set_target_properties(grpc++_error_details PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details" -@@ -3925,6 +3933,7 @@ add_library(grpc++_reflection - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.pb.h - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h - ) -+set_target_properties(grpc++_reflection PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection" -@@ -4473,6 +4482,7 @@ add_library(grpc++_unsecure - third_party/nanopb/pb_encode.c - src/cpp/codegen/codegen_init.cc - ) -+set_target_properties(grpc++_unsecure PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(grpc++_unsecure PROPERTIES COMPILE_PDB_NAME "grpc++_unsecure" -@@ -4874,6 +4884,7 @@ add_library(grpc_plugin_support - src/compiler/python_generator.cc - src/compiler/ruby_generator.cc - ) -+set_target_properties(grpc_plugin_support PROPERTIES VERSION 2.0.0 SOVERSION 2) - - if(WIN32 AND MSVC) - set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support" -@@ -4936,6 +4947,7 @@ add_library(grpcpp_channelz - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/channelz/channelz.pb.h - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/channelz/channelz.grpc.pb.h - ) -+set_target_properties(grpcpp_channelz PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(grpcpp_channelz PROPERTIES COMPILE_PDB_NAME "grpcpp_channelz" -@@ -5478,6 +5490,7 @@ if (gRPC_BUILD_CSHARP_EXT) - add_library(grpc_csharp_ext SHARED - src/csharp/ext/grpc_csharp_ext.c - ) -+set_target_properties(grpc_csharp_ext PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(grpc_csharp_ext PROPERTIES COMPILE_PDB_NAME "grpc_csharp_ext" +@@ -19451,5 +19451,22 @@ foreach(_config gRPCConfig gRPCConfigVer + ) + endforeach() + ++foreach(_lib ++ address_sorting ++ gpr ++ grpc++ ++ grpc++_error_details ++ grpc++_reflection ++ grpc++_unsecure ++ grpc ++ grpc_cronet ++ grpc_csharp_ext ++ grpc_plugin_support ++ grpc_unsecure ++ grpcpp_channelz ++) ++ set_target_properties(${_lib} PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) ++endforeach() ++ + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/etc/roots.pem + DESTINATION ${gRPC_INSTALL_SHAREDIR}) --_----------=_1566759157158560--