| 1 |
commit: e2cfff62965a2d82ceb0e34eaf1d5cb65548af3c |
| 2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 29 23:39:01 2017 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 29 23:39:01 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2cfff62 |
| 7 |
|
| 8 |
app-arch/libarchive: Add patch to build with libressl |
| 9 |
|
| 10 |
Gentoo-Bug: 614460 |
| 11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 12 |
|
| 13 |
.../files/libarchive-3.3.1-libressl.patch | 22 ++++++++++++++++++++++ |
| 14 |
app-arch/libarchive/libarchive-3.3.1.ebuild | 4 ++++ |
| 15 |
2 files changed, 26 insertions(+) |
| 16 |
|
| 17 |
diff --git a/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch b/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..8078bc09210 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch |
| 22 |
@@ -0,0 +1,22 @@ |
| 23 |
+--- a/libarchive/archive_openssl_evp_private.h |
| 24 |
++++ b/libarchive/archive_openssl_evp_private.h |
| 25 |
+@@ -28,7 +28,7 @@ |
| 26 |
+ #include <openssl/evp.h> |
| 27 |
+ #include <openssl/opensslv.h> |
| 28 |
+ |
| 29 |
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 30 |
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 31 |
+ #include <stdlib.h> /* malloc, free */ |
| 32 |
+ #include <string.h> /* memset */ |
| 33 |
+ static inline EVP_MD_CTX *EVP_MD_CTX_new(void) |
| 34 |
+--- a/libarchive/archive_openssl_hmac_private.h |
| 35 |
++++ b/libarchive/archive_openssl_hmac_private.h |
| 36 |
+@@ -28,7 +28,7 @@ |
| 37 |
+ #include <openssl/hmac.h> |
| 38 |
+ #include <openssl/opensslv.h> |
| 39 |
+ |
| 40 |
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 41 |
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 42 |
+ #include <stdlib.h> /* malloc, free */ |
| 43 |
+ #include <string.h> /* memset */ |
| 44 |
+ static inline HMAC_CTX *HMAC_CTX_new(void) |
| 45 |
|
| 46 |
diff --git a/app-arch/libarchive/libarchive-3.3.1.ebuild b/app-arch/libarchive/libarchive-3.3.1.ebuild |
| 47 |
index 48ed2be6dd9..a7a6d960e76 100644 |
| 48 |
--- a/app-arch/libarchive/libarchive-3.3.1.ebuild |
| 49 |
+++ b/app-arch/libarchive/libarchive-3.3.1.ebuild |
| 50 |
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND} |
| 51 |
e2fsprogs? ( sys-fs/e2fsprogs ) |
| 52 |
)" |
| 53 |
|
| 54 |
+PATCHES=( |
| 55 |
+ "${FILESDIR}"/${PN}-3.3.1-libressl.patch |
| 56 |
+) |
| 57 |
+ |
| 58 |
src_prepare() { |
| 59 |
default |
| 60 |
elibtoolize # is required for Solaris sol2_ld linker fix |
Archives