net/grpc: Update to 1.7.0

Notable changes:
- Channel are now by default persistent
- Some bug fixes from 1.4 branch
- Fixed hang bug when fork() was used

5 files changed, 24 insertions, 38 deletions

diff --git a/net/grpc/Makefile b/net/grpc/Makefile
index 7babecabc99..b610806ab1b 100644
--- a/net/grpc/Makefile
+++ b/net/grpc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2017/10/23 15:48:04 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/10/27 16:45:34 minskim Exp $
 
-DISTNAME=	grpc-1.6.7
+DISTNAME=	grpc-1.7.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=grpc/}
 GITHUB_PROJECT=	grpc
diff --git a/net/grpc/PLIST b/net/grpc/PLIST
index 353fc06d7e7..315a9f33e84 100644
--- a/net/grpc/PLIST
+++ b/net/grpc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2017/10/23 15:48:04 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/10/27 16:45:34 minskim Exp $
 bin/check_epollexclusive
 bin/gen_hpack_tables
 bin/gen_legal_metadata_characters
@@ -30,6 +30,7 @@ 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
@@ -95,6 +96,7 @@ include/grpc/byte_buffer.h
 include/grpc/byte_buffer_reader.h
 include/grpc/census.h
 include/grpc/compression.h
+include/grpc/fork.h
 include/grpc/grpc.h
 include/grpc/grpc_cronet.h
 include/grpc/grpc_posix.h
@@ -104,10 +106,12 @@ 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/exec_ctx_fwd.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
@@ -116,6 +120,7 @@ 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_custom.h
 include/grpc/impl/codegen/sync_generic.h
 include/grpc/impl/codegen/sync_posix.h
 include/grpc/impl/codegen/sync_windows.h
@@ -139,6 +144,7 @@ include/grpc/support/port_platform.h
 include/grpc/support/string_util.h
 include/grpc/support/subprocess.h
 include/grpc/support/sync.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
diff --git a/net/grpc/distinfo b/net/grpc/distinfo
index e2899c42d44..a7b501447c9 100644
--- a/net/grpc/distinfo
+++ b/net/grpc/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.1 2017/10/23 15:48:04 minskim Exp $
+$NetBSD: distinfo,v 1.2 2017/10/27 16:45:34 minskim Exp $
 
-SHA1 (grpc-1.6.7.tar.gz) = 0a2677d7f05b5fe3bcf6820f89237fad615eb301
-RMD160 (grpc-1.6.7.tar.gz) = b6856325273d210a36619de6e80c8f11753a73cc
-SHA512 (grpc-1.6.7.tar.gz) = 7c4c3e21cb24cdd18022c75d94b78ea099fe3f97af39bf26672e0240945d109f122e79a8476f82b086ec22747569b69826a850ad2c0e8e37df3b3f4a0b67e7e5
-Size (grpc-1.6.7.tar.gz) = 4835956 bytes
-SHA1 (patch-CMakeLists.txt) = e560a1f4d70ba520b5bf454da97946bf8b803360
-SHA1 (patch-src_core_ext_transport_chttp2_transport_flow__control.c) = 81d7c5e3065c3ea9d505d654a9c5a723793d85a5
+SHA1 (grpc-1.7.0.tar.gz) = 06228e7274af8fabfeb3cf78d490c13f2ffa739d
+RMD160 (grpc-1.7.0.tar.gz) = 8181c2e315e38efff0b9d2f4092beb3314f38f79
+SHA512 (grpc-1.7.0.tar.gz) = 23427ac1f180ce6d70b039225f26cecbd938655d1e5b726414aee7dfee6e6f301913255cfe0ff326dfb34e206ca6476c389b2fd0db58b284fff30c9757c5e4ac
+Size (grpc-1.7.0.tar.gz) = 4724700 bytes
+SHA1 (patch-CMakeLists.txt) = cad9e05c7c93e684456506cb5f8a195fdc7b8efc
diff --git a/net/grpc/patches/patch-CMakeLists.txt b/net/grpc/patches/patch-CMakeLists.txt
index 7d70ccdf6ef..a04dfa74096 100644
--- a/net/grpc/patches/patch-CMakeLists.txt
+++ b/net/grpc/patches/patch-CMakeLists.txt
@@ -1,11 +1,15 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2017/10/23 15:48:04 minskim Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2017/10/27 16:45:34 minskim Exp $
 
 Make this build with pkgsrc google-benchmark and libcares.
 
---- CMakeLists.txt.orig	2017-10-19 02:10:38.000000000 +0000
+--- CMakeLists.txt.orig	2017-10-26 19:11:22.000000000 +0000
 +++ CMakeLists.txt
-@@ -159,6 +159,8 @@ elseif("${gRPC_CARES_PROVIDER}" STREQUAL
-   find_package(c-ares CONFIG)
+@@ -144,9 +144,11 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo
+     set(gRPC_INSTALL FALSE)
+   endif()
+ elseif("${gRPC_CARES_PROVIDER}" STREQUAL "package")
+-  find_package(c-ares REQUIRED CONFIG)
++  find_library(cares REQUIRED)
    if(TARGET c-ares::cares)
      set(_gRPC_CARES_LIBRARIES c-ares::cares)
 +  else()
@@ -13,7 +17,7 @@ Make this build with pkgsrc google-benchmark and libcares.
    endif()
    set(_gRPC_FIND_CARES "if(NOT c-ares_FOUND)\n  find_package(c-ares CONFIG)\nendif()")
  endif()
-@@ -282,7 +284,6 @@ if("${gRPC_BENCHMARK_PROVIDER}" STREQUAL
+@@ -271,7 +273,6 @@ if("${gRPC_BENCHMARK_PROVIDER}" STREQUAL
        message(WARNING "gRPC_BENCHMARK_PROVIDER is \"module\" but BENCHMARK_ROOT_DIR is wrong")
    endif()
  elseif("${gRPC_BENCHMARK_PROVIDER}" STREQUAL "package")
@@ -21,12 +25,3 @@ Make this build with pkgsrc google-benchmark and libcares.
    if(TARGET benchmark::benchmark)
      set(_gRPC_BENCHMARK_LIBRARIES benchmark::benchmark)
    endif()
-@@ -339,7 +340,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"
--      COMMAND $<TARGET_FILE:${_gRPC_PROTOBUF_PROTOC}>
-+      COMMAND ${_gRPC_PROTOBUF_PROTOC}
-       ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR}
-            --cpp_out=${_gRPC_PROTO_GENS_DIR}
-            --plugin=protoc-gen-grpc=$<TARGET_FILE:grpc_cpp_plugin>
diff --git a/net/grpc/patches/patch-src_core_ext_transport_chttp2_transport_flow__control.c b/net/grpc/patches/patch-src_core_ext_transport_chttp2_transport_flow__control.c
deleted file mode 100644
index 74ae5cb4969..00000000000
--- a/net/grpc/patches/patch-src_core_ext_transport_chttp2_transport_flow__control.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_core_ext_transport_chttp2_transport_flow__control.c,v 1.1 2017/10/23 15:48:04 minskim Exp $
-
-Include limits.h to use INT_MAX.
-
---- src/core/ext/transport/chttp2/transport/flow_control.c.orig	2017-10-19 02:10:38.000000000 +0000
-+++ src/core/ext/transport/chttp2/transport/flow_control.c
-@@ -18,6 +18,7 @@
- 
- #include "src/core/ext/transport/chttp2/transport/internal.h"
- 
-+#include <limits.h>
- #include <math.h>
- #include <string.h>
-