Date: Mon, 28 Feb 2000 08:51:14 +0200 (SAT) From: John Hay <jhay@mikom.csir.co.za> To: kris@FreeBSD.ORG (Kris Kennaway) Cc: jhay@mikom.csir.co.za (John Hay), current@FreeBSD.ORG, jkh@FreeBSD.ORG Subject: Re: NO_DESCRYPT patch Message-ID: <200002280651.IAA81667@zibbi.mikom.csir.co.za> In-Reply-To: <Pine.BSF.4.21.0002272214420.95768-100000@freefall.freebsd.org> from Kris Kennaway at "Feb 27, 2000 10:18:40 pm"
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200002280651.IAA81667>