Received: by mail.netbsd.org (Postfix, from userid 605) id A7A0184D85; Fri, 19 Apr 2019 07:15:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 288C884D85 for ; Fri, 19 Apr 2019 07:15: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 BrxtQENcaa8x for ; Fri, 19 Apr 2019 07:15:37 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id ECC6A84D74 for ; Fri, 19 Apr 2019 07:15:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E0F05FB16; Fri, 19 Apr 2019 07:15:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1555658136165660" MIME-Version: 1.0 Date: Fri, 19 Apr 2019 07:15:36 +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: <20190419071536.E0F05FB16@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. --_----------=_1555658136165660 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Fri Apr 19 07:15:36 UTC 2019 Modified Files: pkgsrc/net/grpc: Makefile PLIST distinfo pkgsrc/net/grpc/patches: patch-CMakeLists.txt patch-include_grpc_impl_codegen_port__platform.h Log Message: grpc: updated to 1.20.0 Release v1.20.0 This release contains refinements, improvements, and bug fixes, with highlights listed below. Core Fix bug in CFStream endpoint. Fix a NULL deref in tcp_client_windows.cc. Avoid using grpc_core::Executor when the background poller is available. Update the c-ares submodule to the 1.15 release. Remove unnecessary hack which causes data races. Fix Potentially Dangerous Typo - locked function being run outside of combiner. Trace log the status of every c-ares lookup; cleanup error handling. Add SPIFFE security stack to gRPC . Nuking the poll-cv polling engine. Backport 18201 to fix "symbol not found: _ares_library_init" error in Bazel on MacOS build. Run run_after_write closures in h2 once write action is done. Transition into state CONNECTING when we start name resolution. Support "darwin_x86_64" CPU in cares.BUILD. Move grpc_shutdown internals to a detached thread. Fix c-ares on Windows "DNS resolution failure" triggered by logging. Disable c-ares on Android. C++ Global Interceptor Registration allowed only once. cmake fix: builds disabled by CODEGEN=OFF should not be installed. cmake: when cross-compiling, the host grpc_cpp_plugin should be used. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/grpc/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/grpc/PLIST cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/grpc/distinfo cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/grpc/patches/patch-CMakeLists.txt cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/net/grpc/patches/patch-include_grpc_impl_codegen_port__platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1555658136165660 Content-Disposition: inline Content-Length: 11617 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.7 pkgsrc/net/grpc/Makefile:1.8 --- pkgsrc/net/grpc/Makefile:1.7 Fri Mar 22 08:25:51 2019 +++ pkgsrc/net/grpc/Makefile Fri Apr 19 07:15:36 2019 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2019/03/22 08:25:51 adam Exp $ +# $NetBSD: Makefile,v 1.8 2019/04/19 07:15:36 adam Exp $ -DISTNAME= grpc-1.19.1 +DISTNAME= grpc-1.20.0 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=grpc/} GITHUB_TAG= v${PKGVERSION_NOREV} Index: pkgsrc/net/grpc/PLIST diff -u pkgsrc/net/grpc/PLIST:1.5 pkgsrc/net/grpc/PLIST:1.6 --- pkgsrc/net/grpc/PLIST:1.5 Fri Mar 22 08:25:51 2019 +++ pkgsrc/net/grpc/PLIST Fri Apr 19 07:15:36 2019 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2019/03/22 08:25:51 adam Exp $ +@comment $NetBSD: PLIST,v 1.6 2019/04/19 07:15:36 adam Exp $ bin/grpc_cpp_plugin bin/grpc_csharp_plugin bin/grpc_node_plugin @@ -146,7 +146,9 @@ include/grpcpp/client_context.h include/grpcpp/completion_queue.h include/grpcpp/create_channel.h include/grpcpp/create_channel_posix.h +include/grpcpp/create_channel_posix_impl.h include/grpcpp/ext/channelz_service_plugin.h +include/grpcpp/ext/channelz_service_plugin_impl.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 @@ -208,6 +210,7 @@ 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_option_impl.h include/grpcpp/impl/server_builder_plugin.h include/grpcpp/impl/server_initializer.h include/grpcpp/impl/service_type.h @@ -220,6 +223,7 @@ include/grpcpp/server.h include/grpcpp/server_builder.h include/grpcpp/server_context.h include/grpcpp/server_posix.h +include/grpcpp/server_posix_impl.h include/grpcpp/support/async_stream.h include/grpcpp/support/async_unary_call.h include/grpcpp/support/byte_buffer.h Index: pkgsrc/net/grpc/distinfo diff -u pkgsrc/net/grpc/distinfo:1.8 pkgsrc/net/grpc/distinfo:1.9 --- pkgsrc/net/grpc/distinfo:1.8 Fri Mar 22 08:25:51 2019 +++ pkgsrc/net/grpc/distinfo Fri Apr 19 07:15:36 2019 @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.8 2019/03/22 08:25:51 adam Exp $ +$NetBSD: distinfo,v 1.9 2019/04/19 07:15:36 adam Exp $ -SHA1 (grpc-1.19.1.tar.gz) = 9d556e9702c1505ab8474924407e5d22ca5a8829 -RMD160 (grpc-1.19.1.tar.gz) = 4b695158fd08d1511d02b7ced5242e67244dcc94 -SHA512 (grpc-1.19.1.tar.gz) = 4bb127d946fc16887fd4cf75215f0bc9f6d17dbd36fc4f1b191a64914f96c49dddb41f1b6c72fd24ea0a40f242b4398248f32fcb1fe9a764367be1c2edda9142 -Size (grpc-1.19.1.tar.gz) = 14794085 bytes -SHA1 (patch-CMakeLists.txt) = 45b87caaf7edf664b337648dda1722fd3cf20690 +SHA1 (grpc-1.20.0.tar.gz) = f7eaf137271e21efa36d4f3e2c61dd69f962832a +RMD160 (grpc-1.20.0.tar.gz) = d5525a7f2db94eead858bc62f48387f9f10ba4b9 +SHA512 (grpc-1.20.0.tar.gz) = 01074f87a3cfaa30cbd3ae8f723118fd91cab586872b26b0f96fe5f8472dff8f6e8845af605765f747cc10ef1b62c974c57e08affc43eb8487b524a98d1dcae1 +Size (grpc-1.20.0.tar.gz) = 14926918 bytes +SHA1 (patch-CMakeLists.txt) = f3cf27ec59109a8a0a6fa8aebd2ffa1871c29442 SHA1 (patch-cmake_benchmark.cmake) = 031873ba9a8cd93d491693feb4d58e52a715cc64 SHA1 (patch-cmake_cares.cmake) = 19324318dce81451bf7a53d0ca5a7e445a751db5 -SHA1 (patch-include_grpc_impl_codegen_port__platform.h) = 18e213ffc4875b736a6a895a4d56cccc2b66c660 +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 SHA1 (patch-src_core_lib_iomgr_port.h) = e3c5e6ee071557c717df0a1a61597f9906fbeff5 Index: pkgsrc/net/grpc/patches/patch-CMakeLists.txt diff -u pkgsrc/net/grpc/patches/patch-CMakeLists.txt:1.4 pkgsrc/net/grpc/patches/patch-CMakeLists.txt:1.5 --- pkgsrc/net/grpc/patches/patch-CMakeLists.txt:1.4 Fri Mar 22 08:25:51 2019 +++ pkgsrc/net/grpc/patches/patch-CMakeLists.txt Fri Apr 19 07:15:36 2019 @@ -1,10 +1,10 @@ -$NetBSD: patch-CMakeLists.txt,v 1.4 2019/03/22 08:25:51 adam Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.5 2019/04/19 07:15:36 adam Exp $ Add version number to shared libraries. ---- CMakeLists.txt.orig 2019-03-08 20:07:26.000000000 +0000 +--- CMakeLists.txt.orig 2019-04-15 22:38:24.000000000 +0000 +++ CMakeLists.txt -@@ -196,7 +196,7 @@ function(protobuf_generate_grpc_cpp) +@@ -203,7 +203,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" @@ -12,8 +12,8 @@ Add version number to shared libraries. + COMMAND env LD_LIBRARY_PATH=${CMAKE_BINARY_DIR} ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE} ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR} --cpp_out=${_gRPC_PROTO_GENS_DIR} - --plugin=protoc-gen-grpc=$ -@@ -735,6 +735,7 @@ add_library(address_sorting + --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 ) @@ -21,7 +21,7 @@ Add version number to shared libraries. if(WIN32 AND MSVC) set_target_properties(address_sorting PROPERTIES COMPILE_PDB_NAME "address_sorting" -@@ -868,6 +869,7 @@ add_library(gpr +@@ -874,6 +875,7 @@ add_library(gpr src/core/lib/profiling/basic_timers.cc src/core/lib/profiling/stap_timers.cc ) @@ -29,7 +29,7 @@ Add version number to shared libraries. if(WIN32 AND MSVC) set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr" -@@ -1288,6 +1290,7 @@ add_library(grpc +@@ -1295,6 +1297,7 @@ add_library(grpc src/core/ext/filters/workarounds/workaround_utils.cc src/core/plugin_registry/grpc_plugin_registry.cc ) @@ -37,7 +37,7 @@ Add version number to shared libraries. if(WIN32 AND MSVC) set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc" -@@ -1679,6 +1682,7 @@ add_library(grpc_cronet +@@ -1687,6 +1690,7 @@ add_library(grpc_cronet src/core/tsi/transport_security_grpc.cc src/core/plugin_registry/grpc_cronet_plugin_registry.cc ) @@ -45,7 +45,7 @@ Add version number to shared libraries. if(WIN32 AND MSVC) set_target_properties(grpc_cronet PROPERTIES COMPILE_PDB_NAME "grpc_cronet" -@@ -2674,6 +2678,7 @@ add_library(grpc_unsecure +@@ -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 ) @@ -53,7 +53,7 @@ Add version number to shared libraries. if(WIN32 AND MSVC) set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure" -@@ -2907,6 +2912,7 @@ add_library(grpc++ +@@ -2912,6 +2917,7 @@ add_library(grpc++ third_party/nanopb/pb_encode.c src/cpp/codegen/codegen_init.cc ) @@ -61,7 +61,7 @@ Add version number to shared libraries. if(WIN32 AND MSVC) set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++" -@@ -3497,6 +3503,7 @@ add_library(grpc++_cronet +@@ -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 ) @@ -69,7 +69,7 @@ Add version number to shared libraries. if(WIN32 AND MSVC) set_target_properties(grpc++_cronet PROPERTIES COMPILE_PDB_NAME "grpc++_cronet" -@@ -3781,6 +3788,7 @@ add_library(grpc++_error_details +@@ -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 ) @@ -77,7 +77,7 @@ Add version number to shared libraries. if(WIN32 AND MSVC) set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details" -@@ -3911,6 +3919,7 @@ add_library(grpc++_reflection +@@ -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 ) @@ -85,7 +85,7 @@ Add version number to shared libraries. if(WIN32 AND MSVC) set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection" -@@ -4454,6 +4463,7 @@ add_library(grpc++_unsecure +@@ -4473,6 +4482,7 @@ add_library(grpc++_unsecure third_party/nanopb/pb_encode.c src/cpp/codegen/codegen_init.cc ) @@ -93,7 +93,7 @@ Add version number to shared libraries. if(WIN32 AND MSVC) set_target_properties(grpc++_unsecure PROPERTIES COMPILE_PDB_NAME "grpc++_unsecure" -@@ -4851,6 +4861,7 @@ add_library(grpc_plugin_support +@@ -4874,6 +4884,7 @@ add_library(grpc_plugin_support src/compiler/python_generator.cc src/compiler/ruby_generator.cc ) @@ -101,7 +101,7 @@ Add version number to shared libraries. if(WIN32 AND MSVC) set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support" -@@ -4913,6 +4924,7 @@ add_library(grpcpp_channelz +@@ -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 ) @@ -109,7 +109,7 @@ Add version number to shared libraries. if(WIN32 AND MSVC) set_target_properties(grpcpp_channelz PROPERTIES COMPILE_PDB_NAME "grpcpp_channelz" -@@ -5445,6 +5457,7 @@ if (gRPC_BUILD_CSHARP_EXT) +@@ -5478,6 +5490,7 @@ if (gRPC_BUILD_CSHARP_EXT) add_library(grpc_csharp_ext SHARED src/csharp/ext/grpc_csharp_ext.c ) Index: pkgsrc/net/grpc/patches/patch-include_grpc_impl_codegen_port__platform.h diff -u pkgsrc/net/grpc/patches/patch-include_grpc_impl_codegen_port__platform.h:1.2 pkgsrc/net/grpc/patches/patch-include_grpc_impl_codegen_port__platform.h:1.3 --- pkgsrc/net/grpc/patches/patch-include_grpc_impl_codegen_port__platform.h:1.2 Mon Dec 31 23:00:08 2018 +++ pkgsrc/net/grpc/patches/patch-include_grpc_impl_codegen_port__platform.h Fri Apr 19 07:15:36 2019 @@ -1,11 +1,10 @@ -$NetBSD: patch-include_grpc_impl_codegen_port__platform.h,v 1.2 2018/12/31 23:00:08 leot Exp $ +$NetBSD: patch-include_grpc_impl_codegen_port__platform.h,v 1.3 2019/04/19 07:15:36 adam Exp $ Add NetBSD support. -Add SunOS support. ---- include/grpc/impl/codegen/port_platform.h.orig 2018-07-12 14:40:09.000000000 +0000 +--- include/grpc/impl/codegen/port_platform.h.orig 2019-04-15 22:38:24.000000000 +0000 +++ include/grpc/impl/codegen/port_platform.h -@@ -282,6 +282,29 @@ +@@ -331,6 +331,29 @@ #else /* _LP64 */ #define GPR_ARCH_32 1 #endif /* _LP64 */ @@ -35,30 +34,3 @@ Add SunOS support. #elif defined(__native_client__) #define GPR_PLATFORM_STRING "nacl" #ifndef _BSD_SOURCE -@@ -310,6 +333,26 @@ - #else /* _LP64 */ - #define GPR_ARCH_32 1 - #endif /* _LP64 */ -+#elif defined(__sun) -+#define GPR_PLATFORM_STRING "sunos" -+#define GPR_SUNOS 1 -+#define GPR_CPU_POSIX 1 -+#define GPR_GCC_ATOMIC 1 -+#define GPR_GCC_TLS 1 -+#define GPR_POSIX_LOG 1 -+#define GPR_POSIX_ENV 1 -+#define GPR_POSIX_TMPFILE 1 -+#define GPR_POSIX_STRING 1 -+#define GPR_POSIX_SUBPROCESS 1 -+#define GPR_POSIX_SYNC 1 -+#define GPR_POSIX_TIME 1 -+#define GPR_GETPID_IN_UNISTD_H 1 -+#define GPR_SUPPORT_CHANNELS_FROM_FD 1 -+#ifdef _LP64 -+#define GPR_ARCH_64 1 -+#else /* _LP64 */ -+#define GPR_ARCH_32 1 -+#endif /* _LP64 */ - #else - #error "Could not auto-detect platform" - #endif --_----------=_1555658136165660--