From owner-p4-projects@FreeBSD.ORG Wed Oct 22 19:19:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1787C16A4C0; Wed, 22 Oct 2003 19:19:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E627816A4B3 for ; Wed, 22 Oct 2003 19:19:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4ABFD43F75 for ; Wed, 22 Oct 2003 19:19:14 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9N2JEXJ050921 for ; Wed, 22 Oct 2003 19:19:14 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9N2JDSR050916 for perforce@freebsd.org; Wed, 22 Oct 2003 19:19:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 22 Oct 2003 19:19:13 -0700 (PDT) Message-Id: <200310230219.h9N2JDSR050916@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 40234 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Oct 2003 02:19:15 -0000 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 ==== //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 ==== //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 ==== //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 ==== //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 ==== //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