svn commit: r443000 - in branches/2017Q2/security/openssh-portable: . files

[Bryan Drewery]

Author: bdrewery
Date: Fri Jun  9 14:45:08 2017
New Revision: 443000
URL: https://svnweb.freebsd.org/changeset/ports/443000

Log:
  MFH: r442999
  
  Fix LDNS detection.
  
  This is the same fix made upstream as well.
  
  PR:		218472
  Submitted by:	leres at ee.lbl.gov
  Approved by:	portmgr (implicit)

Modified:
  branches/2017Q2/security/openssh-portable/Makefile
  branches/2017Q2/security/openssh-portable/files/patch-configure.ac
Directory Properties:
  branches/2017Q2/   (props changed)

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

Modified: branches/2017Q2/security/openssh-portable/files/patch-configure.ac
==============================================================================
--- branches/2017Q2/security/openssh-portable/files/patch-configure.ac	Fri Jun  9 14:44:19 2017	(r442999)
+++ branches/2017Q2/security/openssh-portable/files/patch-configure.ac	Fri Jun  9 14:45:08 2017	(r443000)
@@ -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