From owner-svn-src-head@freebsd.org Tue Jan 10 07:56:58 2017 Return-Path: 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 C8D43CA9468; Tue, 10 Jan 2017 07:56:58 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [IPv6:2001:470:1:117::25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "anubis.delphij.net", Issuer "StartCom Class 1 DV Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AAED31C9B; Tue, 10 Jan 2017 07:56:58 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from Xins-MBP.ut.rhv.delphij.net (unknown [IPv6:2601:646:8882:752a:e0b9:c9ec:8d0c:8aeb]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by anubis.delphij.net (Postfix) with ESMTPSA id 4D67F1C3F1; Mon, 9 Jan 2017 23:56:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=delphij.net; s=anubis; t=1484035018; x=1484049418; bh=j8nOq8/Tab3liniIlW+0kkocCMB3foWzwhjQx9DBaX0=; h=Subject:To:References:Cc:From:Date:In-Reply-To; b=XL4u0/9aRxnF8wd5nJEeL1imMCTdaC5VdbGy2pi0Wv9LDX8RNXTi/cffiX39zyjtp FnIrRR3ee66D+dQTLXLvWc6BinjnjZwSq0H8oxtodzc2YqzOz83R1upzNF6gwrukOX 0ckpBYBOun5qMCvi4IpanNTW+A5THIT891m/CXwM= Subject: Re: svn commit: r311585 - in head: crypto/openssh secure/usr.sbin/sshd To: Ngie Cooper , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201701070808.v0788aEi064973@repo.freebsd.org> Cc: d@delphij.net, des@freebsd.org From: Xin Li Message-ID: Date: Mon, 9 Jan 2017 23:56:57 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <201701070808.v0788aEi064973@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="LlFPvvv0bgv2COB0vIOLCNP8IjPOkfqDX" 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2017 07:56:58 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --LlFPvvv0bgv2COB0vIOLCNP8IjPOkfqDX Content-Type: multipart/mixed; boundary="A36V9bNgWLMlOjJTeLTQW4FSB7sDNGiEB"; protected-headers="v1" From: Xin Li To: Ngie Cooper , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Cc: d@delphij.net, des@freebsd.org Message-ID: Subject: Re: svn commit: r311585 - in head: crypto/openssh secure/usr.sbin/sshd References: <201701070808.v0788aEi064973@repo.freebsd.org> In-Reply-To: <201701070808.v0788aEi064973@repo.freebsd.org> --A36V9bNgWLMlOjJTeLTQW4FSB7sDNGiEB Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 1/7/17 00:08, Ngie Cooper wrote: > Author: ngie > Date: Sat Jan 7 08:08:35 2017 > New Revision: 311585 > URL: https://svnweb.freebsd.org/changeset/base/311585 >=20 > Log: > Conditionalize building libwrap support into sshd > =20 > Only build libwrap support into sshd if MK_TCP_WRAPPERS !=3D no > =20 > This will unbreak the build if libwrap has been removed from the syst= em > =20 > MFC after: 2 weeks > PR: 210141 > Submitted by: kpect@protonmail.com > Differential Revision: D9049 I didn't see this approved by maintainer, did you ping him? [delphij@saturn] /usr/src> grep ssh MAINTAINERS openssh des Pre-commit review requested. (Not that the change itself is bad, though, but it's important to keep everyone on the same page). > Modified: > head/crypto/openssh/config.h > head/secure/usr.sbin/sshd/Makefile >=20 > Modified: head/crypto/openssh/config.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 */ > =20 > /* Define if you want TCP Wrappers support */ > -#define LIBWRAP 1 > +/* #undef LIBWRAP */ > =20 > /* Define to whatever link() returns for "not supported" if it doesn't= return > EOPNOTSUPP. */ >=20 > Modified: head/secure/usr.sbin/sshd/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/secure/usr.sbin/sshd/Makefile Sat Jan 7 07:54:23 2017 (r31158= 4) > +++ head/secure/usr.sbin/sshd/Makefile Sat Jan 7 08:08:35 2017 (r31158= 5) > @@ -27,7 +27,7 @@ CFLAGS+=3D-I${SSHDIR} -include ssh_namespa > SRCS+=3D ssh_namespace.h > =20 > # pam should always happen before ssh here for static linking > -LIBADD=3D pam ssh util wrap > +LIBADD=3D pam ssh util > =20 > .if ${MK_LDNS} !=3D "no" > CFLAGS+=3D -DHAVE_LDNS=3D1 > @@ -53,6 +53,11 @@ SRCS+=3D krb5_config.h > LIBADD+=3D gssapi_krb5 gssapi krb5 > .endif > =20 > +.if ${MK_TCP_WRAPPERS} !=3D "no" > +CFLAGS+=3D -DLIBWRAP > +LIBADD+=3D wrap > +.endif > + > LIBADD+=3D crypto > =20 > .if defined(LOCALBASE) >=20 --A36V9bNgWLMlOjJTeLTQW4FSB7sDNGiEB-- --LlFPvvv0bgv2COB0vIOLCNP8IjPOkfqDX Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJYdJPJAAoJEJW2GBstM+nsJcIP/0aKl6wpYN7XQDfqY6N5fAhP nRGFmBtLlLid4DXX684FlQYTO5aIQhM4W+2X/lcJ8lktI/f2rr3/T4uRUYVgUo5/ eLt28vphZSRtVWKqaJes4RvubFK3JTqDpygmQ0ZDzr645MacCh3tsIjnvGsdPHq+ 9EBCbUrIadXjgEjNJ6yngZneRellxwAVAmw8T4TI+BATjraKimuaEgl7TkVSuA+4 jAfid0onhxbdxoY46x27MMGCqxHZO/PKwhEubxSHfpuJ1sexxfGamKD6Gy8nC82L /s6aQmmpz2e17CovHVJD2JoU2RBOMIWErxedESDhXz5gxvGNnb86xW6+AL3wc9ew WmxiaQQrF7i8u0F/9OyXsyvctIAleGJ98/lRc6inrHTARlgmmDw48ZeIn5PtLW72 IXubwqfKcbUObUpb/44dYtvvHbCiKTrNBtsgBBXfRYh8mK50LEB1aJlA/h4rCA5h iu734p3e79hMABXM+9ywadhLBgHGZGGZ0fhwArok7axCEuuimITa/RCnzGlGLRnD thVRbrPMTppW0LeFMZsUJKyfVpN94ZivKpEFR77ux+cIUxvEAC7oVUcbVBimtYxA qdE87+Dr+h/y0BrdhBAznMxzyL8hozTlTsVJMfbDO/xsFs/zoGBLUVF3CY4nwvkE EbQVGJYeVcnfu5AyiqXC =Ffbq -----END PGP SIGNATURE----- --LlFPvvv0bgv2COB0vIOLCNP8IjPOkfqDX--