Wed Jul 6 15:18:17 2022 UTC ()
grpc py-grpcio py-grpcio-testing py-grpcio-tools: updated to 1.47.0

Release v1.47.0 Latest

For gRPC documentation, see grpc.io. For previous releases, see Releases.

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

Announcement

gRPC C++ 1.47.0 is the first release requiring C++14 (proposal). For those who cannot upgrade to C++14 right now, you can use gRPC C++ 1.46.x in the meantime and gRPC C++ 1.46.x will be maintained by having fixes for critical bugs (P0) and security fixes until 2023-06-01.

Core

xDS: Workaround to get gRPC clients working with istio
Bump core version to 25.0.0 for upcoming release.
Initial support for Haiku.
Add NetBSD support (Community-supported).
server: per-rpc backend metric reporting.
Remove C# implementation (individual packages will continue to be maintained through v2.46.x patches or moved to grpc-dotnet).

C++

Expose NoOpCertificateVerifier to C++.
RouteGuide example: Abort if database file not found.

C#

C#: Suppress CS8981 in generated source.

Python

Set Correct Platform Tag in Wheels on Mac OS with Python 3.10
Removed manylinux2010 python artifacts.
Allow grpcio to be built against system abseil-cpp.
[Python] Add an UDS example.

Ruby

Backport "Support for prebuilt Ruby binary on x64-mingw-ucrt platform
Upgrade ruby rake-compiler-dock images (and stop building ruby gem artifacts on mac, in favor of rake-compile-dock darwin builds).

Other

Downgrade io_bazel_rules_go to v0.27.0 restore Bazel 3.x support.


(adam)
diff -r1.57 -r1.58 pkgsrc/net/grpc/Makefile
diff -r1.33 -r1.34 pkgsrc/net/grpc/PLIST
diff -r1.5 -r1.6 pkgsrc/net/grpc/buildlink3.mk
diff -r1.58 -r1.59 pkgsrc/net/grpc/distinfo
diff -r1.11 -r1.12 pkgsrc/net/grpc/patches/patch-CMakeLists.txt
diff -r1.5 -r0 pkgsrc/net/grpc/patches/patch-include_grpc_event__engine_port.h
diff -r1.47 -r1.48 pkgsrc/net/py-grpcio/Makefile
diff -r1.43 -r1.44 pkgsrc/net/py-grpcio/distinfo
diff -r1.30 -r1.31 pkgsrc/net/py-grpcio-testing/Makefile
diff -r1.30 -r1.31 pkgsrc/net/py-grpcio-testing/distinfo
diff -r1.43 -r1.44 pkgsrc/net/py-grpcio-tools/Makefile
diff -r1.39 -r1.40 pkgsrc/net/py-grpcio-tools/distinfo
diff -r1.13 -r1.14 pkgsrc/net/py-grpcio/patches/patch-setup.py

cvs diff -r1.57 -r1.58 pkgsrc/net/grpc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/grpc/Makefile 2022/05/25 09:49:24 1.57
+++ pkgsrc/net/grpc/Makefile 2022/07/06 15:18:17 1.58
@@ -1,42 +1,50 @@ @@ -1,42 +1,50 @@
1# $NetBSD: Makefile,v 1.57 2022/05/25 09:49:24 adam Exp $ 1# $NetBSD: Makefile,v 1.58 2022/07/06 15:18:17 adam Exp $
2 2
3DISTNAME= grpc-1.46.3 3DISTNAME= grpc-1.47.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
17# For Darwin 
18#MAKE_ENV+= DYLD_LIBRARY_PATH=${PREFIX}/lib 
19 
20CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON 17CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
21# use cmake's find_package() to locate a pre-installed dependency 18# use cmake's find_package() to locate a pre-installed dependency
22CMAKE_ARGS+= -DgRPC_ABSL_PROVIDER=package 19CMAKE_ARGS+= -DgRPC_ABSL_PROVIDER=package
23CMAKE_ARGS+= -DgRPC_BENCHMARK_PROVIDER=package 20CMAKE_ARGS+= -DgRPC_BENCHMARK_PROVIDER=package
24CMAKE_ARGS+= -DgRPC_CARES_PROVIDER=package 21CMAKE_ARGS+= -DgRPC_CARES_PROVIDER=package
25CMAKE_ARGS+= -DgRPC_GFLAGS_PROVIDER=package 22CMAKE_ARGS+= -DgRPC_GFLAGS_PROVIDER=package
26CMAKE_ARGS+= -DgRPC_PROTOBUF_PROVIDER=package 23CMAKE_ARGS+= -DgRPC_PROTOBUF_PROVIDER=package
27CMAKE_ARGS+= -DgRPC_RE2_PROVIDER=package 24CMAKE_ARGS+= -DgRPC_RE2_PROVIDER=package
28CMAKE_ARGS+= -DgRPC_SSL_PROVIDER=package 25CMAKE_ARGS+= -DgRPC_SSL_PROVIDER=package
29CMAKE_ARGS+= -DgRPC_ZLIB_PROVIDER=package 26CMAKE_ARGS+= -DgRPC_ZLIB_PROVIDER=package
30 27
 28# This should be included in the distfile, but it's not,
 29# so CMakeFile.txt will try to download it.
 30CENSUS_DIST= v0.3.0.tar.gz
 31SITES.${CENSUS_DIST}= ${MASTER_SITE_GITHUB:=census-instrumentation/opencensus-proto/archive/}
 32
 33DISTFILES= ${DEFAULT_DISTFILES} ${CENSUS_DIST}
 34
 35post-extract:
 36 cd ${WRKSRC}/third_party/opencensus-proto && \
 37 ${LN} -s ${WRKDIR}/opencensus-proto-0.3.0/src src
 38
31.include "../../mk/atomic64.mk" 39.include "../../mk/atomic64.mk"
32.include "../../benchmarks/google-benchmark/buildlink3.mk" 40.include "../../benchmarks/google-benchmark/buildlink3.mk"
33.include "../../devel/abseil/buildlink3.mk" 41.include "../../devel/abseil/buildlink3.mk"
34.include "../../devel/gflags/buildlink3.mk" 42.include "../../devel/gflags/buildlink3.mk"
35BUILDLINK_API_DEPENDS.protobuf+= protobuf>=3.5 43BUILDLINK_API_DEPENDS.protobuf+= protobuf>=3.5
36.include "../../devel/protobuf/buildlink3.mk" 44.include "../../devel/protobuf/buildlink3.mk"
37.include "../../devel/re2/buildlink3.mk" 45.include "../../devel/re2/buildlink3.mk"
38.include "../../devel/zlib/buildlink3.mk" 46.include "../../devel/zlib/buildlink3.mk"
39BUILDLINK_API_DEPENDS.libcares+= libcares>=1.15.0nb1 47BUILDLINK_API_DEPENDS.libcares+= libcares>=1.15.0nb1
40.include "../../net/libcares/buildlink3.mk" 48.include "../../net/libcares/buildlink3.mk"
41.include "../../security/openssl/buildlink3.mk" 49.include "../../security/openssl/buildlink3.mk"
42.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"

cvs diff -r1.33 -r1.34 pkgsrc/net/grpc/PLIST (expand / switch to unified diff)

--- pkgsrc/net/grpc/PLIST 2022/05/13 07:35:53 1.33
+++ pkgsrc/net/grpc/PLIST 2022/07/06 15:18:17 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.33 2022/05/13 07:35:53 adam Exp $ 1@comment $NetBSD: PLIST,v 1.34 2022/07/06 15:18:17 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
@@ -85,26 +85,28 @@ include/grpc++/support/string_ref.h @@ -85,26 +85,28 @@ include/grpc++/support/string_ref.h
85include/grpc++/support/stub_options.h 85include/grpc++/support/stub_options.h
86include/grpc++/support/sync_stream.h 86include/grpc++/support/sync_stream.h
87include/grpc++/support/time.h 87include/grpc++/support/time.h
88include/grpc/byte_buffer.h 88include/grpc/byte_buffer.h
89include/grpc/byte_buffer_reader.h 89include/grpc/byte_buffer_reader.h
90include/grpc/census.h 90include/grpc/census.h
91include/grpc/compression.h 91include/grpc/compression.h
92include/grpc/event_engine/endpoint_config.h 92include/grpc/event_engine/endpoint_config.h
93include/grpc/event_engine/event_engine.h 93include/grpc/event_engine/event_engine.h
94include/grpc/event_engine/internal/memory_allocator_impl.h 94include/grpc/event_engine/internal/memory_allocator_impl.h
95include/grpc/event_engine/memory_allocator.h 95include/grpc/event_engine/memory_allocator.h
96include/grpc/event_engine/memory_request.h 96include/grpc/event_engine/memory_request.h
97include/grpc/event_engine/port.h 97include/grpc/event_engine/port.h
 98include/grpc/event_engine/slice.h
 99include/grpc/event_engine/slice_buffer.h
98include/grpc/fork.h 100include/grpc/fork.h
99include/grpc/grpc.h 101include/grpc/grpc.h
100include/grpc/grpc_posix.h 102include/grpc/grpc_posix.h
101include/grpc/grpc_security.h 103include/grpc/grpc_security.h
102include/grpc/grpc_security_constants.h 104include/grpc/grpc_security_constants.h
103include/grpc/impl/codegen/atm.h 105include/grpc/impl/codegen/atm.h
104include/grpc/impl/codegen/atm_gcc_atomic.h 106include/grpc/impl/codegen/atm_gcc_atomic.h
105include/grpc/impl/codegen/atm_gcc_sync.h 107include/grpc/impl/codegen/atm_gcc_sync.h
106include/grpc/impl/codegen/atm_windows.h 108include/grpc/impl/codegen/atm_windows.h
107include/grpc/impl/codegen/byte_buffer.h 109include/grpc/impl/codegen/byte_buffer.h
108include/grpc/impl/codegen/byte_buffer_reader.h 110include/grpc/impl/codegen/byte_buffer_reader.h
109include/grpc/impl/codegen/compression_types.h 111include/grpc/impl/codegen/compression_types.h
110include/grpc/impl/codegen/connectivity_state.h 112include/grpc/impl/codegen/connectivity_state.h
@@ -143,26 +145,27 @@ include/grpc/support/sync_custom.h @@ -143,26 +145,27 @@ include/grpc/support/sync_custom.h
143include/grpc/support/sync_generic.h 145include/grpc/support/sync_generic.h
144include/grpc/support/sync_posix.h 146include/grpc/support/sync_posix.h
145include/grpc/support/sync_windows.h 147include/grpc/support/sync_windows.h
146include/grpc/support/thd_id.h 148include/grpc/support/thd_id.h
147include/grpc/support/time.h 149include/grpc/support/time.h
148include/grpc/support/workaround_list.h 150include/grpc/support/workaround_list.h
149include/grpcpp/alarm.h 151include/grpcpp/alarm.h
150include/grpcpp/channel.h 152include/grpcpp/channel.h
151include/grpcpp/client_context.h 153include/grpcpp/client_context.h
152include/grpcpp/completion_queue.h 154include/grpcpp/completion_queue.h
153include/grpcpp/create_channel.h 155include/grpcpp/create_channel.h
154include/grpcpp/create_channel_binder.h 156include/grpcpp/create_channel_binder.h
155include/grpcpp/create_channel_posix.h 157include/grpcpp/create_channel_posix.h
 158include/grpcpp/ext/call_metric_recorder.h
156include/grpcpp/ext/channelz_service_plugin.h 159include/grpcpp/ext/channelz_service_plugin.h
157include/grpcpp/ext/health_check_service_server_builder_option.h 160include/grpcpp/ext/health_check_service_server_builder_option.h
158include/grpcpp/ext/proto_server_reflection_plugin.h 161include/grpcpp/ext/proto_server_reflection_plugin.h
159include/grpcpp/generic/async_generic_service.h 162include/grpcpp/generic/async_generic_service.h
160include/grpcpp/generic/generic_stub.h 163include/grpcpp/generic/generic_stub.h
161include/grpcpp/grpcpp.h 164include/grpcpp/grpcpp.h
162include/grpcpp/health_check_service_interface.h 165include/grpcpp/health_check_service_interface.h
163include/grpcpp/impl/call.h 166include/grpcpp/impl/call.h
164include/grpcpp/impl/channel_argument_option.h 167include/grpcpp/impl/channel_argument_option.h
165include/grpcpp/impl/client_unary_call.h 168include/grpcpp/impl/client_unary_call.h
166include/grpcpp/impl/codegen/async_generic_service.h 169include/grpcpp/impl/codegen/async_generic_service.h
167include/grpcpp/impl/codegen/async_stream.h 170include/grpcpp/impl/codegen/async_stream.h
168include/grpcpp/impl/codegen/async_unary_call.h 171include/grpcpp/impl/codegen/async_unary_call.h
@@ -261,54 +264,54 @@ include/grpcpp/support/status_code_enum. @@ -261,54 +264,54 @@ include/grpcpp/support/status_code_enum.
261include/grpcpp/support/string_ref.h 264include/grpcpp/support/string_ref.h
262include/grpcpp/support/stub_options.h 265include/grpcpp/support/stub_options.h
263include/grpcpp/support/sync_stream.h 266include/grpcpp/support/sync_stream.h
264include/grpcpp/support/time.h 267include/grpcpp/support/time.h
265include/grpcpp/support/validate_service_config.h 268include/grpcpp/support/validate_service_config.h
266include/grpcpp/xds_server_builder.h 269include/grpcpp/xds_server_builder.h
267lib/cmake/grpc/gRPCConfig.cmake 270lib/cmake/grpc/gRPCConfig.cmake
268lib/cmake/grpc/gRPCConfigVersion.cmake 271lib/cmake/grpc/gRPCConfigVersion.cmake
269lib/cmake/grpc/gRPCTargets-noconfig.cmake 272lib/cmake/grpc/gRPCTargets-noconfig.cmake
270lib/cmake/grpc/gRPCTargets.cmake 273lib/cmake/grpc/gRPCTargets.cmake
271lib/cmake/grpc/modules/Findc-ares.cmake 274lib/cmake/grpc/modules/Findc-ares.cmake
272lib/cmake/grpc/modules/Findre2.cmake 275lib/cmake/grpc/modules/Findre2.cmake
273lib/libaddress_sorting.so 276lib/libaddress_sorting.so
274lib/libaddress_sorting.so.24 277lib/libaddress_sorting.so.25
275lib/libaddress_sorting.so.24.0.0 278lib/libaddress_sorting.so.25.0.0
276lib/libgpr.so 279lib/libgpr.so
277lib/libgpr.so.24 280lib/libgpr.so.25
278lib/libgpr.so.24.0.0 281lib/libgpr.so.25.0.0
279lib/libgrpc++.so 282lib/libgrpc++.so
280lib/libgrpc++.so.${PKGVERSION} 283lib/libgrpc++.so.${PKGVERSION}
281lib/libgrpc++.so.1.46 284lib/libgrpc++.so.1.47
282lib/libgrpc++_alts.so 285lib/libgrpc++_alts.so
283lib/libgrpc++_alts.so.${PKGVERSION} 286lib/libgrpc++_alts.so.${PKGVERSION}
284lib/libgrpc++_alts.so.1.46 287lib/libgrpc++_alts.so.1.47
285lib/libgrpc++_error_details.so 288lib/libgrpc++_error_details.so
286lib/libgrpc++_error_details.so.${PKGVERSION} 289lib/libgrpc++_error_details.so.${PKGVERSION}
287lib/libgrpc++_error_details.so.1.46 290lib/libgrpc++_error_details.so.1.47
288lib/libgrpc++_reflection.so 291lib/libgrpc++_reflection.so
289lib/libgrpc++_reflection.so.${PKGVERSION} 292lib/libgrpc++_reflection.so.${PKGVERSION}
290lib/libgrpc++_reflection.so.1.46 293lib/libgrpc++_reflection.so.1.47
291lib/libgrpc++_unsecure.so 294lib/libgrpc++_unsecure.so
292lib/libgrpc++_unsecure.so.${PKGVERSION} 295lib/libgrpc++_unsecure.so.${PKGVERSION}
293lib/libgrpc++_unsecure.so.1.46 296lib/libgrpc++_unsecure.so.1.47
294lib/libgrpc.so 297lib/libgrpc.so
295lib/libgrpc.so.24 298lib/libgrpc.so.25
296lib/libgrpc.so.24.0.0 299lib/libgrpc.so.25.0.0
297lib/libgrpc_plugin_support.so 300lib/libgrpc_plugin_support.so
298lib/libgrpc_plugin_support.so.${PKGVERSION} 301lib/libgrpc_plugin_support.so.${PKGVERSION}
299lib/libgrpc_plugin_support.so.1.46 302lib/libgrpc_plugin_support.so.1.47
300lib/libgrpc_unsecure.so 303lib/libgrpc_unsecure.so
301lib/libgrpc_unsecure.so.24 304lib/libgrpc_unsecure.so.25
302lib/libgrpc_unsecure.so.24.0.0 305lib/libgrpc_unsecure.so.25.0.0
303lib/libgrpcpp_channelz.so 306lib/libgrpcpp_channelz.so
304lib/libgrpcpp_channelz.so.${PKGVERSION} 307lib/libgrpcpp_channelz.so.${PKGVERSION}
305lib/libgrpcpp_channelz.so.1.46 308lib/libgrpcpp_channelz.so.1.47
306lib/libupb.so 309lib/libupb.so
307lib/libupb.so.24 310lib/libupb.so.25
308lib/libupb.so.24.0.0 311lib/libupb.so.25.0.0
309lib/pkgconfig/gpr.pc 312lib/pkgconfig/gpr.pc
310lib/pkgconfig/grpc++.pc 313lib/pkgconfig/grpc++.pc
311lib/pkgconfig/grpc++_unsecure.pc 314lib/pkgconfig/grpc++_unsecure.pc
312lib/pkgconfig/grpc.pc 315lib/pkgconfig/grpc.pc
313lib/pkgconfig/grpc_unsecure.pc 316lib/pkgconfig/grpc_unsecure.pc
314share/grpc/roots.pem 317share/grpc/roots.pem

cvs diff -r1.5 -r1.6 pkgsrc/net/grpc/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/net/grpc/buildlink3.mk 2022/04/03 18:50:17 1.5
+++ pkgsrc/net/grpc/buildlink3.mk 2022/07/06 15:18:17 1.6
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.5 2022/04/03 18:50:17 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.6 2022/07/06 15:18:17 adam Exp $
2 2
3BUILDLINK_TREE+= grpc 3BUILDLINK_TREE+= grpc
4 4
5.if !defined(GRPC_BUILDLINK3_MK) 5.if !defined(GRPC_BUILDLINK3_MK)
6GRPC_BUILDLINK3_MK:= 6GRPC_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.grpc+= grpc>=1.11.0 8BUILDLINK_API_DEPENDS.grpc+= grpc>=1.11.0
9BUILDLINK_ABI_DEPENDS.grpc?= grpc>=1.44.0nb1 9BUILDLINK_ABI_DEPENDS.grpc?= grpc>=1.47.0
10BUILDLINK_PKGSRCDIR.grpc?= ../../net/grpc 10BUILDLINK_PKGSRCDIR.grpc?= ../../net/grpc
11 11
12.include "../../devel/protobuf/buildlink3.mk" 12.include "../../devel/protobuf/buildlink3.mk"
13.endif # GRPC_BUILDLINK3_MK 13.endif # GRPC_BUILDLINK3_MK
14 14
15BUILDLINK_TREE+= -grpc 15BUILDLINK_TREE+= -grpc

cvs diff -r1.58 -r1.59 pkgsrc/net/grpc/distinfo (expand / switch to unified diff)

--- pkgsrc/net/grpc/distinfo 2022/05/25 09:49:24 1.58
+++ pkgsrc/net/grpc/distinfo 2022/07/06 15:18:17 1.59
@@ -1,11 +1,13 @@ @@ -1,11 +1,13 @@
1$NetBSD: distinfo,v 1.58 2022/05/25 09:49:24 adam Exp $ 1$NetBSD: distinfo,v 1.59 2022/07/06 15:18:17 adam Exp $
2 2
3BLAKE2s (grpc-1.46.3.tar.gz) = 948cc8ba05bddc4efc9cf714e7fef9205e0b14cde98f1d8c856d9d607d22eb48 3BLAKE2s (grpc-1.47.0.tar.gz) = 1431fb15523fccf48c3a487fdab2d3d906280de024703c0b35acecdab67aa3c2
4SHA512 (grpc-1.46.3.tar.gz) = e80322b65c6f8d64dc91bce9f612119191e8d329cac2fbc5da6dad9a2a7ccaa7a501470ed483e555c3ba596e8aff796fbda2747f09e9c4329aed3de4d9b6b666 4SHA512 (grpc-1.47.0.tar.gz) = d0bb34e8763db6a0c7c6475137dd4659ab96b40ea50d60f55a93a669c60c42fbcb5c924089ea0eccdabfbf8eff12564e2909810095931910d9fdcbace618bb44
5Size (grpc-1.46.3.tar.gz) = 8910711 bytes 5Size (grpc-1.47.0.tar.gz) = 8197682 bytes
6SHA1 (patch-CMakeLists.txt) = d32a78bb8fdc28c0946aa2d62a5c810211692e62 6BLAKE2s (v0.3.0.tar.gz) = be3ce863226f4aa422d9faa997fe29f9bb1743c0e804af3c5fad3c170e60ba42
7SHA1 (patch-include_grpc_event__engine_port.h) = 842fa47d98303f25417aa1a45aa9d78e5402a3bd 7SHA512 (v0.3.0.tar.gz) = 39231a495dfdccfc8267d1e6af2ac624feea611a8691c10ec570de2194b352e4a9c3b0ce1606414fb98e5d77c66873bed4a9e56512efa12b267b8a91e0c5851e
 8Size (v0.3.0.tar.gz) = 163404 bytes
 9SHA1 (patch-CMakeLists.txt) = e3ec7dd3fdc01ac7b7afaa8abdac0dfb47bb5317
8SHA1 (patch-include_grpc_impl_codegen_port__platform.h) = a9d2f116c941d1ed23b18f25cf4fb638ed004181 10SHA1 (patch-include_grpc_impl_codegen_port__platform.h) = a9d2f116c941d1ed23b18f25cf4fb638ed004181
9SHA1 (patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc) = 0aa7fcadae98d1dd5229f0a695cffc1e9c1e8164 11SHA1 (patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc) = 0aa7fcadae98d1dd5229f0a695cffc1e9c1e8164
10SHA1 (patch-src_core_lib_iomgr_port.h) = 21275c54771f91e7fa34629827343169024c0df0 12SHA1 (patch-src_core_lib_iomgr_port.h) = 21275c54771f91e7fa34629827343169024c0df0
11SHA1 (patch-src_core_lib_iomgr_sockaddr__utils__posix.cc) = f4b21499e245244d9ba2ecf1476c7e33eb5cb087 13SHA1 (patch-src_core_lib_iomgr_sockaddr__utils__posix.cc) = f4b21499e245244d9ba2ecf1476c7e33eb5cb087

cvs diff -r1.11 -r1.12 pkgsrc/net/grpc/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/net/grpc/patches/patch-CMakeLists.txt 2021/10/06 10:58:30 1.11
+++ pkgsrc/net/grpc/patches/patch-CMakeLists.txt 2022/07/06 15:18:17 1.12
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-CMakeLists.txt,v 1.11 2021/10/06 10:58:30 adam Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.12 2022/07/06 15:18:17 adam Exp $
2 2
3--- CMakeLists.txt.orig 2020-02-04 17:04:33.000000000 +0000 3--- CMakeLists.txt.orig 2022-06-21 20:39:47.000000000 +0000
4+++ CMakeLists.txt 4+++ CMakeLists.txt
5@@ -254,7 +254,7 @@ function(protobuf_generate_grpc_cpp) 5@@ -504,7 +504,7 @@ function(protobuf_generate_grpc_cpp_with
6 "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}_mock.grpc.pb.h" 6 "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}_mock.grpc.pb.h"
7 "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc" 7 "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc"
8 "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h" 8 "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h"
9- COMMAND ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE} 9- COMMAND ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE}
10+ COMMAND env LD_LIBRARY_PATH=${CMAKE_BINARY_DIR} DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR} ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE} 10+ COMMAND env LD_LIBRARY_PATH=${CMAKE_BINARY_DIR} DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR} ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE}
11 ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR} 11 ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR}
12 --cpp_out=${_gRPC_PROTO_GENS_DIR} 12 --cpp_out=${_gRPC_PROTO_GENS_DIR}
13 --plugin=protoc-gen-grpc=${_gRPC_CPP_PLUGIN} 13 --plugin=protoc-gen-grpc=${_gRPC_CPP_PLUGIN}

File Deleted: pkgsrc/net/grpc/patches/patch-include_grpc_event__engine_port.h

cvs diff -r1.47 -r1.48 pkgsrc/net/py-grpcio/Makefile (expand / switch to unified diff)

--- pkgsrc/net/py-grpcio/Makefile 2022/05/25 09:49:24 1.47
+++ pkgsrc/net/py-grpcio/Makefile 2022/07/06 15:18:17 1.48
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.47 2022/05/25 09:49:24 adam Exp $ 1# $NetBSD: Makefile,v 1.48 2022/07/06 15:18:17 adam Exp $
2 2
3DISTNAME= grpcio-1.46.3 3DISTNAME= grpcio-1.47.0
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= net python 5CATEGORIES= net python
6MASTER_SITES= ${MASTER_SITE_PYPI:=g/grpcio/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=g/grpcio/}
7 7
8MAINTAINER= kethzer.dr@gmail.com 8MAINTAINER= kethzer.dr@gmail.com
9HOMEPAGE= https://grpc.io/ 9HOMEPAGE= https://grpc.io/
10COMMENT= HTTP/2-based RPC framework 10COMMENT= HTTP/2-based RPC framework
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13DEPENDS+= ${PYPKGPREFIX}-six>=1.5.2:../../lang/py-six 13DEPENDS+= ${PYPKGPREFIX}-six>=1.5.2:../../lang/py-six
14 14
15PYTHON_VERSIONS_INCOMPATIBLE= 27 15PYTHON_VERSIONS_INCOMPATIBLE= 27
16 16
17USE_LANGUAGES= c99 c++11 17USE_LANGUAGES= c99 c++11
18USE_TOOLS+= gmake pkg-config 18USE_TOOLS+= gmake pkg-config
19 19
20.include "../../devel/abseil/buildlink3.mk" 20.include "../../devel/abseil/buildlink3.mk"
 21.include "../../devel/re2/buildlink3.mk"
21.include "../../devel/zlib/buildlink3.mk" 22.include "../../devel/zlib/buildlink3.mk"
22.include "../../net/grpc/buildlink3.mk" 23.include "../../net/grpc/buildlink3.mk"
23.include "../../net/libcares/buildlink3.mk" 24.include "../../net/libcares/buildlink3.mk"
24.include "../../security/openssl/buildlink3.mk" 25.include "../../security/openssl/buildlink3.mk"
25.include "../../lang/python/egg.mk" 26.include "../../lang/python/egg.mk"
26.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"

cvs diff -r1.43 -r1.44 pkgsrc/net/py-grpcio/distinfo (expand / switch to unified diff)

--- pkgsrc/net/py-grpcio/distinfo 2022/05/25 09:49:24 1.43
+++ pkgsrc/net/py-grpcio/distinfo 2022/07/06 15:18:17 1.44
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.43 2022/05/25 09:49:24 adam Exp $ 1$NetBSD: distinfo,v 1.44 2022/07/06 15:18:17 adam Exp $
2 2
3BLAKE2s (grpcio-1.46.3.tar.gz) = 5b51eb102565d70c8aeab76f71dbaab3e79cbd8bbce49b575bbd06221414bfd5 3BLAKE2s (grpcio-1.47.0.tar.gz) = 7cc4e30f7a67bb4cce9b86e0343448da1db3e01d2ae3d775778a73ef310d209a
4SHA512 (grpcio-1.46.3.tar.gz) = 34b0157b3be1a04c3d01b52e9ecdfc14c969ce0f505b0c04f5b1c0d77c2288bfaf3eaa1439af9c717570518323d7d0086406d7e44435e9738fe9e0801e3faa68 4SHA512 (grpcio-1.47.0.tar.gz) = daa345850ef0c96c00c45249e4cc281af812ed65d8e5ebcb15c2a1d801a429efa18fa66d0bce82fd4c11a7694e9ef8487aa299117dd51d1da42dd025ea7a5ed2
5Size (grpcio-1.46.3.tar.gz) = 21847306 bytes 5Size (grpcio-1.47.0.tar.gz) = 21892877 bytes
6SHA1 (patch-setup.py) = d4de4272537d6e57fb9c4fe338aed0a787f7747c 6SHA1 (patch-setup.py) = d95ba143e8bf51b97946b40f3f7295c990c0dd7d
7SHA1 (patch-src_core_lib_iomgr_port.h) = 8f088cbf22110c03a684c24c9e17ef5fc64e925a 7SHA1 (patch-src_core_lib_iomgr_port.h) = 8f088cbf22110c03a684c24c9e17ef5fc64e925a

cvs diff -r1.30 -r1.31 pkgsrc/net/py-grpcio-testing/Makefile (expand / switch to unified diff)

--- pkgsrc/net/py-grpcio-testing/Makefile 2022/05/25 09:49:24 1.30
+++ pkgsrc/net/py-grpcio-testing/Makefile 2022/07/06 15:18:17 1.31
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.30 2022/05/25 09:49:24 adam Exp $ 1# $NetBSD: Makefile,v 1.31 2022/07/06 15:18:17 adam Exp $
2 2
3DISTNAME= grpcio-testing-1.46.3 3DISTNAME= grpcio-testing-1.47.0
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= net python 5CATEGORIES= net python
6MASTER_SITES= ${MASTER_SITE_PYPI:=g/grpcio-testing/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=g/grpcio-testing/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://grpc.io/ 9HOMEPAGE= https://grpc.io/
10COMMENT= gRPC Python testing package 10COMMENT= gRPC Python testing package
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13DEPENDS+= ${PYPKGPREFIX}-grpcio>=${PKGVERSION_NOREV}:../../net/py-grpcio 13DEPENDS+= ${PYPKGPREFIX}-grpcio>=${PKGVERSION_NOREV}:../../net/py-grpcio
14DEPENDS+= ${PYPKGPREFIX}-protobuf>=3.6.0:../../devel/py-protobuf 14DEPENDS+= ${PYPKGPREFIX}-protobuf>=3.6.0:../../devel/py-protobuf
15 15
16USE_LANGUAGES= # none 16USE_LANGUAGES= # none

cvs diff -r1.30 -r1.31 pkgsrc/net/py-grpcio-testing/distinfo (expand / switch to unified diff)

--- pkgsrc/net/py-grpcio-testing/distinfo 2022/05/25 09:49:24 1.30
+++ pkgsrc/net/py-grpcio-testing/distinfo 2022/07/06 15:18:17 1.31
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.30 2022/05/25 09:49:24 adam Exp $ 1$NetBSD: distinfo,v 1.31 2022/07/06 15:18:17 adam Exp $
2 2
3BLAKE2s (grpcio-testing-1.46.3.tar.gz) = fed87d34224c079a27849cce702914116344dc3e2fbe85a2b54ef75656cfa226 3BLAKE2s (grpcio-testing-1.47.0.tar.gz) = 196a3af33a884fc696ea6e206470d53b49473cc00748ba217b07b14ab6da61ca
4SHA512 (grpcio-testing-1.46.3.tar.gz) = edefc2653730c9cb343f709a5214d3e06c764acfc7e81eaa30a774e6a22f9b0d92806ecdd7135b0d719e140a4aea34f920921477207f0099cb42ca010e99e232 4SHA512 (grpcio-testing-1.47.0.tar.gz) = f07874544cb90712b9bc70867caa14e9773a14389bebc205d9971c5d8ed8258074d265927b57be774a11811d5d7e9f0e56bc5ec9d7171475d72a27cdefc2b459
5Size (grpcio-testing-1.46.3.tar.gz) = 17426 bytes 5Size (grpcio-testing-1.47.0.tar.gz) = 17964 bytes

cvs diff -r1.43 -r1.44 pkgsrc/net/py-grpcio-tools/Makefile (expand / switch to unified diff)

--- pkgsrc/net/py-grpcio-tools/Makefile 2022/05/25 09:49:25 1.43
+++ pkgsrc/net/py-grpcio-tools/Makefile 2022/07/06 15:18:17 1.44
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.43 2022/05/25 09:49:25 adam Exp $ 1# $NetBSD: Makefile,v 1.44 2022/07/06 15:18:17 adam Exp $
2 2
3DISTNAME= grpcio-tools-1.46.3 3DISTNAME= grpcio-tools-1.47.0
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= net python 5CATEGORIES= net python
6MASTER_SITES= ${MASTER_SITE_PYPI:=g/grpcio-tools/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=g/grpcio-tools/}
7 7
8MAINTAINER= minskim@NetBSD.org 8MAINTAINER= minskim@NetBSD.org
9HOMEPAGE= https://grpc.io/ 9HOMEPAGE= https://grpc.io/
10COMMENT= Protobuf code generator for gRPC 10COMMENT= Protobuf code generator for gRPC
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13DEPENDS+= ${PYPKGPREFIX}-grpcio>=${PKGVERSION_NOREV}:../../net/py-grpcio 13DEPENDS+= ${PYPKGPREFIX}-grpcio>=${PKGVERSION_NOREV}:../../net/py-grpcio
14DEPENDS+= ${PYPKGPREFIX}-protobuf>=3.5.1:../../devel/py-protobuf 14DEPENDS+= ${PYPKGPREFIX}-protobuf>=3.5.1:../../devel/py-protobuf
15 15
16CHECK_PORTABILITY_SKIP= third_party/protobuf/*.sh 16CHECK_PORTABILITY_SKIP= third_party/protobuf/*.sh

cvs diff -r1.39 -r1.40 pkgsrc/net/py-grpcio-tools/distinfo (expand / switch to unified diff)

--- pkgsrc/net/py-grpcio-tools/distinfo 2022/05/25 09:49:25 1.39
+++ pkgsrc/net/py-grpcio-tools/distinfo 2022/07/06 15:18:17 1.40
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.39 2022/05/25 09:49:25 adam Exp $ 1$NetBSD: distinfo,v 1.40 2022/07/06 15:18:17 adam Exp $
2 2
3BLAKE2s (grpcio-tools-1.46.3.tar.gz) = 3d1c2296e2c061f6f98474773c8c83f7af45848e172da67fde1a6641cd3d9707 3BLAKE2s (grpcio-tools-1.47.0.tar.gz) = bc70de5cf1249036f54e9b42fe265d4acbfcef9ce02bbf3607bedebe42c21a0e
4SHA512 (grpcio-tools-1.46.3.tar.gz) = 92874cead68f8dfba6ac2c7dd2231910d21283fbb9fe8b52082a0004eb9a7af312ac2c66e3dda320583deb2fccd0701da329d37a4cf0b16551e238d9421b59e0 4SHA512 (grpcio-tools-1.47.0.tar.gz) = 87869741ba89230d022a0f5824852b0e7bf3f48127aef378191667a7e3c2abc5cb584a91e5d8375acae963fbb72b9e233371ad3e7498a1cdd2303257fd3e44ea
5Size (grpcio-tools-1.46.3.tar.gz) = 2230780 bytes 5Size (grpcio-tools-1.47.0.tar.gz) = 2236500 bytes
6SHA1 (patch-setup.py) = ecd08109c7d3173ccaa6d3b4428a66a9eac560f7 6SHA1 (patch-setup.py) = ecd08109c7d3173ccaa6d3b4428a66a9eac560f7

cvs diff -r1.13 -r1.14 pkgsrc/net/py-grpcio/patches/patch-setup.py (expand / switch to unified diff)

--- pkgsrc/net/py-grpcio/patches/patch-setup.py 2022/02/18 09:08:08 1.13
+++ pkgsrc/net/py-grpcio/patches/patch-setup.py 2022/07/06 15:18:17 1.14
@@ -1,57 +1,60 @@ @@ -1,57 +1,60 @@
1$NetBSD: patch-setup.py,v 1.13 2022/02/18 09:08:08 adam Exp $ 1$NetBSD: patch-setup.py,v 1.14 2022/07/06 15:18:17 adam Exp $
2 2
3Fix libatomic detection. 3Fix libatomic detection.
4Use dependencies in pkgsrc. 4Use dependencies in pkgsrc.
5 5
6--- setup.py.orig 2022-02-11 11:07:23.000000000 +0000 6--- setup.py.orig 2022-06-21 21:07:50.000000000 +0000
7+++ setup.py 7+++ setup.py
8@@ -304,29 +304,7 @@ EXTENSION_INCLUDE_DIRECTORIES = ((PYTHON 8@@ -316,32 +316,7 @@ EXTENSION_INCLUDE_DIRECTORIES = ((PYTHON
9 UPBDEFS_GRPC_GENERATED_INCLUDE + 9 UPBDEFS_GRPC_GENERATED_INCLUDE +
10 XXHASH_INCLUDE + ZLIB_INCLUDE) 10 XXHASH_INCLUDE + ZLIB_INCLUDE)
11  11
12-EXTENSION_LIBRARIES = () 12-EXTENSION_LIBRARIES = ()
13-if "linux" in sys.platform: 13-if "linux" in sys.platform:
14- EXTENSION_LIBRARIES += ('rt',) 14- EXTENSION_LIBRARIES += ('rt',)
15-if not "win32" in sys.platform: 15-if not "win32" in sys.platform:
16- EXTENSION_LIBRARIES += ('m',) 16- EXTENSION_LIBRARIES += ('m',)
17-if "win32" in sys.platform: 17-if "win32" in sys.platform:
18- EXTENSION_LIBRARIES += ( 18- EXTENSION_LIBRARIES += (
19- 'advapi32', 19- 'advapi32',
20- 'bcrypt', 20- 'bcrypt',
21- 'dbghelp', 21- 'dbghelp',
22- 'ws2_32', 22- 'ws2_32',
23- ) 23- )
24-if BUILD_WITH_SYSTEM_OPENSSL: 24-if BUILD_WITH_SYSTEM_OPENSSL:
25- EXTENSION_LIBRARIES += ( 25- EXTENSION_LIBRARIES += (
26- 'ssl', 26- 'ssl',
27- 'crypto', 27- 'crypto',
28- ) 28- )
29-if BUILD_WITH_SYSTEM_ZLIB: 29-if BUILD_WITH_SYSTEM_ZLIB:
30- EXTENSION_LIBRARIES += ('z',) 30- EXTENSION_LIBRARIES += ('z',)
31-if BUILD_WITH_SYSTEM_CARES: 31-if BUILD_WITH_SYSTEM_CARES:
32- EXTENSION_LIBRARIES += ('cares',) 32- EXTENSION_LIBRARIES += ('cares',)
33-if BUILD_WITH_SYSTEM_RE2: 33-if BUILD_WITH_SYSTEM_RE2:
34- EXTENSION_LIBRARIES += ('re2',) 34- EXTENSION_LIBRARIES += ('re2',)
 35-if BUILD_WITH_SYSTEM_ABSL:
 36- EXTENSION_LIBRARIES += tuple(
 37- lib.stem[3:] for lib in pathlib.Path('/usr').glob('lib*/libabsl_*.so'))
35+EXTENSION_LIBRARIES = ('grpc',) 38+EXTENSION_LIBRARIES = ('grpc',)
36  39
37 DEFINE_MACROS = (('_WIN32_WINNT', 0x600),) 40 DEFINE_MACROS = (('_WIN32_WINNT', 0x600),)
38 asm_files = [] 41 asm_files = []
39@@ -427,7 +405,7 @@ def cython_extensions_and_necessity(): 42@@ -442,7 +417,7 @@ def cython_extensions_and_necessity():
40 ] 43 ]
41 config = os.environ.get('CONFIG', 'opt') 44 config = os.environ.get('CONFIG', 'opt')
42 prefix = 'libs/' + config + '/' 45 prefix = 'libs/' + config + '/'
43- if USE_PREBUILT_GRPC_CORE: 46- if USE_PREBUILT_GRPC_CORE:
44+ if False: 47+ if False:
45 extra_objects = [ 48 extra_objects = [
46 prefix + 'libares.a', prefix + 'libboringssl.a', 49 prefix + 'libares.a', prefix + 'libboringssl.a',
47 prefix + 'libgpr.a', prefix + 'libgrpc.a' 50 prefix + 'libgpr.a', prefix + 'libgrpc.a'
48@@ -439,8 +417,7 @@ def cython_extensions_and_necessity(): 51@@ -454,8 +429,7 @@ def cython_extensions_and_necessity():
49 extensions = [ 52 extensions = [
50 _extension.Extension( 53 _extension.Extension(
51 name=module_name, 54 name=module_name,
52- sources=([module_file] + list(CYTHON_HELPER_C_FILES) + 55- sources=([module_file] + list(CYTHON_HELPER_C_FILES) +
53- core_c_files + asm_files), 56- core_c_files + asm_files),
54+ sources=[module_file] + list(CYTHON_HELPER_C_FILES), 57+ sources=[module_file] + list(CYTHON_HELPER_C_FILES),
55 include_dirs=list(EXTENSION_INCLUDE_DIRECTORIES), 58 include_dirs=list(EXTENSION_INCLUDE_DIRECTORIES),
56 libraries=list(EXTENSION_LIBRARIES), 59 libraries=list(EXTENSION_LIBRARIES),
57 define_macros=list(DEFINE_MACROS), 60 define_macros=list(DEFINE_MACROS),