From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8A617138334 for ; Tue, 1 Jan 2019 17:00:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E303E07B2; Tue, 1 Jan 2019 17:00:42 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EEEC1E07B2 for ; Tue, 1 Jan 2019 17:00:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF4E9335CF9 for ; Tue, 1 Jan 2019 17:00:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 49246326 for ; Tue, 1 Jan 2019 17:00:36 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1546362026.92ae9ac4cbb9cb0dbf8b54c14b1404b18dbe13f9.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/xar/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/xar/files/xar-1.8-openssl-1.1.patch X-VCS-Directories: app-arch/xar/files/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 92ae9ac4cbb9cb0dbf8b54c14b1404b18dbe13f9 X-VCS-Branch: master Date: Tue, 1 Jan 2019 17:00:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1fe61adc-2ecf-469f-88bc-bfae79d273e8 X-Archives-Hash: 7770dad60ea7c573049535429240edfc commit: 92ae9ac4cbb9cb0dbf8b54c14b1404b18dbe13f9 Author: Fabian Groffen gentoo org> AuthorDate: Tue Jan 1 17:00:08 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Jan 1 17:00:26 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92ae9ac4 app-arch/xar: fix compatibility with openssl-1.0 create/destroy in 1.0 were renamed to new/free in 1.1, but defines for backwards compatibility are in 1.1 so use the old names to ensure we can still compile on 1.0. Closes: https://bugs.gentoo.org/674268 Signed-off-by: Fabian Groffen gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-arch/xar/files/xar-1.8-openssl-1.1.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-arch/xar/files/xar-1.8-openssl-1.1.patch b/app-arch/xar/files/xar-1.8-openssl-1.1.patch index bd0b1daab00..f811d99d07e 100644 --- a/app-arch/xar/files/xar-1.8-openssl-1.1.patch +++ b/app-arch/xar/files/xar-1.8-openssl-1.1.patch @@ -19,7 +19,7 @@ for it anymore. OpenSSL_add_all_digests(); HASH_CTX(hash)->type = EVP_get_digestbyname(digest_name); - EVP_DigestInit(&HASH_CTX(hash)->digest, HASH_CTX(hash)->type); -+ HASH_CTX(hash)->digest = EVP_MD_CTX_new(); ++ HASH_CTX(hash)->digest = EVP_MD_CTX_create(); + EVP_DigestInit(HASH_CTX(hash)->digest, HASH_CTX(hash)->type); #endif @@ -39,7 +39,7 @@ for it anymore. #else - EVP_DigestFinal(&HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length); + EVP_DigestFinal(HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length); -+ EVP_MD_CTX_free(HASH_CTX(hash)->digest); ++ EVP_MD_CTX_destroy(HASH_CTX(hash)->digest); #endif *nbyte = HASH_CTX(hash)->length;