From owner-cvs-all@FreeBSD.ORG Wed Dec 21 08:58:36 2005 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B36B16A420 for ; Wed, 21 Dec 2005 08:58:36 +0000 (GMT) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mail2.fluidhosting.com [204.14.90.12]) by mx1.FreeBSD.org (Postfix) with SMTP id 3A34A43D77 for ; Wed, 21 Dec 2005 08:58:32 +0000 (GMT) (envelope-from dougb@FreeBSD.org) Received: (qmail 83877 invoked by uid 399); 21 Dec 2005 08:32:53 -0000 Received: from localhost (HELO ?192.168.1.101?) (dougb@dougbarton.us@127.0.0.1) by localhost with SMTP; 21 Dec 2005 08:32:53 -0000 Message-ID: <43A91330.2000704@FreeBSD.org> Date: Wed, 21 Dec 2005 00:32:48 -0800 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 1.5 (X11/20051203) MIME-Version: 1.0 To: Ruslan Ermilov References: <200512202056.jBKKuLQO034591@repoman.freebsd.org> <20051221080846.GA55142@ip.net.ua> In-Reply-To: <20051221080846.GA55142@ip.net.ua> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/etc/rc.d Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Dec 2005 08:58:36 -0000 Ruslan Ermilov wrote: > On Tue, Dec 20, 2005 at 08:56:21PM +0000, Doug Barton wrote: >> dougb 2005-12-20 20:56:21 UTC >> >> FreeBSD src repository >> >> Modified files: (Branch: RELENG_6) >> etc/rc.d Makefile >> Log: >> MFC 1.56, make install of sshd conditional on NO_OPENSSH >> >> Revision Changes Path >> 1.53.2.4 +6 -1 src/etc/rc.d/Makefile >> > The full condition, to match the sources, would be: > > .if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) > > That's how we get to compile secure/usr.sbin/sshd/. Well, I wondered about that, but I didn't make the original change, so I just MFC'ed what was there. If you want to update the Makefile in HEAD I've no objection, or if you think it's really important, I'll be glad to do it as well. Personally, while I remember the support problems that not having all those tests caused back in the day, I always thought that it was providing too big a crutch. However, that's just grousing, and I've no objection to updating rc.d/Makefile if you think we need to. Doug -- This .signature sanitized for your protection