Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/xar/files/
Date: Tue, 01 Jan 2019 17:00:43
Message-Id: 1546362026.92ae9ac4cbb9cb0dbf8b54c14b1404b18dbe13f9.grobian@gentoo
1 commit: 92ae9ac4cbb9cb0dbf8b54c14b1404b18dbe13f9
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 1 17:00:08 2019 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 1 17:00:26 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92ae9ac4
7
8 app-arch/xar: fix compatibility with openssl-1.0
9
10 create/destroy in 1.0 were renamed to new/free in 1.1, but defines for
11 backwards compatibility are in 1.1 so use the old names to ensure we can
12 still compile on 1.0.
13
14 Closes: https://bugs.gentoo.org/674268
15 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
16 Package-Manager: Portage-2.3.51, Repoman-2.3.11
17
18 app-arch/xar/files/xar-1.8-openssl-1.1.patch | 4 ++--
19 1 file changed, 2 insertions(+), 2 deletions(-)
20
21 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
22 index bd0b1daab00..f811d99d07e 100644
23 --- a/app-arch/xar/files/xar-1.8-openssl-1.1.patch
24 +++ b/app-arch/xar/files/xar-1.8-openssl-1.1.patch
25 @@ -19,7 +19,7 @@ for it anymore.
26 OpenSSL_add_all_digests();
27 HASH_CTX(hash)->type = EVP_get_digestbyname(digest_name);
28 - EVP_DigestInit(&HASH_CTX(hash)->digest, HASH_CTX(hash)->type);
29 -+ HASH_CTX(hash)->digest = EVP_MD_CTX_new();
30 ++ HASH_CTX(hash)->digest = EVP_MD_CTX_create();
31 + EVP_DigestInit(HASH_CTX(hash)->digest, HASH_CTX(hash)->type);
32 #endif
33
34 @@ -39,7 +39,7 @@ for it anymore.
35 #else
36 - EVP_DigestFinal(&HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length);
37 + EVP_DigestFinal(HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length);
38 -+ EVP_MD_CTX_free(HASH_CTX(hash)->digest);
39 ++ EVP_MD_CTX_destroy(HASH_CTX(hash)->digest);
40 #endif
41
42 *nbyte = HASH_CTX(hash)->length;