From 9fcaa71e4675d12dc3c9a5895edd68610e03cbcd Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Tue, 27 Mar 2018 07:07:16 +0000
Subject: . Fix the build with libressl-devel

PR:		226853
Submitted by:	Piotr Kubaj <pkubaj@anongoth.pl>
---
 .../files/patch-libarchive-archive_openssl_evp_private.h     |  9 +++++----
 .../libarchive/files/patch-libarchive_openssl_hmac_private.h | 12 ++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 archivers/libarchive/files/patch-libarchive_openssl_hmac_private.h

diff --git a/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h b/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h
index d07b8a0f3277..0b00e15fe55c 100644
--- a/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h
+++ b/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h
@@ -1,11 +1,12 @@
---- libarchive/archive_openssl_evp_private.h.orig	Sun Jan 29 06:06:27 2017
-+++ libarchive/archive_openssl_evp_private.h	Fri Mar 10 12:53:43 2017
-@@ -28,7 +28,7 @@
+--- libarchive/archive_openssl_evp_private.h.orig	2017-01-29 05:06:27 UTC
++++ libarchive/archive_openssl_evp_private.h
+@@ -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 < 0x2070000fL)
  #include <stdlib.h> /* malloc, free */
  #include <string.h> /* memset */
  static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
diff --git a/archivers/libarchive/files/patch-libarchive_openssl_hmac_private.h b/archivers/libarchive/files/patch-libarchive_openssl_hmac_private.h
new file mode 100644
index 000000000000..fe138bb3aa40
--- /dev/null
+++ b/archivers/libarchive/files/patch-libarchive_openssl_hmac_private.h
@@ -0,0 +1,12 @@
+--- libarchive/archive_openssl_hmac_private.h.orig	2018-03-22 20:47:12 UTC
++++ libarchive/archive_openssl_hmac_private.h
+@@ -28,7 +28,8 @@
+ #include <openssl/hmac.h>
+ #include <openssl/opensslv.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+ #include <stdlib.h> /* malloc, free */
+ #include <string.h> /* memset */
+ static inline HMAC_CTX *HMAC_CTX_new(void)
-- 
cgit