head	1.17;
access;
symbols
	RELENG_8_4:1.17.0.2
	RELENG_9_1_0_RELEASE:1.16.2.1.4.2
	RELENG_9_1:1.16.2.1.0.4
	RELENG_9_1_BP:1.16.2.1
	RELENG_8_3_0_RELEASE:1.15.10.2.6.1
	RELENG_8_3:1.15.10.2.0.6
	RELENG_8_3_BP:1.15.10.2
	RELENG_9_0_0_RELEASE:1.16.2.1.2.1
	RELENG_9_0:1.16.2.1.0.2
	RELENG_9_0_BP:1.16.2.1
	RELENG_9:1.16.0.2
	RELENG_9_BP:1.16
	RELENG_7_4_0_RELEASE:1.15.14.1
	RELENG_8_2_0_RELEASE:1.15.10.2.4.1
	RELENG_7_4:1.15.0.14
	RELENG_7_4_BP:1.15
	RELENG_8_2:1.15.10.2.0.4
	RELENG_8_2_BP:1.15.10.2
	RELENG_8_1_0_RELEASE:1.15.10.2.2.1
	RELENG_8_1:1.15.10.2.0.2
	RELENG_8_1_BP:1.15.10.2
	RELENG_7_3_0_RELEASE:1.15.12.1
	RELENG_7_3:1.15.0.12
	RELENG_7_3_BP:1.15
	RELENG_8_0_0_RELEASE:1.15.10.1.2.1
	RELENG_8_0:1.15.10.1.0.2
	RELENG_8_0_BP:1.15.10.1
	RELENG_8:1.15.0.10
	RELENG_8_BP:1.15
	RELENG_7_2_0_RELEASE:1.15.8.1
	RELENG_7_2:1.15.0.8
	RELENG_7_2_BP:1.15
	RELENG_7_1_0_RELEASE:1.15.6.1
	RELENG_6_4_0_RELEASE:1.12.2.2.6.1
	RELENG_7_1:1.15.0.6
	RELENG_7_1_BP:1.15
	RELENG_6_4:1.12.2.2.0.6
	RELENG_6_4_BP:1.12.2.2
	RELENG_7_0_0_RELEASE:1.15
	RELENG_6_3_0_RELEASE:1.12.2.2
	RELENG_7_0:1.15.0.4
	RELENG_7_0_BP:1.15
	RELENG_6_3:1.12.2.2.0.4
	RELENG_6_3_BP:1.12.2.2
	RELENG_7:1.15.0.2
	RELENG_7_BP:1.15
	RELENG_6_2_0_RELEASE:1.12.2.2
	RELENG_6_2:1.12.2.2.0.2
	RELENG_6_2_BP:1.12.2.2
	RELENG_5_5_0_RELEASE:1.9
	RELENG_5_5:1.9.0.8
	RELENG_5_5_BP:1.9
	RELENG_6_1_0_RELEASE:1.12
	RELENG_6_1:1.12.0.6
	RELENG_6_1_BP:1.12
	RELENG_6_0_0_RELEASE:1.12
	RELENG_6_0:1.12.0.4
	RELENG_6_0_BP:1.12
	RELENG_6:1.12.0.2
	RELENG_6_BP:1.12
	RELENG_5_4_0_RELEASE:1.9
	RELENG_5_4:1.9.0.6
	RELENG_5_4_BP:1.9
	RELENG_4_11_0_RELEASE:1.1.2.3
	RELENG_4_11:1.1.2.3.0.10
	RELENG_4_11_BP:1.1.2.3
	RELENG_5_3_0_RELEASE:1.9
	RELENG_5_3:1.9.0.4
	RELENG_5_3_BP:1.9
	RELENG_5:1.9.0.2
	RELENG_5_BP:1.9
	RELENG_4_10_0_RELEASE:1.1.2.3
	RELENG_4_10:1.1.2.3.0.8
	RELENG_4_10_BP:1.1.2.3
	RELENG_5_2_1_RELEASE:1.7
	RELENG_5_2_0_RELEASE:1.7
	RELENG_5_2:1.7.0.2
	RELENG_5_2_BP:1.7
	RELENG_4_9_0_RELEASE:1.1.2.3
	RELENG_4_9:1.1.2.3.0.6
	RELENG_4_9_BP:1.1.2.3
	RELENG_5_1_0_RELEASE:1.6
	RELENG_5_1:1.6.0.4
	RELENG_5_1_BP:1.6
	RELENG_4_8_0_RELEASE:1.1.2.3
	RELENG_4_8:1.1.2.3.0.4
	RELENG_4_8_BP:1.1.2.3
	RELENG_5_0_0_RELEASE:1.6
	RELENG_5_0:1.6.0.2
	RELENG_5_0_BP:1.6
	RELENG_4_7_0_RELEASE:1.1.2.3
	RELENG_4_7:1.1.2.3.0.2
	RELENG_4_7_BP:1.1.2.3
	RELENG_4_6_2_RELEASE:1.1.2.1.4.1
	RELENG_4_6_1_RELEASE:1.1.2.1.4.1
	RELENG_4_6_0_RELEASE:1.1.2.1
	RELENG_4_6:1.1.2.1.0.4
	RELENG_4_6_BP:1.1.2.1
	RELENG_4_5_0_RELEASE:1.1.2.1
	RELENG_4_5:1.1.2.1.0.2
	RELENG_4_5_BP:1.1.2.1
	RELENG_4:1.1.0.2;
locks; strict;
comment	@# @;


1.17
date	2012.11.17.01.50.27;	author svnexp;	state Exp;
branches
	1.17.2.1;
next	1.16;

1.16
date	2009.10.01.17.12.52;	author des;	state Exp;
branches
	1.16.2.1;
next	1.15;

1.15
date	2006.10.07.17.32.05;	author ru;	state Exp;
branches
	1.15.2.1
	1.15.6.1
	1.15.8.1
	1.15.10.1
	1.15.12.1
	1.15.14.1;
next	1.14;

1.14
date	2006.05.13.21.38.15;	author des;	state Exp;
branches;
next	1.13;

1.13
date	2006.05.13.13.47.44;	author des;	state Exp;
branches;
next	1.12;

1.12
date	2005.06.07.09.31.27;	author des;	state Exp;
branches
	1.12.2.1;
next	1.11;

1.11
date	2005.06.06.16.13.06;	author des;	state Exp;
branches;
next	1.10;

1.10
date	2005.06.05.15.47.06;	author des;	state Exp;
branches;
next	1.9;

1.9
date	2004.02.26.11.26.46;	author des;	state Exp;
branches;
next	1.8;

1.8
date	2004.01.07.11.17.23;	author des;	state Exp;
branches;
next	1.7;

1.7
date	2003.08.19.07.45.03;	author gordon;	state Exp;
branches;
next	1.6;

1.6
date	2002.06.25.19.10.08;	author des;	state Exp;
branches;
next	1.5;

1.5
date	2002.06.24.12.32.29;	author des;	state Exp;
branches;
next	1.4;

1.4
date	2002.03.18.10.20.33;	author des;	state Exp;
branches;
next	1.3;

1.3
date	2002.02.08.13.42.57;	author ru;	state Exp;
branches;
next	1.2;

1.2
date	2002.01.23.15.54.10;	author ru;	state Exp;
branches;
next	1.1;

1.1
date	2001.05.04.04.21.21;	author green;	state Exp;
branches
	1.1.2.1;
next	;

1.17.2.1
date	2012.11.17.01.50.27;	author svnexp;	state dead;
branches;
next	1.17.2.2;

1.17.2.2
date	2013.03.28.13.03.39;	author svnexp;	state Exp;
branches;
next	;

1.16.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.16.2.1.2.1
	1.16.2.1.4.1;
next	1.16.2.2;

1.16.2.2
date	2012.11.17.11.36.33;	author svnexp;	state Exp;
branches;
next	1.16.2.3;

1.16.2.3
date	2014.03.20.11.01.50;	author svnexp;	state Exp;
branches;
next	1.16.2.4;

1.16.2.4
date	2014.03.31.15.01.51;	author svnexp;	state Exp;
branches;
next	;

1.16.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.16.2.1.2.2;

1.16.2.1.2.2
date	2012.11.17.08.36.32;	author svnexp;	state Exp;
branches;
next	;

1.16.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.16.2.1.4.2;

1.16.2.1.4.2
date	2012.11.17.08.47.23;	author svnexp;	state Exp;
branches;
next	;

1.15.2.1
date	2012.11.17.08.03.45;	author svnexp;	state Exp;
branches;
next	;

1.15.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.15.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.15.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.15.10.1.2.1;
next	1.15.10.2;

1.15.10.2
date	2010.04.21.06.33.10;	author des;	state Exp;
branches
	1.15.10.2.2.1
	1.15.10.2.4.1
	1.15.10.2.6.1;
next	1.15.10.3;

1.15.10.3
date	2012.11.17.10.36.17;	author svnexp;	state Exp;
branches;
next	;

1.15.10.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.15.10.2.2.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.15.10.2.4.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.15.10.2.6.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.15.10.2.6.2;

1.15.10.2.6.2
date	2012.11.17.08.24.57;	author svnexp;	state Exp;
branches;
next	;

1.15.12.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.15.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.15.14.2;

1.15.14.2
date	2012.11.17.08.16.55;	author svnexp;	state Exp;
branches;
next	;

1.12.2.1
date	2006.07.08.14.37.18;	author des;	state Exp;
branches;
next	1.12.2.2;

1.12.2.2
date	2006.10.11.09.36.32;	author des;	state Exp;
branches
	1.12.2.2.6.1;
next	1.12.2.3;

1.12.2.3
date	2012.11.17.07.41.25;	author svnexp;	state Exp;
branches;
next	;

1.12.2.2.6.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.1.2.1
date	2001.10.08.14.11.00;	author green;	state Exp;
branches
	1.1.2.1.4.1;
next	1.1.2.2;

1.1.2.2
date	2002.07.03.22.13.24;	author des;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2002.07.03.22.20.30;	author des;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2012.11.17.07.24.39;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1.4.1
date	2002.07.16.12.33.26;	author des;	state Exp;
branches;
next	;


desc
@@


1.17
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/secure/usr.bin/sftp/Makefile 197679 2009-10-01 17:12:52Z des $

PROG=	sftp
SRCS=   sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h

# required when linking with a dynamic libssh 
SRCS+=	roaming_dummy.c

DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} ${LIBEDIT} ${LIBNCURSES}
LDADD=	-lssh -lcrypt -lcrypto -lz -ledit -lncurses

.include <bsd.prog.mk>

.PATH:	${SSHDIR}

${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
@


1.17.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:03:38 +0000
@
text
@d1 17
@


1.17.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 17
# $FreeBSD: releng/8.4/secure/usr.bin/sftp/Makefile 206984 2010-04-21 06:33:10Z des $

PROG=	sftp
SRCS=   sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h

# required when linking with a dynamic libssh 
SRCS+=	roaming_dummy.c

DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} ${LIBEDIT} ${LIBNCURSES}
LDADD=	-lssh -lcrypt -lcrypto -lz -ledit -lncurses

.include <bsd.prog.mk>

.PATH:	${SSHDIR}

${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
@


1.16
log
@SVN rev 197679 on 2009-10-01 17:12:52Z by des

Upgrade to OpenSSH 5.3p1.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.16.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.16.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/secure/usr.bin/sftp/Makefile 197679 2009-10-01 17:12:52Z des $
@


1.16.2.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/263421
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/secure/usr.bin/sftp/Makefile 263421 2014-03-20 10:56:05Z des $
a11 1
USEPRIVATELIB= ssh
@


1.16.2.4
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/263970
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 3
# $FreeBSD: stable/9/secure/usr.bin/sftp/Makefile 263970 2014-03-31 14:39:56Z des $

.include <bsd.own.mk>
d7 1
a7 2
.if !defined(NO_SHARED)
# required when linking with a dynamic libssh
a8 1
.endif
d10 2
a11 2
DPADD=	${LIBSSH} ${LIBEDIT} ${LIBNCURSES}
LDADD=	-lssh -ledit -lncurses
a13 3
DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
LDADD+= -lcrypt -lcrypto -lz

@


1.16.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.16.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/secure/usr.bin/sftp/Makefile 197679 2009-10-01 17:12:52Z des $
@


1.16.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.16.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/secure/usr.bin/sftp/Makefile 197679 2009-10-01 17:12:52Z des $
@


1.15
log
@Fix static compilation.
@
text
@d7 3
@


1.15.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/secure/usr.bin/sftp/Makefile 163089 2006-10-07 17:32:05Z ru $
@


1.15.14.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.15.14.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/secure/usr.bin/sftp/Makefile 163089 2006-10-07 17:32:05Z ru $
@


1.15.12.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.15.10.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.15.10.2
log
@SVN rev 206984 on 2010-04-21 06:33:10Z by des

MFH OpenSSH 5.4p1
@
text
@a6 3
# required when linking with a dynamic libssh 
SRCS+=	roaming_dummy.c

@


1.15.10.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/secure/usr.bin/sftp/Makefile 206984 2010-04-21 06:33:10Z des $
@


1.15.10.2.6.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.15.10.2.6.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/secure/usr.bin/sftp/Makefile 206984 2010-04-21 06:33:10Z des $
@


1.15.10.2.4.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.15.10.2.2.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.15.10.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.15.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.15.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.14
log
@Add a manual dependency on ssh_namespace.h.

Discussed with:	ru
@
text
@d7 2
a8 2
DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} ${LIBEDIT}
LDADD=	-lssh -lcrypt -lcrypto -lz -ledit
@


1.13
log
@Introduce a namespace munging hack inspired by NetBSD to avoid polluting
the namespace of applications which inadvertantly link in libssh (usually
through pam_ssh)

Suggested by:	lukem@@netbsd.org
MFC after:	6 weeks
@
text
@d13 2
@


1.12
log
@Revert the commits that made libssh an INTERNALLIB; they caused too much
trouble, especially on amd64.

Requested by:	ru
@
text
@d5 1
a5 1
CFLAGS+=-I${SSHDIR}
@


1.12.2.1
log
@MFC: namespace munging hack
@
text
@d5 1
a5 1
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
a12 2

${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
@


1.12.2.2
log
@Fix NO_KERBEROS and static build (stupdily left out to hunks in previous
commit)

Submitted by:	ru
Approved by:	re (hrs)
@
text
@d7 2
a8 2
DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} ${LIBEDIT} ${LIBNCURSES}
LDADD=	-lssh -lcrypt -lcrypto -lz -ledit -lncurses
@


1.12.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/secure/usr.bin/sftp/Makefile 163228 2006-10-11 09:36:32Z des $
@


1.12.2.2.6.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.11
log
@Make libssh an INTERNALLIB like it is in {Net,Open}BSD.
@
text
@a2 2
LIBSSH=	${.OBJDIR}/../../lib/libssh/libssh.a

d8 1
a8 1
LDADD=	${LIBSSH} -lcrypt -lcrypto -lz -ledit
@


1.10
log
@Update for OpenSSH 4.1p1.
@
text
@d3 2
d10 1
a10 1
LDADD=	-lssh -lcrypt -lcrypto -lz -ledit
@


1.9
log
@Update for 3.8p1, including workaround for a bug in gss-genr.c.
@
text
@d7 2
a8 2
DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
LDADD=	-lssh -lcrypt -lcrypto -lz
@


1.8
log
@Update Makefiles for OpenSSH 3.7.1p2.
@
text
@d4 1
a4 1
SRCS=   sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c
@


1.7
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
@
text
@d7 2
a8 2
DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
LDADD=	-lssh -lcrypto -lz
@


1.6
log
@No guts, no glory.  Switch to OpenSSH-portable.

Sponsored by:	DARPA, NAI Labs
@
text
@d7 2
a8 2
DPADD=	${LIBSSH} ${LIBCRYPTO}
LDADD=	-lssh -lcrypto
@


1.5
log
@My previous style commits weren't entirely right.  Fix some bugs I
introduced, and a few more I hadn't yet fixed.

Submitted by:	bde
@
text
@d5 1
@


1.4
log
@Adjust for OpenSSH 3.1.

Sponsored by:	DARPA, NAI Labs
@
text
@a1 1
#
d6 1
a7 1
DPADD=	${LIBSSH} ${LIBCRYPTO}
@


1.3
log
@Now that cross-tools ld(1) has been fixed to look for dynamic
dependencies in the correct place, record the fact that -lssh
depends on -lcrypto and -lz.

Removed false dependencies on -lz (except ssh(1) and sshd(8)).
Removed false dependencies on -lcrypto and -lutil for scp(1).

Reviewed by:	markm
@
text
@d5 1
a5 1
SRCS=   sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c scp-common.c
@


1.2
log
@Add pam_ssh support to the static PAM library, libpam.a:

- Spam /usr/lib some more by making libssh a standard library.
- Tweak ${LIBPAM} and ${MINUSLPAM}.
- Garbage collect unused libssh_pic.a.
- Add fake -lz dependency to secure/ makefiles needed for
  dynamic linkage with -lssh.

Reviewed by:	des, markm
Approved by:	markm
@
text
@d7 2
a8 2
LDADD+=	-lssh -lcrypto -lz
DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
@


1.1
log
@Follow the OpenSSH 2.9 upgrade with the infrastructure.  Two new
programs are now included: sftp(1) and ssh-keyscan(1).
@
text
@d7 2
a8 2
LDADD+=	${LIBSSH} -lcrypto
DPADD+=	${LIBSSH} ${LIBCRYPTO}
@


1.1.2.1
log
@Connect sftp and ssh-keyscan.
@
text
@@


1.1.2.1.4.1
log
@Merge OpenSSH, OPIE, PAM and a number of dependencies from -STABLE.
@
text
@d2 1
d5 1
a5 2
SRCS=   sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c
CFLAGS+=-I${SSHDIR}
d7 2
a8 2
DPADD=	${LIBSSH} ${LIBCRYPTO}
LDADD=	-lssh -lcrypto
@


1.1.2.2
log
@Update Makefiles for OpenSSH 3.4p1.  Remove some hacks made superfluous
by an earlier commit to src/Makefile.inc1.  Reduce diffs against -CURRENT.

Sponsored by:	DARPA, NAI Labs
@
text
@d2 1
d5 1
a5 2
SRCS=   sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c
CFLAGS+=-I${SSHDIR}
d7 2
a8 2
DPADD=	${LIBSSH} ${LIBCRYPTO}
LDADD+=	-lssh -lcrypto
@


1.1.2.3
log
@More diff reduction.
@
text
@d8 1
a8 1
LDADD=	-lssh -lcrypto
@


1.1.2.4
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/secure/usr.bin/sftp/Makefile 99394 2002-07-03 22:20:33Z des $
@


