Date: Wed, 22 Oct 2003 19:19:13 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 40234 for review Message-ID: <200310230219.h9N2JDSR050916@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=40234 Change 40234 by rwatson@rwatson_paprika on 2003/10/22 19:18:18 Integrate trustedbsd_sebsd secure tree forward to 39070, the last major integration of the trustedbsd_mac branch, which brings in many of the major changes in the last four months to the main FreeBSD tree. This includes substantial lock pushdown, threading bug fixes, compiler upgrades, et al. This includes the other half of the crypto update: build changes for OpenSSH and OpenSSL upgrades. Affected files ... .. //depot/projects/trustedbsd/sebsd/secure/lib/libcrypto/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/secure/libexec/sftp-server/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/secure/usr.bin/scp/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/secure/usr.bin/sftp/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/secure/usr.bin/ssh-add/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/secure/usr.bin/ssh-agent/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/secure/usr.bin/ssh-keygen/Makefile#2 integrate Differences ... ==== //depot/projects/trustedbsd/sebsd/secure/lib/libcrypto/Makefile#4 (text+ko) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: src/secure/lib/libcrypto/Makefile,v 1.64 2003/06/01 23:39:16 obrien Exp $ +# $FreeBSD: src/secure/lib/libcrypto/Makefile,v 1.65 2003/08/17 08:28:46 gordon Exp $ LIB= crypto +SHLIBDIR?= /lib SHLIB_MAJOR= 3 NOLINT= true ==== //depot/projects/trustedbsd/sebsd/secure/libexec/sftp-server/Makefile#4 (text+ko) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/secure/libexec/sftp-server/Makefile,v 1.7 2003/04/23 17:25:47 des Exp $ +# $FreeBSD: src/secure/libexec/sftp-server/Makefile,v 1.8 2003/08/19 07:45:02 gordon Exp $ PROG= sftp-server SRCS= sftp-common.c sftp-server.c MAN= sftp-server.8 CFLAGS+=-I${SSHDIR} -DPADD+= ${LIBSSH} ${LIBCRYPTO} -LDADD+= -lssh -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lssh -lcrypto -lz .include <bsd.prog.mk> ==== //depot/projects/trustedbsd/sebsd/secure/usr.bin/scp/Makefile#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/secure/usr.bin/scp/Makefile,v 1.10 2002/06/25 19:10:08 des Exp $ +# $FreeBSD: src/secure/usr.bin/scp/Makefile,v 1.11 2003/08/19 07:45:03 gordon Exp $ PROG= scp CFLAGS+=-I${SSHDIR} -DPADD= ${LIBSSH} -LDADD= -lssh +DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD= -lssh -lcrypto -lz .include <bsd.prog.mk> ==== //depot/projects/trustedbsd/sebsd/secure/usr.bin/sftp/Makefile#2 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/secure/usr.bin/sftp/Makefile,v 1.6 2002/06/25 19:10:08 des Exp $ +# $FreeBSD: src/secure/usr.bin/sftp/Makefile,v 1.7 2003/08/19 07:45:03 gordon Exp $ PROG= sftp SRCS= sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c CFLAGS+=-I${SSHDIR} -DPADD= ${LIBSSH} ${LIBCRYPTO} -LDADD= -lssh -lcrypto +DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD= -lssh -lcrypto -lz .include <bsd.prog.mk> ==== //depot/projects/trustedbsd/sebsd/secure/usr.bin/ssh-add/Makefile#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/secure/usr.bin/ssh-add/Makefile,v 1.10 2002/06/25 19:10:08 des Exp $ +# $FreeBSD: src/secure/usr.bin/ssh-add/Makefile,v 1.11 2003/08/19 07:45:03 gordon Exp $ PROG= ssh-add CFLAGS+=-I${SSHDIR} -DPADD= ${LIBSSH} ${LIBCRYPTO} -LDADD= -lssh -lcrypto +DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD= -lssh -lcrypto -lz .include <bsd.prog.mk> ==== //depot/projects/trustedbsd/sebsd/secure/usr.bin/ssh-agent/Makefile#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/secure/usr.bin/ssh-agent/Makefile,v 1.10 2002/06/25 19:10:08 des Exp $ +# $FreeBSD: src/secure/usr.bin/ssh-agent/Makefile,v 1.11 2003/08/19 07:45:03 gordon Exp $ PROG= ssh-agent CFLAGS+=-I${SSHDIR} -DPADD= ${LIBSSH} ${LIBCRYPTO} -LDADD= -lssh -lcrypto +DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD= -lssh -lcrypto -lz .include <bsd.prog.mk> ==== //depot/projects/trustedbsd/sebsd/secure/usr.bin/ssh-keygen/Makefile#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/secure/usr.bin/ssh-keygen/Makefile,v 1.11 2002/06/25 19:10:08 des Exp $ +# $FreeBSD: src/secure/usr.bin/ssh-keygen/Makefile,v 1.12 2003/08/19 07:45:03 gordon Exp $ PROG= ssh-keygen CFLAGS+=-I${SSHDIR} -DPADD= ${LIBSSH} ${LIBCRYPTO} -LDADD= -lssh -lcrypto +DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD= -lssh -lcrypto -lz .include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310230219.h9N2JDSR050916>