Attachment #191797 for bug #226853

Lines 2-7 Link Here

(-)Makefile (+1 lines)
2		2
3	PORTNAME= libarchive	3	PORTNAME= libarchive
4	PORTVERSION= 3.3.2	4	PORTVERSION= 3.3.2
		5	PORTREVISION= 1
5	PORTEPOCH= 1	6	PORTEPOCH= 1
6	CATEGORIES= archivers	7	CATEGORIES= archivers
7	MASTER_SITES= https://libarchive.org/downloads/	8	MASTER_SITES= https://libarchive.org/downloads/




--- 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) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
 #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	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)

Return to bug 226853

Lines 1-11 Link Here

(-)files/patch-libarchive-archive_openssl_evp_private.h (-4 / +5 lines)
1	--- libarchive/archive_openssl_evp_private.h.orig Sun Jan 29 06:06:27 2017	1	--- libarchive/archive_openssl_evp_private.h.orig 2017-01-29 05:06:27 UTC
2	+++ libarchive/archive_openssl_evp_private.h Fri Mar 10 12:53:43 2017	2	+++ libarchive/archive_openssl_evp_private.h
3	@@ -28,7 +28,7 @@	3	@@ -28,7 +28,8 @@
4	#include <openssl/evp.h>	4	#include <openssl/evp.h>
5	#include <openssl/opensslv.h>	5	#include <openssl/opensslv.h>
6		6
7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L	7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)	8	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| \
		9	+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
9	#include <stdlib.h> /* malloc, free */	10	#include <stdlib.h> /* malloc, free */
10	#include <string.h> /* memset */	11	#include <string.h> /* memset */
11	static inline EVP_MD_CTX *EVP_MD_CTX_new(void)	12	static inline EVP_MD_CTX *EVP_MD_CTX_new(void)

Line 0 Link Here

(-)files/patch-libarchive_archive__openssl__hmac__private.h (+12 lines)
	1	--- libarchive/archive_openssl_hmac_private.h.orig 2018-03-22 20:47:12 UTC
	2	+++ libarchive/archive_openssl_hmac_private.h
	3	@@ -28,7 +28,8 @@
	4	#include <openssl/hmac.h>
	5	#include <openssl/opensslv.h>
	6
	7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
	8	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| \
	9	+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
	10	#include <stdlib.h> /* malloc, free */
	11	#include <string.h> /* memset */
	12	static inline HMAC_CTX *HMAC_CTX_new(void)