From owner-freebsd-current  Thu Feb 24 22:38:22 2000
Delivered-To: freebsd-current@freebsd.org
Received: from kbtfw.kubota.co.jp (kbtfw.kubota.co.jp [133.253.102.202])
	by hub.freebsd.org (Postfix) with ESMTP id D365437BE2F
	for <freebsd-current@FreeBSD.ORG>; Thu, 24 Feb 2000 22:38:17 -0800 (PST)
	(envelope-from haro@tk.kubota.co.jp)
Received: by kbtfw.kubota.co.jp; id PAA11436; Fri, 25 Feb 2000 15:38:11 +0900 (JST)
Received: from unknown(133.253.31.1) by kbtfw.kubota.co.jp via smap (V4.2)
	id xma011209; Fri, 25 Feb 00 15:37:30 +0900
Received: (from uucp@localhost)
	by lemond.gkn.kubota.co.jp (8.9.3+3.2W/3.7W00013112) with UUCP id PAA09799;
	Fri, 25 Feb 2000 15:37:30 +0900 (JST)
Received: from localhost (localhost [127.0.0.1])
	by jkpc15.ttr.kubota.co.jp (8.9.3/3.7W-uucp) with ESMTP id PAA02379;
	Fri, 25 Feb 2000 15:35:46 +0900 (JST)
To: bloom@acm.org
Cc: freebsd-current@FreeBSD.ORG
Subject: Re: mergemaster fail with crypto changes
In-Reply-To: <38B5FF33.DE8D6C6A@acm.org>
References: <20000225135218A.haro@tk.kubota.co.jp>
	<38B5FF33.DE8D6C6A@acm.org>
X-Mailer: Mew version 1.94.1 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-Id: <20000225153546A.haro@tk.kubota.co.jp>
Date: Fri, 25 Feb 2000 15:35:46 +0900
From: haro@tk.kubota.co.jp (Munehiro Matsuda)
X-Dispatcher: imput version 990905(IM130)
Lines: 56
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

Well that does't seem to work for me. Becase mergemaster doesn't use
NOCRYPT stuff and /usr/src/crypto doesn't exist by default, if you
just cvsup (or use CTM for my case).

I think checking for crypto is just simple.

  Munehiro (Haro) Matsuda

From: Jim Bloom <bloom@acm.org>
Date: Thu, 24 Feb 2000 23:04:03 -0500
::While I was working on this project before I found out that Mark was 95%
::done already, I made those tests be:
::
::	.in !defined(NO_OPENSSH) && !defined(NOCRYPT)
::
::NOCRYPT has been the standard way of indicating that the cryptograph
::package has not been installed.
::
::Jim Bloom
::bloom@acm.org
::
::Munehiro Matsuda wrote:
::> 
::> Hi all,
::> 
::> I don't have crypto in my source tree, because I'm in Japan,
::> I get following error using mergemaster.
::> 
::> ----------8<---------8<---------Cut here---------8<---------8<---------
::> # mergemaster
::>     ....
::>     ....
::> install: /usr/src/etc/../crypto/openssh/ssh_config: No such file or directory
::> *** Error code 71
::> 
::> Stop in /usr/src/etc.
::> 
::>   *** FATAL ERROR: Cannot 'cd' to /usr/src/etc and install files to the
::>       temproot environment
::> ----------8<---------8<---------Cut here---------8<---------8<---------
::> 
::> In /usr/src/etc/Makefile (rev  1.214), it should check for existance of
::> crypto directory.
::> 
::> --- Makefile.ctm        Fri Feb 25 11:53:34 2000
::> +++ Makefile    Fri Feb 25 13:47:10 2000
::> @@ -20,7 +20,7 @@
::>         ${.CURDIR}/../usr.bin/mail/misc/mail.rc \
::>         ${.CURDIR}/../usr.bin/locate/locate/locate.rc
::> 
::> -.if !defined(NO_OPENSSH)
::> +.if exists(${.CURDIR}../crypto) && !defined(NO_OPENSSH)
::>  BIN1+= ${.CURDIR}/../crypto/openssh/ssh_config \
::>         ${.CURDIR}/../crypto/openssh/sshd_config
::>  .endif
::


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message