grpc: updated to 1.31.0

Release v1.31.0

Core

The following new xDS functionality is added in this release:

Requests matching based on path (prefix, full path and safe regex) and headers.
Requests routing to multiple clusters based on weights.
The features supported in a given release are documented here.
Other changes:

Remove MAX_EPOLL_EVENTS_HANDLED_EACH_POLL_CALL to ensure timely processing of events.
Include the target name in top-level DNS error messages.
Remove xds-experimental URI scheme.
fix memory leak of grpc_resource_user_quota.
Store ref to the ExternalConnectivityWatcher in external_watchers_ map.
Update grpclb configuration with field "service_name".
Fix possible deadlock in RemoveExternalConnectivityWatcher.
Enable TLS 1.3 in the C-core and all wrapped languages.
Add message-size check before message decompression with ordering change.
Fix race condition caused by simultaneous updates on SSL server handshaker.
Add missing reset for ping clocks to avoid mistakenly sending GOAWAY frames due to 'too_many_pings'.

C++

Simplify makefile: Get rid of "install" rules with pure make, recommend cmake and bazel instead.
Replaced grpc::string with std::string.
Fix wrong version in gRPCConfigVersion.cmake and grpc++*.pc.

Python

[Aio] Support tuple and aio.Metadata interaction.
[Aio] Allows poller to bind to ephemeral loops in multiple threads.
[Aio] Hide init_grpc_aio and guard async API outside of AsyncIO context.
[Aio] Implement methods to access auth context and peer info.
Add protobuf as an "extras" dependency to grpcio package.
[Aio] Use Metadata type.
Avoid attribute error in del of _ChannelCallState.
Default wait_for_ready to True in simple stubs.
Propagate contextvars to auxiliary threads.
Simplify channel credentials in simple stubs.

11 files changed, 53 insertions, 59 deletions

diff --git a/net/grpc/Makefile b/net/grpc/Makefile
index efa85f4202a..9b5f2833a19 100644
--- a/net/grpc/Makefile
+++ b/net/grpc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2020/07/31 09:26:29 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2020/08/07 06:45:57 adam Exp $
 
-DISTNAME=	grpc-1.30.2
+DISTNAME=	grpc-1.31.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=grpc/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -21,6 +21,7 @@ CMAKE_ARGS+=	-DgRPC_BENCHMARK_PROVIDER=package
 CMAKE_ARGS+=	-DgRPC_CARES_PROVIDER=package
 CMAKE_ARGS+=	-DgRPC_GFLAGS_PROVIDER=package
 CMAKE_ARGS+=	-DgRPC_PROTOBUF_PROVIDER=package
+CMAKE_ARGS+=	-DgRPC_RE2_PROVIDER=package
 CMAKE_ARGS+=	-DgRPC_SSL_PROVIDER=package
 CMAKE_ARGS+=	-DgRPC_ZLIB_PROVIDER=package
 
@@ -37,6 +38,7 @@ CXXFLAGS+=		-march=i586
 .include "../../devel/gflags/buildlink3.mk"
 BUILDLINK_API_DEPENDS.protobuf+=	protobuf>=3.5
 .include "../../devel/protobuf/buildlink3.mk"
+.include "../../devel/re2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libcares+=	libcares>=1.15.0nb1
 .include "../../net/libcares/buildlink3.mk"
diff --git a/net/grpc/PLIST b/net/grpc/PLIST
index e73d0723851..20648d34518 100644
--- a/net/grpc/PLIST
+++ b/net/grpc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2020/06/03 09:28:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2020/08/07 06:45:57 adam Exp $
 bin/grpc_cpp_plugin
 bin/grpc_csharp_plugin
 bin/grpc_node_plugin
@@ -150,18 +150,14 @@ include/grpcpp/completion_queue_impl.h
 include/grpcpp/create_channel.h
 include/grpcpp/create_channel_impl.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/ext/proto_server_reflection_plugin_impl.h
 include/grpcpp/generic/async_generic_service.h
 include/grpcpp/generic/generic_stub.h
-include/grpcpp/generic/generic_stub_impl.h
 include/grpcpp/grpcpp.h
 include/grpcpp/health_check_service_interface.h
-include/grpcpp/health_check_service_interface_impl.h
 include/grpcpp/impl/call.h
 include/grpcpp/impl/channel_argument_option.h
 include/grpcpp/impl/client_unary_call.h
@@ -236,12 +232,10 @@ include/grpcpp/impl/server_initializer.h
 include/grpcpp/impl/server_initializer_impl.h
 include/grpcpp/impl/service_type.h
 include/grpcpp/resource_quota.h
-include/grpcpp/resource_quota_impl.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/auth_metadata_processor_impl.h
 include/grpcpp/security/credentials.h
 include/grpcpp/security/credentials_impl.h
 include/grpcpp/security/server_credentials.h
@@ -249,11 +243,9 @@ include/grpcpp/security/server_credentials_impl.h
 include/grpcpp/security/tls_credentials_options.h
 include/grpcpp/server.h
 include/grpcpp/server_builder.h
-include/grpcpp/server_builder_impl.h
 include/grpcpp/server_context.h
 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
@@ -290,11 +282,11 @@ lib/cmake/grpc/gRPCTargets-noconfig.cmake
 lib/cmake/grpc/gRPCTargets.cmake
 lib/cmake/grpc/modules/Findc-ares.cmake
 lib/libaddress_sorting.so
-lib/libaddress_sorting.so.10
-lib/libaddress_sorting.so.10.0.0
+lib/libaddress_sorting.so.11
+lib/libaddress_sorting.so.11.0.0
 lib/libgpr.so
-lib/libgpr.so.10
-lib/libgpr.so.10.0.0
+lib/libgpr.so.11
+lib/libgpr.so.11.0.0
 lib/libgrpc++.so
 lib/libgrpc++.so.${PKGVERSION}
 lib/libgrpc++.so.1
@@ -311,20 +303,20 @@ lib/libgrpc++_unsecure.so
 lib/libgrpc++_unsecure.so.${PKGVERSION}
 lib/libgrpc++_unsecure.so.1
 lib/libgrpc.so
-lib/libgrpc.so.10
-lib/libgrpc.so.10.0.0
+lib/libgrpc.so.11
+lib/libgrpc.so.11.0.0
 lib/libgrpc_plugin_support.so
 lib/libgrpc_plugin_support.so.${PKGVERSION}
 lib/libgrpc_plugin_support.so.1
 lib/libgrpc_unsecure.so
-lib/libgrpc_unsecure.so.10
-lib/libgrpc_unsecure.so.10.0.0
+lib/libgrpc_unsecure.so.11
+lib/libgrpc_unsecure.so.11.0.0
 lib/libgrpcpp_channelz.so
 lib/libgrpcpp_channelz.so.${PKGVERSION}
 lib/libgrpcpp_channelz.so.1
 lib/libupb.so
-lib/libupb.so.10
-lib/libupb.so.10.0.0
+lib/libupb.so.11
+lib/libupb.so.11.0.0
 lib/pkgconfig/gpr.pc
 lib/pkgconfig/grpc++.pc
 lib/pkgconfig/grpc++_unsecure.pc
diff --git a/net/grpc/distinfo b/net/grpc/distinfo
index cf138af894d..1591094c741 100644
--- a/net/grpc/distinfo
+++ b/net/grpc/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.28 2020/07/31 09:26:29 wiz Exp $
+$NetBSD: distinfo,v 1.29 2020/08/07 06:45:57 adam Exp $
 
-SHA1 (grpc-1.30.2.tar.gz) = d5f2270c7a42154e0a5a184b3b0a9a97e90442de
-RMD160 (grpc-1.30.2.tar.gz) = 0bf9f056cd5f08412cd2ef92e691a7c3b4af309d
-SHA512 (grpc-1.30.2.tar.gz) = 584eda0488a00859507a40199bafcf78cc1beb5f92a586f25097e2507a2b6854d9e252d3bce68a9f0c5a47b4c280f5b6178f1992c65ad721dcfb722031b17982
-Size (grpc-1.30.2.tar.gz) = 6978015 bytes
+SHA1 (grpc-1.31.0.tar.gz) = c502a8eba541250f6120df7786d237db894d6a16
+RMD160 (grpc-1.31.0.tar.gz) = 45a4ec0cf2d12c361f447d999af2bedb8323a787
+SHA512 (grpc-1.31.0.tar.gz) = fc68079a70c39d66cb6f028e775418a90c61694406ddfa413298ec33de2f56e26eb47e10a53fc616e32c254c84e335598dc22598a95c223698ebf8eca60f7cea
+Size (grpc-1.31.0.tar.gz) = 7026165 bytes
 SHA1 (patch-CMakeLists.txt) = af17a03bdbb2b7905ced111b3c13c80b0cf3fec2
 SHA1 (patch-cmake_benchmark.cmake) = 6a7880c30019a723a35b56b0c5bd2d730b36550d
 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_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc) = 3b250e94b20c64c80c1b3943da2c82031e084773
 SHA1 (patch-src_core_lib_iomgr_port.h) = e3c5e6ee071557c717df0a1a61597f9906fbeff5
diff --git a/net/grpc/patches/patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc b/net/grpc/patches/patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc
index 2add859d17d..cf627de6202 100644
--- a/net/grpc/patches/patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc
+++ b/net/grpc/patches/patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc,v 1.2 2019/03/22 08:25:51 adam Exp $
+$NetBSD: patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc,v 1.3 2020/08/07 06:45:57 adam Exp $
 
 Add SunOS support.
 
---- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc.orig	2019-03-08 20:07:26.000000000 +0000
+--- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc.orig	2020-08-04 20:02:23.000000000 +0000
 +++ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
 @@ -23,6 +23,11 @@
  #include <ares.h>
@@ -14,5 +14,5 @@ Add SunOS support.
 +#include <stropts.h>
 +#endif
  
- #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h"
+ #include "absl/strings/str_cat.h"
  
diff --git a/net/py-grpcio-testing/Makefile b/net/py-grpcio-testing/Makefile
index b5f9fdb1649..723da766240 100644
--- a/net/py-grpcio-testing/Makefile
+++ b/net/py-grpcio-testing/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2020/07/09 07:23:44 adam Exp $
+# $NetBSD: Makefile,v 1.8 2020/08/07 06:45:58 adam Exp $
 
-DISTNAME=	grpcio-testing-1.30.0
+DISTNAME=	grpcio-testing-1.31.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/grpcio-testing/}
diff --git a/net/py-grpcio-testing/distinfo b/net/py-grpcio-testing/distinfo
index 02b4d766b8f..e01b0c89e33 100644
--- a/net/py-grpcio-testing/distinfo
+++ b/net/py-grpcio-testing/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2020/07/09 07:23:44 adam Exp $
+$NetBSD: distinfo,v 1.7 2020/08/07 06:45:58 adam Exp $
 
-SHA1 (grpcio-testing-1.30.0.tar.gz) = d69d3dfed5185372f32e2afa8f813964e869aad3
-RMD160 (grpcio-testing-1.30.0.tar.gz) = b89695c6984ac3e716be135c1c2ab85060e7b744
-SHA512 (grpcio-testing-1.30.0.tar.gz) = e2776385d29e1f257812eb1a6776b1a6de27e97da5d3db874accedead73947b345ccf2c6a19ae1c5839a687464969d16a701a2e9b72f017262d6dfdb075ddfaf
-Size (grpcio-testing-1.30.0.tar.gz) = 16525 bytes
+SHA1 (grpcio-testing-1.31.0.tar.gz) = da20736868decb1c63e4b0574e594edf983e58d1
+RMD160 (grpcio-testing-1.31.0.tar.gz) = 24751c9676486be669ef09e7896ed77ce4bbd1ed
+SHA512 (grpcio-testing-1.31.0.tar.gz) = 8691686f6de541edd532ea9f524bfd27a510a3f2514a0ad78c05a33fa70da3bfd75294039c1690d799ed096beb035a1325a9c51ca6dc2da8fa2103f700cebfd2
+Size (grpcio-testing-1.31.0.tar.gz) = 16477 bytes
diff --git a/net/py-grpcio-tools/Makefile b/net/py-grpcio-tools/Makefile
index 5c15a60e5ad..b4f64925dbd 100644
--- a/net/py-grpcio-tools/Makefile
+++ b/net/py-grpcio-tools/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2020/07/09 07:23:43 adam Exp $
+# $NetBSD: Makefile,v 1.18 2020/08/07 06:45:58 adam Exp $
 
-DISTNAME=	grpcio-tools-1.30.0
+DISTNAME=	grpcio-tools-1.31.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/grpcio-tools/}
diff --git a/net/py-grpcio-tools/distinfo b/net/py-grpcio-tools/distinfo
index cdc82c2ffa4..388a3b204e2 100644
--- a/net/py-grpcio-tools/distinfo
+++ b/net/py-grpcio-tools/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2020/07/09 07:23:43 adam Exp $
+$NetBSD: distinfo,v 1.16 2020/08/07 06:45:58 adam Exp $
 
-SHA1 (grpcio-tools-1.30.0.tar.gz) = d5ef07ae8622201fd4c6799bde1ef3decdc3e8d8
-RMD160 (grpcio-tools-1.30.0.tar.gz) = dc091f7d8359d6b6ee92df740b4af99165114d24
-SHA512 (grpcio-tools-1.30.0.tar.gz) = 0a14e6f1b52852ab489b66b68cd5aed9cc88cceb3ab6fdba4bd53e3a71d9801d75252f58adce64845251164b03ca099150ff0260d3c6d84648ce1b15d2b2ae56
-Size (grpcio-tools-1.30.0.tar.gz) = 2060447 bytes
+SHA1 (grpcio-tools-1.31.0.tar.gz) = 7fca6f8f306e62674a4380865722ebf9e448d34d
+RMD160 (grpcio-tools-1.31.0.tar.gz) = 0a7e8f2ced620339c3f5e402f8301534f09f28bb
+SHA512 (grpcio-tools-1.31.0.tar.gz) = 08a362b9f1a4f5e78f70020ed7fce596ff7836085c0a3d4d1886415e9b70532ad77bf2f7f329df237f5e2a9cb55774827268da9cd3be8a766ae9277b6b1e7aa1
+Size (grpcio-tools-1.31.0.tar.gz) = 2065294 bytes
 SHA1 (patch-setup.py) = 080ba75a31b51631000e79006316e0a2d5ce6cee
diff --git a/net/py-grpcio/Makefile b/net/py-grpcio/Makefile
index 9100c058270..a0b797c54a8 100644
--- a/net/py-grpcio/Makefile
+++ b/net/py-grpcio/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2020/07/09 07:23:44 adam Exp $
+# $NetBSD: Makefile,v 1.20 2020/08/07 06:45:57 adam Exp $
 
-DISTNAME=	grpcio-1.30.0
+DISTNAME=	grpcio-1.31.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/grpcio/}
diff --git a/net/py-grpcio/distinfo b/net/py-grpcio/distinfo
index af7cca10ef8..3927bd6589f 100644
--- a/net/py-grpcio/distinfo
+++ b/net/py-grpcio/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2020/07/09 07:23:44 adam Exp $
+$NetBSD: distinfo,v 1.20 2020/08/07 06:45:57 adam Exp $
 
-SHA1 (grpcio-1.30.0.tar.gz) = 64a6541ef998c77fa4dbc60b7f23bf067e6c36eb
-RMD160 (grpcio-1.30.0.tar.gz) = 994432167572a3779d84b29cc4e49b9b1288640a
-SHA512 (grpcio-1.30.0.tar.gz) = 5060198c5765ff3f2417453a0cad58dfabed676166265ce3d580976cdb5e9d00e64648626e998cb66f96ba477b85cacd8610aa8598e65ac8758ff9a09083db5b
-Size (grpcio-1.30.0.tar.gz) = 19674635 bytes
-SHA1 (patch-setup.py) = 60a9d7acb285af64289fd4fe5f4323ed890d72d2
+SHA1 (grpcio-1.31.0.tar.gz) = a206c8a980a21f24df91b6cf229a9a33920e5ebf
+RMD160 (grpcio-1.31.0.tar.gz) = c99223d30d704ad51f383ee400759138cfffe1a8
+SHA512 (grpcio-1.31.0.tar.gz) = 7949a3037d71e1910f56f6950c17a6732adc7246fca7c31e42d482ca34360de3ea0dc1e9c57ac205dd98b49903e6ecc17f78223a755052f2e6103940d2c00fe7
+Size (grpcio-1.31.0.tar.gz) = 20039534 bytes
+SHA1 (patch-setup.py) = dbdd4270e2cb497032a2a1f54d606d72164c816d
 SHA1 (patch-src_core_lib_iomgr_port.h) = 8f088cbf22110c03a684c24c9e17ef5fc64e925a
diff --git a/net/py-grpcio/patches/patch-setup.py b/net/py-grpcio/patches/patch-setup.py
index fd88515c26d..aaab6231c64 100644
--- a/net/py-grpcio/patches/patch-setup.py
+++ b/net/py-grpcio/patches/patch-setup.py
@@ -1,11 +1,11 @@
-$NetBSD: patch-setup.py,v 1.7 2020/07/09 07:23:44 adam Exp $
+$NetBSD: patch-setup.py,v 1.8 2020/08/07 06:45:58 adam Exp $
 
 Fix libatomic detection.
 Use dependencies in pkgsrc.
 
---- setup.py.orig	2020-06-22 21:42:24.000000000 +0000
+--- setup.py.orig	2020-08-05 07:00:04.000000000 +0000
 +++ setup.py
-@@ -150,7 +150,7 @@ def check_linker_need_libatomic():
+@@ -151,7 +151,7 @@ def check_linker_need_libatomic():
      """Test if linker on system needs libatomic."""
      code_test = (b'#include <atomic>\n' +
                   b'int main() { return std::atomic<int64_t>{}; }')
@@ -14,8 +14,8 @@ Use dependencies in pkgsrc.
                                 stdin=PIPE,
                                 stdout=PIPE,
                                 stderr=PIPE)
-@@ -235,26 +235,7 @@ EXTENSION_INCLUDE_DIRECTORIES = ((PYTHON
-                                  SSL_INCLUDE + UPB_INCLUDE +
+@@ -236,26 +236,7 @@ EXTENSION_INCLUDE_DIRECTORIES = ((PYTHON
+                                  RE2_INCLUDE + SSL_INCLUDE + UPB_INCLUDE +
                                   UPB_GRPC_GENERATED_INCLUDE + ZLIB_INCLUDE)
  
 -EXTENSION_LIBRARIES = ()
@@ -42,7 +42,7 @@ Use dependencies in pkgsrc.
  
  DEFINE_MACROS = (('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600))
  if not DISABLE_LIBC_COMPATIBILITY:
-@@ -311,7 +292,7 @@ def cython_extensions_and_necessity():
+@@ -312,7 +293,7 @@ def cython_extensions_and_necessity():
      ]
      config = os.environ.get('CONFIG', 'opt')
      prefix = 'libs/' + config + '/'
@@ -51,7 +51,7 @@ Use dependencies in pkgsrc.
          extra_objects = [
              prefix + 'libares.a', prefix + 'libboringssl.a',
              prefix + 'libgpr.a', prefix + 'libgrpc.a'
-@@ -323,7 +304,7 @@ def cython_extensions_and_necessity():
+@@ -324,7 +305,7 @@ def cython_extensions_and_necessity():
      extensions = [
          _extension.Extension(
              name=module_name,