svn commit: r314527 - in head: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/ope...

[Ngie Cooper]

On Wed, Mar 1, 2017 at 4:11 PM, Dag-Erling Smørgrav <des at freebsd.org> wrote:
> Author: des
> Date: Thu Mar  2 00:11:32 2017
> New Revision: 314527
> URL: https://svnweb.freebsd.org/changeset/base/314527
>
> Log:
>   Upgrade to OpenSSH 7.3p1.

Hi DES,
    I'm not sure if you saw this commit last month, but it
conditionalized libwrap support (which is unfortunately broken again):

commit 078b533dd4a9d30e34427fab86a493af72b3a300
Author: ngie <ngie at FreeBSD.org>
Date:   Sat Jan 7 08:08:35 2017 +0000

    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 at protonmail.com
    Differential Revision:  D9049

Notes:
    svn path=/head/; revision=311585

This change fixes the build again when MK_TCP_WRAPPERS == no:

$ git diff /usr/src/secure/usr.sbin/sshd/../../../crypto/openssh/config.h
diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h
index 729edba7c3b7..63418ab07eb9 100644
--- a/crypto/openssh/config.h
+++ b/crypto/openssh/config.h
@@ -1438,7 +1438,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. */

Thanks,
-Ngie