Fix build with LibreSSL.

PR:		215323
Submitted by:	naddy
This commit is contained in:
Cy Schubert 2016-12-15 20:22:14 +00:00
parent f2742272da
commit b49c1750b8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=428634
3 changed files with 22 additions and 4 deletions

View file

@ -70,10 +70,6 @@ ${D}_CONFIGURE_ON= --enable-${D}
BROKEN= Does not build under FreeBSD-9, aclocal not found
.endif
.if ${SSL_DEFAULT:Mlibressl*}
IGNORE= detected LibreSSL (md5 definition conflicts)
.endif
# XXX Temporary hack. Remember to remove this next commit.
post-extract:
@${TOUCH} ${WRKSRC}/scripts/build/checkHtmlFileDates

View file

@ -0,0 +1,11 @@
--- include/libssl_compat.h.orig 2016-11-21 12:28:40 UTC
+++ include/libssl_compat.h
@@ -25,7 +25,7 @@
#include "openssl/rsa.h"
/* ----------------------------------------------------------------- */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
/* ----------------------------------------------------------------- */
# include <openssl/objects.h>

View file

@ -0,0 +1,11 @@
--- libntp/libssl_compat.c.orig 2016-11-21 12:28:40 UTC
+++ libntp/libssl_compat.c
@@ -23,7 +23,7 @@
#include "ntp_types.h"
/* ----------------------------------------------------------------- */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
/* ----------------------------------------------------------------- */
#include "libssl_compat.h"