Date: Wed, 23 Aug 2000 12:58:47 +1000 From: Peter Jeremy <peter.jeremy@alcatel.com.au> To: Brian Feldman <green@FreeBSD.ORG> Cc: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: Re: cvs commit: src/include unistd.h src/lib/libcrypt Makefile crypt.3 crypt.c crypt.h src/lib/libutil Makefile login_cap.c login_cap.h login_cap.3 src/secure/lib/libcrypt Makefile src/usr.bin/passwd local_passwd.c src/usr.sbin/pw Makefile pw_user.c Message-ID: <00Aug23.125850est.115230@border.alcanet.com.au> In-Reply-To: <200008220215.TAA35477@freefall.freebsd.org>; from green@FreeBSD.ORG on Mon, Aug 21, 2000 at 07:15:55PM -0700 References: <200008220215.TAA35477@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2000-Aug-21 19:15:55 -0700, Brian Feldman <green@FreeBSD.ORG> wrote:
>green 2000/08/21 19:15:54 PDT
>
> Modified files:
> include unistd.h
> lib/libcrypt Makefile crypt.3 crypt.c crypt.h
> lib/libutil Makefile login_cap.c login_cap.h
> login_cap.3
> secure/lib/libcrypt Makefile
> usr.bin/passwd local_passwd.c
> usr.sbin/pw Makefile pw_user.c
> Log:
> Add working and easy crypt(3)-switching. Yes, we need a whole new API
> for crypt(3) by now. In any case:
This seems to have broken world for me. In /etc/make.conf, I have:
USA_RESIDENT=NO
NODESCRYPTLINKS=true
and references to `-lcrypt' die with
.../libcrypt.so: undefined reference to `crypt_des'
For /bin/csh, adding -ldescrypt after -lcrypt worked, but the same
trick doesn't work with dynamically linked code (eg
/usr/src/gnu/usr.bin/cvs/cvs/cvs).
I think the correct solution is to merge /usr/src/lib/libcrypt
and /usr/src/secure/lib/libcrypt to produce a single libcrypt
(rather than the mix of libcrypt, libscript and libdescrypt we
currently have). I'm currently trying the following:
Index: Makefile
===================================================================
RCS file: /home/CVSROOT/src/lib/libcrypt/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- Makefile 2000/08/22 02:17:54 1.26
+++ Makefile 2000/08/23 02:44:00
@@ -15,13 +15,13 @@
SONAME= ${LCRYPTSO}
.endif
-.PATH: ${.CURDIR}/../libmd
-SRCS= crypt.c crypt-md5.c misc.c
+.PATH: ${.CURDIR}/../libmd ${.CURDIR}/../../secure/lib/libcrypt
+SRCS= crypt.c crypt-md5.c misc.c crypt-des.c
STATICSRCS= md5c.c
STATICOBJS= ${STATICSRCS:S/.c/.o/g}
MAN3= crypt.3
MLINKS= crypt.3 crypt_get_format.3 crypt.3 crypt_set_format.3
-CFLAGS+= -I${.CURDIR}/../libmd
+CFLAGS+= -I${.CURDIR}/../libmd -I${.CURDIR}
CFLAGS+= -DLIBC_SCCS -Wall
PRECIOUSLIB= yes
Alternative suggestions?
Peter
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?00Aug23.125850est.115230>