From nobody Fri Jan 28 23:29:35 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 72D371997737; Fri, 28 Jan 2022 23:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jltw5629Lz4vSG; Fri, 28 Jan 2022 23:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643412582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1mjymNNL38dETaNd4nNjTAeIcglr0Ecp5982PxA7o5c=; b=SArUGZrGKcHZBVERDGWV1wKUVjFnZnTcb0Y8aoT3Nj/L8xLmy5SK7H/3ZDIRt6DGkZBLsb B9yN+y8oIkKC9Cg0TqIh3kgw0nS1Lp24B5pvwlZRj7ecf0mYS6b53W9A3RlVeorQ91hP+3 Tvt/pw0Me7RjXDIaoQq/57URyXjJ4wEkQCYNL1aeHwG4bzPCAVphAJ9VIViFwg5iC/6TL4 jiYZk4zWZOFKNpPCICPhvFtufuJARfc7qMAvWvLFdrxt90EQd3Ss+APCgEsN4tr9d6Q9Wc 2AeqRgvj38v3p/rmD+dQa8ds952W5dQnOOnckqkIY3VsymnbVwQF/o3akr3PNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A8A812FD4; Fri, 28 Jan 2022 23:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20SNTZNV096263; Fri, 28 Jan 2022 23:29:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20SNTZ8b096262; Fri, 28 Jan 2022 23:29:35 GMT (envelope-from git) Date: Fri, 28 Jan 2022 23:29:35 GMT Message-Id: <202201282329.20SNTZ8b096262@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: d76ea52354cb - main - devel/grpc: Clean up outdated patches List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d76ea52354cb9db13e8b83af7ac72298e5790ca7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643412583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1mjymNNL38dETaNd4nNjTAeIcglr0Ecp5982PxA7o5c=; b=n8Yey1WvBfz/tb+n0lFtBSftf3O3RfdzsFd3NhMOovxXmSu4lDZay4/rTL1bU35Y4XscVv uX84obg/MfS4kHa0IRU6TosNJOjLRgF5yjkNdk1Hm+81KaGEjEYOhhSDKzwzJlgtXLiAON mtZhK5XzJViuuz7HE4Qx9Kh/cn8rlbqVjcGOxgkYDKRuRnSlKKS9YtborpwuIMXSfVVwed HUg5XmbggBsKNSJm2+DWHycNgBBAzatyHhywQFhGx0IPHh9VnyvH8zOggp0gIoQK7te8Qa 3xDbSXuaso8Z9+OZ+4qVvSqd+sXzsq+Y233pkz1J8WAVKqIk/cqQXlXk+q4Q9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643412583; a=rsa-sha256; cv=none; b=lDQUlKMv+RrLbFiK/DsG8F+rm2wszoL6slq8nni9mFOYI89HbQb6Lj6qEQcBdUt3kqmARU sihW5RoSUkvJO4QGBDp21YZvca9CsscSV6wbtxaiUvnv4cIeW/tZSPptUqwgS8pZ4kG4LZ HbK3X3RC811UH82p0GGA3DmLKSjk+xd0fL6kyI5oiUE1zA5+UGydCo3Tu0J+oMcYrwWT01 7mkjM/fXJYbesy/7FctH14p4i/nZBq9OuCu7NDiBICG2zed62mg+VZoTIZLKfP5ny3okG1 iXa22tEev797U40kUC3Z94Xipv2pQKTt0qOg5I0lryqlOVfgKJnNhbCcXqKTlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=d76ea52354cb9db13e8b83af7ac72298e5790ca7 commit d76ea52354cb9db13e8b83af7ac72298e5790ca7 Author: Po-Chuan Hsieh AuthorDate: 2022-01-28 23:24:01 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-01-28 23:27:02 +0000 devel/grpc: Clean up outdated patches --- ...e_lib_security_credentials_jwt_jwt__verifier.cc | 11 --------- .../patch-src_core_tsi_alts_crypt_aes__gcm.cc | 11 --------- .../patch-src_core_tsi_ssl__transport__security.cc | 26 ---------------------- 3 files changed, 48 deletions(-) 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 deleted file mode 100644 index d68a3c9ce37f..000000000000 --- a/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 -@@ -472,7 +472,7 @@ static BIGNUM* bignum_from_base64(const char* b64) { - return result; - } - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - - // Provide compatibility across OpenSSL 1.02 and 1.1. - static int RSA_set0_key(RSA* r, BIGNUM* n, BIGNUM* e, BIGNUM* d) { 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 deleted file mode 100644 index c14ba4026b09..000000000000 --- a/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/core/tsi/alts/crypt/aes_gcm.cc.orig 2020-12-01 19:24:28 UTC -+++ src/core/tsi/alts/crypt/aes_gcm.cc -@@ -185,7 +185,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; --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - HMAC_CTX hmac; - HMAC_CTX_init(&hmac); - if (!HMAC_Init_ex(&hmac, kdf_key, kKdfKeyLen, EVP_sha256(), nullptr) || 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 deleted file mode 100644 index c0183ee78552..000000000000 --- a/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc +++ /dev/null @@ -1,26 +0,0 @@ ---- src/core/tsi/ssl_transport_security.cc.orig 2020-12-01 19:24:28 UTC -+++ src/core/tsi/ssl_transport_security.cc -@@ -70,11 +70,10 @@ extern "C" { - #define TSI_SSL_MAX_PROTECTED_FRAME_SIZE_LOWER_BOUND 1024 - #define TSI_SSL_HANDSHAKER_OUTGOING_BUFFER_INITIAL_SIZE 1024 - --/* Putting a macro like this and littering the source file with #if is really -- bad practice. -- TODO(jboeuf): refactor all the #if / #endif in a separate module. */ --#ifndef TSI_OPENSSL_ALPN_SUPPORT -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L - #define TSI_OPENSSL_ALPN_SUPPORT 1 -+#else -+#define TSI_OPENSSL_ALPN_SUPPORT 0 - #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 - options->cipher_suites); - if (result != TSI_OK) break; - --#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - // X509_STORE_up_ref is only available since OpenSSL 1.1. - if (options->root_store != nullptr) { - X509_STORE_up_ref(options->root_store->store);