From owner-svn-ports-all@FreeBSD.ORG  Sun Mar 29 19:00:19 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1EB092EE;
 Sun, 29 Mar 2015 19:00:19 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 09A74955;
 Sun, 29 Mar 2015 19:00:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2TJ0IWY074259;
 Sun, 29 Mar 2015 19:00:18 GMT (envelope-from pi@FreeBSD.org)
Received: (from pi@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2TJ0Igx074258;
 Sun, 29 Mar 2015 19:00:18 GMT (envelope-from pi@FreeBSD.org)
Message-Id: <201503291900.t2TJ0Igx074258@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pi set sender to pi@FreeBSD.org
 using -f
From: Kurt Jaeger <pi@FreeBSD.org>
Date: Sun, 29 Mar 2015 19:00:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r382620 - head/devel/ace/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-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Mar 2015 19:00:19 -0000

Author: pi
Date: Sun Mar 29 19:00:17 2015
New Revision: 382620
URL: https://svnweb.freebsd.org/changeset/ports/382620
QAT: https://qat.redports.org/buildarchive/r382620/

Log:
  devel/ace: Make EGD conditional/Fix build with LibreSSL
  
  PR:		198776
  Submitted by:	Bernard Spil <spil.oss@gmail.com>

Modified:
  head/devel/ace/files/patch-ace__SSL__SSL_Context.cpp

Modified: head/devel/ace/files/patch-ace__SSL__SSL_Context.cpp
==============================================================================
--- head/devel/ace/files/patch-ace__SSL__SSL_Context.cpp	Sun Mar 29 18:10:37 2015	(r382619)
+++ head/devel/ace/files/patch-ace__SSL__SSL_Context.cpp	Sun Mar 29 19:00:17 2015	(r382620)
@@ -1,6 +1,6 @@
---- ace/SSL/SSL_Context.cpp.orig
+--- ace/SSL/SSL_Context.cpp.orig	2014-12-29 10:41:20 UTC
 +++ ace/SSL/SSL_Context.cpp
-@@ -274,7 +274,7 @@
+@@ -274,7 +274,7 @@ ACE_SSL_Context::set_mode (int mode)
      case ACE_SSL_Context::TLSv1:
        method = ::TLSv1_method ();
        break;
@@ -9,7 +9,7 @@
      case ACE_SSL_Context::TLSv1_1_client:
        method = ::TLSv1_1_client_method ();
        break;
-@@ -285,7 +285,7 @@
+@@ -285,7 +285,7 @@ ACE_SSL_Context::set_mode (int mode)
        method = ::TLSv1_1_method ();
        break;
  #endif
@@ -18,3 +18,12 @@
      case ACE_SSL_Context::TLSv1_2_client:
        method = ::TLSv1_2_client_method ();
        break;
+@@ -556,7 +556,7 @@ ACE_SSL_Context::random_seed (const char
+ int
+ ACE_SSL_Context::egd_file (const char * socket_file)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x00905100L
++#if OPENSSL_VERSION_NUMBER < 0x00905100L || defined(LIBRESSL_VERSION_NUMBER)
+   // OpenSSL < 0.9.5 doesn't have EGD support.
+   ACE_UNUSED_ARG (socket_file);
+   ACE_NOTSUP_RETURN (-1);