Attachment 229629 Details for Bug 259960 – Patch was tested with base and port openssl

[patch] Patch was tested with base and port openssl

0001-devel-grpc-update-to-1.42.0.patch (text/plain), 8.55 KB, created by Matthias Fechner on 2021-11-21 07:25:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Fechner

Created: 2021-11-21 07:25:32 UTC

Size: 8.55 KB

patch

obsolete

>From 40ddecae0f6b65786d29c748f065acc4d4564e0c Mon Sep 17 00:00:00 2001
>From: Matthias Fechner <mfechner@FreeBSD.org>
>Date: Sun, 21 Nov 2021 08:17:52 +0100
>Subject: [PATCH] devel/grpc: update to 1.42.0
>
>This version fixes some long lasting segfault caused www/gitlab-ce to crash.
>For reference please see here:
>https://gitlab.com/gitlab-org/gitlab/-/issues/345693
>
>Changelog:
>https://github.com/grpc/grpc/releases/tag/v1.42.0
>
>PR:		259960
>PR:		259848
>Approved by:	sunpoet (maintainer)
>---
> devel/grpc/Makefile                           |  2 +-
> devel/grpc/distinfo                           |  6 ++---
> devel/grpc/files/extra-patch-CMakeLists.txt   |  8 +++---
> ..._security_credentials_jwt_jwt__verifier.cc |  4 +--
> .../patch-src_core_tsi_alts_crypt_aes__gcm.cc |  4 +--
> ...h-src_core_tsi_ssl__transport__security.cc |  6 ++---
> devel/grpc/pkg-plist                          | 26 +++++++++++--------
> 7 files changed, 30 insertions(+), 26 deletions(-)
>
>diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile
>index e7f6ec581505..681218b20abe 100644
>--- a/devel/grpc/Makefile
>+++ b/devel/grpc/Makefile
>@@ -1,7 +1,7 @@
> # Created by: vanilla@
> 
> PORTNAME=	grpc
>-PORTVERSION=	1.41.1
>+PORTVERSION=	1.42.0
> DISTVERSIONPREFIX=	v
> PORTEPOCH=	2
> CATEGORIES=	devel
>diff --git a/devel/grpc/distinfo b/devel/grpc/distinfo
>index a41b73d9d504..c0b2e038eb74 100644
>--- a/devel/grpc/distinfo
>+++ b/devel/grpc/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1636117240
>-SHA256 (grpc-grpc-v1.41.1_GH0.tar.gz) = 12a4a6f8c06b96e38f8576ded76d0b79bce13efd7560ed22134c2f433bc496ad
>-SIZE (grpc-grpc-v1.41.1_GH0.tar.gz) = 8346512
>+TIMESTAMP = 1637404122
>+SHA256 (grpc-grpc-v1.42.0_GH0.tar.gz) = b2f2620c762427bfeeef96a68c1924319f384e877bc0e084487601e4cc6e434c
>+SIZE (grpc-grpc-v1.42.0_GH0.tar.gz) = 8460322
>diff --git a/devel/grpc/files/extra-patch-CMakeLists.txt b/devel/grpc/files/extra-patch-CMakeLists.txt
>index 794b40b630cb..3a642e49593d 100644
>--- a/devel/grpc/files/extra-patch-CMakeLists.txt
>+++ b/devel/grpc/files/extra-patch-CMakeLists.txt
>@@ -1,11 +1,11 @@
>---- CMakeLists.txt.orig	2021-09-25 02:33:41 UTC
>+--- CMakeLists.txt.orig	2021-11-21 07:13:59 UTC
> +++ CMakeLists.txt
>-@@ -17664,7 +17664,7 @@ generate_pkgconfig(
>+@@ -17280,7 +17280,7 @@ generate_pkgconfig(
>    "gRPC"
>    "high performance general RPC framework"
>    "${gRPC_CORE_VERSION}"
>--  "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_variant"
>-+  "gpr absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_variant"
>+-  "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_hash absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_utility absl_variant"
>++  "gpr absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_hash absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_utility absl_variant"
>    "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz"
>    ""
>    "grpc.pc")
>diff --git a/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc b/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc
>index d68a3c9ce37f..3aec9473960b 100644
>--- a/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc
>+++ b/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc
>@@ -1,6 +1,6 @@
>---- src/core/lib/security/credentials/jwt/jwt_verifier.cc.orig	2020-12-01 19:24:28 UTC
>+--- src/core/lib/security/credentials/jwt/jwt_verifier.cc.orig	2021-11-16 23:39:48 UTC
> +++ src/core/lib/security/credentials/jwt/jwt_verifier.cc
>-@@ -472,7 +472,7 @@ static BIGNUM* bignum_from_base64(const char* b64) {
>+@@ -467,7 +467,7 @@ static BIGNUM* bignum_from_base64(const char* b64) {
>    return result;
>  }
>  
>diff --git a/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc b/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc
>index c14ba4026b09..9cb0a6a5fcbe 100644
>--- a/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc
>+++ b/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc
>@@ -1,6 +1,6 @@
>---- src/core/tsi/alts/crypt/aes_gcm.cc.orig	2020-12-01 19:24:28 UTC
>+--- src/core/tsi/alts/crypt/aes_gcm.cc.orig	2021-11-16 23:39:48 UTC
> +++ src/core/tsi/alts/crypt/aes_gcm.cc
>-@@ -185,7 +185,7 @@ static grpc_status_code aes_gcm_derive_aead_key(uint8_
>+@@ -186,7 +186,7 @@ static grpc_status_code aes_gcm_derive_aead_key(uint8_
>                                                  const uint8_t* kdf_counter) {
>    unsigned char buf[EVP_MAX_MD_SIZE];
>    unsigned char ctr = 1;
>diff --git a/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc b/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc
>index c0183ee78552..830a0d7a95b8 100644
>--- a/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc
>+++ b/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc
>@@ -1,6 +1,6 @@
>---- src/core/tsi/ssl_transport_security.cc.orig	2020-12-01 19:24:28 UTC
>+--- src/core/tsi/ssl_transport_security.cc.orig	2021-11-16 23:39:48 UTC
> +++ src/core/tsi/ssl_transport_security.cc
>-@@ -70,11 +70,10 @@ extern "C" {
>+@@ -67,11 +67,10 @@ extern "C" {
>  #define TSI_SSL_MAX_PROTECTED_FRAME_SIZE_LOWER_BOUND 1024
>  #define TSI_SSL_HANDSHAKER_OUTGOING_BUFFER_INITIAL_SIZE 1024
>  
>@@ -15,7 +15,7 @@
>  #endif
>  
>  /* TODO(jboeuf): I have not found a way to get this number dynamically from the
>-@@ -1930,7 +1929,7 @@ tsi_result tsi_create_ssl_client_handshaker_factory_wi
>+@@ -1965,7 +1964,7 @@ tsi_result tsi_create_ssl_client_handshaker_factory_wi
>                                    options->cipher_suites);
>      if (result != TSI_OK) break;
>  
>diff --git a/devel/grpc/pkg-plist b/devel/grpc/pkg-plist
>index 050eb8277703..d4a0d94f8cc0 100644
>--- a/devel/grpc/pkg-plist
>+++ b/devel/grpc/pkg-plist
>@@ -90,8 +90,9 @@ include/grpc/census.h
> include/grpc/compression.h
> include/grpc/event_engine/endpoint_config.h
> include/grpc/event_engine/event_engine.h
>+include/grpc/event_engine/internal/memory_allocator_impl.h
>+include/grpc/event_engine/memory_allocator.h
> include/grpc/event_engine/port.h
>-include/grpc/event_engine/slice_allocator.h
> include/grpc/fork.h
> include/grpc/grpc.h
> include/grpc/grpc_posix.h
>@@ -148,6 +149,7 @@ include/grpcpp/channel.h
> include/grpcpp/client_context.h
> 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/channelz_service_plugin.h
> include/grpcpp/ext/health_check_service_server_builder_option.h
>@@ -225,6 +227,8 @@ include/grpcpp/security/alts_util.h
> include/grpcpp/security/auth_context.h
> include/grpcpp/security/auth_metadata_processor.h
> include/grpcpp/security/authorization_policy_provider.h
>+include/grpcpp/security/binder_credentials.h
>+include/grpcpp/security/binder_security_policy.h
> include/grpcpp/security/credentials.h
> include/grpcpp/security/server_credentials.h
> include/grpcpp/security/tls_certificate_provider.h
>@@ -264,11 +268,11 @@ 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.19
>-lib/libaddress_sorting.so.19.0.0
>+lib/libaddress_sorting.so.20
>+lib/libaddress_sorting.so.20.0.0
> lib/libgpr.so
>-lib/libgpr.so.19
>-lib/libgpr.so.19.0.0
>+lib/libgpr.so.20
>+lib/libgpr.so.20.0.0
> lib/libgrpc++.so
> lib/libgrpc++.so.%%SHLIB_MAJOR%%
> lib/libgrpc++.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
>@@ -285,20 +289,20 @@ lib/libgrpc++_unsecure.so
> lib/libgrpc++_unsecure.so.%%SHLIB_MAJOR%%
> lib/libgrpc++_unsecure.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
> lib/libgrpc.so
>-lib/libgrpc.so.19
>-lib/libgrpc.so.19.0.0
>+lib/libgrpc.so.20
>+lib/libgrpc.so.20.0.0
> lib/libgrpc_plugin_support.so
> lib/libgrpc_plugin_support.so.%%SHLIB_MAJOR%%
> lib/libgrpc_plugin_support.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
> lib/libgrpc_unsecure.so
>-lib/libgrpc_unsecure.so.19
>-lib/libgrpc_unsecure.so.19.0.0
>+lib/libgrpc_unsecure.so.20
>+lib/libgrpc_unsecure.so.20.0.0
> lib/libgrpcpp_channelz.so
> lib/libgrpcpp_channelz.so.%%SHLIB_MAJOR%%
> lib/libgrpcpp_channelz.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
> lib/libupb.so
>-lib/libupb.so.19
>-lib/libupb.so.19.0.0
>+lib/libupb.so.20
>+lib/libupb.so.20.0.0
> libdata/pkgconfig/gpr.pc
> libdata/pkgconfig/grpc++.pc
> libdata/pkgconfig/grpc++_unsecure.pc
>-- 
>2.33.1
>

Flags:

mfechner: maintainer-approval?

Actions: View | Diff

Attachments on bug 259960: 229629