From owner-freebsd-current  Sun Feb 27 22:51:50 2000
Delivered-To: freebsd-current@freebsd.org
Received: from zibbi.mikom.csir.co.za (zibbi.mikom.csir.co.za [146.64.24.58])
	by hub.freebsd.org (Postfix) with ESMTP
	id EB3E737B929; Sun, 27 Feb 2000 22:51:21 -0800 (PST)
	(envelope-from jhay@zibbi.mikom.csir.co.za)
Received: (from jhay@localhost)
	by zibbi.mikom.csir.co.za (8.9.3/8.9.3) id IAA81667;
	Mon, 28 Feb 2000 08:51:14 +0200 (SAT)
	(envelope-from jhay)
From: John Hay <jhay@mikom.csir.co.za>
Message-Id: <200002280651.IAA81667@zibbi.mikom.csir.co.za>
Subject: Re: NO_DESCRYPT patch
In-Reply-To: <Pine.BSF.4.21.0002272214420.95768-100000@freefall.freebsd.org> from Kris Kennaway at "Feb 27, 2000 10:18:40 pm"
To: kris@FreeBSD.ORG (Kris Kennaway)
Date: Mon, 28 Feb 2000 08:51:14 +0200 (SAT)
Cc: jhay@mikom.csir.co.za (John Hay), current@FreeBSD.ORG,
	jkh@FreeBSD.ORG
X-Mailer: ELM [version 2.4ME+ PL54 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

I'm happy with it, although from what I just read in Bruce's emails, maybe
it should be NODESCRYPTLINKS.

> 
> > > This is something which has been requested a fair bit..it will disable the
> > > building of the DES CRYPT libraries even if you have the crypto sources
> > > installed, so you can e.g. get OpenSSL/OpenSSH without having to deal with
> > > the pitfalls of libdescrypt. It seems to work fine for me..if I hear any
> > > other positive feedback I'll commit it.
> > 
> > Why not let them (libdes) be installed, but leave the symlinks to point
> > to libscrypt. That way things that for some reason need the des stuff
> > can still get to it. Something like this:
> 
> Thats better, although the conditional should be renamed to something like
> NO_DESCRYPTLINKS.
> 
> Any objections to a commit?
> 
> Index: ../secure/lib/libcrypt/Makefile
> ===================================================================
> RCS file: /home/ncvs/src/secure/lib/libcrypt/Makefile,v
> retrieving revision 1.25
> diff -u -r1.25 Makefile
> --- ../secure/lib/libcrypt/Makefile	2000/01/09 21:22:48	1.25
> +++ ../secure/lib/libcrypt/Makefile	2000/02/28 06:18:23
> @@ -50,6 +50,7 @@
>  .include <bsd.lib.mk>
>  
>  afterinstall:
> +.if !defined(NO_DESCRYPTLINKS)
>  .if !defined(NOPIC)
>  	@cd ${DESTDIR}${SHLIBDIR}; \
>  	rm -f ${LCRYPTSO}; \
> @@ -67,4 +68,5 @@
>  	@cd  ${DESTDIR}${LIBDIR}; \
>  	rm -f ${LCRYPTBASE}_p.a; \
>  	ln -sf ${LSCRYPTBASE}_p.a libcrypt_p.a
> +.endif
>  .endif
> 

John
-- 
John Hay -- John.Hay@mikom.csir.co.za


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