head	1.2;
access;
symbols
	RELENG_4_11_0_RELEASE:1.1.1.1.2.3
	RELENG_4_11:1.1.1.1.2.3.0.10
	RELENG_4_11_BP:1.1.1.1.2.3
	RELENG_4_10_0_RELEASE:1.1.1.1.2.3
	RELENG_4_10:1.1.1.1.2.3.0.8
	RELENG_4_10_BP:1.1.1.1.2.3
	RELENG_4_9_0_RELEASE:1.1.1.1.2.3
	RELENG_4_9:1.1.1.1.2.3.0.6
	RELENG_4_9_BP:1.1.1.1.2.3
	RELENG_4_8_0_RELEASE:1.1.1.1.2.3
	RELENG_4_8:1.1.1.1.2.3.0.4
	RELENG_4_8_BP:1.1.1.1.2.3
	RELENG_4_7_0_RELEASE:1.1.1.1.2.3
	RELENG_4_7:1.1.1.1.2.3.0.2
	RELENG_4_7_BP:1.1.1.1.2.3
	RELENG_4_6_2_RELEASE:1.1.1.1.2.2.4.1
	RELENG_4_6_1_RELEASE:1.1.1.1.2.2.4.1
	OpenSSH_3_3:1.1.1.5
	RELENG_4_6_0_RELEASE:1.1.1.1.2.2
	RELENG_4_6:1.1.1.1.2.2.0.4
	RELENG_4_6_BP:1.1.1.1.2.2
	OpenSSH_3_1:1.1.1.4
	RELENG_4_5_0_RELEASE:1.1.1.1.2.2
	RELENG_4_5:1.1.1.1.2.2.0.2
	RELENG_4_5_BP:1.1.1.1.2.2
	RELENG_4_4_0_RELEASE:1.1.1.1.2.1
	RELENG_4_4:1.1.1.1.2.1.0.4
	RELENG_4_4_BP:1.1.1.1.2.1
	OpenSSH_2_9:1.1.1.3
	RELENG_4_3_0_RELEASE:1.1.1.1.2.1
	RELENG_4_3:1.1.1.1.2.1.0.2
	RELENG_4_3_BP:1.1.1.1.2.1
	OpenSSH_2_3_0:1.1.1.2
	OpenBSD:1.1.1
	RELENG_4_2_0_RELEASE:1.1.1.1.2.1
	RELENG_4_1_1_RELEASE:1.1.1.1
	v_2_2_0_2000_09_09:1.1.1.2
	PRE_SMPNG:1.1.1.1
	RELENG_4_1_0_RELEASE:1.1.1.1
	v_2_1_0_2000_05_30:1.1.1.1
	v_2_1:1.1.1.1
	v_1_2_3_2000_03_25:1.1.1.1
	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.06;	author des;	state dead;
branches;
next	1.1;

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

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

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

1.1.1.3
date	2001.05.04.03.56.59;	author green;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2002.03.18.09.54.52;	author des;	state Exp;
branches;
next	1.1.1.5;

1.1.1.5
date	2002.06.23.14.01.41;	author des;	state Exp;
branches;
next	;

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

1.1.1.1.2.2
date	2001.09.28.01.33.33;	author green;	state Exp;
branches
	1.1.1.1.2.2.4.1;
next	1.1.1.1.2.3;

1.1.1.1.2.3
date	2002.07.03.22.11.41;	author des;	state dead;
branches;
next	;

1.1.1.1.2.2.4.1
date	2002.07.16.12.27.05;	author des;	state dead;
branches;
next	;


desc
@@


1.2
log
@Forcibly revert to mainline.
@
text
@#	$OpenBSD: Makefile,v 1.5 1999/10/25 20:27:26 markus Exp $

.include <bsd.own.mk>

SUBDIR=	lib ssh sshd ssh-add ssh-keygen ssh-agent scp

distribution:
	install -C -o root -g wheel -m 0644 ${.CURDIR}/ssh_config \
	    ${DESTDIR}/etc/ssh_config
	install -C -o root -g wheel -m 0644 ${.CURDIR}/sshd_config \
	    ${DESTDIR}/etc/sshd_config

.include <bsd.subdir.mk>
@


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.2.0
@
text
@d1 1
a1 1
#	$OpenBSD: Makefile,v 1.6 2000/08/31 21:52:23 markus Exp $
d5 1
a5 1
SUBDIR=	lib ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server
@


1.1.1.1.2.2
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
@d1 1
a1 1
#	$OpenBSD: Makefile,v 1.8 2001/02/04 11:11:53 djm Exp $
d5 1
a5 2
SUBDIR=	lib ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server \
	ssh-keyscan sftp
@


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


1.1.1.1.2.3
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
@Initial import of OpenSSH post-2.2.0 snapshot dated 2000-09-09
@
text
@d1 1
a1 1
#	$OpenBSD: Makefile,v 1.6 2000/08/31 21:52:23 markus Exp $
d5 1
a5 1
SUBDIR=	lib ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server
@


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

Happy birthday to:	rwatson
@
text
@d1 1
a1 1
#	$OpenBSD: Makefile,v 1.8 2001/02/04 11:11:53 djm Exp $
d5 1
a5 2
SUBDIR=	lib ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server \
	ssh-keyscan sftp
@


1.1.1.4
log
@Vendor import of OpenSSH 3.1
@
text
@d1 1
a1 1
#	$OpenBSD: Makefile,v 1.10 2002/02/09 17:37:34 deraadt Exp $
d6 1
a6 1
	ssh-keyscan sftp scard
d10 1
a10 1
	    ${DESTDIR}/etc/ssh/ssh_config
d12 1
a12 1
	    ${DESTDIR}/etc/ssh/sshd_config
@


1.1.1.5
log
@Vendor import of OpenSSH 3.3.
@
text
@d1 1
a1 1
#	$OpenBSD: Makefile,v 1.11 2002/05/23 19:24:30 markus Exp $
d6 1
a6 1
	ssh-keysign ssh-keyscan sftp scard
@


