From owner-freebsd-current Sun Feb 27 22:18:43 2000 Delivered-To: freebsd-current@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 8B1FD37B88C; Sun, 27 Feb 2000 22:18:40 -0800 (PST) (envelope-from kris@FreeBSD.org) Received: from localhost (kris@localhost) by freefall.freebsd.org (8.9.3/8.9.2) with ESMTP id WAA96490; Sun, 27 Feb 2000 22:18:40 -0800 (PST) (envelope-from kris@FreeBSD.org) X-Authentication-Warning: freefall.freebsd.org: kris owned process doing -bs Date: Sun, 27 Feb 2000 22:18:40 -0800 (PST) From: Kris Kennaway To: John Hay Cc: current@FreeBSD.ORG, jkh@freebsd.org Subject: Re: NO_DESCRYPT patch In-Reply-To: <200002271035.MAA56704@zibbi.mikom.csir.co.za> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Sun, 27 Feb 2000, John Hay wrote: > > 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 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 Kris To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message