Date: Fri, 25 Feb 2000 15:35:46 +0900 From: haro@tk.kubota.co.jp (Munehiro Matsuda) To: bloom@acm.org Cc: freebsd-current@FreeBSD.ORG Subject: Re: mergemaster fail with crypto changes Message-ID: <20000225153546A.haro@tk.kubota.co.jp> In-Reply-To: <38B5FF33.DE8D6C6A@acm.org> References: <20000225135218A.haro@tk.kubota.co.jp> <38B5FF33.DE8D6C6A@acm.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000225153546A.haro>