From owner-svn-src-head@freebsd.org  Sat Jan  7 08:08:37 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-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 28C8CCA4630;
 Sat,  7 Jan 2017 08:08:37 +0000 (UTC)
 (envelope-from ngie@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 EED7B151F;
 Sat,  7 Jan 2017 08:08:36 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0788av1064975;
 Sat, 7 Jan 2017 08:08:36 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0788aEi064973;
 Sat, 7 Jan 2017 08:08:36 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201701070808.v0788aEi064973@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sat, 7 Jan 2017 08:08:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r311585 - in head: crypto/openssh secure/usr.sbin/sshd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Jan 2017 08:08:37 -0000

Author: ngie
Date: Sat Jan  7 08:08:35 2017
New Revision: 311585
URL: https://svnweb.freebsd.org/changeset/base/311585

Log:
  Conditionalize building libwrap support into sshd
  
  Only build libwrap support into sshd if MK_TCP_WRAPPERS != no
  
  This will unbreak the build if libwrap has been removed from the system
  
  MFC after:	2 weeks
  PR:		210141
  Submitted by:	kpect@protonmail.com
  Differential Revision:	D9049

Modified:
  head/crypto/openssh/config.h
  head/secure/usr.sbin/sshd/Makefile

Modified: head/crypto/openssh/config.h
==============================================================================
--- head/crypto/openssh/config.h	Sat Jan  7 07:54:23 2017	(r311584)
+++ head/crypto/openssh/config.h	Sat Jan  7 08:08:35 2017	(r311585)
@@ -1408,7 +1408,7 @@
 /* #undef LASTLOG_WRITE_PUTUTXLINE */
 
 /* Define if you want TCP Wrappers support */
-#define LIBWRAP 1
+/* #undef LIBWRAP */
 
 /* Define to whatever link() returns for "not supported" if it doesn't return
    EOPNOTSUPP. */

Modified: head/secure/usr.sbin/sshd/Makefile
==============================================================================
--- head/secure/usr.sbin/sshd/Makefile	Sat Jan  7 07:54:23 2017	(r311584)
+++ head/secure/usr.sbin/sshd/Makefile	Sat Jan  7 08:08:35 2017	(r311585)
@@ -27,7 +27,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespa
 SRCS+=	ssh_namespace.h
 
 # pam should always happen before ssh here for static linking
-LIBADD=	pam ssh util wrap
+LIBADD=	pam ssh util
 
 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
@@ -53,6 +53,11 @@ SRCS+=	krb5_config.h
 LIBADD+=	gssapi_krb5 gssapi krb5
 .endif
 
+.if ${MK_TCP_WRAPPERS} != "no"
+CFLAGS+=	-DLIBWRAP
+LIBADD+=	wrap
+.endif
+
 LIBADD+=	crypto
 
 .if defined(LOCALBASE)