diff options
| author | Vlad Glagolev | 2017-06-10 17:14:44 -0400 |
|---|---|---|
| committer | Vlad Glagolev | 2017-06-10 17:16:12 -0400 |
| commit | dc63eb6deb03c23dd68a76e11cefb337574d6a5d (patch) | |
| tree | dd10e802af1d5f8c7e655f63782739e2fac88c29 | |
| parent | 82db5329cec347f97c7934666a83cbf556406b6f (diff) | |
libarchive: fixed build with libressl
(cherry picked from commit a60a9495fe15ff592ce79245d76cacd5f11d4cfc)
| -rw-r--r-- | archive-libs/libarchive/HISTORY | 4 | ||||
| -rwxr-xr-x | archive-libs/libarchive/PRE_BUILD | 4 | ||||
| -rw-r--r-- | archive-libs/libarchive/libressl.patch | 22 |
3 files changed, 30 insertions, 0 deletions
diff --git a/archive-libs/libarchive/HISTORY b/archive-libs/libarchive/HISTORY index c39476e915..a712cbad4b 100644 --- a/archive-libs/libarchive/HISTORY +++ b/archive-libs/libarchive/HISTORY @@ -1,3 +1,7 @@ +2017-06-10 Vlad Glagolev <stealth@sourcemage.org> + * PRE_BUILD: added, to apply patch + * libressl.patch: added, to fix build with libressl + 2017-02-26 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 3.3.1, SECURITY_PATCH++ diff --git a/archive-libs/libarchive/PRE_BUILD b/archive-libs/libarchive/PRE_BUILD new file mode 100755 index 0000000000..2c03a54fca --- /dev/null +++ b/archive-libs/libarchive/PRE_BUILD @@ -0,0 +1,4 @@ +default_pre_build && +cd "${SOURCE_DIRECTORY}" && + +patch -p0 < "${SPELL_DIRECTORY}/libressl.patch" diff --git a/archive-libs/libarchive/libressl.patch b/archive-libs/libarchive/libressl.patch new file mode 100644 index 0000000000..a6f758e6f8 --- /dev/null +++ b/archive-libs/libarchive/libressl.patch @@ -0,0 +1,22 @@ +--- libarchive/archive_openssl_evp_private.h.orig ++++ libarchive/archive_openssl_evp_private.h +@@ -28,7 +28,7 @@ + #include <openssl/evp.h> + #include <openssl/opensslv.h> + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #include <stdlib.h> /* malloc, free */ + #include <string.h> /* memset */ + static inline EVP_MD_CTX *EVP_MD_CTX_new(void) +--- libarchive/archive_openssl_hmac_private.h.orig ++++ libarchive/archive_openssl_hmac_private.h +@@ -28,7 +28,7 @@ + #include <openssl/hmac.h> + #include <openssl/opensslv.h> + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #include <stdlib.h> /* malloc, free */ + #include <string.h> /* memset */ + static inline HMAC_CTX *HMAC_CTX_new(void) |