From owner-p4-projects  Thu Apr  4 18: 2:45 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C152C37B420; Thu,  4 Apr 2002 18:02:34 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id E1DB537B41D
	for <perforce@freebsd.org>; Thu,  4 Apr 2002 18:02:33 -0800 (PST)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g3522XQ17788
	for perforce@freebsd.org; Thu, 4 Apr 2002 18:02:33 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Thu, 4 Apr 2002 18:02:33 -0800 (PST)
Message-Id: <200204050202.g3522XQ17788@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 9078 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9078

Change 9078 by peter@peter_daintree on 2002/04/04 18:02:06

	back out local addition of -lz for static linking support.
	the static linked sshd was handy, but is no longer required.

Affected files ...

... //depot/projects/ia64/secure/libexec/sftp-server/Makefile#4 edit
... //depot/projects/ia64/secure/usr.bin/scp/Makefile#5 edit
... //depot/projects/ia64/secure/usr.bin/sftp/Makefile#5 edit
... //depot/projects/ia64/secure/usr.bin/ssh-add/Makefile#4 edit
... //depot/projects/ia64/secure/usr.bin/ssh-agent/Makefile#4 edit
... //depot/projects/ia64/secure/usr.bin/ssh-keygen/Makefile#4 edit
... //depot/projects/ia64/secure/usr.bin/ssh-keyscan/Makefile#4 edit

Differences ...

==== //depot/projects/ia64/secure/libexec/sftp-server/Makefile#4 (text+ko) ====

@@ -5,8 +5,8 @@
 SRCS=   sftp-server.c sftp-common.c
 MAN=	sftp-server.8
 
-LDADD+=	-lssh -lcrypto -lz
-DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD+=	-lssh -lcrypto
+DPADD+=	${LIBSSH} ${LIBCRYPTO}
 
 .include <bsd.prog.mk>
 

==== //depot/projects/ia64/secure/usr.bin/scp/Makefile#5 (text+ko) ====

@@ -4,8 +4,8 @@
 PROG=	scp
 SRCS=	scp.c
 
-DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
-LDADD=	-lssh -lcrypto -lz
+DPADD=	${LIBSSH}
+LDADD=	-lssh
 
 .include <bsd.prog.mk>
 

==== //depot/projects/ia64/secure/usr.bin/sftp/Makefile#5 (text+ko) ====

@@ -4,8 +4,8 @@
 PROG=	sftp
 SRCS=   sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c
 
-LDADD=	-lssh -lcrypto -lz
-DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD=	-lssh -lcrypto
+DPADD=	${LIBSSH} ${LIBCRYPTO}
 
 .include <bsd.prog.mk>
 

==== //depot/projects/ia64/secure/usr.bin/ssh-add/Makefile#4 (text+ko) ====

@@ -4,8 +4,8 @@
 PROG=	ssh-add
 SRCS=	ssh-add.c
 
-LDADD+=	-lssh -lcrypto -lz
-DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD+=	-lssh -lcrypto
+DPADD+= ${LIBSSH} ${LIBCRYPTO}
 
 .include <bsd.prog.mk>
 

==== //depot/projects/ia64/secure/usr.bin/ssh-agent/Makefile#4 (text+ko) ====

@@ -4,8 +4,8 @@
 PROG=	ssh-agent
 SRCS=	ssh-agent.c
 
-LDADD+=	-lssh -lcrypto -lz
-DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD+=	-lssh -lcrypto
+DPADD+=	${LIBSSH} ${LIBCRYPTO}
 
 .include <bsd.prog.mk>
 

==== //depot/projects/ia64/secure/usr.bin/ssh-keygen/Makefile#4 (text+ko) ====

@@ -4,8 +4,8 @@
 PROG=	ssh-keygen
 SRCS=	ssh-keygen.c
 
-LDADD+=	-lssh -lcrypto -lz
-DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPTO}
+LDADD+=	-lssh -lcrypto
+DPADD+=	${LIBSSH} ${LIBCRYPTO}
 
 .include <bsd.prog.mk>
 

==== //depot/projects/ia64/secure/usr.bin/ssh-keyscan/Makefile#4 (text+ko) ====

@@ -4,8 +4,8 @@
 PROG=	ssh-keyscan
 SRCS=	ssh-keyscan.c
 
-LDADD+=	-lssh -lcrypto -lz
-DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD+=	-lssh -lcrypto
+DPADD+=	${LIBSSH} ${LIBCRYPTO}
 
 .include <bsd.prog.mk>
 

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message