pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/net



Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jul  6 15:18:17 UTC 2022

Modified Files:
        pkgsrc/net/grpc: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/net/grpc/patches: patch-CMakeLists.txt
        pkgsrc/net/py-grpcio: Makefile distinfo
        pkgsrc/net/py-grpcio-testing: Makefile distinfo
        pkgsrc/net/py-grpcio-tools: Makefile distinfo
        pkgsrc/net/py-grpcio/patches: patch-setup.py
Removed Files:
        pkgsrc/net/grpc/patches: patch-include_grpc_event__engine_port.h

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/net/grpc/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/grpc/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/grpc/buildlink3.mk
cvs rdiff -u -r1.58 -r1.59 pkgsrc/net/grpc/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/grpc/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.5 -r0 \
    pkgsrc/net/grpc/patches/patch-include_grpc_event__engine_port.h
cvs rdiff -u -r1.47 -r1.48 pkgsrc/net/py-grpcio/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/net/py-grpcio/distinfo
cvs rdiff -u -r1.30 -r1.31 pkgsrc/net/py-grpcio-testing/Makefile \
    pkgsrc/net/py-grpcio-testing/distinfo
cvs rdiff -u -r1.43 -r1.44 pkgsrc/net/py-grpcio-tools/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/net/py-grpcio-tools/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/py-grpcio/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/grpc/Makefile
diff -u pkgsrc/net/grpc/Makefile:1.57 pkgsrc/net/grpc/Makefile:1.58
--- pkgsrc/net/grpc/Makefile:1.57       Wed May 25 09:49:24 2022
+++ pkgsrc/net/grpc/Makefile    Wed Jul  6 15:18:17 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2022/05/25 09:49:24 adam Exp $
+# $NetBSD: Makefile,v 1.58 2022/07/06 15:18:17 adam Exp $
 
-DISTNAME=      grpc-1.46.3
+DISTNAME=      grpc-1.47.0
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=grpc/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -14,9 +14,6 @@ USE_CMAKE=    yes
 USE_LANGUAGES+=        c c++11
 USE_TOOLS+=    pkg-config
 
-# For Darwin
-#MAKE_ENV+=    DYLD_LIBRARY_PATH=${PREFIX}/lib
-
 CMAKE_ARGS+=   -DBUILD_SHARED_LIBS=ON
 # use cmake's find_package() to locate a pre-installed dependency
 CMAKE_ARGS+=   -DgRPC_ABSL_PROVIDER=package
@@ -28,6 +25,17 @@ CMAKE_ARGS+= -DgRPC_RE2_PROVIDER=package
 CMAKE_ARGS+=   -DgRPC_SSL_PROVIDER=package
 CMAKE_ARGS+=   -DgRPC_ZLIB_PROVIDER=package
 
+# This should be included in the distfile, but it's not,
+# so CMakeFile.txt will try to download it.
+CENSUS_DIST=           v0.3.0.tar.gz
+SITES.${CENSUS_DIST}=  ${MASTER_SITE_GITHUB:=census-instrumentation/opencensus-proto/archive/}
+
+DISTFILES=      ${DEFAULT_DISTFILES} ${CENSUS_DIST}
+
+post-extract:
+       cd ${WRKSRC}/third_party/opencensus-proto && \
+       ${LN} -s ${WRKDIR}/opencensus-proto-0.3.0/src src
+
 .include "../../mk/atomic64.mk"
 .include "../../benchmarks/google-benchmark/buildlink3.mk"
 .include "../../devel/abseil/buildlink3.mk"

Index: pkgsrc/net/grpc/PLIST
diff -u pkgsrc/net/grpc/PLIST:1.33 pkgsrc/net/grpc/PLIST:1.34
--- pkgsrc/net/grpc/PLIST:1.33  Fri May 13 07:35:53 2022
+++ pkgsrc/net/grpc/PLIST       Wed Jul  6 15:18:17 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2022/05/13 07:35:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.34 2022/07/06 15:18:17 adam Exp $
 bin/grpc_cpp_plugin
 bin/grpc_csharp_plugin
 bin/grpc_node_plugin
@@ -95,6 +95,8 @@ include/grpc/event_engine/internal/memor
 include/grpc/event_engine/memory_allocator.h
 include/grpc/event_engine/memory_request.h
 include/grpc/event_engine/port.h
+include/grpc/event_engine/slice.h
+include/grpc/event_engine/slice_buffer.h
 include/grpc/fork.h
 include/grpc/grpc.h
 include/grpc/grpc_posix.h
@@ -153,6 +155,7 @@ include/grpcpp/completion_queue.h
 include/grpcpp/create_channel.h
 include/grpcpp/create_channel_binder.h
 include/grpcpp/create_channel_posix.h
+include/grpcpp/ext/call_metric_recorder.h
 include/grpcpp/ext/channelz_service_plugin.h
 include/grpcpp/ext/health_check_service_server_builder_option.h
 include/grpcpp/ext/proto_server_reflection_plugin.h
@@ -271,41 +274,41 @@ lib/cmake/grpc/gRPCTargets.cmake
 lib/cmake/grpc/modules/Findc-ares.cmake
 lib/cmake/grpc/modules/Findre2.cmake
 lib/libaddress_sorting.so
-lib/libaddress_sorting.so.24
-lib/libaddress_sorting.so.24.0.0
+lib/libaddress_sorting.so.25
+lib/libaddress_sorting.so.25.0.0
 lib/libgpr.so
-lib/libgpr.so.24
-lib/libgpr.so.24.0.0
+lib/libgpr.so.25
+lib/libgpr.so.25.0.0
 lib/libgrpc++.so
 lib/libgrpc++.so.${PKGVERSION}
-lib/libgrpc++.so.1.46
+lib/libgrpc++.so.1.47
 lib/libgrpc++_alts.so
 lib/libgrpc++_alts.so.${PKGVERSION}
-lib/libgrpc++_alts.so.1.46
+lib/libgrpc++_alts.so.1.47
 lib/libgrpc++_error_details.so
 lib/libgrpc++_error_details.so.${PKGVERSION}
-lib/libgrpc++_error_details.so.1.46
+lib/libgrpc++_error_details.so.1.47
 lib/libgrpc++_reflection.so
 lib/libgrpc++_reflection.so.${PKGVERSION}
-lib/libgrpc++_reflection.so.1.46
+lib/libgrpc++_reflection.so.1.47
 lib/libgrpc++_unsecure.so
 lib/libgrpc++_unsecure.so.${PKGVERSION}
-lib/libgrpc++_unsecure.so.1.46
+lib/libgrpc++_unsecure.so.1.47
 lib/libgrpc.so
-lib/libgrpc.so.24
-lib/libgrpc.so.24.0.0
+lib/libgrpc.so.25
+lib/libgrpc.so.25.0.0
 lib/libgrpc_plugin_support.so
 lib/libgrpc_plugin_support.so.${PKGVERSION}
-lib/libgrpc_plugin_support.so.1.46
+lib/libgrpc_plugin_support.so.1.47
 lib/libgrpc_unsecure.so
-lib/libgrpc_unsecure.so.24
-lib/libgrpc_unsecure.so.24.0.0
+lib/libgrpc_unsecure.so.25
+lib/libgrpc_unsecure.so.25.0.0
 lib/libgrpcpp_channelz.so
 lib/libgrpcpp_channelz.so.${PKGVERSION}
-lib/libgrpcpp_channelz.so.1.46
+lib/libgrpcpp_channelz.so.1.47
 lib/libupb.so
-lib/libupb.so.24
-lib/libupb.so.24.0.0
+lib/libupb.so.25
+lib/libupb.so.25.0.0
 lib/pkgconfig/gpr.pc
 lib/pkgconfig/grpc++.pc
 lib/pkgconfig/grpc++_unsecure.pc

Index: pkgsrc/net/grpc/buildlink3.mk
diff -u pkgsrc/net/grpc/buildlink3.mk:1.5 pkgsrc/net/grpc/buildlink3.mk:1.6
--- pkgsrc/net/grpc/buildlink3.mk:1.5   Sun Apr  3 18:50:17 2022
+++ pkgsrc/net/grpc/buildlink3.mk       Wed Jul  6 15:18:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2022/04/03 18:50:17 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2022/07/06 15:18:17 adam Exp $
 
 BUILDLINK_TREE+=       grpc
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        grpc
 GRPC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.grpc+=   grpc>=1.11.0
-BUILDLINK_ABI_DEPENDS.grpc?=   grpc>=1.44.0nb1
+BUILDLINK_ABI_DEPENDS.grpc?=   grpc>=1.47.0
 BUILDLINK_PKGSRCDIR.grpc?=     ../../net/grpc
 
 .include "../../devel/protobuf/buildlink3.mk"

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

Index: pkgsrc/net/grpc/patches/patch-CMakeLists.txt
diff -u pkgsrc/net/grpc/patches/patch-CMakeLists.txt:1.11 pkgsrc/net/grpc/patches/patch-CMakeLists.txt:1.12
--- pkgsrc/net/grpc/patches/patch-CMakeLists.txt:1.11   Wed Oct  6 10:58:30 2021
+++ pkgsrc/net/grpc/patches/patch-CMakeLists.txt        Wed Jul  6 15:18:17 2022
@@ -1,13 +1,13 @@
-$NetBSD: patch-CMakeLists.txt,v 1.11 2021/10/06 10:58:30 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.12 2022/07/06 15:18:17 adam Exp $
 
---- CMakeLists.txt.orig        2020-02-04 17:04:33.000000000 +0000
+--- CMakeLists.txt.orig        2022-06-21 20:39:47.000000000 +0000
 +++ CMakeLists.txt
-@@ -254,7 +254,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_EXECUTABLE}
-+      COMMAND env LD_LIBRARY_PATH=${CMAKE_BINARY_DIR} DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR} ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE}
-       ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR}
-            --cpp_out=${_gRPC_PROTO_GENS_DIR}
-            --plugin=protoc-gen-grpc=${_gRPC_CPP_PLUGIN}
+@@ -504,7 +504,7 @@ function(protobuf_generate_grpc_cpp_with
+            "${_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_EXECUTABLE}
++    COMMAND env LD_LIBRARY_PATH=${CMAKE_BINARY_DIR} DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR} ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE}
+     ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR}
+          --cpp_out=${_gRPC_PROTO_GENS_DIR}
+          --plugin=protoc-gen-grpc=${_gRPC_CPP_PLUGIN}

Index: pkgsrc/net/py-grpcio/Makefile
diff -u pkgsrc/net/py-grpcio/Makefile:1.47 pkgsrc/net/py-grpcio/Makefile:1.48
--- pkgsrc/net/py-grpcio/Makefile:1.47  Wed May 25 09:49:24 2022
+++ pkgsrc/net/py-grpcio/Makefile       Wed Jul  6 15:18:17 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2022/05/25 09:49:24 adam Exp $
+# $NetBSD: Makefile,v 1.48 2022/07/06 15:18:17 adam Exp $
 
-DISTNAME=      grpcio-1.46.3
+DISTNAME=      grpcio-1.47.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=g/grpcio/}
@@ -18,6 +18,7 @@ USE_LANGUAGES=        c99 c++11
 USE_TOOLS+=    gmake pkg-config
 
 .include "../../devel/abseil/buildlink3.mk"
+.include "../../devel/re2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../net/grpc/buildlink3.mk"
 .include "../../net/libcares/buildlink3.mk"

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

Index: pkgsrc/net/py-grpcio-testing/Makefile
diff -u pkgsrc/net/py-grpcio-testing/Makefile:1.30 pkgsrc/net/py-grpcio-testing/Makefile:1.31
--- pkgsrc/net/py-grpcio-testing/Makefile:1.30  Wed May 25 09:49:24 2022
+++ pkgsrc/net/py-grpcio-testing/Makefile       Wed Jul  6 15:18:17 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2022/05/25 09:49:24 adam Exp $
+# $NetBSD: Makefile,v 1.31 2022/07/06 15:18:17 adam Exp $
 
-DISTNAME=      grpcio-testing-1.46.3
+DISTNAME=      grpcio-testing-1.47.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=g/grpcio-testing/}
Index: pkgsrc/net/py-grpcio-testing/distinfo
diff -u pkgsrc/net/py-grpcio-testing/distinfo:1.30 pkgsrc/net/py-grpcio-testing/distinfo:1.31
--- pkgsrc/net/py-grpcio-testing/distinfo:1.30  Wed May 25 09:49:24 2022
+++ pkgsrc/net/py-grpcio-testing/distinfo       Wed Jul  6 15:18:17 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.30 2022/05/25 09:49:24 adam Exp $
+$NetBSD: distinfo,v 1.31 2022/07/06 15:18:17 adam Exp $
 
-BLAKE2s (grpcio-testing-1.46.3.tar.gz) = fed87d34224c079a27849cce702914116344dc3e2fbe85a2b54ef75656cfa226
-SHA512 (grpcio-testing-1.46.3.tar.gz) = edefc2653730c9cb343f709a5214d3e06c764acfc7e81eaa30a774e6a22f9b0d92806ecdd7135b0d719e140a4aea34f920921477207f0099cb42ca010e99e232
-Size (grpcio-testing-1.46.3.tar.gz) = 17426 bytes
+BLAKE2s (grpcio-testing-1.47.0.tar.gz) = 196a3af33a884fc696ea6e206470d53b49473cc00748ba217b07b14ab6da61ca
+SHA512 (grpcio-testing-1.47.0.tar.gz) = f07874544cb90712b9bc70867caa14e9773a14389bebc205d9971c5d8ed8258074d265927b57be774a11811d5d7e9f0e56bc5ec9d7171475d72a27cdefc2b459
+Size (grpcio-testing-1.47.0.tar.gz) = 17964 bytes

Index: pkgsrc/net/py-grpcio-tools/Makefile
diff -u pkgsrc/net/py-grpcio-tools/Makefile:1.43 pkgsrc/net/py-grpcio-tools/Makefile:1.44
--- pkgsrc/net/py-grpcio-tools/Makefile:1.43    Wed May 25 09:49:25 2022
+++ pkgsrc/net/py-grpcio-tools/Makefile Wed Jul  6 15:18:17 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2022/05/25 09:49:25 adam Exp $
+# $NetBSD: Makefile,v 1.44 2022/07/06 15:18:17 adam Exp $
 
-DISTNAME=      grpcio-tools-1.46.3
+DISTNAME=      grpcio-tools-1.47.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=g/grpcio-tools/}

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

Index: pkgsrc/net/py-grpcio/patches/patch-setup.py
diff -u pkgsrc/net/py-grpcio/patches/patch-setup.py:1.13 pkgsrc/net/py-grpcio/patches/patch-setup.py:1.14
--- pkgsrc/net/py-grpcio/patches/patch-setup.py:1.13    Fri Feb 18 09:08:08 2022
+++ pkgsrc/net/py-grpcio/patches/patch-setup.py Wed Jul  6 15:18:17 2022
@@ -1,11 +1,11 @@
-$NetBSD: patch-setup.py,v 1.13 2022/02/18 09:08:08 adam Exp $
+$NetBSD: patch-setup.py,v 1.14 2022/07/06 15:18:17 adam Exp $
 
 Fix libatomic detection.
 Use dependencies in pkgsrc.
 
---- setup.py.orig      2022-02-11 11:07:23.000000000 +0000
+--- setup.py.orig      2022-06-21 21:07:50.000000000 +0000
 +++ setup.py
-@@ -304,29 +304,7 @@ EXTENSION_INCLUDE_DIRECTORIES = ((PYTHON
+@@ -316,32 +316,7 @@ EXTENSION_INCLUDE_DIRECTORIES = ((PYTHON
                                   UPBDEFS_GRPC_GENERATED_INCLUDE +
                                   XXHASH_INCLUDE + ZLIB_INCLUDE)
  
@@ -32,11 +32,14 @@ Use dependencies in pkgsrc.
 -    EXTENSION_LIBRARIES += ('cares',)
 -if BUILD_WITH_SYSTEM_RE2:
 -    EXTENSION_LIBRARIES += ('re2',)
+-if BUILD_WITH_SYSTEM_ABSL:
+-    EXTENSION_LIBRARIES += tuple(
+-        lib.stem[3:] for lib in pathlib.Path('/usr').glob('lib*/libabsl_*.so'))
 +EXTENSION_LIBRARIES = ('grpc',)
  
  DEFINE_MACROS = (('_WIN32_WINNT', 0x600),)
  asm_files = []
-@@ -427,7 +405,7 @@ def cython_extensions_and_necessity():
+@@ -442,7 +417,7 @@ def cython_extensions_and_necessity():
      ]
      config = os.environ.get('CONFIG', 'opt')
      prefix = 'libs/' + config + '/'
@@ -45,7 +48,7 @@ Use dependencies in pkgsrc.
          extra_objects = [
              prefix + 'libares.a', prefix + 'libboringssl.a',
              prefix + 'libgpr.a', prefix + 'libgrpc.a'
-@@ -439,8 +417,7 @@ def cython_extensions_and_necessity():
+@@ -454,8 +429,7 @@ def cython_extensions_and_necessity():
      extensions = [
          _extension.Extension(
              name=module_name,



Home | Main Index | Thread Index | Old Index