Update to 1.3.4.

Sponsored by:	kkstream

6 files changed, 68 insertions, 35 deletions

diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile
index 097a887182ec..88c4f1f1b56d 100644
--- a/devel/grpc/Makefile
+++ b/devel/grpc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grpc
-PORTVERSION=	1.3.2
+PORTVERSION=	1.3.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/grpc/distinfo b/devel/grpc/distinfo
index 557b1dd26b80..4e904ebc9cbe 100644
--- a/devel/grpc/distinfo
+++ b/devel/grpc/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1494645576
-SHA256 (grpc-grpc-v1.3.2_GH0.tar.gz) = 6228fb43e6b11b1dec5aa21e66482bb45013b45cb70c1ca062f4848469d1ab99
-SIZE (grpc-grpc-v1.3.2_GH0.tar.gz) = 4694379
+TIMESTAMP = 1497326729
+SHA256 (grpc-grpc-v1.3.4_GH0.tar.gz) = c12ca2693a3b3d80cadb15f1618d9ca6c83fe8c64a32b058a95ff8dce39b3e82
+SIZE (grpc-grpc-v1.3.4_GH0.tar.gz) = 4803665
 SHA256 (boringssl-boringssl-ebcb5be_GH0.tar.gz) = 324b80025f73eba48791fdfcf82e81b4496b8a002fd985d68cca137f31d25e4c
 SIZE (boringssl-boringssl-ebcb5be_GH0.tar.gz) = 5936046
 SHA256 (google-benchmark-v1.1.0_GH0.tar.gz) = e7334dd254434c6668e33a54c8f839194c7c61840d52f4b6258eee28e9f3b20e
diff --git a/devel/grpc/files/patch-CMakeLists.txt b/devel/grpc/files/patch-CMakeLists.txt
index 9fbb70c13482..0ac4c6093ec8 100644
--- a/devel/grpc/files/patch-CMakeLists.txt
+++ b/devel/grpc/files/patch-CMakeLists.txt
@@ -1,5 +1,14 @@
---- CMakeLists.txt.orig	2017-04-27 20:59:19 UTC
+--- CMakeLists.txt.orig	2017-05-19 23:18:40 UTC
 +++ CMakeLists.txt
+@@ -39,7 +39,7 @@
+ cmake_minimum_required(VERSION 2.8)
+ 
+ set(PACKAGE_NAME      "grpc")
+-set(PACKAGE_VERSION   "1.4.0-dev")
++set(PACKAGE_VERSION   "1.3.4")
+ set(PACKAGE_STRING    "${PACKAGE_NAME} ${PACKAGE_VERSION}")
+ set(PACKAGE_TARNAME   "${PACKAGE_NAME}-${PACKAGE_VERSION}")
+ set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")
 @@ -150,7 +150,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo
      message(WARNING "gRPC_CARES_PROVIDER is \"module\" but CARES_ROOT_DIR is wrong")
    endif()
@@ -39,25 +48,16 @@
      set(_gRPC_FIND_PROTOBUF "if(NOT protobuf_FOUND)\n  find_package(protobuf CONFIG)\nendif()")
    else()
      find_package(Protobuf MODULE)
-@@ -270,7 +261,7 @@ if(NOT MSVC)
- endif()
- 
- if(UNIX)
--  set(_gRPC_ALLTARGETS_LIBRARIES dl rt m pthread)
-+  set(_gRPC_ALLTARGETS_LIBRARIES rt m pthread)
- endif()
- 
- if(WIN32 AND MSVC)
-@@ -316,7 +307,7 @@ function(protobuf_generate_grpc_cpp)
-              "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.h"
+@@ -319,7 +310,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 ${_gRPC_PROTOBUF_PROTOC}
 +      COMMAND "protoc"
-       ARGS --grpc_out=${_gRPC_PROTO_GENS_DIR}
+       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>
-@@ -780,6 +771,7 @@ add_library(gpr
+@@ -791,6 +782,7 @@ add_library(gpr
    src/core/lib/support/tmpfile_windows.c
    src/core/lib/support/wrap_memcpy.c
  )
@@ -65,15 +65,15 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr"
-@@ -1145,6 +1137,7 @@ add_library(grpc
-   src/core/ext/filters/max_age/max_age_filter.c
+@@ -1169,6 +1161,7 @@ add_library(grpc
+   src/core/ext/filters/workarounds/workaround_utils.c
    src/core/plugin_registry/grpc_plugin_registry.c
  )
 +set_target_properties(grpc PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc"
-@@ -1437,6 +1430,7 @@ add_library(grpc_cronet
+@@ -1470,6 +1463,7 @@ add_library(grpc_cronet
    src/core/ext/filters/load_reporting/load_reporting_filter.c
    src/core/plugin_registry/grpc_cronet_plugin_registry.c
  )
@@ -81,15 +81,31 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc_cronet PROPERTIES COMPILE_PDB_NAME "grpc_cronet"
-@@ -2011,6 +2005,7 @@ add_library(grpc_unsecure
-   src/core/ext/filters/max_age/max_age_filter.c
+@@ -1706,6 +1700,7 @@ add_library(grpc_test_util
+   src/core/lib/transport/transport_op_string.c
+   src/core/lib/debug/trace.c
+ )
++set_target_properties(grpc_test_util PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
+ 
+ if(WIN32 AND MSVC)
+   set_target_properties(grpc_test_util PROPERTIES COMPILE_PDB_NAME "grpc_test_util"
+@@ -1800,6 +1795,7 @@ add_library(grpc_test_util_unsecure
+   test/core/util/slice_splitter.c
+   test/core/util/trickle_endpoint.c
+ )
++set_target_properties(grpc_test_util_unsecure PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
+ 
+ if(WIN32 AND MSVC)
+   set_target_properties(grpc_test_util_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_test_util_unsecure"
+@@ -2060,6 +2056,7 @@ add_library(grpc_unsecure
+   src/core/ext/filters/workarounds/workaround_utils.c
    src/core/plugin_registry/grpc_unsecure_plugin_registry.c
  )
 +set_target_properties(grpc_unsecure PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure"
-@@ -2353,6 +2348,7 @@ add_library(grpc++
+@@ -2405,6 +2402,7 @@ add_library(grpc++
    third_party/nanopb/pb_encode.c
    src/cpp/codegen/codegen_init.cc
  )
@@ -97,7 +113,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++"
-@@ -2746,6 +2742,7 @@ add_library(grpc++_cronet
+@@ -2805,6 +2803,7 @@ add_library(grpc++_cronet
    src/core/ext/census/trace_context.c
    src/core/ext/census/tracing.c
  )
@@ -105,7 +121,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++_cronet PROPERTIES COMPILE_PDB_NAME "grpc++_cronet"
-@@ -2915,6 +2912,7 @@ add_library(grpc++_error_details
+@@ -2974,6 +2973,7 @@ add_library(grpc++_error_details
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/status/status.grpc.pb.h
    src/cpp/util/error_details.cc
  )
@@ -113,7 +129,15 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details"
-@@ -3042,6 +3040,7 @@ add_library(grpc++_reflection
+@@ -3041,6 +3041,7 @@ add_library(grpc++_proto_reflection_desc
+   ${_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
+ )
++set_target_properties(grpc++_proto_reflection_desc_db PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
+ 
+ if(WIN32 AND MSVC)
+   set_target_properties(grpc++_proto_reflection_desc_db PROPERTIES COMPILE_PDB_NAME "grpc++_proto_reflection_desc_db"
+@@ -3103,6 +3104,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
  )
@@ -121,15 +145,23 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection"
-@@ -3169,6 +3168,7 @@ add_library(grpc++_test_util
+@@ -3165,6 +3167,7 @@ if (gRPC_BUILD_TESTS)
+ add_library(grpc++_test_config
+   test/cpp/util/test_config_cc.cc
+ )
++set_target_properties(grpc++_test_config PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
+ 
+ if(WIN32 AND MSVC)
+   set_target_properties(grpc++_test_config PROPERTIES COMPILE_PDB_NAME "grpc++_test_config"
+@@ -3233,6 +3236,7 @@ add_library(grpc++_test_util
    test/cpp/util/test_credentials_provider.cc
    src/cpp/codegen/codegen_init.cc
  )
-+set_target_properties(grpc++_unsecure PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
++set_target_properties(grpc++_test_util PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++_test_util PROPERTIES COMPILE_PDB_NAME "grpc++_test_util"
-@@ -3450,6 +3450,7 @@ add_library(grpc++_unsecure
+@@ -3515,6 +3519,7 @@ add_library(grpc++_unsecure
    third_party/nanopb/pb_encode.c
    src/cpp/codegen/codegen_init.cc
  )
@@ -137,7 +169,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++_unsecure PROPERTIES COMPILE_PDB_NAME "grpc++_unsecure"
-@@ -3732,6 +3733,7 @@ add_library(grpc_plugin_support
+@@ -3801,6 +3806,7 @@ add_library(grpc_plugin_support
    src/compiler/python_generator.cc
    src/compiler/ruby_generator.cc
  )
@@ -145,7 +177,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support"
-@@ -4241,6 +4243,7 @@ endif (gRPC_BUILD_TESTS)
+@@ -4324,6 +4330,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_tsi_ssl__transport__security.c b/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c
index 13954eb44322..05627112a2c5 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-05-02 03:20:57 UTC
+--- src/core/tsi/ssl_transport_security.c.orig	2017-05-19 23:18:40 UTC
 +++ src/core/tsi/ssl_transport_security.c
 @@ -35,6 +35,7 @@
  
diff --git a/devel/grpc/files/patch-third__party_boringssl_crypto_CMakeLists.txt b/devel/grpc/files/patch-third__party_boringssl_crypto_CMakeLists.txt
index 0a0c5fd65c2e..f0179e181806 100644
--- a/devel/grpc/files/patch-third__party_boringssl_crypto_CMakeLists.txt
+++ b/devel/grpc/files/patch-third__party_boringssl_crypto_CMakeLists.txt
@@ -1,4 +1,4 @@
---- third_party/boringssl/crypto/CMakeLists.txt.orig	2017-05-01 12:40:52 UTC
+--- third_party/boringssl/crypto/CMakeLists.txt.orig	2017-03-30 20:04:23 UTC
 +++ third_party/boringssl/crypto/CMakeLists.txt
 @@ -195,29 +195,3 @@ add_executable(
  
diff --git a/devel/grpc/pkg-plist b/devel/grpc/pkg-plist
index bc6e607a830b..14bdeb77c69d 100644
--- a/devel/grpc/pkg-plist
+++ b/devel/grpc/pkg-plist
@@ -1,3 +1,4 @@
+bin/check_epollexclusive
 bin/gen_hpack_tables
 bin/gen_legal_metadata_characters
 bin/gen_percent_encoding_tables
@@ -58,7 +59,6 @@ include/grpc++/impl/codegen/service_type.h
 include/grpc++/impl/codegen/slice.h
 include/grpc++/impl/codegen/status.h
 include/grpc++/impl/codegen/status_code_enum.h
-include/grpc++/impl/codegen/status_helper.h
 include/grpc++/impl/codegen/string_ref.h
 include/grpc++/impl/codegen/stub_options.h
 include/grpc++/impl/codegen/sync_stream.h
@@ -152,6 +152,7 @@ include/grpc/support/tls_gcc.h
 include/grpc/support/tls_msvc.h
 include/grpc/support/tls_pthread.h
 include/grpc/support/useful.h
+include/grpc/support/workaround_list.h
 lib/cmake/gRPC/gRPCConfig.cmake
 lib/cmake/gRPC/gRPCConfigVersion.cmake
 lib/libbenchmark.so