Fix build with LibreSSL 2.8+

PR:		233480
Submitted by:	Bernard Spil <brnrd@freebsd.org>
This commit is contained in:
Lev A. Serebryakov 2019-11-03 22:54:23 +00:00
parent 8510770bb6
commit 8455d1c7fb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=516613
2 changed files with 8 additions and 8 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= serf
PORTVERSION= 1.3.9
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= APACHE/serf

View File

@ -1,11 +1,11 @@
--- buckets/ssl_buckets.c.orig 2016-06-30 15:45:07 UTC
+++ buckets/ssl_buckets.c
@@ -52,7 +52,7 @@
#define APR_ARRAY_PUSH(ary,type) (*((type *)apr_array_push(ary)))
#endif
-#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
#define USE_OPENSSL_1_1_API
@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void)
}
#endif
-#ifdef USE_OPENSSL_1_1_API
+#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER)
OPENSSL_malloc_init();
#else
CRYPTO_malloc_init();