tools/cmake/patches/150-libarchive-fix-libressl.patch

   1 From 5da00ad75b09e262774ec3675bbe4d5a4502a852 Mon Sep 17 00:00:00 2001
   2 From: Bernard Spil <brnrd@FreeBSD.org>
   3 Date: Sun, 1 Apr 2018 23:01:44 +0200
   4 Subject: [PATCH] fix build with LibreSSL 2.7
   5
   6 LibreSSL 2.7 adds OpenSSL 1.1 API leading to conflicts on method names
   7
   8 See also: https://bugs.freebsd.org/226853
   9 Signed-off-by: Bernard Spil <brnrd@FreeBSD.org>
  10 ---
  11  libarchive/archive_openssl_hmac_private.h | 3 ++-
  12  1 file changed, 2 insertions(+), 1 deletion(-)
  13
  14 --- a/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h
  15 +++ b/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h
  16 @@ -28,7 +28,8 @@
  17  #include <openssl/hmac.h>
  18  #include <openssl/opensslv.h>
  19
  20 -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
  21 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
  22 +       (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
  23  #include <stdlib.h> /* malloc, free */
  24  #include <string.h> /* memset */
  25  static inline HMAC_CTX *HMAC_CTX_new(void)
  26 --- a/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
  27 +++ b/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
  28 @@ -28,7 +28,8 @@
  29  #include <openssl/evp.h>
  30  #include <openssl/opensslv.h>
  31
  32 -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
  33 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
  34 +       (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
  35  #include <stdlib.h> /* malloc, free */
  36  #include <string.h> /* memset */
  37  static inline EVP_MD_CTX *EVP_MD_CTX_new(void)