6 files changed, 30 insertions, 43 deletions

diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile
index b8450632adcd..e62d3d37c769 100644
--- a/devel/grpc/Makefile
+++ b/devel/grpc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grpc
-PORTVERSION=	1.6.7
+PORTVERSION=	1.7.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libgflags.so:devel/gflags \
 
 USES=		cmake localbase:ldflags perl5 pkgconfig ssl
 USE_GITHUB=	yes
-GH_TUPLE=	google:benchmark:v1.2.0:benchmark/third_party/benchmark
+GH_TUPLE=	google:benchmark:v1.3.0:benchmark/third_party/benchmark
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 PLIST_SUB+=	SOVERSION=${PORTVERSION}
diff --git a/devel/grpc/distinfo b/devel/grpc/distinfo
index 506fb4d47530..370ec775abc6 100644
--- a/devel/grpc/distinfo
+++ b/devel/grpc/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1508735707
-SHA256 (grpc-grpc-v1.6.7_GH0.tar.gz) = 0ed08e406eb3ecb1ab88b1eb183c7c51a996dae8fa79a0e6fbb9561c9098bf96
-SIZE (grpc-grpc-v1.6.7_GH0.tar.gz) = 4835956
-SHA256 (google-benchmark-v1.2.0_GH0.tar.gz) = 3dcc90c158838e2ac4a7ad06af9e28eb5877cf28252a81e55eb3c836757d3070
-SIZE (google-benchmark-v1.2.0_GH0.tar.gz) = 102297
+TIMESTAMP = 1509758803
+SHA256 (grpc-grpc-v1.7.0_GH0.tar.gz) = eddbef9b16eafe1760aadc3c94507a433a9f8de4f82a53c7d68a950fbb866a73
+SIZE (grpc-grpc-v1.7.0_GH0.tar.gz) = 4724700
+SHA256 (google-benchmark-v1.3.0_GH0.tar.gz) = f19559475a592cbd5ac48b61f6b9cedf87f0b6775d1443de54cfe8f53940b28d
+SIZE (google-benchmark-v1.3.0_GH0.tar.gz) = 105485
diff --git a/devel/grpc/files/patch-CMakeLists.txt b/devel/grpc/files/patch-CMakeLists.txt
index b385b7942aa3..87985d967491 100644
--- a/devel/grpc/files/patch-CMakeLists.txt
+++ b/devel/grpc/files/patch-CMakeLists.txt
@@ -1,35 +1,16 @@
---- CMakeLists.txt.orig	2017-10-05 19:05:39 UTC
+--- CMakeLists.txt.orig	2017-10-26 19:11:22 UTC
 +++ CMakeLists.txt
-@@ -156,7 +156,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo
+@@ -144,7 +144,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo
      set(gRPC_INSTALL FALSE)
    endif()
  elseif("${gRPC_CARES_PROVIDER}" STREQUAL "package")
--  find_package(c-ares CONFIG)
+-  find_package(c-ares REQUIRED CONFIG)
 +  find_package(PkgConfig REQUIRED)
 +  pkg_search_module(CARES REQUIRED libcares)
    if(TARGET c-ares::cares)
      set(_gRPC_CARES_LIBRARIES c-ares::cares)
    endif()
-@@ -188,9 +189,6 @@ if("${gRPC_PROTOBUF_PROVIDER}" STREQUAL 
-     if(TARGET libprotoc)
-       set(_gRPC_PROTOBUF_PROTOC_LIBRARIES libprotoc)
-     endif()
--    if(TARGET protoc)
--      set(_gRPC_PROTOBUF_PROTOC protoc)
--    endif()
-   else()
-       message(WARNING "gRPC_PROTOBUF_PROVIDER is \"module\" but PROTOBUF_ROOT_DIR is wrong")
-   endif()
-@@ -339,7 +337,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 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>
-@@ -818,6 +816,7 @@ add_library(gpr
+@@ -828,6 +829,7 @@ add_library(gpr
    src/core/lib/support/tmpfile_windows.c
    src/core/lib/support/wrap_memcpy.c
  )
@@ -37,7 +18,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr"
-@@ -1206,6 +1205,7 @@ add_library(grpc
+@@ -1220,6 +1222,7 @@ add_library(grpc
    src/core/ext/filters/workarounds/workaround_utils.c
    src/core/plugin_registry/grpc_plugin_registry.c
  )
@@ -45,15 +26,15 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc"
-@@ -1512,6 +1512,7 @@ add_library(grpc_cronet
-   src/core/ext/filters/load_reporting/load_reporting_filter.c
+@@ -1533,6 +1536,7 @@ add_library(grpc_cronet
+   src/core/ext/filters/load_reporting/server_load_reporting_plugin.c
    src/core/plugin_registry/grpc_cronet_plugin_registry.c
  )
 +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"
-@@ -2344,6 +2345,7 @@ add_library(grpc_unsecure
+@@ -2383,6 +2387,7 @@ add_library(grpc_unsecure
    src/core/ext/filters/workarounds/workaround_utils.c
    src/core/plugin_registry/grpc_unsecure_plugin_registry.c
  )
@@ -61,7 +42,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure"
-@@ -2561,6 +2563,7 @@ add_library(grpc++
+@@ -2598,6 +2603,7 @@ add_library(grpc++
    src/cpp/util/time_cc.cc
    src/cpp/codegen/codegen_init.cc
  )
@@ -69,7 +50,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++"
-@@ -2991,6 +2994,7 @@ add_library(grpc++_cronet
+@@ -3097,6 +3103,7 @@ add_library(grpc++_cronet
    third_party/nanopb/pb_decode.c
    third_party/nanopb/pb_encode.c
  )
@@ -77,7 +58,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++_cronet PROPERTIES COMPILE_PDB_NAME "grpc++_cronet"
-@@ -3187,6 +3191,7 @@ add_library(grpc++_error_details
+@@ -3297,6 +3304,7 @@ add_library(grpc++_error_details
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/status/status.grpc.pb.h
    src/cpp/util/error_details.cc
  )
@@ -85,7 +66,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details"
-@@ -3317,6 +3322,7 @@ add_library(grpc++_reflection
+@@ -3423,6 +3431,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
  )
@@ -93,7 +74,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection"
-@@ -3740,6 +3746,7 @@ add_library(grpc++_unsecure
+@@ -3846,6 +3855,7 @@ add_library(grpc++_unsecure
    src/cpp/util/time_cc.cc
    src/cpp/codegen/codegen_init.cc
  )
@@ -101,7 +82,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++_unsecure PROPERTIES COMPILE_PDB_NAME "grpc++_unsecure"
-@@ -4053,6 +4060,7 @@ add_library(grpc_plugin_support
+@@ -4159,6 +4169,7 @@ add_library(grpc_plugin_support
    src/compiler/python_generator.cc
    src/compiler/ruby_generator.cc
  )
@@ -109,7 +90,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support"
-@@ -4577,6 +4585,7 @@ endif (gRPC_BUILD_TESTS)
+@@ -4668,6 +4679,7 @@ endif (gRPC_BUILD_TESTS)
  add_library(grpc_csharp_ext SHARED
    src/csharp/ext/grpc_csharp_ext.c
  )
diff --git a/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c b/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c
index 4bc740e2fe27..e48772d04b33 100644
--- a/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c
+++ b/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c
@@ -1,4 +1,4 @@
---- src/core/lib/security/credentials/jwt/jwt_verifier.c.orig	2017-10-05 19:05:39 UTC
+--- src/core/lib/security/credentials/jwt/jwt_verifier.c.orig	2017-10-26 19:11:22 UTC
 +++ src/core/lib/security/credentials/jwt/jwt_verifier.c
 @@ -462,7 +462,7 @@ static BIGNUM *bignum_from_base64(grpc_e
    return result;
diff --git a/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c b/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c
index e242cc52a169..7374bdbe0bbf 100644
--- a/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c
+++ b/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c
@@ -1,4 +1,4 @@
---- src/core/tsi/ssl_transport_security.c.orig	2017-10-05 19:05:39 UTC
+--- src/core/tsi/ssl_transport_security.c.orig	2017-10-26 19:11:22 UTC
 +++ src/core/tsi/ssl_transport_security.c
 @@ -20,6 +20,7 @@
  
diff --git a/devel/grpc/pkg-plist b/devel/grpc/pkg-plist
index a0567c3a914b..6510bd483f16 100644
--- a/devel/grpc/pkg-plist
+++ b/devel/grpc/pkg-plist
@@ -32,6 +32,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
@@ -97,6 +98,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
@@ -106,10 +108,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
@@ -118,6 +122,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
@@ -141,6 +146,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