From owner-svn-ports-all@freebsd.org  Sat Oct 27 02:05:02 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E20C210D23D3;
 Sat, 27 Oct 2018 02:05:02 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 95DA47657F;
 Sat, 27 Oct 2018 02:05:02 +0000 (UTC)
 (envelope-from swills@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 76F5A1957;
 Sat, 27 Oct 2018 02:05:02 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9R252aI051209;
 Sat, 27 Oct 2018 02:05:02 GMT (envelope-from swills@FreeBSD.org)
Received: (from swills@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9R252Af051208;
 Sat, 27 Oct 2018 02:05:02 GMT (envelope-from swills@FreeBSD.org)
Message-Id: <201810270205.w9R252Af051208@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: swills set sender to
 swills@FreeBSD.org using -f
From: Steve Wills <swills@FreeBSD.org>
Date: Sat, 27 Oct 2018 02:05:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r483096 - head/mail/opendkim/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: swills
X-SVN-Commit-Paths: head/mail/opendkim/files
X-SVN-Commit-Revision: 483096
X-SVN-Commit-Repository: ports
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.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Oct 2018 02:05:03 -0000

Author: swills
Date: Sat Oct 27 02:05:01 2018
New Revision: 483096
URL: https://svnweb.freebsd.org/changeset/ports/483096

Log:
  mail/opendkim: Fix build with LibreSSL 2.8.2
  
  PR:		232481
  Submitted by:	Daniel Austin <freebsd-ports@dan.me.uk> (maintainer)
  Reported by:	Simeon Simeonov <blackmore@pichove.org>

Modified:
  head/mail/opendkim/files/patch-opendkim_opendkim-crypto.c   (contents, props changed)

Modified: head/mail/opendkim/files/patch-opendkim_opendkim-crypto.c
==============================================================================
--- head/mail/opendkim/files/patch-opendkim_opendkim-crypto.c	Sat Oct 27 01:59:28 2018	(r483095)
+++ head/mail/opendkim/files/patch-opendkim_opendkim-crypto.c	Sat Oct 27 02:05:01 2018	(r483096)
@@ -4,7 +4,7 @@
  	{
  		assert(pthread_setspecific(id_key, ptr) == 0);
  
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER))
 +		OPENSSL_thread_stop();
 +#else
  		ERR_remove_state(0);
@@ -16,7 +16,7 @@
  {
  	if (crypto_init_done)
  	{
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER))
 +		OPENSSL_thread_stop();
 +#else
  		CRYPTO_cleanup_all_ex_data();