From owner-svn-ports-all@freebsd.org  Fri May 11 20:14:55 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 CBDE7FCA4C4;
 Fri, 11 May 2018 20:14:55 +0000 (UTC)
 (envelope-from marcus@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 77594868EC;
 Fri, 11 May 2018 20:14:55 +0000 (UTC)
 (envelope-from marcus@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 543F214573;
 Fri, 11 May 2018 20:14:55 +0000 (UTC)
 (envelope-from marcus@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4BKEtpn042404;
 Fri, 11 May 2018 20:14:55 GMT (envelope-from marcus@FreeBSD.org)
Received: (from marcus@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4BKEtJ5042403;
 Fri, 11 May 2018 20:14:55 GMT (envelope-from marcus@FreeBSD.org)
Message-Id: <201805112014.w4BKEtJ5042403@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marcus set sender to
 marcus@FreeBSD.org using -f
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Fri, 11 May 2018 20:14:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r469690 - head/net/netatalk3/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: marcus
X-SVN-Commit-Paths: head/net/netatalk3/files
X-SVN-Commit-Revision: 469690
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.25
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: Fri, 11 May 2018 20:14:56 -0000

Author: marcus
Date: Fri May 11 20:14:54 2018
New Revision: 469690
URL: https://svnweb.freebsd.org/changeset/ports/469690

Log:
  Fix the build with libressl > 2.7.0.
  
  PR:		227860
  Submitted by:	brnrd

Modified:
  head/net/netatalk3/files/patch-etc_uams_openssl__compat.h

Modified: head/net/netatalk3/files/patch-etc_uams_openssl__compat.h
==============================================================================
--- head/net/netatalk3/files/patch-etc_uams_openssl__compat.h	Fri May 11 20:11:49 2018	(r469689)
+++ head/net/netatalk3/files/patch-etc_uams_openssl__compat.h	Fri May 11 20:14:54 2018	(r469690)
@@ -5,7 +5,7 @@
  #define OPENSSL_COMPAT_H
  
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
  inline static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
  {
     /* If the fields p and g in d are NULL, the corresponding input