From owner-svn-ports-head@freebsd.org Thu Jun 22 07:08:55 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5AB5ADA7E03; Thu, 22 Jun 2017 07:08:55 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 29DD77049A; Thu, 22 Jun 2017 07:08:55 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5M78sAx080788; Thu, 22 Jun 2017 07:08:54 GMT (envelope-from vanilla@FreeBSD.org) Received: (from vanilla@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5M78rhJ080784; Thu, 22 Jun 2017 07:08:53 GMT (envelope-from vanilla@FreeBSD.org) Message-Id: <201706220708.v5M78rhJ080784@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vanilla set sender to vanilla@FreeBSD.org using -f From: "Vanilla I. Shu" Date: Thu, 22 Jun 2017 07:08:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r444101 - in head/devel/grpc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jun 2017 07:08:55 -0000 Author: vanilla Date: Thu Jun 22 07:08:53 2017 New Revision: 444101 URL: https://svnweb.freebsd.org/changeset/ports/444101 Log: Update to 1.4.0. Modified: head/devel/grpc/Makefile head/devel/grpc/distinfo head/devel/grpc/files/patch-CMakeLists.txt head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c Modified: head/devel/grpc/Makefile ============================================================================== --- head/devel/grpc/Makefile Thu Jun 22 06:38:46 2017 (r444100) +++ head/devel/grpc/Makefile Thu Jun 22 07:08:53 2017 (r444101) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= grpc -PORTVERSION= 1.3.4 +PORTVERSION= 1.4.0 DISTVERSIONPREFIX= v CATEGORIES= devel Modified: head/devel/grpc/distinfo ============================================================================== --- head/devel/grpc/distinfo Thu Jun 22 06:38:46 2017 (r444100) +++ head/devel/grpc/distinfo Thu Jun 22 07:08:53 2017 (r444101) @@ -1,6 +1,6 @@ -TIMESTAMP = 1497326729 -SHA256 (grpc-grpc-v1.3.4_GH0.tar.gz) = c12ca2693a3b3d80cadb15f1618d9ca6c83fe8c64a32b058a95ff8dce39b3e82 -SIZE (grpc-grpc-v1.3.4_GH0.tar.gz) = 4803665 +TIMESTAMP = 1498113591 +SHA256 (grpc-grpc-v1.4.0_GH0.tar.gz) = 26da0fa694111cb073f09c1273355a63930e2127479a64271a81b71d8ac78592 +SIZE (grpc-grpc-v1.4.0_GH0.tar.gz) = 4818770 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 Modified: head/devel/grpc/files/patch-CMakeLists.txt ============================================================================== --- head/devel/grpc/files/patch-CMakeLists.txt Thu Jun 22 06:38:46 2017 (r444100) +++ head/devel/grpc/files/patch-CMakeLists.txt Thu Jun 22 07:08:53 2017 (r444101) @@ -1,14 +1,5 @@ ---- CMakeLists.txt.orig 2017-05-19 23:18:40 UTC +--- CMakeLists.txt.orig 2017-06-21 17:05:33 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() @@ -53,11 +44,11 @@ "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc" "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h" - COMMAND ${_gRPC_PROTOBUF_PROTOC} -+ COMMAND "protoc" ++ COMMAND protoc ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR} --cpp_out=${_gRPC_PROTO_GENS_DIR} --plugin=protoc-gen-grpc=$ -@@ -791,6 +782,7 @@ add_library(gpr +@@ -793,6 +784,7 @@ add_library(gpr src/core/lib/support/tmpfile_windows.c src/core/lib/support/wrap_memcpy.c ) @@ -65,7 +56,15 @@ if(WIN32 AND MSVC) set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr" -@@ -1169,6 +1161,7 @@ add_library(grpc +@@ -885,6 +877,7 @@ if (gRPC_BUILD_TESTS) + add_library(gpr_test_util + test/core/util/test_config.c + ) ++set_target_properties(gpr_test_util PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(gpr_test_util PROPERTIES COMPILE_PDB_NAME "gpr_test_util" +@@ -1172,6 +1165,7 @@ add_library(grpc src/core/ext/filters/workarounds/workaround_utils.c src/core/plugin_registry/grpc_plugin_registry.c ) @@ -73,7 +72,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc" -@@ -1470,6 +1463,7 @@ add_library(grpc_cronet +@@ -1473,6 +1467,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,7 +80,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc_cronet PROPERTIES COMPILE_PDB_NAME "grpc_cronet" -@@ -1706,6 +1700,7 @@ add_library(grpc_test_util +@@ -1709,6 +1704,7 @@ add_library(grpc_test_util src/core/lib/transport/transport_op_string.c src/core/lib/debug/trace.c ) @@ -89,7 +88,7 @@ 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 +@@ -1803,6 +1799,7 @@ add_library(grpc_test_util_unsecure test/core/util/slice_splitter.c test/core/util/trickle_endpoint.c ) @@ -97,7 +96,7 @@ 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 +@@ -2064,6 +2061,7 @@ add_library(grpc_unsecure src/core/ext/filters/workarounds/workaround_utils.c src/core/plugin_registry/grpc_unsecure_plugin_registry.c ) @@ -105,7 +104,23 @@ if(WIN32 AND MSVC) set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure" -@@ -2405,6 +2402,7 @@ add_library(grpc++ +@@ -2152,6 +2150,7 @@ if (gRPC_BUILD_TESTS) + add_library(reconnect_server + test/core/util/reconnect_server.c + ) ++set_target_properties(reconnect_server PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(reconnect_server PROPERTIES COMPILE_PDB_NAME "reconnect_server" +@@ -2196,6 +2195,7 @@ if (gRPC_BUILD_TESTS) + add_library(test_tcp_server + test/core/util/test_tcp_server.c + ) ++set_target_properties(test_tcp_server PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(test_tcp_server PROPERTIES COMPILE_PDB_NAME "test_tcp_server" +@@ -2282,6 +2282,7 @@ add_library(grpc++ third_party/nanopb/pb_encode.c src/cpp/codegen/codegen_init.cc ) @@ -113,7 +128,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++" -@@ -2805,6 +2803,7 @@ add_library(grpc++_cronet +@@ -2671,6 +2672,7 @@ add_library(grpc++_cronet src/core/ext/census/trace_context.c src/core/ext/census/tracing.c ) @@ -121,7 +136,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_cronet PROPERTIES COMPILE_PDB_NAME "grpc++_cronet" -@@ -2974,6 +2973,7 @@ add_library(grpc++_error_details +@@ -2841,6 +2843,7 @@ add_library(grpc++_error_details ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/status/status.grpc.pb.h src/cpp/util/error_details.cc ) @@ -129,7 +144,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details" -@@ -3041,6 +3041,7 @@ add_library(grpc++_proto_reflection_desc +@@ -2908,6 +2911,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 ) @@ -137,7 +152,7 @@ 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 +@@ -2970,6 +2974,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 ) @@ -145,7 +160,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection" -@@ -3165,6 +3167,7 @@ if (gRPC_BUILD_TESTS) +@@ -3032,6 +3037,7 @@ if (gRPC_BUILD_TESTS) add_library(grpc++_test_config test/cpp/util/test_config_cc.cc ) @@ -153,7 +168,7 @@ 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 +@@ -3100,6 +3106,7 @@ add_library(grpc++_test_util test/cpp/util/test_credentials_provider.cc src/cpp/codegen/codegen_init.cc ) @@ -161,7 +176,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_test_util PROPERTIES COMPILE_PDB_NAME "grpc++_test_util" -@@ -3515,6 +3519,7 @@ add_library(grpc++_unsecure +@@ -3255,6 +3262,7 @@ add_library(grpc++_unsecure third_party/nanopb/pb_encode.c src/cpp/codegen/codegen_init.cc ) @@ -169,7 +184,23 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_unsecure PROPERTIES COMPILE_PDB_NAME "grpc++_unsecure" -@@ -3801,6 +3806,7 @@ add_library(grpc_plugin_support +@@ -3409,6 +3417,7 @@ if (gRPC_BUILD_TESTS) + add_library(grpc_benchmark + test/cpp/microbenchmarks/helpers.cc + ) ++set_target_properties(grpc_benchmark PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(grpc_benchmark PROPERTIES COMPILE_PDB_NAME "grpc_benchmark" +@@ -3467,6 +3476,7 @@ add_library(grpc_cli_libs + ${_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_cli_libs PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(grpc_cli_libs PROPERTIES COMPILE_PDB_NAME "grpc_cli_libs" +@@ -3531,6 +3541,7 @@ add_library(grpc_plugin_support src/compiler/python_generator.cc src/compiler/ruby_generator.cc ) @@ -177,7 +208,63 @@ if(WIN32 AND MSVC) set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support" -@@ -4324,6 +4330,7 @@ endif (gRPC_BUILD_TESTS) +@@ -3602,6 +3613,7 @@ add_library(http2_client_main + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.grpc.pb.h + test/cpp/interop/http2_client.cc + ) ++set_target_properties(http2_client_main PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(http2_client_main PROPERTIES COMPILE_PDB_NAME "http2_client_main" +@@ -3665,6 +3677,7 @@ add_library(interop_client_helper + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.grpc.pb.h + test/cpp/interop/client_helper.cc + ) ++set_target_properties(interop_client_helper PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(interop_client_helper PROPERTIES COMPILE_PDB_NAME "interop_client_helper" +@@ -3731,6 +3744,7 @@ add_library(interop_client_main + test/cpp/interop/client.cc + test/cpp/interop/interop_client.cc + ) ++set_target_properties(interop_client_main PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(interop_client_main PROPERTIES COMPILE_PDB_NAME "interop_client_main" +@@ -3793,6 +3807,7 @@ if (gRPC_BUILD_TESTS) + add_library(interop_server_helper + test/cpp/interop/server_helper.cc + ) ++set_target_properties(interop_server_helper PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(interop_server_helper PROPERTIES COMPILE_PDB_NAME "interop_server_helper" +@@ -3855,6 +3870,7 @@ add_library(interop_server_lib + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.grpc.pb.h + test/cpp/interop/interop_server.cc + ) ++set_target_properties(interop_server_lib PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(interop_server_lib PROPERTIES COMPILE_PDB_NAME "interop_server_lib" +@@ -3917,6 +3933,7 @@ if (gRPC_BUILD_TESTS) + add_library(interop_server_main + test/cpp/interop/interop_server_bootstrap.cc + ) ++set_target_properties(interop_server_main PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(interop_server_main PROPERTIES COMPILE_PDB_NAME "interop_server_main" +@@ -3992,6 +4009,7 @@ add_library(qps + test/cpp/qps/server_sync.cc + test/cpp/qps/usage_timer.cc + ) ++set_target_properties(qps PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(qps PROPERTIES COMPILE_PDB_NAME "qps" +@@ -4054,6 +4072,7 @@ endif (gRPC_BUILD_TESTS) add_library(grpc_csharp_ext SHARED src/csharp/ext/grpc_csharp_ext.c ) @@ -185,3 +272,43 @@ if(WIN32 AND MSVC) set_target_properties(grpc_csharp_ext PROPERTIES COMPILE_PDB_NAME "grpc_csharp_ext" +@@ -4151,6 +4170,7 @@ add_library(ares + third_party/cares/cares/inet_ntop.c + third_party/cares/cares/windows_port.c + ) ++set_target_properties(ares PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(ares PROPERTIES COMPILE_PDB_NAME "ares" +@@ -4191,6 +4211,7 @@ if (gRPC_BUILD_TESTS) + add_library(bad_client_test + test/core/bad_client/bad_client.c + ) ++set_target_properties(bad_client_test PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(bad_client_test PROPERTIES COMPILE_PDB_NAME "bad_client_test" +@@ -4234,6 +4255,7 @@ if (gRPC_BUILD_TESTS) + add_library(bad_ssl_test_server + test/core/bad_ssl/server_common.c + ) ++set_target_properties(bad_ssl_test_server PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(bad_ssl_test_server PROPERTIES COMPILE_PDB_NAME "bad_ssl_test_server" +@@ -4332,6 +4354,7 @@ add_library(end2end_tests + test/core/end2end/tests/write_buffering.c + test/core/end2end/tests/write_buffering_at_end.c + ) ++set_target_properties(end2end_tests PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(end2end_tests PROPERTIES COMPILE_PDB_NAME "end2end_tests" +@@ -4430,6 +4453,7 @@ add_library(end2end_nosec_tests + test/core/end2end/tests/write_buffering.c + test/core/end2end/tests/write_buffering_at_end.c + ) ++set_target_properties(end2end_nosec_tests PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(end2end_nosec_tests PROPERTIES COMPILE_PDB_NAME "end2end_nosec_tests" Modified: head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c ============================================================================== --- head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c Thu Jun 22 06:38:46 2017 (r444100) +++ head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c Thu Jun 22 07:08:53 2017 (r444101) @@ -1,4 +1,4 @@ ---- src/core/tsi/ssl_transport_security.c.orig 2017-05-19 23:18:40 UTC +--- src/core/tsi/ssl_transport_security.c.orig 2017-06-21 17:05:33 UTC +++ src/core/tsi/ssl_transport_security.c @@ -35,6 +35,7 @@