From owner-svn-ports-head@freebsd.org  Thu Jan 12 14:30:38 2017
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 9E777CAB50F;
 Thu, 12 Jan 2017 14:30:38 +0000 (UTC)
 (envelope-from marino@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 6B263132A;
 Thu, 12 Jan 2017 14:30:38 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0CEUbGg000104;
 Thu, 12 Jan 2017 14:30:37 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0CEUboZ000102;
 Thu, 12 Jan 2017 14:30:37 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201701121430.v0CEUboZ000102@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Thu, 12 Jan 2017 14:30:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r431271 - in head/net/softethervpn: . 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, 12 Jan 2017 14:30:38 -0000

Author: marino
Date: Thu Jan 12 14:30:37 2017
New Revision: 431271
URL: https://svnweb.freebsd.org/changeset/ports/431271

Log:
  net/softethervpn: Fix build with LibreSSL
  
  Approved by:	SSL blanket

Added:
  head/net/softethervpn/files/patch-src_Mayaqua_Network.c   (contents, props changed)
Modified:
  head/net/softethervpn/Makefile

Modified: head/net/softethervpn/Makefile
==============================================================================
--- head/net/softethervpn/Makefile	Thu Jan 12 14:21:43 2017	(r431270)
+++ head/net/softethervpn/Makefile	Thu Jan 12 14:30:37 2017	(r431271)
@@ -10,7 +10,8 @@ COMMENT=	Cross-platform Multi-protocol V
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		gmake iconv localbase readline ssl
+USES=		dos2unix gmake iconv localbase readline ssl
+DOS2UNIX_FILES=	src/Mayaqua/Network.c
 USE_GITHUB=	yes
 GH_ACCOUNT=	SoftEtherVPN
 GH_PROJECT=	SoftEtherVPN

Added: head/net/softethervpn/files/patch-src_Mayaqua_Network.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/softethervpn/files/patch-src_Mayaqua_Network.c	Thu Jan 12 14:30:37 2017	(r431271)
@@ -0,0 +1,14 @@
+--- src/Mayaqua/Network.c.orig	2017-01-12 14:15:02 UTC
++++ src/Mayaqua/Network.c
+@@ -12983,7 +12983,11 @@ bool StartSSLEx(SOCK *sock, X *x, K *pri
+ 		{
+ 			if (client_tls == false)
+ 			{
++#ifndef OPENSSL_NO_SSL3_METHOD
+ 				SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method());
++#else
++				SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_method());
++#endif
+ 			}
+ 			else
+ 			{