From owner-svn-ports-all@freebsd.org  Fri Jun  9 14:44:20 2017
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AC0C3BF6389;
 Fri,  9 Jun 2017 14:44:20 +0000 (UTC)
 (envelope-from bdrewery@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 7C7886E3C5;
 Fri,  9 Jun 2017 14:44:20 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v59EiJTk022553;
 Fri, 9 Jun 2017 14:44:19 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v59EiJIJ022551;
 Fri, 9 Jun 2017 14:44:19 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201706091444.v59EiJIJ022551@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 9 Jun 2017 14:44:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r442999 - in head/security/openssh-portable: . 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.23
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, 09 Jun 2017 14:44:20 -0000

Author: bdrewery
Date: Fri Jun  9 14:44:19 2017
New Revision: 442999
URL: https://svnweb.freebsd.org/changeset/ports/442999

Log:
  Fix LDNS detection.
  
  This is the same fix made upstream as well.
  
  PR:		218472
  Submitted by:	leres@ee.lbl.gov
  MFH:		2017Q2

Modified:
  head/security/openssh-portable/Makefile
  head/security/openssh-portable/files/patch-configure.ac

Modified: head/security/openssh-portable/Makefile
==============================================================================
--- head/security/openssh-portable/Makefile	Fri Jun  9 14:35:08 2017	(r442998)
+++ head/security/openssh-portable/Makefile	Fri Jun  9 14:44:19 2017	(r442999)
@@ -3,7 +3,7 @@
 
 PORTNAME=	openssh
 DISTVERSION=	7.5p1
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	OPENBSD/OpenSSH/portable

Modified: head/security/openssh-portable/files/patch-configure.ac
==============================================================================
--- head/security/openssh-portable/files/patch-configure.ac	Fri Jun  9 14:35:08 2017	(r442998)
+++ head/security/openssh-portable/files/patch-configure.ac	Fri Jun  9 14:44:19 2017	(r442999)
@@ -1,6 +1,14 @@
---- configure.ac.intermediate	2016-02-03 22:06:00 UTC
+--- configure.ac.orig	2017-04-08 02:15:16 UTC
 +++ configure.ac
-@@ -1543,7 +1543,7 @@ AC_ARG_WITH([libedit],
+@@ -1486,6 +1486,7 @@ AC_ARG_WITH(ldns,
+ 		else
+ 			LIBS="$LIBS `$LDNSCONFIG --libs`"
+ 			CPPFLAGS="$CPPFLAGS `$LDNSCONFIG --cflags`"
++			ldns=yes
+ 		fi
+ 	elif test "x$withval" != "xno" ; then
+ 			CPPFLAGS="$CPPFLAGS -I${withval}/include"
+@@ -1544,7 +1545,7 @@ AC_ARG_WITH([libedit],
  			LIBEDIT=`$PKGCONFIG --libs libedit`
  			CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
  		else