grpc: updated to 1.26.0

Release v1.26.0
This release contains refinements, improvements, and bug fixes, with highlights listed below.

Core
Fix compression filter crash on empty payload.
Ensure awake pollset_work threads exist on Windows.
Disable client_idle_filter.
Remove gpr_get/set_allocation_functions.
Security audit response.

C++
Automatically disable testing frameworks if gRPC_BUILD_TESTS=OFF.
Do not build channelz when gRPC_USE_PROTO_LITE.
Add options for all codegen plugins.
gRPC-C++ podspec follows gRPC versioning.
Issue 19208: Fix pollset_set_del_fd to cleanup all fd references.
De-duplicate .proto file processing.
cmake: Add VERSION and SOVERSION properties to libraries.

Python
Release Python3.8 wheels for Windows.
Release Python3.8 wheel on macOS.
Fix issue with exception being out of scope in Python 3.
[AIO] Implement the shutdown process for AIO server and completion queue.
Attempt to drop support for Python 3.4.
AIO Unified call interface.
Make sure Core aware of gevent Cython objects.
[bazel] Add an ability to call an optional custom plugin for py_proto_library and py_grpc_library.

5 files changed, 27 insertions, 22 deletions

diff --git a/net/grpc/Makefile b/net/grpc/Makefile
index 7dc5994cb93..31a3d778b9e 100644
--- a/net/grpc/Makefile
+++ b/net/grpc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2019/11/06 17:14:24 adam Exp $
+# $NetBSD: Makefile,v 1.18 2020/01/03 08:21:36 adam Exp $
 
-DISTNAME=	grpc-1.25.0
+DISTNAME=	grpc-1.26.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=grpc/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/net/grpc/PLIST b/net/grpc/PLIST
index b8c72b037d5..e7dcdb0dd9f 100644
--- a/net/grpc/PLIST
+++ b/net/grpc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2019/11/06 17:14:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2020/01/03 08:21:36 adam Exp $
 bin/grpc_cpp_plugin
 bin/grpc_csharp_plugin
 bin/grpc_node_plugin
@@ -207,6 +207,7 @@ 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_callback_impl.h
 include/grpcpp/impl/codegen/server_context.h
 include/grpcpp/impl/codegen/server_context_impl.h
@@ -319,6 +320,9 @@ lib/libgrpc_unsecure.so.1
 lib/libgrpcpp_channelz.so
 lib/libgrpcpp_channelz.so.${PKGVERSION}
 lib/libgrpcpp_channelz.so.1
+lib/libupb.so
+lib/libupb.so.${PKGVERSION}
+lib/libupb.so.9
 lib/pkgconfig/gpr.pc
 lib/pkgconfig/grpc++.pc
 lib/pkgconfig/grpc++_unsecure.pc
diff --git a/net/grpc/distinfo b/net/grpc/distinfo
index b4c814c3628..4e8e994627b 100644
--- a/net/grpc/distinfo
+++ b/net/grpc/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.18 2019/11/06 17:14:24 adam Exp $
+$NetBSD: distinfo,v 1.19 2020/01/03 08:21:36 adam Exp $
 
-SHA1 (grpc-1.25.0.tar.gz) = f44584031c3f4a1b4353766e4173e23c3b0bf1ce
-RMD160 (grpc-1.25.0.tar.gz) = 8ad86ac690283830ffde6c5bc4b2a31ecbd5ede4
-SHA512 (grpc-1.25.0.tar.gz) = 7d9e126eafdfefe9b5c2eacf9c082b972115f231a55cff53386305f2df68037e2593eedc3f27fe0eaeb7fbe78b28f6b87607cdeccf59929b9a9b33bf74ab5c92
-Size (grpc-1.25.0.tar.gz) = 16460163 bytes
-SHA1 (patch-CMakeLists.txt) = 0b046300aac3ffb48eca4a8943e5877b6a3a8c55
-SHA1 (patch-cmake_benchmark.cmake) = 031873ba9a8cd93d491693feb4d58e52a715cc64
+SHA1 (grpc-1.26.0.tar.gz) = 69ac73b58c058e4c48ec1192f1a1c67a46f5194d
+RMD160 (grpc-1.26.0.tar.gz) = fb95bf93628ee6d0f164e9c39c1d64caa9a99835
+SHA512 (grpc-1.26.0.tar.gz) = 4f7d067c582d0a9be7b7d4dd1e08acdbe6ff0686dfe92b5db5b7927f779410a4237acfd1c61d9f79eb2d00f86cf93cc7492fa372c1877e57c1aa23e9bb2648bb
+Size (grpc-1.26.0.tar.gz) = 16673794 bytes
+SHA1 (patch-CMakeLists.txt) = 90fee82c0625d71ec3c086ca21364c1b4e4bcfda
+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_lib_iomgr_port.h) = e3c5e6ee071557c717df0a1a61597f9906fbeff5
diff --git a/net/grpc/patches/patch-CMakeLists.txt b/net/grpc/patches/patch-CMakeLists.txt
index 6066c8e21fe..c8c92857b3d 100644
--- a/net/grpc/patches/patch-CMakeLists.txt
+++ b/net/grpc/patches/patch-CMakeLists.txt
@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.6 2019/08/25 18:52:37 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.7 2020/01/03 08:21:36 adam Exp $
 
 Add version number to shared libraries.
 
---- CMakeLists.txt.orig	2019-08-14 21:29:55.000000000 +0000
+--- CMakeLists.txt.orig	2019-12-18 01:29:27.000000000 +0000
 +++ CMakeLists.txt
-@@ -205,7 +205,7 @@ function(protobuf_generate_grpc_cpp)
+@@ -212,7 +212,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,9 +13,9 @@ 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}
-@@ -19451,5 +19451,22 @@ foreach(_config gRPCConfig gRPCConfigVer
-   )
- endforeach()
+@@ -18361,6 +18361,23 @@ install(FILES
+   DESTINATION ${gRPC_INSTALL_CMAKEDIR}
+ )
  
 +foreach(_lib
 +  address_sorting
@@ -36,3 +36,4 @@ Add version number to shared libraries.
 +
  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/etc/roots.pem
    DESTINATION ${gRPC_INSTALL_SHAREDIR})
+ 
diff --git a/net/grpc/patches/patch-cmake_benchmark.cmake b/net/grpc/patches/patch-cmake_benchmark.cmake
index 41beeed4fab..65ccc605914 100644
--- a/net/grpc/patches/patch-cmake_benchmark.cmake
+++ b/net/grpc/patches/patch-cmake_benchmark.cmake
@@ -1,13 +1,13 @@
-$NetBSD: patch-cmake_benchmark.cmake,v 1.1 2018/04/27 17:47:27 minskim Exp $
+$NetBSD: patch-cmake_benchmark.cmake,v 1.2 2020/01/03 08:21:36 adam Exp $
 
 Find benchmark from pkgsrc.
 
---- cmake/benchmark.cmake.orig	2018-04-13 18:08:11.000000000 +0000
+--- cmake/benchmark.cmake.orig	2019-12-18 01:29:27.000000000 +0000
 +++ cmake/benchmark.cmake
-@@ -26,8 +26,12 @@ if("${gRPC_BENCHMARK_PROVIDER}" STREQUAL
-       message(WARNING "gRPC_BENCHMARK_PROVIDER is \"module\" but BENCHMARK_ROOT_DIR is wrong")
+@@ -26,8 +26,12 @@ if(gRPC_BENCHMARK_PROVIDER STREQUAL "mod
+     message(WARNING "gRPC_BENCHMARK_PROVIDER is \"module\" but BENCHMARK_ROOT_DIR is wrong")
    endif()
- elseif("${gRPC_BENCHMARK_PROVIDER}" STREQUAL "package")
+ elseif(gRPC_BENCHMARK_PROVIDER STREQUAL "package")
 -  # Use "CONFIG" as there is no built-in cmake module for benchmark.
 -  find_package(benchmark REQUIRED CONFIG)
 +  find_path(BENCHMARK_INCLUDE_DIR benchmark/benchmark.h)
@@ -18,4 +18,4 @@ Find benchmark from pkgsrc.
 +    IMPORTED_LOCATION "${BENCHMARK_LIB}")
    if(TARGET benchmark::benchmark)
      set(_gRPC_BENCHMARK_LIBRARIES benchmark::benchmark)
-     # extract the include dir from target's properties
+   endif()