diff --git a/net-libs/grpc/grpc-1.42.0.recipe b/net-libs/grpc/grpc-1.43.2.recipe similarity index 81% rename from net-libs/grpc/grpc-1.42.0.recipe rename to net-libs/grpc/grpc-1.43.2.recipe index f5cad1110..bfb6e2424 100644 --- a/net-libs/grpc/grpc-1.42.0.recipe +++ b/net-libs/grpc/grpc-1.43.2.recipe @@ -4,11 +4,11 @@ call (RPC) framework that can run anywhere. gRPC enables client and server \ applications to communicate transparently, and simplifies the building of \ connected systems." HOMEPAGE="https://grpc.io/" -COPYRIGHT="2015-2021 The gRPC Authors" +COPYRIGHT="2015-2022 The gRPC Authors" LICENSE="Apache v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/grpc/grpc/archive/refs/tags/v$portVersion.tar.gz" -CHECKSUM_SHA256="b2f2620c762427bfeeef96a68c1924319f384e877bc0e084487601e4cc6e434c" +CHECKSUM_SHA256="b74ce7d26fe187970d1d8e2c06a5d3391122f7bc1fdce569aff5e435fb8fe780" SOURCE_FILENAME="grpc-$portVersion.tar.gz" gtestCommit="c9ccac7cb7345901884aabf5d1a786cfa6e2f397" SOURCE_URI_2="https://github.com/google/googletest/archive/$gtestCommit/googletest-$gtestCommit.tar.gz" @@ -19,8 +19,10 @@ PATCHES="grpc-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="19.0.0" +libVersion="21.0.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" +libCppVersion="1.43.2" +libCppVersionCompat="$libCppVersion compat >= ${libCppVersion%%.*}" PROVIDES=" grpc$secondaryArchSuffix = $portVersion @@ -28,14 +30,14 @@ PROVIDES=" lib:libaddress_sorting$secondaryArchSuffix = $libVersionCompat lib:libgpr$secondaryArchSuffix = $libVersionCompat lib:libgrpc$secondaryArchSuffix = $libVersionCompat - lib:libgrpc_plugin_support$secondaryArchSuffix = $libVersionCompat + lib:libgrpc_plugin_support$secondaryArchSuffix = $libCppVersionCompat lib:libgrpc_unsecure$secondaryArchSuffix = $libVersionCompat - lib:libgrpc++$secondaryArchSuffix = $libVersionCompat - lib:libgrpc++_alts$secondaryArchSuffix = $libVersionCompat - lib:libgrpc++_error_details$secondaryArchSuffix = $libVersionCompat - lib:libgrpc++_reflection$secondaryArchSuffix = $libVersionCompat - lib:libgrpc++_unsecure$secondaryArchSuffix = $libVersionCompat - lib:libgrpcpp_channelz$secondaryArchSuffix = $libVersionCompat + lib:libgrpc++$secondaryArchSuffix = $libCppVersionCompat + lib:libgrpc++_alts$secondaryArchSuffix = $libCppVersionCompat + lib:libgrpc++_error_details$secondaryArchSuffix = $libCppVersionCompat + lib:libgrpc++_reflection$secondaryArchSuffix = $libCppVersionCompat + lib:libgrpc++_unsecure$secondaryArchSuffix = $libCppVersionCompat + lib:libgrpcpp_channelz$secondaryArchSuffix = $libCppVersionCompat lib:libupb$secondaryArchSuffix = $libVersionCompat " REQUIRES=" @@ -60,12 +62,12 @@ PROVIDES_devel=" devel:libgpr$secondaryArchSuffix = $libVersionCompat devel:libgrpc$secondaryArchSuffix = $libVersionCompat devel:libgrpc_unsecure$secondaryArchSuffix = $libVersionCompat - devel:libgrpc++$secondaryArchSuffix = $libVersionCompat - devel:libgrpc++_alts$secondaryArchSuffix = $libVersionCompat - devel:libgrpc++_error_details$secondaryArchSuffix = $libVersionCompat - devel:libgrpc++_reflection$secondaryArchSuffix = $libVersionCompat - devel:libgrpc++_unsecure$secondaryArchSuffix = $libVersionCompat - devel:libgrpcpp_channelz$secondaryArchSuffix = $libVersionCompat + devel:libgrpc++$secondaryArchSuffix = $libCppVersionCompat + devel:libgrpc++_alts$secondaryArchSuffix = $libCppVersionCompat + devel:libgrpc++_error_details$secondaryArchSuffix = $libCppVersionCompat + devel:libgrpc++_reflection$secondaryArchSuffix = $libCppVersionCompat + devel:libgrpc++_unsecure$secondaryArchSuffix = $libCppVersionCompat + devel:libgrpcpp_channelz$secondaryArchSuffix = $libCppVersionCompat devel:libupb$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" diff --git a/net-libs/grpc/patches/grpc-1.42.0.patchset b/net-libs/grpc/patches/grpc-1.43.2.patchset similarity index 94% rename from net-libs/grpc/patches/grpc-1.42.0.patchset rename to net-libs/grpc/patches/grpc-1.43.2.patchset index e12a69f7b..319f9a0c8 100644 --- a/net-libs/grpc/patches/grpc-1.42.0.patchset +++ b/net-libs/grpc/patches/grpc-1.43.2.patchset @@ -122,16 +122,6 @@ index 48503d3..500aafe 100755 else: return 'posix' -diff --git a/tools/run_tests/python_utils/port_server.py b/tools/run_tests/python_utils/port_server.py -index db1d755..8bcfb36 100755 ---- a/tools/run_tests/python_utils/port_server.py -+++ b/tools/run_tests/python_utils/port_server.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2.7 -+#!/usr/bin/env python3 - # Copyright 2015 gRPC authors. - # - # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 9fa3b4b..5ea7fa0 100755 --- a/tools/run_tests/run_tests.py