head	1.43;
access;
symbols
	RELENG_8_4:1.43.0.2
	RELENG_9_1_0_RELEASE:1.39.2.2.2.2
	RELENG_9_1:1.39.2.2.0.2
	RELENG_9_1_BP:1.39.2.2
	RELENG_8_3_0_RELEASE:1.37.2.2.6.1
	RELENG_8_3:1.37.2.2.0.6
	RELENG_8_3_BP:1.37.2.2
	RELENG_9_0_0_RELEASE:1.39.2.1.2.1
	RELENG_9_0:1.39.2.1.0.2
	RELENG_9_0_BP:1.39.2.1
	RELENG_9:1.39.0.2
	RELENG_9_BP:1.39
	RELENG_7_4_0_RELEASE:1.35.2.2.8.1
	RELENG_8_2_0_RELEASE:1.37.2.2.4.1
	RELENG_7_4:1.35.2.2.0.8
	RELENG_7_4_BP:1.35.2.2
	RELENG_8_2:1.37.2.2.0.4
	RELENG_8_2_BP:1.37.2.2
	RELENG_8_1_0_RELEASE:1.37.2.2.2.1
	RELENG_8_1:1.37.2.2.0.2
	RELENG_8_1_BP:1.37.2.2
	RELENG_7_3_0_RELEASE:1.35.2.2.6.1
	RELENG_7_3:1.35.2.2.0.6
	RELENG_7_3_BP:1.35.2.2
	RELENG_8_0_0_RELEASE:1.37.2.1.2.1
	RELENG_8_0:1.37.2.1.0.2
	RELENG_8_0_BP:1.37.2.1
	RELENG_8:1.37.0.2
	RELENG_8_BP:1.37
	RELENG_7_2_0_RELEASE:1.35.2.2.4.1
	RELENG_7_2:1.35.2.2.0.4
	RELENG_7_2_BP:1.35.2.2
	RELENG_7_1_0_RELEASE:1.35.2.2.2.1
	RELENG_6_4_0_RELEASE:1.31.2.4.2.1
	RELENG_7_1:1.35.2.2.0.2
	RELENG_7_1_BP:1.35.2.2
	RELENG_6_4:1.31.2.4.0.2
	RELENG_6_4_BP:1.31.2.4
	RELENG_7_0_0_RELEASE:1.35
	RELENG_6_3_0_RELEASE:1.31.2.3
	RELENG_7_0:1.35.0.4
	RELENG_7_0_BP:1.35
	RELENG_6_3:1.31.2.3.0.4
	RELENG_6_3_BP:1.31.2.3
	RELENG_7:1.35.0.2
	RELENG_7_BP:1.35
	RELENG_6_2_0_RELEASE:1.31.2.3
	RELENG_6_2:1.31.2.3.0.2
	RELENG_6_2_BP:1.31.2.3
	RELENG_5_5_0_RELEASE:1.28
	RELENG_5_5:1.28.0.8
	RELENG_5_5_BP:1.28
	RELENG_6_1_0_RELEASE:1.31
	RELENG_6_1:1.31.0.6
	RELENG_6_1_BP:1.31
	RELENG_6_0_0_RELEASE:1.31
	RELENG_6_0:1.31.0.4
	RELENG_6_0_BP:1.31
	RELENG_6:1.31.0.2
	RELENG_6_BP:1.31
	RELENG_5_4_0_RELEASE:1.28
	RELENG_5_4:1.28.0.6
	RELENG_5_4_BP:1.28
	RELENG_4_11_0_RELEASE:1.4.2.8
	RELENG_4_11:1.4.2.8.0.8
	RELENG_4_11_BP:1.4.2.8
	RELENG_5_3_0_RELEASE:1.28
	RELENG_5_3:1.28.0.4
	RELENG_5_3_BP:1.28
	RELENG_5:1.28.0.2
	RELENG_5_BP:1.28
	RELENG_4_10_0_RELEASE:1.4.2.8
	RELENG_4_10:1.4.2.8.0.6
	RELENG_4_10_BP:1.4.2.8
	RELENG_5_2_1_RELEASE:1.24
	RELENG_5_2_0_RELEASE:1.24
	RELENG_5_2:1.24.0.2
	RELENG_5_2_BP:1.24
	RELENG_4_9_0_RELEASE:1.4.2.8
	RELENG_4_9:1.4.2.8.0.4
	RELENG_4_9_BP:1.4.2.8
	RELENG_5_1_0_RELEASE:1.23
	RELENG_5_1:1.23.0.2
	RELENG_5_1_BP:1.23
	RELENG_4_8_0_RELEASE:1.4.2.8
	RELENG_4_8:1.4.2.8.0.2
	RELENG_4_8_BP:1.4.2.8
	RELENG_5_0_0_RELEASE:1.20
	RELENG_5_0:1.20.0.2
	RELENG_5_0_BP:1.20
	RELENG_4_7_0_RELEASE:1.4.2.7
	RELENG_4_7:1.4.2.7.0.2
	RELENG_4_7_BP:1.4.2.7
	RELENG_4_6_2_RELEASE:1.4.2.5.4.1
	RELENG_4_6_1_RELEASE:1.4.2.5.4.1
	RELENG_4_6_0_RELEASE:1.4.2.5
	RELENG_4_6:1.4.2.5.0.4
	RELENG_4_6_BP:1.4.2.5
	RELENG_4_5_0_RELEASE:1.4.2.5
	RELENG_4_5:1.4.2.5.0.2
	RELENG_4_5_BP:1.4.2.5
	RELENG_4_4_0_RELEASE:1.4.2.4
	RELENG_4_4:1.4.2.4.0.4
	RELENG_4_4_BP:1.4.2.4
	RELENG_4_3_0_RELEASE:1.4.2.4
	RELENG_4_3:1.4.2.4.0.2
	RELENG_4_3_BP:1.4.2.4
	RELENG_4_2_0_RELEASE:1.4.2.3
	RELENG_4_1_1_RELEASE:1.4.2.2
	PRE_SMPNG:1.9
	RELENG_4_1_0_RELEASE:1.4.2.1
	RELENG_4_0_0_RELEASE:1.4
	RELENG_4:1.4.0.2
	RELENG_4_BP:1.4;
locks; strict;
comment	@# @;


1.43
date	2013.01.18.00.27.37;	author svnexp;	state Exp;
branches
	1.43.2.1;
next	1.42;

1.42
date	2012.11.17.01.50.27;	author svnexp;	state Exp;
branches;
next	1.41;

1.41
date	2012.03.24.19.41.43;	author eadler;	state Exp;
branches;
next	1.40;

1.40
date	2012.03.19.00.41.40;	author eadler;	state Exp;
branches;
next	1.39;

1.39
date	2010.03.09.19.16.43;	author des;	state Exp;
branches
	1.39.2.1;
next	1.38;

1.38
date	2009.10.01.17.12.52;	author des;	state Exp;
branches;
next	1.37;

1.37
date	2008.08.01.02.48.36;	author des;	state Exp;
branches
	1.37.2.1;
next	1.36;

1.36
date	2008.03.05.20.58.14;	author kris;	state Exp;
branches;
next	1.35;

1.35
date	2006.05.13.21.38.15;	author des;	state Exp;
branches
	1.35.2.1;
next	1.34;

1.34
date	2006.05.13.13.47.44;	author des;	state Exp;
branches;
next	1.33;

1.33
date	2006.03.17.18.54.32;	author ru;	state Exp;
branches;
next	1.32;

1.32
date	2005.12.29.14.40.22;	author dfr;	state Exp;
branches;
next	1.31;

1.31
date	2005.06.07.09.31.27;	author des;	state Exp;
branches
	1.31.2.1;
next	1.30;

1.30
date	2005.06.06.16.13.06;	author des;	state Exp;
branches;
next	1.29;

1.29
date	2005.06.05.15.47.07;	author des;	state Exp;
branches;
next	1.28;

1.28
date	2004.02.26.11.26.46;	author des;	state Exp;
branches;
next	1.27;

1.27
date	2004.01.08.11.40.19;	author ru;	state Exp;
branches;
next	1.26;

1.26
date	2004.01.08.09.05.24;	author des;	state Exp;
branches;
next	1.25;

1.25
date	2004.01.07.11.17.23;	author des;	state Exp;
branches;
next	1.24;

1.24
date	2003.07.02.23.38.42;	author ru;	state Exp;
branches;
next	1.23;

1.23
date	2003.05.05.07.58.44;	author markm;	state Exp;
branches;
next	1.22;

1.22
date	2003.04.30.17.46.24;	author markm;	state Exp;
branches;
next	1.21;

1.21
date	2003.04.23.17.25.47;	author des;	state Exp;
branches;
next	1.20;

1.20
date	2002.10.29.10.18.00;	author des;	state Exp;
branches;
next	1.19;

1.19
date	2002.07.05.08.39.09;	author des;	state Exp;
branches;
next	1.18;

1.18
date	2002.06.25.19.10.08;	author des;	state Exp;
branches;
next	1.17;

1.17
date	2002.06.24.10.17.26;	author des;	state Exp;
branches;
next	1.16;

1.16
date	2002.06.23.21.43.42;	author des;	state Exp;
branches;
next	1.15;

1.15
date	2002.04.26.17.55.19;	author ru;	state Exp;
branches;
next	1.14;

1.14
date	2002.01.23.15.54.13;	author ru;	state Exp;
branches;
next	1.13;

1.13
date	2001.05.04.04.21.21;	author green;	state Exp;
branches;
next	1.12;

1.12
date	2001.03.26.14.53.29;	author ru;	state Exp;
branches;
next	1.11;

1.11
date	2000.11.14.04.42.25;	author green;	state Exp;
branches;
next	1.10;

1.10
date	2000.09.10.09.43.29;	author kris;	state Exp;
branches;
next	1.9;

1.9
date	2000.08.23.19.14.48;	author ache;	state Exp;
branches;
next	1.8;

1.8
date	2000.08.23.09.39.20;	author kris;	state Exp;
branches;
next	1.7;

1.7
date	2000.07.16.05.53.03;	author peter;	state Exp;
branches;
next	1.6;

1.6
date	2000.05.15.05.26.50;	author kris;	state Exp;
branches;
next	1.5;

1.5
date	2000.03.26.07.54.09;	author kris;	state Exp;
branches;
next	1.4;

1.4
date	2000.03.03.20.33.53;	author jhay;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2000.02.28.19.25.33;	author markm;	state Exp;
branches;
next	1.2;

1.2
date	2000.02.25.08.21.15;	author peter;	state Exp;
branches;
next	1.1;

1.1
date	2000.02.24.17.00.49;	author markm;	state Exp;
branches;
next	;

1.43.2.1
date	2013.01.18.00.27.37;	author svnexp;	state dead;
branches;
next	1.43.2.2;

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

1.39.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.39.2.1.2.1;
next	1.39.2.2;

1.39.2.2
date	2012.03.29.01.46.01;	author eadler;	state Exp;
branches
	1.39.2.2.2.1;
next	1.39.2.3;

1.39.2.3
date	2012.11.17.11.36.33;	author svnexp;	state Exp;
branches;
next	1.39.2.4;

1.39.2.4
date	2013.03.01.01.05.02;	author svnexp;	state Exp;
branches;
next	1.39.2.5;

1.39.2.5
date	2014.03.20.11.01.50;	author svnexp;	state Exp;
branches;
next	1.39.2.6;

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

1.39.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.39.2.1.2.2;

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

1.39.2.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.39.2.2.2.2;

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

1.37.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.37.2.1.2.1;
next	1.37.2.2;

1.37.2.2
date	2010.04.21.06.33.10;	author des;	state Exp;
branches
	1.37.2.2.2.1
	1.37.2.2.4.1
	1.37.2.2.6.1;
next	1.37.2.3;

1.37.2.3
date	2012.03.29.01.46.30;	author eadler;	state Exp;
branches;
next	1.37.2.4;

1.37.2.4
date	2012.11.17.10.36.17;	author svnexp;	state Exp;
branches;
next	1.37.2.5;

1.37.2.5
date	2013.03.01.02.23.12;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.37.2.2.6.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.37.2.2.6.2;

1.37.2.2.6.2
date	2012.11.17.08.24.58;	author svnexp;	state Exp;
branches;
next	;

1.35.2.1
date	2008.03.22.15.12.06;	author kris;	state Exp;
branches;
next	1.35.2.2;

1.35.2.2
date	2008.09.01.20.03.13;	author des;	state Exp;
branches
	1.35.2.2.2.1
	1.35.2.2.4.1
	1.35.2.2.6.1
	1.35.2.2.8.1;
next	1.35.2.3;

1.35.2.3
date	2012.03.29.01.46.56;	author eadler;	state Exp;
branches;
next	1.35.2.4;

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

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

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

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

1.35.2.2.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.35.2.2.8.2;

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

1.31.2.1
date	2006.07.08.14.37.18;	author des;	state Exp;
branches;
next	1.31.2.2;

1.31.2.2
date	2006.10.11.09.31.48;	author des;	state Exp;
branches;
next	1.31.2.3;

1.31.2.3
date	2006.10.11.09.49.12;	author ru;	state Exp;
branches;
next	1.31.2.4;

1.31.2.4
date	2008.03.22.15.13.26;	author kris;	state Exp;
branches
	1.31.2.4.2.1;
next	1.31.2.5;

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

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

1.4.2.1
date	2000.06.09.07.21.07;	author kris;	state Exp;
branches;
next	1.4.2.2;

1.4.2.2
date	2000.09.22.09.44.17;	author kris;	state Exp;
branches;
next	1.4.2.3;

1.4.2.3
date	2000.10.28.23.05.13;	author kris;	state Exp;
branches;
next	1.4.2.4;

1.4.2.4
date	2001.01.12.04.26.22;	author green;	state Exp;
branches;
next	1.4.2.5;

1.4.2.5
date	2001.09.28.01.33.52;	author green;	state Exp;
branches
	1.4.2.5.4.1;
next	1.4.2.6;

1.4.2.6
date	2002.07.03.22.13.24;	author des;	state Exp;
branches;
next	1.4.2.7;

1.4.2.7
date	2002.07.05.11.11.02;	author des;	state Exp;
branches;
next	1.4.2.8;

1.4.2.8
date	2003.02.03.17.31.12;	author des;	state Exp;
branches;
next	1.4.2.9;

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

1.4.2.5.4.1
date	2002.07.16.12.33.27;	author des;	state Exp;
branches;
next	;


desc
@@


1.43
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/245527
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# $FreeBSD: head/secure/usr.bin/ssh/Makefile 245527 2013-01-17 01:51:04Z bz $
#

.include <bsd.own.mk>

PROG=	ssh
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
LINKS=	${BINDIR}/ssh ${BINDIR}/slogin
MAN=	ssh.1 ssh_config.5
MLINKS=	ssh.1 slogin.1

SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
	sshconnect.c sshconnect1.c sshconnect2.c mux.c \
	roaming_common.c roaming_client.c

# gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
SRCS+=	gss-genr.c

DPADD=	${LIBSSH} ${LIBUTIL} ${LIBZ}
LDADD=	-lssh -lutil -lz

.if ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL
DPADD+=	 ${LIBGSSAPI}
LDADD+=	 -lgssapi
.endif

.if ${MK_OPENSSH_NONE_CIPHER} != "no"
CFLAGS+= -DNONE_CIPHER_ENABLED
.endif

DPADD+=	${LIBCRYPT} ${LIBCRYPTO}
LDADD+=	-lcrypt -lcrypto

.if defined(LOCALBASE)
CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
.endif

.include <bsd.prog.mk>

.PATH:	${SSHDIR}

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


1.43.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:03:39 +0000
@
text
@d1 43
@


1.43.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 43
# $FreeBSD: releng/8.4/secure/usr.bin/ssh/Makefile 247521 2013-03-01 02:06:04Z des $
#

.include <bsd.own.mk>

PROG=	ssh
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
LINKS=	${BINDIR}/ssh ${BINDIR}/slogin
MAN=	ssh.1 ssh_config.5
MLINKS=	ssh.1 slogin.1

SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
	sshconnect.c sshconnect1.c sshconnect2.c mux.c \
	roaming_common.c roaming_client.c

# gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
SRCS+=	gss-genr.c

DPADD=	${LIBSSH} ${LIBUTIL} ${LIBZ}
LDADD=	-lssh -lutil -lz

.if ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL
DPADD+=	 ${LIBGSSAPI}
LDADD+=	 -lgssapi
.endif

.if ${MK_OPENSSH_NONE_CIPHER} != "no"
CFLAGS+= -DNONE_CIPHER_ENABLED
.endif

DPADD+=	${LIBCRYPT} ${LIBCRYPTO}
LDADD+=	-lcrypt -lcrypto

.if defined(LOCALBASE)
CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
.endif

.include <bsd.prog.mk>

.PATH:	${SSHDIR}

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


1.42
log
@Switching exporter and resync
@
text
@d1 1
a1 1
# $FreeBSD: head/secure/usr.bin/ssh/Makefile 233432 2012-03-24 19:41:43Z eadler $
d28 4
@


1.41
log
@SVN rev 233432 on 2012-03-24 19:41:43Z by eadler

Restore the ability to use a non-standard LOCALBASE to sshd
Add the ability to use a non-standard LOCALBASE to ssh

Submitted by:	jhb
Reviewed by:	des
Approved by:	cperciva
MFC after:	0 days (with r233136)
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.40
log
@SVN rev 233136 on 2012-03-19 00:41:40Z by eadler

X11BASE is not used any more and has been killed by the x11 team.

Reviewed by:	???
Approved by:	???
MFC after:	3 days
@
text
@d31 4
@


1.39
log
@SVN rev 204917 on 2010-03-09 19:16:43Z by des

Upgrade to OpenSSH 5.4p1.

MFC after:	1 month
@
text
@a27 13
.if defined(X11BASE) || defined(LOCALBASE)
# Recommended /etc/make.conf setting is X11BASE=${LOCALBASE} for x.org
# 7.x upgrade on <= 6.2, but LOCALBASE has moved out of scope of src/
# so we need to provide the default for users with old make.conf
# settings.
LOCALBASE?=	/usr/local

# Users may override either LOCALBASE or X11BASE to move the location
# of xauth
X11BASE?=	${LOCALBASE}
CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
.endif

@


1.39.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.39.2.2
log
@SVN rev 233632 on 2012-03-29 01:46:01Z by eadler

MFC r233136, r233432:
	Restore the ability to use a non-standard LOCALBASE to sshd
	Add the ability to use a non-standard LOCALBASE to ssh

Approved by:	cperciva (implicit)
@
text
@d28 13
a43 4
.if defined(LOCALBASE)
CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
.endif

@


1.39.2.3
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/ssh/Makefile 233632 2012-03-29 01:46:01Z eadler $
@


1.39.2.4
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/247515
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/secure/usr.bin/ssh/Makefile 247515 2013-03-01 01:02:26Z des $
a27 4
.if ${MK_OPENSSH_NONE_CIPHER} != "no"
CFLAGS+= -DNONE_CIPHER_ENABLED
.endif

@


1.39.2.5
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/ssh/Makefile 263421 2014-03-20 10:56:05Z des $
a20 1
USEPRIVATELIB= ssh
@


1.39.2.6
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/263970
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 2
a2 1
# $FreeBSD: stable/9/secure/usr.bin/ssh/Makefile 263970 2014-03-31 14:39:56Z des $
d19 2
a20 2
DPADD=	${LIBSSH} ${LIBUTIL}
LDADD=	-lssh -lutil
d24 1
a24 1
CFLAGS+= -include krb5_config.h
d33 2
a34 2
DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
LDADD+= -lcrypt -lcrypto -lz
a44 3
.if ${MK_KERBEROS_SUPPORT} != "no"
${OBJS} ${POBJS} ${SOBJS}: krb5_config.h
.endif
@


1.39.2.2.2.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.39.2.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/secure/usr.bin/ssh/Makefile 233632 2012-03-29 01:46:01Z eadler $
@


1.39.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.39.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/secure/usr.bin/ssh/Makefile 204917 2010-03-09 19:16:43Z des $
@


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

Upgrade to OpenSSH 5.3p1.
@
text
@d14 1
a14 1
	roaming_common.c
@


1.37
log
@SVN rev 181111 on 2008-08-01 02:48:36Z by des

Upgrade to OpenSSH 5.1p1.

I have worked hard to reduce diffs against the vendor branch.  One
notable change in that respect is that we no longer prefer DSA over
RSA - the reasons for doing so went away years ago.  This may cause
some surprises, as ssh will warn about unknown host keys even for
hosts whose keys haven't changed.

MFC after:	6 weeks
@
text
@d14 4
a17 1
	gss-genr.c
@


1.37.2.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.37.2.2
log
@SVN rev 206984 on 2010-04-21 06:33:10Z by des

MFH OpenSSH 5.4p1
@
text
@d14 1
a14 4
	roaming_common.c roaming_client.c

# gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
SRCS+=	gss-genr.c
@


1.37.2.3
log
@SVN rev 233633 on 2012-03-29 01:46:30Z by eadler

MFC r233136, r233432:
	Restore the ability to use a non-standard LOCALBASE to sshd
	Add the ability to use a non-standard LOCALBASE to ssh

Approved by:	cperciva (implicit)
@
text
@d28 13
a43 4
.if defined(LOCALBASE)
CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
.endif

@


1.37.2.4
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/ssh/Makefile 233633 2012-03-29 01:46:30Z eadler $
@


1.37.2.5
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/247521
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/secure/usr.bin/ssh/Makefile 247521 2013-03-01 02:06:04Z des $
a27 4
.if ${MK_OPENSSH_NONE_CIPHER} != "no"
CFLAGS+= -DNONE_CIPHER_ENABLED
.endif

@


1.37.2.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.37.2.2.6.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/secure/usr.bin/ssh/Makefile 206984 2010-04-21 06:33:10Z des $
@


1.37.2.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.37.2.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.37.2.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.36
log
@For users of FreeBSD <= 6.2 we recommend during the x.org 7.x upgrade
that they add X11BASE=${LOCALBASE} to /etc/make.conf since X11BASE was
hard-wired to the now-wrong location in old releases.

However, both X11BASE and LOCALBASE have moved out of scope of src/
into ports/ now, which causes problems for upgraded users who have old
make.conf files still containing the above setting.  X11BASE becomes
null and we instruct ssh and sshd to look for xauth in /bin/xauth
where it is unlikely to be found.

Instead, provide a copy of the default LOCALBASE?=/usr/local setting
here.

We also have to deal with the case where the user only overrides
LOCALBASE and doesn't set an explicit X11BASE (in ports it will be set
implicitly but not here), which will also move the location of xauth.

MFC after:	 3 days
Reported by:	 rwatson
@
text
@d13 1
a13 1
	sshconnect.c sshconnect1.c sshconnect2.c \
@


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

Discussed with:	ru
@
text
@d25 10
a34 1
.if defined(X11BASE)
@


1.35.2.1
log
@MFC: Repair handling of X11BASE and LOCALBASE
@
text
@d25 1
a25 10
.if defined(X11BASE) || defined(LOCALBASE)
# Recommended /etc/make.conf setting is X11BASE=${LOCALBASE} for x.org
# 7.x upgrade on <= 6.2, but LOCALBASE has moved out of scope of src/
# so we need to provide the default for users with old make.conf
# settings.
LOCALBASE?=	/usr/local

# Users may override either LOCALBASE or X11BASE to move the location
# of xauth
X11BASE?=	${LOCALBASE}
@


1.35.2.2
log
@SVN rev 182634 on 2008-09-01 20:03:13Z by des

MFH OpenSSH 5.1p1
@
text
@d13 1
a13 1
	sshconnect.c sshconnect1.c sshconnect2.c mux.c \
@


1.35.2.3
log
@SVN rev 233634 on 2012-03-29 01:46:56Z by eadler

MFC r233136, r233432:
	Restore the ability to use a non-standard LOCALBASE to sshd
	Add the ability to use a non-standard LOCALBASE to ssh

Approved by:	cperciva (implicit)
@
text
@d25 13
a40 4
.if defined(LOCALBASE)
CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
.endif

@


1.35.2.4
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/secure/usr.bin/ssh/Makefile 233634 2012-03-29 01:46:56Z eadler $
@


1.35.2.2.8.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.35.2.2.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/secure/usr.bin/ssh/Makefile 182634 2008-09-01 20:03:13Z des $
@


1.35.2.2.6.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.35.2.2.4.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.35.2.2.2.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.34
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
@d35 2
@


1.33
log
@Reimplementation of world/kernel build options.  For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by:	imp, jhb, kris, phk, ru (all bugs are mine)
@
text
@d7 1
a7 1
CFLAGS+=-I${SSHDIR}
@


1.32
log
@Add a new extensible GSS-API layer which can support GSS-API plugins,
similar the the Solaris implementation. Repackage the krb5 GSS mechanism
as a plugin library for the new implementation. This also includes a
comprehensive set of manpages for the GSS-API functions with text mostly
taken from the RFC.

Reviewed by: Love Hrnquist strand <lha@@it.su.se>, ru (build system), des (openssh parts)
@
text
@d4 2
d19 1
a19 1
.if !defined(NO_KERBEROS)
@


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

Requested by:	ru
@
text
@d18 3
a20 3
CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL
DPADD+=	 ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
LDADD+=	 -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
@


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

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


1.31.2.2
log
@Fix NO_KERBEROS and static build.

Submitted by:	ru
Approved by:	re (hrs)
@
text
@a13 2
DPADD=	${LIBSSH} ${LIBMD} ${LIBUTIL} ${LIBZ}
LDADD=	-lssh -lmd -lutil -lz
d19 2
a20 2
DPADD+=	 ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
LDADD+=	 -lgssapi -lkrb5 -lasn1 -lcom_err -lroken
@


1.31.2.3
log
@Ugh, I accidentally sent des@@ a patch that included some test
stuff, and forgot to notify him about this when I sent again
a cleaned up patch.  Sorry about that.

Approved by:	re (hrs)
@
text
@d16 2
@


1.31.2.4
log
@MFC: Repair handling of X11BASE and LOCALBASE
@
text
@d23 1
a23 10
.if defined(X11BASE) || defined(LOCALBASE)
# Recommended /etc/make.conf setting is X11BASE=${LOCALBASE} for x.org
# 7.x upgrade on <= 6.2, but LOCALBASE has moved out of scope of src/
# so we need to provide the default for users with old make.conf
# settings.
LOCALBASE?=	/usr/local

# Users may override either LOCALBASE or X11BASE to move the location
# of xauth
X11BASE?=	${LOCALBASE}
@


1.31.2.5
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/secure/usr.bin/ssh/Makefile 177499 2008-03-22 15:13:26Z kris $
@


1.31.2.4.2.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.30
log
@Make libssh an INTERNALLIB like it is in {Net,Open}BSD.
@
text
@d2 1
a2 2

LIBSSH=	${.OBJDIR}/../../lib/libssh/libssh.a
d11 2
a12 1
	sshconnect.c sshconnect1.c sshconnect2.c
d15 1
a15 1
LDADD=	${LIBSSH} -lutil -lz
@


1.29
log
@Update for OpenSSH 4.1p1.
@
text
@d2 2
a3 1
#
d12 1
a12 2
	sshconnect.c sshconnect1.c sshconnect2.c \
	gss-genr.c
d15 1
a15 1
LDADD=	-lssh -lutil -lz
@


1.28
log
@Update for 3.8p1, including workaround for a bug in gss-genr.c.
@
text
@d18 1
a18 1
CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL
@


1.27
log
@Fixed static linkage.

Reviewed by:	des
@
text
@d11 2
a12 1
	sshconnect.c sshconnect1.c sshconnect2.c
@


1.26
log
@Enable GSSAPI support. [1]
Also remove some duplicates from ssh's SRCS.

Submitted by:	[1] Bjrn Grnvall <bg@@sics.se>
@
text
@d13 3
d26 2
a27 2
DPADD+=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
LDADD+=	-lssh -lcrypt -lcrypto -lutil -lz
@


1.25
log
@Update Makefiles for OpenSSH 3.7.1p2.
@
text
@d10 1
a10 1
SRCS=	ssh.c authfd.c hostfile.c msg.c readconf.c clientloop.c sshtty.c \
d14 3
a16 3
CFLAGS+= -DKRB5 -DHEIMDAL
LDADD+=	 -lkrb5 -lasn1 -lcom_err -lmd -lroken -lcrypt
DPADD+=	 ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN} ${LIBCRYPT}
@


1.24
log
@Fixed "make checkdpadd".

OK'ed by:	markm
@
text
@d23 2
a24 2
LDADD+=	-lssh -lcrypto -lutil -lz
DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
@


1.23
log
@Turn MAKE_KERBEROS5 into NO_KERBEROS by negating the logic. Some extra
cleanups were necessary in release/Makefile, and the tinderbox code
was syntax checked, not run checked.
@
text
@d15 2
a16 2
LDADD+=	 -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -lcrypt
DPADD+=	 ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT}
@


1.22
log
@We no longer have a separate kerberos distribution. Its now just
part of the regular security dist.
@
text
@d13 1
a13 1
.if defined(MAKE_KERBEROS5)
@


1.21
log
@Update for 3.6.1p1; also remove Kerberos IV shims.
@
text
@a13 1
DISTRIBUTION=krb5
@


1.20
log
@Update for OpenSSH 3.5p1.
@
text
@a12 7
.if defined(MAKE_KERBEROS4)
DISTRIBUTION=krb4
CFLAGS+= -DKRB4
LDADD+=	 -lkrb -lcom_err
DPADD+=	 ${LIBKRB} ${LIBCOM_ERR}
.endif

@


1.19
log
@ssh-keysign(8) belongs in /usr/libexec, not in /usr/bin, and needs to be
setuid so ssh(1) doesn't have to be.

Pointy hat to:	des
Submitted by:	Katsuyuki TATEISHI <katsu@@iec.hiroshima-u.ac.jp>
@
text
@d10 1
a10 1
SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
@


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

Sponsored by:	DARPA, NAI Labs
@
text
@a5 3
.if defined(ENABLE_SUID_SSH)
BINMODE=4555
.endif
@


1.17
log
@Previous commit made no sense.
@
text
@d5 1
d25 1
a25 1
CFLAGS+= -DKRB5
@


1.16
log
@Install the new man pages.
@
text
@d9 2
a10 1
MLINKS=	ssh.1 slogin.1 ssh_config.5
@


1.15
log
@Milestone #1 in cross-arch make releases.

Do not install games and profiled libraries to the ${CHROOTDIR}
with the initial installworld.

Eliminate the need in the second installworld.  For that, make sure
_everything_ is built in the "world" environment, using the right
tool chain.

Added SUBDIR_OVERRIDE helper stuff to Makefile.inc1.  Split the
buildworld process into stages, and skip some stages when
SUBDIR_OVERRIDE is set (used to build crypto, krb4, and krb5
dists).

Added NO_MAKEDB_RUN knob to Makefile.inc1 to avoid running
makewhatis(1) at the end of installworld (used when making crypto,
krb4, and krb5 dists).

In release/scripts/doFS.sh, ensure that the correct boot blocks are
used.

Moved the creation of the "crypto" dist from release.5 to
release.2.

In release.3 and doMFSKERN, build kernels in the "world"
environment.  KERNELS now means "additional" kernels, GENERIC is
always built.

Ensure we build crunched binaries in the "world" environment.
Obfuscate release/Makefile some more (WMAKEENV) to achieve this.

Inline createBOOTMFS target.

Use already built GENERIC kernel modules to augment mfsfd's
/stand/modules.  GC doMODULES as such.

Assorted fixes:

Get rid of the "afterdistribute" target by moving the single use
of it from sys/Makefile to etc/Makefile's "distribute".

Makefile.inc1: apparently "etc" no longer needs to be last for
"distribute" to succeed.

gnu/usr.bin/perl/library/Makefile.inc: do not override the
"install" and "distribute" targets, do it the "canonical" way.

release/scripts/{man,cat}pages-make.sh: make sure Perl manpages and
catpages appear in the right dists.  Note that because Perl does
not respect the MANBUILDCAT (and NOMAN), this results in a loss of
/usr/share/perl/man/cat* empty directories.  This will be fixed
soon.

Turn MAKE_KERBEROS4 into a plain boolean variable (if it is set it
means "make KerberosIV"), as documented in the make.conf(5)
manpage.  Most of the userland makefiles did not test it for "YES"
anyway.

XXX Should specialized kerberized libpam versions be included into
the krb4 and krb5 dists?  (libpam.a would be incorrect anyway if
both krb4 and krb5 dists were choosen.)

Make sure "games" dist is made before "catpages", otherwise games
catpages settle in the wrong dist.

Fast build machine provided by: Igor Kucherenko <kivvy@@sunbay.com>
@
text
@d9 1
a9 1
MLINKS=	ssh.1 slogin.1
@


1.14
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
@d14 1
a14 2
.if defined(MAKE_KERBEROS4) && \
	((${MAKE_KERBEROS4} == "yes") || (${MAKE_KERBEROS4} == "YES"))
d19 1
a19 1
.endif # MAKE_KERBEROS4
d21 1
a21 2
.if defined(MAKE_KERBEROS5) && \
	((${MAKE_KERBEROS5} == "yes") || (${MAKE_KERBEROS5} == "YES"))
d26 1
a26 1
.endif # MAKE_KERBEROS5
@


1.13
log
@Follow the OpenSSH 2.9 upgrade with the infrastructure.  Two new
programs are now included: sftp(1) and ssh-keyscan(1).
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.12 2001/03/26 14:53:29 ru Exp $
d34 1
a34 1
LDADD+=	${LIBSSH} -lcrypto -lutil -lz
@


1.12
log
@secure/ build fixes:

- TELNETOBJDIR is gone.  `buildworld' already installs libtelnet.a
  in ${WORLDTMP}/usr/lib, and we have LIBRARY_PATH pointing there.

- SSHDIR (formerly SSHSRC) is now shared between all SSH modules.
  New LIBSSH is introduced for libssh.a (an internal static lib).
  Previously, build without prior `obj' was broken; SSH modules
  always looked for libssh.a in ${.OBJDIR}.  Also, the dependancies
  on the libssh.a were missing.

- libtelnet/ did not install the crypto version of telnet.h into
  /usr/include/arpa.

- Removed BINOWN, BINMODE, BINDIR and SRCS with default values.

Reviewed by:	markm

- MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.11 2000/11/14 04:42:25 green Exp $
d11 2
a12 2
SRCS=	ssh.c log-client.c readconf.c clientloop.c sshconnect.c \
	sshconnect1.c sshconnect2.c
@


1.11
log
@Disable /usr/bin/ssh being setuid root by default.  Let the variable
ENABLE_SUID_SSH being defined reenable it for those that want it.

This follows discussion favoring the change from September.  It
is not usually necessary to be setuid root, possibly less safe,
and less convenient (cannot use $HOSTALIASES, for example).

Submitted by:	jedgar
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.10 2000/09/10 09:43:29 kris Exp $
a3 2
SSHSRC=	${.CURDIR}/../../../crypto/openssh

a4 1
BINOWN=	root
a7 1
MAN1=	ssh.1
a13 5
.include <bsd.own.mk>

.PATH:		${SSHSRC}
.PATH:		${SSHSRC}/lib

d34 2
a35 2
LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lutil -lz
DPADD+=	${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
d38 2
@


1.10
log
@Update for OpenSSH 2.2.0
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.9 2000/08/23 19:14:48 ache Exp $
d8 1
d10 1
@


1.9
log
@Add missing quotes around xauth path
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.8 2000/08/23 09:39:20 kris Exp $
a36 2
.include <bsd.prog.mk>

d43 2
@


1.8
log
@Respect X11BASE to derive the location of xauth(1)

PR:		17818
Submitted by:	Bjoern Fischer <bfischer@@Techfak.Uni-Bielefeld.DE>
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.7 2000/07/16 05:53:03 peter Exp $
d40 1
a40 1
CFLAGS+= -DXAUTH_PATH=${X11BASE}/bin/xauth
@


1.7
log
@Forced commit.  This is to try and help folks that used the international
crypto repo and have slightly different files but with the same version.
cvsup in 'checkout mode' has no trouble with this, but cvs can get really
silly about it.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.6 2000/05/15 05:26:50 kris Exp $
d38 4
@


1.6
log
@Update for OpenSSH 2.1
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.5 2000/03/26 07:54:09 kris Exp $
@


1.5
log
@Update for latest OpenSSH
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.4 2000/03/03 20:33:53 jhay Exp $
d13 2
a14 1
SRCS=	clientloop.c key.c log-client.c readconf.c ssh.c sshconnect.c
@


1.4
log
@MFI: Make ssh and sshd link in the krb5 part of make release.

Reviewed by:	markm
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.3 2000/02/28 19:25:33 markm Exp $
d13 1
a13 1
SRCS=	ssh.c sshconnect.c log-client.c readconf.c clientloop.c
@


1.4.2.1
log
@MFC: OpenSSH 2.1.0
@
text
@d1 1
a1 1
# $FreeBSD$
d13 1
a13 2
SRCS=	ssh.c log-client.c readconf.c clientloop.c sshconnect.c \
	sshconnect1.c sshconnect2.c
@


1.4.2.2
log
@MFC: Sync with recent bugfixes and changes in -current.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.4.2.1 2000/06/09 07:21:07 kris Exp $
a37 4

.if defined(X11BASE)
CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
.endif
@


1.4.2.3
log
@MFC: OpenSSH 2.2.0
@
text
@d1 1
a1 1
# $FreeBSD$
d37 2
a44 2

.include <bsd.prog.mk>
@


1.4.2.4
log
@MFC: OpenSSH 2.3.0

Reviewed by:	freefall
@
text
@a7 1
.if defined(ENABLE_SUID_SSH)
a8 1
.endif
@


1.4.2.5
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
@d4 2
d7 1
d11 1
d15 7
a21 2
SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
	sshconnect.c sshconnect1.c sshconnect2.c
d43 2
a44 2
LDADD+=	${LIBSSH} -lcrypto -lutil -lz
DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
a46 2

.PATH:	${SSHDIR}
@


1.4.2.5.4.1
log
@Merge OpenSSH, OPIE, PAM and a number of dependencies from -STABLE.
@
text
@d5 3
a7 1
CFLAGS+=-I${SSHDIR}
a8 1
MAN=	ssh.1 ssh_config.5
d14 2
a15 1
.if defined(MAKE_KERBEROS4)
d20 1
a20 1
.endif
d22 2
a23 1
.if defined(MAKE_KERBEROS5)
d25 1
a25 1
CFLAGS+= -DKRB5 -DHEIMDAL
d28 1
a28 1
.endif
d34 1
a34 1
LDADD+=	-lssh -lcrypto -lutil -lz
@


1.4.2.6
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
@a4 1
CFLAGS+=-I${SSHDIR}
a8 1
MAN=	ssh.1 ssh_config.5
d14 2
a15 1
.if defined(MAKE_KERBEROS4)
d20 1
a20 1
.endif
d22 2
a23 1
.if defined(MAKE_KERBEROS5)
d25 1
a25 1
CFLAGS+= -DKRB5 -DHEIMDAL
d28 1
a28 1
.endif
d34 1
a34 1
LDADD+=	-lssh -lcrypto -lutil -lz
@


1.4.2.7
log
@MFC: install ssh-keysign in /usr/libexec, move setuid bit from ssh(1) to
ssh-keysign(8).
@
text
@d6 3
@


1.4.2.8
log
@MFC: OpenSSH 3.5p1, with all FreeBSD patches.
@
text
@d10 1
a10 1
SRCS=	ssh.c authfd.c hostfile.c msg.c readconf.c clientloop.c sshtty.c \
@


1.4.2.9
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/secure/usr.bin/ssh/Makefile 110292 2003-02-03 17:31:12Z des $
@


1.3
log
@New distribution names.
@
text
@d1 1
a1 1
# $FreeBSD$
d32 2
a33 2
LDADD+=	 -lkrb5 -lkafs -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken
DPADD+=	 ${LIBKRB5} ${LIBCOM_ERR} ${LIBKAFS} ${LIBASN1} ${LIBMD}
@


1.2
log
@Don't pull in libRSAglue for the rsaref case.  Since this is linked
dynamically by default, we use the dlopen() calls to load librsaref.so
on US code trees.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.1 2000/02/24 17:00:49 markm Exp $
d22 1
d30 1
d32 2
a33 2
LDADD+=	 -lkrb5 -lcom_err
DPADD+=	 ${LIBKRB5} ${LIBCOM_ERR}
@


1.1
log
@Add the OpenSSH userland-building Makefiles.
@
text
@d1 1
a1 1
# $FreeBSD$
a37 4
.if defined(RSAREF) && ${RSAREF} == YES
LDADD+=	-lRSAglue
DPADD+= ${LIBRSAGLUE}
.endif
@

