From owner-cvs-all@FreeBSD.ORG Tue Aug 19 00:45:04 2003 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A684316A4BF; Tue, 19 Aug 2003 00:45:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2777643FAF; Tue, 19 Aug 2003 00:45:04 -0700 (PDT) (envelope-from gordon@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7J7j30U075710; Tue, 19 Aug 2003 00:45:03 -0700 (PDT) (envelope-from gordon@repoman.freebsd.org) Received: (from gordon@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7J7j3g2075709; Tue, 19 Aug 2003 00:45:03 -0700 (PDT) Message-Id: <200308190745.h7J7j3g2075709@repoman.freebsd.org> From: Gordon Tetlow Date: Tue, 19 Aug 2003 00:45:03 -0700 (PDT) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/secure/libexec/sftp-server Makefilesrc/secure/usr.bin/scp Makefile src/secure/usr.bin/sftp Makefile src/secure/usr.bin/ssh-add Makefile src/secure/usr.bin/ssh-agent Makefile src/secure/usr.bin/ssh-keygen Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2003 07:45:05 -0000 gordon 2003/08/19 00:45:03 PDT FreeBSD src repository Modified files: secure/libexec/sftp-server Makefile secure/usr.bin/scp Makefile secure/usr.bin/sftp Makefile secure/usr.bin/ssh-add Makefile secure/usr.bin/ssh-agent Makefile secure/usr.bin/ssh-keygen Makefile Log: Explicitly add libz and libcrypto to LDADD for any ssh utilities missing it. While not strictly required, it unbreaks the cross-build world that is resulting from moving the libraries around. I have a more permanent solution to this problem in the works, but I asked des for permission to commit this to get the ball rolling. This also makes the ssh build more along the lines of what the openssh-portable and OpenBSD openssh Makefile glue does. Reviewed by: des Revision Changes Path 1.8 +2 -2 src/secure/libexec/sftp-server/Makefile 1.11 +2 -2 src/secure/usr.bin/scp/Makefile 1.7 +2 -2 src/secure/usr.bin/sftp/Makefile 1.11 +2 -2 src/secure/usr.bin/ssh-add/Makefile 1.11 +2 -2 src/secure/usr.bin/ssh-agent/Makefile 1.12 +2 -2 src/secure/usr.bin/ssh-keygen/Makefile