diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2019-01-01 15:28:20 +0100 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2019-01-01 15:28:42 +0100 |
| commit | b4e5b9ee780046c14e6bc99574a70bd3b8118eff (patch) | |
| tree | fd6ad085a01081a1a1398c0d19941b4fbc4aafec /app-arch/xar/files | |
| parent | net-misc/gerbera: Fix mysql client dep (diff) | |
| download | gentoo-b4e5b9ee780046c14e6bc99574a70bd3b8118eff.tar.gz gentoo-b4e5b9ee780046c14e6bc99574a70bd3b8118eff.tar.bz2 gentoo-b4e5b9ee780046c14e6bc99574a70bd3b8118eff.zip | |
app-arch/xar: revbump for openssl and solaris fixes
Closes: https://bugs.gentoo.org/674178
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Diffstat (limited to 'app-arch/xar/files')
| -rw-r--r-- | app-arch/xar/files/xar-1.8-openssl-1.1.patch | 45 |
1 files changed, 45 insertions, 0 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 new file mode 100644 index 000000000000..bd0b1daab00b --- /dev/null +++ b/app-arch/xar/files/xar-1.8-openssl-1.1.patch @@ -0,0 +1,45 @@ +lib/hash.c: fix compilation with OpenSSL-1.1+ + +EVP_MD_CTX has become an anonymous struct now, so can't allocate size +for it anymore. + +--- a/lib/hash.c 2015-06-09 03:22:07.000000000 +0000 ++++ b/lib/hash.c 2019-01-01 14:37:01.487775958 +0000 +@@ -102,7 +102,7 @@ + #ifdef __APPLE__ + CCDigestRef digest; + #else +- EVP_MD_CTX digest; ++ EVP_MD_CTX *digest; + const EVP_MD *type; + #endif + unsigned int length; +@@ -123,7 +123,8 @@ + #else + 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(); ++ EVP_DigestInit(HASH_CTX(hash)->digest, HASH_CTX(hash)->type); + #endif + + HASH_CTX(hash)->digest_name = strdup(digest_name); +@@ -143,7 +143,7 @@ + #ifdef __APPLE__ + CCDigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte); + #else +- EVP_DigestUpdate(&HASH_CTX(hash)->digest, buffer, nbyte); ++ EVP_DigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte); + #endif + } + +@@ -160,7 +160,8 @@ + CCDigestFinal(HASH_CTX(hash)->digest, buffer); + CCDigestDestroy(HASH_CTX(hash)->digest); + #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); + #endif + + *nbyte = HASH_CTX(hash)->length; |