5 files changed, 49 insertions, 16 deletions

diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile
index 54f46ffe82fc..a1477405549d 100644
--- a/devel/grpc/Makefile
+++ b/devel/grpc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grpc
-PORTVERSION=	1.4.0
+PORTVERSION=	1.4.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libgflags.so:devel/gflags \
 
 USE_GITHUB=	yes
 GH_TUPLE=	grpc:grpc:v${PORTVERSION} \
-		boringssl:boringssl:ebcb5be:boringssl/third_party/boringssl \
+		google:boringssl:a93bc11:boringssl/third_party/boringssl \
 		google:benchmark:v1.1.0:benchmark/third_party/benchmark
 
 USES=		cmake perl5 pkgconfig
diff --git a/devel/grpc/distinfo b/devel/grpc/distinfo
index f9d3b17b6f9b..a68a9765f981 100644
--- a/devel/grpc/distinfo
+++ b/devel/grpc/distinfo
@@ -1,7 +1,7 @@
-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
+TIMESTAMP = 1498816372
+SHA256 (grpc-grpc-v1.4.1_GH0.tar.gz) = 60840ef0e9b71f47cb73d4e220089b3d1e78dbfa011ae128f7688622f287b543
+SIZE (grpc-grpc-v1.4.1_GH0.tar.gz) = 4819488
+SHA256 (google-boringssl-a93bc11_GH0.tar.gz) = d44ae3ff107d857ff8f8cb7a85910ad059a9723479a1f642b11580aa6f4b7b20
+SIZE (google-boringssl-a93bc11_GH0.tar.gz) = 12810927
 SHA256 (google-benchmark-v1.1.0_GH0.tar.gz) = e7334dd254434c6668e33a54c8f839194c7c61840d52f4b6258eee28e9f3b20e
 SIZE (google-benchmark-v1.1.0_GH0.tar.gz) = 87199
diff --git a/devel/grpc/files/patch-CMakeLists.txt b/devel/grpc/files/patch-CMakeLists.txt
index 99b2635381de..18d6a8dfa17a 100644
--- a/devel/grpc/files/patch-CMakeLists.txt
+++ b/devel/grpc/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2017-06-21 17:05:33 UTC
+--- CMakeLists.txt.orig	2017-06-27 19:46:01 UTC
 +++ CMakeLists.txt
 @@ -150,7 +150,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo
      message(WARNING "gRPC_CARES_PROVIDER is \"module\" but CARES_ROOT_DIR is wrong")
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 c0b2832ea16a..fcb44d2f1f52 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-06-21 17:05:33 UTC
+--- src/core/tsi/ssl_transport_security.c.orig	2017-06-27 19:46:01 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 f0179e181806..8ce10739ced9 100644
--- a/devel/grpc/files/patch-third__party_boringssl_crypto_CMakeLists.txt
+++ b/devel/grpc/files/patch-third__party_boringssl_crypto_CMakeLists.txt
@@ -1,26 +1,59 @@
---- third_party/boringssl/crypto/CMakeLists.txt.orig	2017-03-30 20:04:23 UTC
+--- third_party/boringssl/crypto/CMakeLists.txt.orig	2017-06-29 20:12:53 UTC
 +++ third_party/boringssl/crypto/CMakeLists.txt
-@@ -195,29 +195,3 @@ add_executable(
- 
- target_link_libraries(refcount_test crypto)
- add_dependencies(all_tests refcount_test)
+@@ -212,62 +212,3 @@ SET_TARGET_PROPERTIES(crypto PROPERTIES 
+ if(NOT MSVC AND NOT ANDROID)
+   target_link_libraries(crypto pthread)
+ endif()
 -
 -# TODO(davidben): Convert the remaining tests to GTest.
 -add_executable(
 -  crypto_test
 -
 -  asn1/asn1_test.cc
+-  base64/base64_test.cc
 -  bio/bio_test.cc
+-  bytestring/bytestring_test.cc
 -  chacha/chacha_test.cc
+-  cipher_extra/aead_test.cc
+-  cipher_extra/cipher_test.cc
+-  cmac/cmac_test.cc
+-  compiler_test.cc
 -  constant_time_test.cc
+-  curve25519/ed25519_test.cc
+-  curve25519/spake25519_test.cc
 -  curve25519/x25519_test.cc
+-  ecdh/ecdh_test.cc
 -  dh/dh_test.cc
+-  digest_extra/digest_test.cc
 -  dsa/dsa_test.cc
--  ec/ec_test.cc
 -  err/err_test.cc
 -  evp/evp_extra_test.cc
--  rsa/rsa_test.cc
+-  evp/evp_test.cc
+-  evp/pbkdf_test.cc
+-  evp/scrypt_test.cc
+-  fipsmodule/aes/aes_test.cc
+-  fipsmodule/bn/bn_test.cc
+-  fipsmodule/ec/ec_test.cc
+-  fipsmodule/ec/p256-x86_64_test.cc
+-  fipsmodule/ecdsa/ecdsa_test.cc
+-  fipsmodule/modes/gcm_test.cc
+-  fipsmodule/rand/ctrdrbg_test.cc
+-  hkdf/hkdf_test.cc
+-  hmac_extra/hmac_test.cc
+-  lhash/lhash_test.cc
+-  obj/obj_test.cc
+-  pkcs7/pkcs7_test.cc
+-  pkcs8/pkcs8_test.cc
+-  pkcs8/pkcs12_test.cc
+-  poly1305/poly1305_test.cc
+-  pool/pool_test.cc
+-  refcount_test.cc
+-  rsa_extra/rsa_test.cc
+-  test/file_test_gtest.cc
+-  thread_test.cc
+-  x509/x509_test.cc
 -
+-  $<TARGET_OBJECTS:crypto_test_data>
 -  $<TARGET_OBJECTS:gtest_main>
 -  $<TARGET_OBJECTS:test_support>
 -)