svn commit: r428634 - in head/net/ntp: . files
Cy Schubert
cy at FreeBSD.org
Thu Dec 15 20:22:16 UTC 2016
Author: cy
Date: Thu Dec 15 20:22:14 2016
New Revision: 428634
URL: https://svnweb.freebsd.org/changeset/ports/428634
Log:
Fix build with LibreSSL.
PR: 215323
Submitted by: naddy
Added:
head/net/ntp/files/patch-include_libssl__compat.h (contents, props changed)
head/net/ntp/files/patch-libntp_libssl__compat.c (contents, props changed)
Modified:
head/net/ntp/Makefile
Modified: head/net/ntp/Makefile
==============================================================================
--- head/net/ntp/Makefile Thu Dec 15 19:54:17 2016 (r428633)
+++ head/net/ntp/Makefile Thu Dec 15 20:22:14 2016 (r428634)
@@ -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
Added: head/net/ntp/files/patch-include_libssl__compat.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/ntp/files/patch-include_libssl__compat.h Thu Dec 15 20:22:14 2016 (r428634)
@@ -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>
Added: head/net/ntp/files/patch-libntp_libssl__compat.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/ntp/files/patch-libntp_libssl__compat.c Thu Dec 15 20:22:14 2016 (r428634)
@@ -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"
More information about the svn-ports-head
mailing list