svn commit: r465666 - head/archivers/libarchive/files
Greg Lewis
glewis at FreeBSD.org
Tue Mar 27 07:07:18 UTC 2018
Author: glewis
Date: Tue Mar 27 07:07:16 2018
New Revision: 465666
URL: https://svnweb.freebsd.org/changeset/ports/465666
Log:
. Fix the build with libressl-devel
PR: 226853
Submitted by: Piotr Kubaj <pkubaj at anongoth.pl>
Added:
head/archivers/libarchive/files/patch-libarchive_openssl_hmac_private.h (contents, props changed)
Modified:
head/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h
Modified: head/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h
==============================================================================
--- head/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h Tue Mar 27 07:06:39 2018 (r465665)
+++ head/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h Tue Mar 27 07:07:16 2018 (r465666)
@@ -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)
Added: head/archivers/libarchive/files/patch-libarchive_openssl_hmac_private.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/archivers/libarchive/files/patch-libarchive_openssl_hmac_private.h Tue Mar 27 07:07:16 2018 (r465666)
@@ -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)
More information about the svn-ports-head
mailing list