Fri Apr 19 07:15:36 2019 UTC ()
grpc: updated to 1.20.0

Release v1.20.0
This release contains refinements, improvements, and bug fixes, with highlights listed below.

Core
Fix bug in CFStream endpoint.
Fix a NULL deref in tcp_client_windows.cc.
Avoid using grpc_core::Executor when the background poller is available.
Update the c-ares submodule to the 1.15 release.
Remove unnecessary hack which causes data races.
Fix Potentially Dangerous Typo - locked function being run outside of combiner.
Trace log the status of every c-ares lookup; cleanup error handling.
Add SPIFFE security stack to gRPC .
Nuking the poll-cv polling engine.
Backport 18201 to fix "symbol not found: _ares_library_init" error in Bazel on MacOS build.
Run run_after_write closures in h2 once write action is done.
Transition into state CONNECTING when we start name resolution.
Support "darwin_x86_64" CPU in cares.BUILD.
Move grpc_shutdown internals to a detached thread.
Fix c-ares on Windows "DNS resolution failure" triggered by logging.
Disable c-ares on Android.

C++
Global Interceptor Registration allowed only once.
cmake fix: builds disabled by CODEGEN=OFF should not be installed.
cmake: when cross-compiling, the host grpc_cpp_plugin should be used.


(adam)
diff -r1.7 -r1.8 pkgsrc/net/grpc/Makefile
diff -r1.5 -r1.6 pkgsrc/net/grpc/PLIST
diff -r1.8 -r1.9 pkgsrc/net/grpc/distinfo
diff -r1.4 -r1.5 pkgsrc/net/grpc/patches/patch-CMakeLists.txt
diff -r1.2 -r1.3 pkgsrc/net/grpc/patches/patch-include_grpc_impl_codegen_port__platform.h
cvs diff -r1.7 -r1.8 pkgsrc/net/grpc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/grpc/Makefile 2019/03/22 08:25:51 1.7
+++ pkgsrc/net/grpc/Makefile 2019/04/19 07:15:36 1.8
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.7 2019/03/22 08:25:51 adam Exp $ 1# $NetBSD: Makefile,v 1.8 2019/04/19 07:15:36 adam Exp $
2 2
3DISTNAME= grpc-1.19.1 3DISTNAME= grpc-1.20.0
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= ${MASTER_SITE_GITHUB:=grpc/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=grpc/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
7 7
8MAINTAINER= minskim@NetBSD.org 8MAINTAINER= minskim@NetBSD.org
9HOMEPAGE= https://grpc.io/ 9HOMEPAGE= https://grpc.io/
10COMMENT= High performance, open-source universal RPC framework 10COMMENT= High performance, open-source universal RPC framework
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13USE_CMAKE= yes 13USE_CMAKE= yes
14USE_LANGUAGES+= c c++11 14USE_LANGUAGES+= c c++11
15USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
16 16
cvs diff -r1.5 -r1.6 pkgsrc/net/grpc/PLIST (expand / switch to unified diff)

--- pkgsrc/net/grpc/PLIST 2019/03/22 08:25:51 1.5
+++ pkgsrc/net/grpc/PLIST 2019/04/19 07:15:36 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2019/03/22 08:25:51 adam Exp $ 1@comment $NetBSD: PLIST,v 1.6 2019/04/19 07:15:36 adam Exp $
2bin/grpc_cpp_plugin 2bin/grpc_cpp_plugin
3bin/grpc_csharp_plugin 3bin/grpc_csharp_plugin
4bin/grpc_node_plugin 4bin/grpc_node_plugin
5bin/grpc_objective_c_plugin 5bin/grpc_objective_c_plugin
6bin/grpc_php_plugin 6bin/grpc_php_plugin
7bin/grpc_python_plugin 7bin/grpc_python_plugin
8bin/grpc_ruby_plugin 8bin/grpc_ruby_plugin
9include/grpc++/alarm.h 9include/grpc++/alarm.h
10include/grpc++/channel.h 10include/grpc++/channel.h
11include/grpc++/client_context.h 11include/grpc++/client_context.h
12include/grpc++/completion_queue.h 12include/grpc++/completion_queue.h
13include/grpc++/create_channel.h 13include/grpc++/create_channel.h
14include/grpc++/create_channel_posix.h 14include/grpc++/create_channel_posix.h
@@ -136,27 +136,29 @@ include/grpc/support/sync_custom.h @@ -136,27 +136,29 @@ include/grpc/support/sync_custom.h
136include/grpc/support/sync_generic.h 136include/grpc/support/sync_generic.h
137include/grpc/support/sync_posix.h 137include/grpc/support/sync_posix.h
138include/grpc/support/sync_windows.h 138include/grpc/support/sync_windows.h
139include/grpc/support/thd_id.h 139include/grpc/support/thd_id.h
140include/grpc/support/time.h 140include/grpc/support/time.h
141include/grpc/support/workaround_list.h 141include/grpc/support/workaround_list.h
142include/grpcpp/alarm.h 142include/grpcpp/alarm.h
143include/grpcpp/alarm_impl.h 143include/grpcpp/alarm_impl.h
144include/grpcpp/channel.h 144include/grpcpp/channel.h
145include/grpcpp/client_context.h 145include/grpcpp/client_context.h
146include/grpcpp/completion_queue.h 146include/grpcpp/completion_queue.h
147include/grpcpp/create_channel.h 147include/grpcpp/create_channel.h
148include/grpcpp/create_channel_posix.h 148include/grpcpp/create_channel_posix.h
 149include/grpcpp/create_channel_posix_impl.h
149include/grpcpp/ext/channelz_service_plugin.h 150include/grpcpp/ext/channelz_service_plugin.h
 151include/grpcpp/ext/channelz_service_plugin_impl.h
150include/grpcpp/ext/health_check_service_server_builder_option.h 152include/grpcpp/ext/health_check_service_server_builder_option.h
151include/grpcpp/ext/proto_server_reflection_plugin.h 153include/grpcpp/ext/proto_server_reflection_plugin.h
152include/grpcpp/generic/async_generic_service.h 154include/grpcpp/generic/async_generic_service.h
153include/grpcpp/generic/generic_stub.h 155include/grpcpp/generic/generic_stub.h
154include/grpcpp/grpcpp.h 156include/grpcpp/grpcpp.h
155include/grpcpp/health_check_service_interface.h 157include/grpcpp/health_check_service_interface.h
156include/grpcpp/impl/call.h 158include/grpcpp/impl/call.h
157include/grpcpp/impl/channel_argument_option.h 159include/grpcpp/impl/channel_argument_option.h
158include/grpcpp/impl/client_unary_call.h 160include/grpcpp/impl/client_unary_call.h
159include/grpcpp/impl/codegen/async_generic_service.h 161include/grpcpp/impl/codegen/async_generic_service.h
160include/grpcpp/impl/codegen/async_stream.h 162include/grpcpp/impl/codegen/async_stream.h
161include/grpcpp/impl/codegen/async_unary_call.h 163include/grpcpp/impl/codegen/async_unary_call.h
162include/grpcpp/impl/codegen/byte_buffer.h 164include/grpcpp/impl/codegen/byte_buffer.h
@@ -198,38 +200,40 @@ include/grpcpp/impl/codegen/service_type @@ -198,38 +200,40 @@ include/grpcpp/impl/codegen/service_type
198include/grpcpp/impl/codegen/slice.h 200include/grpcpp/impl/codegen/slice.h
199include/grpcpp/impl/codegen/status.h 201include/grpcpp/impl/codegen/status.h
200include/grpcpp/impl/codegen/status_code_enum.h 202include/grpcpp/impl/codegen/status_code_enum.h
201include/grpcpp/impl/codegen/string_ref.h 203include/grpcpp/impl/codegen/string_ref.h
202include/grpcpp/impl/codegen/stub_options.h 204include/grpcpp/impl/codegen/stub_options.h
203include/grpcpp/impl/codegen/sync_stream.h 205include/grpcpp/impl/codegen/sync_stream.h
204include/grpcpp/impl/codegen/time.h 206include/grpcpp/impl/codegen/time.h
205include/grpcpp/impl/grpc_library.h 207include/grpcpp/impl/grpc_library.h
206include/grpcpp/impl/method_handler_impl.h 208include/grpcpp/impl/method_handler_impl.h
207include/grpcpp/impl/rpc_method.h 209include/grpcpp/impl/rpc_method.h
208include/grpcpp/impl/rpc_service_method.h 210include/grpcpp/impl/rpc_service_method.h
209include/grpcpp/impl/serialization_traits.h 211include/grpcpp/impl/serialization_traits.h
210include/grpcpp/impl/server_builder_option.h 212include/grpcpp/impl/server_builder_option.h
 213include/grpcpp/impl/server_builder_option_impl.h
211include/grpcpp/impl/server_builder_plugin.h 214include/grpcpp/impl/server_builder_plugin.h
212include/grpcpp/impl/server_initializer.h 215include/grpcpp/impl/server_initializer.h
213include/grpcpp/impl/service_type.h 216include/grpcpp/impl/service_type.h
214include/grpcpp/resource_quota.h 217include/grpcpp/resource_quota.h
215include/grpcpp/security/auth_context.h 218include/grpcpp/security/auth_context.h
216include/grpcpp/security/auth_metadata_processor.h 219include/grpcpp/security/auth_metadata_processor.h
217include/grpcpp/security/credentials.h 220include/grpcpp/security/credentials.h
218include/grpcpp/security/server_credentials.h 221include/grpcpp/security/server_credentials.h
219include/grpcpp/server.h 222include/grpcpp/server.h
220include/grpcpp/server_builder.h 223include/grpcpp/server_builder.h
221include/grpcpp/server_context.h 224include/grpcpp/server_context.h
222include/grpcpp/server_posix.h 225include/grpcpp/server_posix.h
 226include/grpcpp/server_posix_impl.h
223include/grpcpp/support/async_stream.h 227include/grpcpp/support/async_stream.h
224include/grpcpp/support/async_unary_call.h 228include/grpcpp/support/async_unary_call.h
225include/grpcpp/support/byte_buffer.h 229include/grpcpp/support/byte_buffer.h
226include/grpcpp/support/channel_arguments.h 230include/grpcpp/support/channel_arguments.h
227include/grpcpp/support/client_callback.h 231include/grpcpp/support/client_callback.h
228include/grpcpp/support/client_interceptor.h 232include/grpcpp/support/client_interceptor.h
229include/grpcpp/support/config.h 233include/grpcpp/support/config.h
230include/grpcpp/support/error_details.h 234include/grpcpp/support/error_details.h
231include/grpcpp/support/interceptor.h 235include/grpcpp/support/interceptor.h
232include/grpcpp/support/proto_buffer_reader.h 236include/grpcpp/support/proto_buffer_reader.h
233include/grpcpp/support/proto_buffer_writer.h 237include/grpcpp/support/proto_buffer_writer.h
234include/grpcpp/support/server_callback.h 238include/grpcpp/support/server_callback.h
235include/grpcpp/support/server_interceptor.h 239include/grpcpp/support/server_interceptor.h
cvs diff -r1.8 -r1.9 pkgsrc/net/grpc/distinfo (expand / switch to unified diff)

--- pkgsrc/net/grpc/distinfo 2019/03/22 08:25:51 1.8
+++ pkgsrc/net/grpc/distinfo 2019/04/19 07:15:36 1.9
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.8 2019/03/22 08:25:51 adam Exp $ 1$NetBSD: distinfo,v 1.9 2019/04/19 07:15:36 adam Exp $
2 2
3SHA1 (grpc-1.19.1.tar.gz) = 9d556e9702c1505ab8474924407e5d22ca5a8829 3SHA1 (grpc-1.20.0.tar.gz) = f7eaf137271e21efa36d4f3e2c61dd69f962832a
4RMD160 (grpc-1.19.1.tar.gz) = 4b695158fd08d1511d02b7ced5242e67244dcc94 4RMD160 (grpc-1.20.0.tar.gz) = d5525a7f2db94eead858bc62f48387f9f10ba4b9
5SHA512 (grpc-1.19.1.tar.gz) = 4bb127d946fc16887fd4cf75215f0bc9f6d17dbd36fc4f1b191a64914f96c49dddb41f1b6c72fd24ea0a40f242b4398248f32fcb1fe9a764367be1c2edda9142 5SHA512 (grpc-1.20.0.tar.gz) = 01074f87a3cfaa30cbd3ae8f723118fd91cab586872b26b0f96fe5f8472dff8f6e8845af605765f747cc10ef1b62c974c57e08affc43eb8487b524a98d1dcae1
6Size (grpc-1.19.1.tar.gz) = 14794085 bytes 6Size (grpc-1.20.0.tar.gz) = 14926918 bytes
7SHA1 (patch-CMakeLists.txt) = 45b87caaf7edf664b337648dda1722fd3cf20690 7SHA1 (patch-CMakeLists.txt) = f3cf27ec59109a8a0a6fa8aebd2ffa1871c29442
8SHA1 (patch-cmake_benchmark.cmake) = 031873ba9a8cd93d491693feb4d58e52a715cc64 8SHA1 (patch-cmake_benchmark.cmake) = 031873ba9a8cd93d491693feb4d58e52a715cc64
9SHA1 (patch-cmake_cares.cmake) = 19324318dce81451bf7a53d0ca5a7e445a751db5 9SHA1 (patch-cmake_cares.cmake) = 19324318dce81451bf7a53d0ca5a7e445a751db5
10SHA1 (patch-include_grpc_impl_codegen_port__platform.h) = 18e213ffc4875b736a6a895a4d56cccc2b66c660 10SHA1 (patch-include_grpc_impl_codegen_port__platform.h) = b8d07e5bbf04694df00d0d19884844b791eb002c
11SHA1 (patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc) = aff0ff2ff52753c3a169d1f7b939b894dda013f9 11SHA1 (patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc) = aff0ff2ff52753c3a169d1f7b939b894dda013f9
12SHA1 (patch-src_core_lib_iomgr_port.h) = e3c5e6ee071557c717df0a1a61597f9906fbeff5 12SHA1 (patch-src_core_lib_iomgr_port.h) = e3c5e6ee071557c717df0a1a61597f9906fbeff5
cvs diff -r1.4 -r1.5 pkgsrc/net/grpc/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/net/grpc/patches/patch-CMakeLists.txt 2019/03/22 08:25:51 1.4
+++ pkgsrc/net/grpc/patches/patch-CMakeLists.txt 2019/04/19 07:15:36 1.5
@@ -1,119 +1,119 @@ @@ -1,119 +1,119 @@
1$NetBSD: patch-CMakeLists.txt,v 1.4 2019/03/22 08:25:51 adam Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.5 2019/04/19 07:15:36 adam Exp $
2 2
3Add version number to shared libraries. 3Add version number to shared libraries.
4 4
5--- CMakeLists.txt.orig 2019-03-08 20:07:26.000000000 +0000 5--- CMakeLists.txt.orig 2019-04-15 22:38:24.000000000 +0000
6+++ CMakeLists.txt 6+++ CMakeLists.txt
7@@ -196,7 +196,7 @@ function(protobuf_generate_grpc_cpp) 7@@ -203,7 +203,7 @@ function(protobuf_generate_grpc_cpp)
8 "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}_mock.grpc.pb.h" 8 "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}_mock.grpc.pb.h"
9 "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc" 9 "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc"
10 "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h" 10 "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h"
11- COMMAND ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE} 11- COMMAND ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE}
12+ COMMAND env LD_LIBRARY_PATH=${CMAKE_BINARY_DIR} ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE} 12+ COMMAND env LD_LIBRARY_PATH=${CMAKE_BINARY_DIR} ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE}
13 ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR} 13 ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR}
14 --cpp_out=${_gRPC_PROTO_GENS_DIR} 14 --cpp_out=${_gRPC_PROTO_GENS_DIR}
15 --plugin=protoc-gen-grpc=$<TARGET_FILE:grpc_cpp_plugin> 15 --plugin=protoc-gen-grpc=${_gRPC_CPP_PLUGIN}
16@@ -735,6 +735,7 @@ add_library(address_sorting 16@@ -741,6 +741,7 @@ add_library(address_sorting
17 third_party/address_sorting/address_sorting_posix.c 17 third_party/address_sorting/address_sorting_posix.c
18 third_party/address_sorting/address_sorting_windows.c 18 third_party/address_sorting/address_sorting_windows.c
19 ) 19 )
20+set_target_properties(address_sorting PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) 20+set_target_properties(address_sorting PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
21  21
22 if(WIN32 AND MSVC) 22 if(WIN32 AND MSVC)
23 set_target_properties(address_sorting PROPERTIES COMPILE_PDB_NAME "address_sorting" 23 set_target_properties(address_sorting PROPERTIES COMPILE_PDB_NAME "address_sorting"
24@@ -868,6 +869,7 @@ add_library(gpr 24@@ -874,6 +875,7 @@ add_library(gpr
25 src/core/lib/profiling/basic_timers.cc 25 src/core/lib/profiling/basic_timers.cc
26 src/core/lib/profiling/stap_timers.cc 26 src/core/lib/profiling/stap_timers.cc
27 ) 27 )
28+set_target_properties(gpr PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) 28+set_target_properties(gpr PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
29  29
30 if(WIN32 AND MSVC) 30 if(WIN32 AND MSVC)
31 set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr" 31 set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr"
32@@ -1288,6 +1290,7 @@ add_library(grpc 32@@ -1295,6 +1297,7 @@ add_library(grpc
33 src/core/ext/filters/workarounds/workaround_utils.cc 33 src/core/ext/filters/workarounds/workaround_utils.cc
34 src/core/plugin_registry/grpc_plugin_registry.cc 34 src/core/plugin_registry/grpc_plugin_registry.cc
35 ) 35 )
36+set_target_properties(grpc PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) 36+set_target_properties(grpc PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
37  37
38 if(WIN32 AND MSVC) 38 if(WIN32 AND MSVC)
39 set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc" 39 set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc"
40@@ -1679,6 +1682,7 @@ add_library(grpc_cronet 40@@ -1687,6 +1690,7 @@ add_library(grpc_cronet
41 src/core/tsi/transport_security_grpc.cc 41 src/core/tsi/transport_security_grpc.cc
42 src/core/plugin_registry/grpc_cronet_plugin_registry.cc 42 src/core/plugin_registry/grpc_cronet_plugin_registry.cc
43 ) 43 )
44+set_target_properties(grpc_cronet PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) 44+set_target_properties(grpc_cronet PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
45  45
46 if(WIN32 AND MSVC) 46 if(WIN32 AND MSVC)
47 set_target_properties(grpc_cronet PROPERTIES COMPILE_PDB_NAME "grpc_cronet" 47 set_target_properties(grpc_cronet PROPERTIES COMPILE_PDB_NAME "grpc_cronet"
48@@ -2674,6 +2678,7 @@ add_library(grpc_unsecure 48@@ -2679,6 +2683,7 @@ add_library(grpc_unsecure
49 src/core/ext/filters/workarounds/workaround_utils.cc 49 src/core/ext/filters/workarounds/workaround_utils.cc
50 src/core/plugin_registry/grpc_unsecure_plugin_registry.cc 50 src/core/plugin_registry/grpc_unsecure_plugin_registry.cc
51 ) 51 )
52+set_target_properties(grpc_unsecure PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) 52+set_target_properties(grpc_unsecure PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
53  53
54 if(WIN32 AND MSVC) 54 if(WIN32 AND MSVC)
55 set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure" 55 set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure"
56@@ -2907,6 +2912,7 @@ add_library(grpc++ 56@@ -2912,6 +2917,7 @@ add_library(grpc++
57 third_party/nanopb/pb_encode.c 57 third_party/nanopb/pb_encode.c
58 src/cpp/codegen/codegen_init.cc 58 src/cpp/codegen/codegen_init.cc
59 ) 59 )
60+set_target_properties(grpc++ PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) 60+set_target_properties(grpc++ PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
61  61
62 if(WIN32 AND MSVC) 62 if(WIN32 AND MSVC)
63 set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++" 63 set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++"
64@@ -3497,6 +3503,7 @@ add_library(grpc++_cronet 64@@ -3505,6 +3511,7 @@ add_library(grpc++_cronet
65 src/core/ext/transport/chttp2/server/chttp2_server.cc 65 src/core/ext/transport/chttp2/server/chttp2_server.cc
66 src/core/ext/filters/census/grpc_context.cc 66 src/core/ext/filters/census/grpc_context.cc
67 ) 67 )
68+set_target_properties(grpc++_cronet PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) 68+set_target_properties(grpc++_cronet PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
69  69
70 if(WIN32 AND MSVC) 70 if(WIN32 AND MSVC)
71 set_target_properties(grpc++_cronet PROPERTIES COMPILE_PDB_NAME "grpc++_cronet" 71 set_target_properties(grpc++_cronet PROPERTIES COMPILE_PDB_NAME "grpc++_cronet"
72@@ -3781,6 +3788,7 @@ add_library(grpc++_error_details 72@@ -3792,6 +3799,7 @@ add_library(grpc++_error_details
73 ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/status/status.grpc.pb.h 73 ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/status/status.grpc.pb.h
74 src/cpp/util/error_details.cc 74 src/cpp/util/error_details.cc
75 ) 75 )
76+set_target_properties(grpc++_error_details PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) 76+set_target_properties(grpc++_error_details PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
77  77
78 if(WIN32 AND MSVC) 78 if(WIN32 AND MSVC)
79 set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details" 79 set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details"
80@@ -3911,6 +3919,7 @@ add_library(grpc++_reflection 80@@ -3925,6 +3933,7 @@ add_library(grpc++_reflection
81 ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.pb.h 81 ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.pb.h
82 ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h 82 ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h
83 ) 83 )
84+set_target_properties(grpc++_reflection PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) 84+set_target_properties(grpc++_reflection PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
85  85
86 if(WIN32 AND MSVC) 86 if(WIN32 AND MSVC)
87 set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection" 87 set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection"
88@@ -4454,6 +4463,7 @@ add_library(grpc++_unsecure 88@@ -4473,6 +4482,7 @@ add_library(grpc++_unsecure
89 third_party/nanopb/pb_encode.c 89 third_party/nanopb/pb_encode.c
90 src/cpp/codegen/codegen_init.cc 90 src/cpp/codegen/codegen_init.cc
91 ) 91 )
92+set_target_properties(grpc++_unsecure PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) 92+set_target_properties(grpc++_unsecure PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
93  93
94 if(WIN32 AND MSVC) 94 if(WIN32 AND MSVC)
95 set_target_properties(grpc++_unsecure PROPERTIES COMPILE_PDB_NAME "grpc++_unsecure" 95 set_target_properties(grpc++_unsecure PROPERTIES COMPILE_PDB_NAME "grpc++_unsecure"
96@@ -4851,6 +4861,7 @@ add_library(grpc_plugin_support 96@@ -4874,6 +4884,7 @@ add_library(grpc_plugin_support
97 src/compiler/python_generator.cc 97 src/compiler/python_generator.cc
98 src/compiler/ruby_generator.cc 98 src/compiler/ruby_generator.cc
99 ) 99 )
100+set_target_properties(grpc_plugin_support PROPERTIES VERSION 2.0.0 SOVERSION 2) 100+set_target_properties(grpc_plugin_support PROPERTIES VERSION 2.0.0 SOVERSION 2)
101  101
102 if(WIN32 AND MSVC) 102 if(WIN32 AND MSVC)
103 set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support" 103 set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support"
104@@ -4913,6 +4924,7 @@ add_library(grpcpp_channelz 104@@ -4936,6 +4947,7 @@ add_library(grpcpp_channelz
105 ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/channelz/channelz.pb.h 105 ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/channelz/channelz.pb.h
106 ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/channelz/channelz.grpc.pb.h 106 ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/channelz/channelz.grpc.pb.h
107 ) 107 )
108+set_target_properties(grpcpp_channelz PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) 108+set_target_properties(grpcpp_channelz PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
109  109
110 if(WIN32 AND MSVC) 110 if(WIN32 AND MSVC)
111 set_target_properties(grpcpp_channelz PROPERTIES COMPILE_PDB_NAME "grpcpp_channelz" 111 set_target_properties(grpcpp_channelz PROPERTIES COMPILE_PDB_NAME "grpcpp_channelz"
112@@ -5445,6 +5457,7 @@ if (gRPC_BUILD_CSHARP_EXT) 112@@ -5478,6 +5490,7 @@ if (gRPC_BUILD_CSHARP_EXT)
113 add_library(grpc_csharp_ext SHARED 113 add_library(grpc_csharp_ext SHARED
114 src/csharp/ext/grpc_csharp_ext.c 114 src/csharp/ext/grpc_csharp_ext.c
115 ) 115 )
116+set_target_properties(grpc_csharp_ext PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) 116+set_target_properties(grpc_csharp_ext PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
117  117
118 if(WIN32 AND MSVC) 118 if(WIN32 AND MSVC)
119 set_target_properties(grpc_csharp_ext PROPERTIES COMPILE_PDB_NAME "grpc_csharp_ext" 119 set_target_properties(grpc_csharp_ext PROPERTIES COMPILE_PDB_NAME "grpc_csharp_ext"
cvs diff -r1.2 -r1.3 pkgsrc/net/grpc/patches/Attic/patch-include_grpc_impl_codegen_port__platform.h (expand / switch to unified diff)

--- pkgsrc/net/grpc/patches/Attic/patch-include_grpc_impl_codegen_port__platform.h 2018/12/31 23:00:08 1.2
+++ pkgsrc/net/grpc/patches/Attic/patch-include_grpc_impl_codegen_port__platform.h 2019/04/19 07:15:36 1.3
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1$NetBSD: patch-include_grpc_impl_codegen_port__platform.h,v 1.2 2018/12/31 23:00:08 leot Exp $ 1$NetBSD: patch-include_grpc_impl_codegen_port__platform.h,v 1.3 2019/04/19 07:15:36 adam Exp $
2 2
3Add NetBSD support. 3Add NetBSD support.
4Add SunOS support. 
5 4
6--- include/grpc/impl/codegen/port_platform.h.orig 2018-07-12 14:40:09.000000000 +0000 5--- include/grpc/impl/codegen/port_platform.h.orig 2019-04-15 22:38:24.000000000 +0000
7+++ include/grpc/impl/codegen/port_platform.h 6+++ include/grpc/impl/codegen/port_platform.h
8@@ -282,6 +282,29 @@ 7@@ -331,6 +331,29 @@
9 #else /* _LP64 */ 8 #else /* _LP64 */
10 #define GPR_ARCH_32 1 9 #define GPR_ARCH_32 1
11 #endif /* _LP64 */ 10 #endif /* _LP64 */
12+#elif defined(__NetBSD__) 11+#elif defined(__NetBSD__)
13+#define GPR_PLATFORM_STRING "netbsd" 12+#define GPR_PLATFORM_STRING "netbsd"
14+#ifndef _BSD_SOURCE 13+#ifndef _BSD_SOURCE
15+#define _BSD_SOURCE 14+#define _BSD_SOURCE
16+#endif 15+#endif
17+#define GPR_NETBSD 1 16+#define GPR_NETBSD 1
18+#define GPR_CPU_POSIX 1 17+#define GPR_CPU_POSIX 1
19+#define GPR_GCC_ATOMIC 1 18+#define GPR_GCC_ATOMIC 1
20+#define GPR_GCC_TLS 1 19+#define GPR_GCC_TLS 1
21+#define GPR_POSIX_LOG 1 20+#define GPR_POSIX_LOG 1
@@ -25,40 +24,13 @@ Add SunOS support. @@ -25,40 +24,13 @@ Add SunOS support.
25+#define GPR_POSIX_SUBPROCESS 1 24+#define GPR_POSIX_SUBPROCESS 1
26+#define GPR_POSIX_SYNC 1 25+#define GPR_POSIX_SYNC 1
27+#define GPR_POSIX_TIME 1 26+#define GPR_POSIX_TIME 1
28+#define GPR_GETPID_IN_UNISTD_H 1 27+#define GPR_GETPID_IN_UNISTD_H 1
29+#define GPR_SUPPORT_CHANNELS_FROM_FD 1 28+#define GPR_SUPPORT_CHANNELS_FROM_FD 1
30+#ifdef _LP64 29+#ifdef _LP64
31+#define GPR_ARCH_64 1 30+#define GPR_ARCH_64 1
32+#else /* _LP64 */ 31+#else /* _LP64 */
33+#define GPR_ARCH_32 1 32+#define GPR_ARCH_32 1
34+#endif /* _LP64 */ 33+#endif /* _LP64 */
35 #elif defined(__native_client__) 34 #elif defined(__native_client__)
36 #define GPR_PLATFORM_STRING "nacl" 35 #define GPR_PLATFORM_STRING "nacl"
37 #ifndef _BSD_SOURCE 36 #ifndef _BSD_SOURCE
38@@ -310,6 +333,26 @@ 
39 #else /* _LP64 */ 
40 #define GPR_ARCH_32 1 
41 #endif /* _LP64 */ 
42+#elif defined(__sun) 
43+#define GPR_PLATFORM_STRING "sunos" 
44+#define GPR_SUNOS 1 
45+#define GPR_CPU_POSIX 1 
46+#define GPR_GCC_ATOMIC 1 
47+#define GPR_GCC_TLS 1 
48+#define GPR_POSIX_LOG 1 
49+#define GPR_POSIX_ENV 1 
50+#define GPR_POSIX_TMPFILE 1 
51+#define GPR_POSIX_STRING 1 
52+#define GPR_POSIX_SUBPROCESS 1 
53+#define GPR_POSIX_SYNC 1 
54+#define GPR_POSIX_TIME 1 
55+#define GPR_GETPID_IN_UNISTD_H 1 
56+#define GPR_SUPPORT_CHANNELS_FROM_FD 1 
57+#ifdef _LP64 
58+#define GPR_ARCH_64 1 
59+#else /* _LP64 */ 
60+#define GPR_ARCH_32 1 
61+#endif /* _LP64 */ 
62 #else 
63 #error "Could not auto-detect platform" 
64 #endif