head	1.2;
access;
symbols
	RELENG_4_11_0_RELEASE:1.1.1.1.2.4
	RELENG_4_11:1.1.1.1.2.4.0.10
	RELENG_4_11_BP:1.1.1.1.2.4
	RELENG_4_10_0_RELEASE:1.1.1.1.2.4
	RELENG_4_10:1.1.1.1.2.4.0.8
	RELENG_4_10_BP:1.1.1.1.2.4
	RELENG_4_9_0_RELEASE:1.1.1.1.2.4
	RELENG_4_9:1.1.1.1.2.4.0.6
	RELENG_4_9_BP:1.1.1.1.2.4
	RELENG_4_8_0_RELEASE:1.1.1.1.2.4
	RELENG_4_8:1.1.1.1.2.4.0.4
	RELENG_4_8_BP:1.1.1.1.2.4
	RELENG_4_7_0_RELEASE:1.1.1.1.2.4
	RELENG_4_7:1.1.1.1.2.4.0.2
	RELENG_4_7_BP:1.1.1.1.2.4
	RELENG_4_6_2_RELEASE:1.1.1.1.2.3.4.1
	RELENG_4_6_1_RELEASE:1.1.1.1.2.3.4.1
	OpenSSH_3_3:1.1.1.7
	RELENG_4_6_0_RELEASE:1.1.1.1.2.3
	RELENG_4_6:1.1.1.1.2.3.0.4
	RELENG_4_6_BP:1.1.1.1.2.3
	OpenSSH_3_1:1.1.1.6
	RELENG_4_5_0_RELEASE:1.1.1.1.2.3
	RELENG_4_5:1.1.1.1.2.3.0.2
	RELENG_4_5_BP:1.1.1.1.2.3
	RELENG_4_4_0_RELEASE:1.1.1.1.2.2
	RELENG_4_4:1.1.1.1.2.2.0.4
	RELENG_4_4_BP:1.1.1.1.2.2
	OpenSSH_2_9:1.1.1.5
	RELENG_4_3_0_RELEASE:1.1.1.1.2.2
	RELENG_4_3:1.1.1.1.2.2.0.2
	RELENG_4_3_BP:1.1.1.1.2.2
	OpenSSH_2_3_0:1.1.1.4
	OpenBSD:1.1.1
	RELENG_4_2_0_RELEASE:1.1.1.1.2.2
	RELENG_4_1_1_RELEASE:1.1.1.1.2.1
	v_2_2_0_2000_09_09:1.1.1.4
	PRE_SMPNG:1.1.1.3
	RELENG_4_1_0_RELEASE:1.1.1.1.2.1
	v_2_1_0_2000_05_30:1.1.1.3
	v_2_1:1.1.1.3
	v_1_2_3_2000_03_25:1.1.1.2
	RELENG_4_0_0_RELEASE:1.1.1.1
	RELENG_4:1.1.1.1.0.2
	RELENG_4_BP:1.1.1.1
	v_1_2_2000_02_24:1.1.1.1
	OPENBSD:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2002.06.27.22.42.10;	author des;	state dead;
branches;
next	1.1;

1.1
date	2000.02.24.14.29.47;	author markm;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2000.02.24.14.29.47;	author markm;	state Exp;
branches
	1.1.1.1.2.1;
next	1.1.1.2;

1.1.1.2
date	2000.03.26.07.07.23;	author kris;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2000.05.15.04.37.24;	author kris;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2000.09.10.08.31.17;	author kris;	state Exp;
branches;
next	1.1.1.5;

1.1.1.5
date	2001.05.04.03.57.04;	author green;	state Exp;
branches;
next	1.1.1.6;

1.1.1.6
date	2002.03.18.09.55.03;	author des;	state Exp;
branches;
next	1.1.1.7;

1.1.1.7
date	2002.06.23.14.01.54;	author des;	state Exp;
branches;
next	;

1.1.1.1.2.1
date	2000.06.09.07.10.31;	author kris;	state Exp;
branches;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	2000.10.28.23.01.04;	author kris;	state Exp;
branches;
next	1.1.1.1.2.3;

1.1.1.1.2.3
date	2001.09.28.01.33.50;	author green;	state Exp;
branches
	1.1.1.1.2.3.4.1;
next	1.1.1.1.2.4;

1.1.1.1.2.4
date	2002.07.03.22.12.14;	author des;	state dead;
branches;
next	;

1.1.1.1.2.3.4.1
date	2002.07.16.12.33.21;	author des;	state dead;
branches;
next	;


desc
@@


1.2
log
@Forcibly revert to mainline.
@
text
@.PATH:		${.CURDIR}/..

PROG=	ssh
BINOWN=	root

.if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "powerpc" || \
	${MACHINE_ARCH} == "hppa")
BINMODE=0000
.else
BINMODE?=4555
.endif

BINDIR=	/usr/bin
MAN=	ssh.1
LINKS=	${BINDIR}/ssh ${BINDIR}/slogin
MLINKS=	ssh.1 slogin.1

SRCS=	ssh.c sshconnect.c log-client.c readconf.c clientloop.c

.include <bsd.own.mk> # for AFS

.if (${KERBEROS} == "yes")
CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
LDADD+=	 -lkrb
DPADD+=	 ${LIBKRB}
.if (${AFS} == "yes")
CFLAGS+= -DAFS
LDADD+=  -lkafs
DPADD+=  ${LIBKRBAFS}
.endif # AFS
.endif # KERBEROS

.include <bsd.prog.mk>

LDADD+=	-lutil -lz -lcrypto
DPADD+=	${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Vendor import of OpenSSH.
@
text
@@


1.1.1.1.2.1
log
@MFC: OpenSSH 2.1.0 snapshot
@
text
@d18 1
a18 2
SRCS=	ssh.c log-client.c readconf.c clientloop.c \
	sshconnect.c sshconnect1.c sshconnect2.c
d23 1
a23 1
CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV
@


1.1.1.1.2.2
log
@MFC: OpenSSH 2.2.0
@
text
@d6 4
d11 1
d23 1
a23 1
.if (${KERBEROS:L} == "yes")
d27 1
a27 1
.if (${AFS:L} == "yes")
@


1.1.1.1.2.3
log
@MFC: OpenSSH 2.9

The only difference between this and what's in -CURRENT is that the
default /etc/ssh/ssh_config sets "Protocol 1,2" for all hosts.  This can
be overrided entirely in user ~/.ssh/config files, as always.
@
text
@a0 2
#	$OpenBSD: Makefile,v 1.30 2001/04/14 16:33:20 stevesk Exp $

d13 1
a13 1
SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
d31 2
a32 2
LDADD+=	-lcrypto -lz
DPADD+=	${LIBCRYPTO} ${LIBZ}
@


1.1.1.1.2.3.4.1
log
@Merge OpenSSH, OPIE, PAM and a number of dependencies from -STABLE.
@
text
@@


1.1.1.1.2.4
log
@Synch up to OpenSSH 3.4p1 - very nearly the same sources as in -CURRENT,
with a slightly different config.h to account for differences between
-CURRENT and -STABLE.

Privilege separation defaults to off for now as it breaks some aspects
of Kerberos authentication.

Sponsored by:	DARPA, NAI Labs
@
text
@@


1.1.1.2
log
@Virgin import of OpenSSH sources dated 2000/03/25
@
text
@d23 1
a23 1
CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV
@


1.1.1.3
log
@Initial import of OpenSSH v2.1.
@
text
@d18 1
a18 2
SRCS=	ssh.c log-client.c readconf.c clientloop.c \
	sshconnect.c sshconnect1.c sshconnect2.c
@


1.1.1.4
log
@Initial import of OpenSSH post-2.2.0 snapshot dated 2000-09-09
@
text
@d6 4
d11 1
d23 1
a23 1
.if (${KERBEROS:L} == "yes")
d27 1
a27 1
.if (${AFS:L} == "yes")
@


1.1.1.5
log
@Say "hi" to the latest in the OpenSSH series, version 2.9!

Happy birthday to:	rwatson
@
text
@a0 2
#	$OpenBSD: Makefile,v 1.30 2001/04/14 16:33:20 stevesk Exp $

d13 1
a13 1
SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
d31 2
a32 2
LDADD+=	-lcrypto -lz
DPADD+=	${LIBCRYPTO} ${LIBZ}
@


1.1.1.6
log
@Vendor import of OpenSSH 3.1
@
text
@d1 1
a1 1
#	$OpenBSD: Makefile,v 1.37 2002/03/05 00:49:51 deraadt Exp $
a19 6
.if (${KERBEROS5:L} == "yes")
CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV
LDADD+=  -lkrb5 -lasn1 -lcom_err
DPADD+=  ${LIBKRB5} ${LIBASN1}
.endif # KERBEROS5

d33 1
a33 1
LDADD+=	-lcrypto -lz -ldes
@


1.1.1.7
log
@Vendor import of OpenSSH 3.3.
@
text
@d1 1
a1 1
#	$OpenBSD: Makefile,v 1.42 2002/06/20 19:56:07 stevesk Exp $
d8 1
a8 1
#BINMODE?=4555
d11 1
a11 1
MAN=	ssh.1 ssh_config.5
d23 1
a23 1
DPADD+=  ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR}
d33 1
a33 1
DPADD+=  ${LIBKAFS}
d40 1
a40 1
DPADD+=	${LIBCRYPTO} ${LIBZ} ${LIBDES}
@


