From owner-svn-ports-head@freebsd.org  Thu Dec 15 20:22:16 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 39FDFC81C20;
 Thu, 15 Dec 2016 20:22:16 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DBDBE1601;
 Thu, 15 Dec 2016 20:22:15 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBFKMFhY085305;
 Thu, 15 Dec 2016 20:22:15 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBFKME4H085302;
 Thu, 15 Dec 2016 20:22:14 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201612152022.uBFKME4H085302@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Thu, 15 Dec 2016 20:22:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r428634 - in head/net/ntp: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Dec 2016 20:22:16 -0000

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"