public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/xar/files/
Date: Tue,  1 Jan 2019 17:00:36 +0000 (UTC)	[thread overview]
Message-ID: <1546362026.92ae9ac4cbb9cb0dbf8b54c14b1404b18dbe13f9.grobian@gentoo> (raw)

commit:     92ae9ac4cbb9cb0dbf8b54c14b1404b18dbe13f9
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  1 17:00:08 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> 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 <grobian <AT> 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;


             reply	other threads:[~2019-01-01 17:00 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-01 17:00 Fabian Groffen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-11-01 10:21 [gentoo-commits] repo/gentoo:master commit in: app-arch/xar/files/ Fabian Groffen
2021-11-04 20:13 Fabian Groffen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1546362026.92ae9ac4cbb9cb0dbf8b54c14b1404b18dbe13f9.grobian@gentoo \
    --to=grobian@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox