Skip to content

Commit

Permalink
app-arch/libarchive: compatibility patch update for LibreSSL
Browse files Browse the repository at this point in the history
This updates the LibreSSL patch to fix building with
dev-libs/libressl-2.7.x. This is a build fix so do not rev bump.

Package-Manager: Portage-2.3.29, Repoman-2.3.9
Closes: gentoo#8063
  • Loading branch information
FuzzyGophers committed Apr 19, 2018
1 parent 524f6f6 commit eed65a3
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions app-arch/libarchive/files/libarchive-3.3.1-libressl.patch
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
--- a/libarchive/archive_openssl_evp_private.h
+++ b/libarchive/archive_openssl_evp_private.h
@@ -28,7 +28,7 @@
--- a/libarchive/archive_openssl_evp_private.h 2017-01-29 05:06:27.000000000 +0000
+++ b/libarchive/archive_openssl_evp_private.h 2018-04-19 04:00:14.061922747 +0000
@@ -28,7 +28,8 @@
#include <openssl/evp.h>
#include <openssl/opensslv.h>

-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
--- a/libarchive/archive_openssl_hmac_private.h
+++ b/libarchive/archive_openssl_hmac_private.h
@@ -28,7 +28,7 @@

--- a/libarchive/archive_openssl_hmac_private.h 2017-01-29 05:06:27.000000000 +0000
+++ b/libarchive/archive_openssl_hmac_private.h 2018-04-19 04:02:18.309167446 +0000
@@ -28,7 +28,8 @@
#include <openssl/hmac.h>
#include <openssl/opensslv.h>

-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
static inline HMAC_CTX *HMAC_CTX_new(void)

0 comments on commit eed65a3

Please sign in to comment.