head	1.55;
access;
symbols
	RELENG_8_4:1.55.0.2
	RELENG_9_1_0_RELEASE:1.51.2.1.4.2
	RELENG_9_1:1.51.2.1.0.4
	RELENG_9_1_BP:1.51.2.1
	RELENG_8_3_0_RELEASE:1.48.2.2.6.1
	RELENG_8_3:1.48.2.2.0.6
	RELENG_8_3_BP:1.48.2.2
	RELENG_9_0_0_RELEASE:1.51.2.1.2.1
	RELENG_9_0:1.51.2.1.0.2
	RELENG_9_0_BP:1.51.2.1
	RELENG_9:1.51.0.2
	RELENG_9_BP:1.51
	RELENG_7_4_0_RELEASE:1.43.2.3.4.1
	RELENG_8_2_0_RELEASE:1.48.2.2.4.1
	RELENG_7_4:1.43.2.3.0.4
	RELENG_7_4_BP:1.43.2.3
	RELENG_8_2:1.48.2.2.0.4
	RELENG_8_2_BP:1.48.2.2
	RELENG_8_1_0_RELEASE:1.48.2.2.2.1
	RELENG_8_1:1.48.2.2.0.2
	RELENG_8_1_BP:1.48.2.2
	RELENG_7_3_0_RELEASE:1.43.2.3.2.1
	RELENG_7_3:1.43.2.3.0.2
	RELENG_7_3_BP:1.43.2.3
	RELENG_8_0_0_RELEASE:1.48.2.1.2.1
	RELENG_8_0:1.48.2.1.0.2
	RELENG_8_0_BP:1.48.2.1
	RELENG_8:1.48.0.2
	RELENG_8_BP:1.48
	RELENG_7_2_0_RELEASE:1.43.2.1.4.1
	RELENG_7_2:1.43.2.1.0.4
	RELENG_7_2_BP:1.43.2.1
	RELENG_7_1_0_RELEASE:1.43.2.1.2.1
	RELENG_6_4_0_RELEASE:1.34.2.5.6.1
	RELENG_7_1:1.43.2.1.0.2
	RELENG_7_1_BP:1.43.2.1
	RELENG_6_4:1.34.2.5.0.6
	RELENG_6_4_BP:1.34.2.5
	RELENG_7_0_0_RELEASE:1.43
	RELENG_6_3_0_RELEASE:1.34.2.5
	RELENG_7_0:1.43.0.4
	RELENG_7_0_BP:1.43
	RELENG_6_3:1.34.2.5.0.4
	RELENG_6_3_BP:1.34.2.5
	RELENG_7:1.43.0.2
	RELENG_7_BP:1.43
	RELENG_6_2_0_RELEASE:1.34.2.5
	RELENG_6_2:1.34.2.5.0.2
	RELENG_6_2_BP:1.34.2.5
	RELENG_5_5_0_RELEASE:1.28.2.1
	RELENG_5_5:1.28.2.1.0.4
	RELENG_5_5_BP:1.28.2.1
	RELENG_6_1_0_RELEASE:1.34.2.2
	RELENG_6_1:1.34.2.2.0.4
	RELENG_6_1_BP:1.34.2.2
	RELENG_6_0_0_RELEASE:1.34.2.2
	RELENG_6_0:1.34.2.2.0.2
	RELENG_6_0_BP:1.34.2.2
	RELENG_6:1.34.0.2
	RELENG_6_BP:1.34
	RELENG_5_4_0_RELEASE:1.28.2.1
	RELENG_5_4:1.28.2.1.0.2
	RELENG_5_4_BP:1.28.2.1
	RELENG_4_11_0_RELEASE:1.2.2.7
	RELENG_4_11:1.2.2.7.0.8
	RELENG_4_11_BP:1.2.2.7
	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.2.2.7
	RELENG_4_10:1.2.2.7.0.6
	RELENG_4_10_BP:1.2.2.7
	RELENG_5_2_1_RELEASE:1.22
	RELENG_5_2_0_RELEASE:1.22
	RELENG_5_2:1.22.0.4
	RELENG_5_2_BP:1.22
	RELENG_4_9_0_RELEASE:1.2.2.7
	RELENG_4_9:1.2.2.7.0.4
	RELENG_4_9_BP:1.2.2.7
	RELENG_5_1_0_RELEASE:1.22
	RELENG_5_1:1.22.0.2
	RELENG_5_1_BP:1.22
	RELENG_4_8_0_RELEASE:1.2.2.7
	RELENG_4_8:1.2.2.7.0.2
	RELENG_4_8_BP:1.2.2.7
	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.2.2.6
	RELENG_4_7:1.2.2.6.0.2
	RELENG_4_7_BP:1.2.2.6
	RELENG_4_6_2_RELEASE:1.2.2.4.4.1
	RELENG_4_6_1_RELEASE:1.2.2.4.4.1
	RELENG_4_6_0_RELEASE:1.2.2.4
	RELENG_4_6:1.2.2.4.0.4
	RELENG_4_6_BP:1.2.2.4
	RELENG_4_5_0_RELEASE:1.2.2.4
	RELENG_4_5:1.2.2.4.0.2
	RELENG_4_5_BP:1.2.2.4
	RELENG_4_4_0_RELEASE:1.2.2.3
	RELENG_4_4:1.2.2.3.0.4
	RELENG_4_4_BP:1.2.2.3
	RELENG_4_3_0_RELEASE:1.2.2.3
	RELENG_4_3:1.2.2.3.0.2
	RELENG_4_3_BP:1.2.2.3
	RELENG_4_2_0_RELEASE:1.2.2.2
	RELENG_4_1_1_RELEASE:1.2.2.1
	PRE_SMPNG:1.5
	RELENG_4_1_0_RELEASE:1.2.2.1
	RELENG_4_0_0_RELEASE:1.2
	RELENG_4:1.2.0.2
	RELENG_4_BP:1.2;
locks; strict;
comment	@# @;


1.55
date	2013.03.23.02.26.26;	author svnexp;	state Exp;
branches
	1.55.2.1;
next	1.54;

1.54
date	2013.01.18.00.27.37;	author svnexp;	state Exp;
branches;
next	1.53;

1.53
date	2012.11.17.01.50.27;	author svnexp;	state Exp;
branches;
next	1.52;

1.52
date	2012.09.03.16.51.41;	author des;	state Exp;
branches;
next	1.51;

1.51
date	2011.05.04.07.34.44;	author des;	state Exp;
branches
	1.51.2.1;
next	1.50;

1.50
date	2010.03.09.19.16.43;	author des;	state Exp;
branches;
next	1.49;

1.49
date	2009.11.10.09.45.43;	author des;	state Exp;
branches;
next	1.48;

1.48
date	2009.07.19.17.25.24;	author kensmith;	state Exp;
branches
	1.48.2.1;
next	1.47;

1.47
date	2009.06.16.15.30.10;	author jhb;	state Exp;
branches;
next	1.46;

1.46
date	2009.05.22.18.46.28;	author des;	state Exp;
branches;
next	1.45;

1.45
date	2008.08.01.02.48.36;	author des;	state Exp;
branches;
next	1.44;

1.44
date	2008.05.07.13.53.11;	author dfr;	state Exp;
branches;
next	1.43;

1.43
date	2007.06.18.18.47.54;	author rafan;	state Exp;
branches
	1.43.2.1;
next	1.42;

1.42
date	2006.09.30.13.41.26;	author des;	state Exp;
branches;
next	1.41;

1.41
date	2006.05.13.21.38.15;	author des;	state Exp;
branches;
next	1.40;

1.40
date	2006.05.13.13.47.43;	author des;	state Exp;
branches;
next	1.39;

1.39
date	2006.03.22.20.42.05;	author des;	state Exp;
branches;
next	1.38;

1.38
date	2006.03.17.18.54.31;	author ru;	state Exp;
branches;
next	1.37;

1.37
date	2005.12.29.14.40.21;	author dfr;	state Exp;
branches;
next	1.36;

1.36
date	2005.09.03.07.10.33;	author des;	state Exp;
branches;
next	1.35;

1.35
date	2005.07.22.17.19.05;	author kensmith;	state Exp;
branches;
next	1.34;

1.34
date	2005.06.07.09.31.26;	author des;	state Exp;
branches
	1.34.2.1;
next	1.33;

1.33
date	2005.06.06.16.13.05;	author des;	state Exp;
branches;
next	1.32;

1.32
date	2005.06.05.15.47.06;	author des;	state Exp;
branches;
next	1.31;

1.31
date	2004.12.21.09.33.45;	author ru;	state Exp;
branches;
next	1.30;

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

1.29
date	2004.10.24.15.32.38;	author ru;	state Exp;
branches;
next	1.28;

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

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

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

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

1.24
date	2004.01.07.11.59.52;	author des;	state Exp;
branches;
next	1.23;

1.23
date	2004.01.07.11.17.22;	author des;	state Exp;
branches;
next	1.22;

1.22
date	2003.05.05.07.58.43;	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.11.06.22.54.58;	author obrien;	state Exp;
branches;
next	1.19;

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

1.18
date	2002.09.25.09.58.00;	author markm;	state Exp;
branches;
next	1.17;

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

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

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

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

1.13
date	2002.02.08.13.42.56;	author ru;	state Exp;
branches;
next	1.12;

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

1.11
date	2001.10.30.19.45.00;	author markm;	state Exp;
branches;
next	1.10;

1.10
date	2001.05.04.04.21.18;	author green;	state Exp;
branches;
next	1.9;

1.9
date	2001.05.03.00.45.03;	author green;	state Exp;
branches;
next	1.8;

1.8
date	2001.03.26.14.53.24;	author ru;	state Exp;
branches;
next	1.7;

1.7
date	2000.12.05.03.01.31;	author green;	state Exp;
branches;
next	1.6;

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

1.5
date	2000.07.16.05.52.54;	author peter;	state Exp;
branches;
next	1.4;

1.4
date	2000.06.03.10.04.31;	author kris;	state Exp;
branches;
next	1.3;

1.3
date	2000.05.15.05.26.50;	author kris;	state Exp;
branches;
next	1.2;

1.2
date	2000.02.24.22.39.24;	author markm;	state Exp;
branches
	1.2.2.1;
next	1.1;

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

1.55.2.1
date	2013.03.23.02.26.26;	author svnexp;	state dead;
branches;
next	1.55.2.2;

1.55.2.2
date	2013.03.28.13.03.38;	author svnexp;	state Exp;
branches;
next	;

1.51.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.51.2.1.2.1
	1.51.2.1.4.1;
next	1.51.2.2;

1.51.2.2
date	2012.11.17.11.36.33;	author svnexp;	state Exp;
branches;
next	1.51.2.3;

1.51.2.3
date	2013.02.28.18.51.26;	author svnexp;	state Exp;
branches;
next	1.51.2.4;

1.51.2.4
date	2013.03.01.01.05.02;	author svnexp;	state Exp;
branches;
next	1.51.2.5;

1.51.2.5
date	2013.05.30.13.02.58;	author svnexp;	state Exp;
branches;
next	1.51.2.6;

1.51.2.6
date	2014.03.20.11.01.50;	author svnexp;	state Exp;
branches;
next	1.51.2.7;

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

1.51.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.51.2.1.2.2;

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

1.51.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.51.2.1.4.2;

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

1.48.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.48.2.1.2.1;
next	1.48.2.2;

1.48.2.2
date	2010.04.21.06.33.10;	author des;	state Exp;
branches
	1.48.2.2.2.1
	1.48.2.2.4.1
	1.48.2.2.6.1;
next	1.48.2.3;

1.48.2.3
date	2012.11.17.10.36.17;	author svnexp;	state Exp;
branches;
next	1.48.2.4;

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

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

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

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

1.48.2.2.6.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.48.2.2.6.2;

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

1.43.2.1
date	2008.09.01.20.03.13;	author des;	state Exp;
branches
	1.43.2.1.2.1
	1.43.2.1.4.1;
next	1.43.2.2;

1.43.2.2
date	2009.07.14.20.46.19;	author jhb;	state Exp;
branches;
next	1.43.2.3;

1.43.2.3
date	2009.07.21.13.45.40;	author jhb;	state Exp;
branches
	1.43.2.3.2.1
	1.43.2.3.4.1;
next	1.43.2.4;

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

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

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

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

1.43.2.3.4.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.43.2.3.4.2;

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

1.34.2.1
date	2005.07.22.17.29.10;	author kensmith;	state Exp;
branches;
next	1.34.2.2;

1.34.2.2
date	2005.09.11.16.50.33;	author des;	state Exp;
branches;
next	1.34.2.3;

1.34.2.3
date	2006.07.08.14.37.17;	author des;	state Exp;
branches;
next	1.34.2.4;

1.34.2.4
date	2006.10.06.14.07.23;	author des;	state Exp;
branches;
next	1.34.2.5;

1.34.2.5
date	2006.10.11.09.31.48;	author des;	state Exp;
branches
	1.34.2.5.6.1;
next	1.34.2.6;

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

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

1.28.2.1
date	2005.02.13.07.23.19;	author obrien;	state Exp;
branches;
next	;

1.2.2.1
date	2000.06.09.07.18.47;	author kris;	state Exp;
branches;
next	1.2.2.2;

1.2.2.2
date	2000.10.28.23.05.14;	author kris;	state Exp;
branches;
next	1.2.2.3;

1.2.2.3
date	2001.01.12.04.26.21;	author green;	state Exp;
branches;
next	1.2.2.4;

1.2.2.4
date	2001.09.28.01.33.51;	author green;	state Exp;
branches
	1.2.2.4.4.1;
next	1.2.2.5;

1.2.2.5
date	2002.07.03.22.13.21;	author des;	state Exp;
branches;
next	1.2.2.6;

1.2.2.6
date	2002.07.03.22.20.19;	author des;	state Exp;
branches;
next	1.2.2.7;

1.2.2.7
date	2003.02.03.17.31.12;	author des;	state Exp;
branches;
next	1.2.2.8;

1.2.2.8
date	2012.11.17.07.24.38;	author svnexp;	state Exp;
branches;
next	;

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


desc
@@


1.55
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248619
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# $FreeBSD: head/secure/lib/libssh/Makefile 248619 2013-03-22 17:55:38Z des $

.include <bsd.own.mk>

LIB=	ssh
SHLIB_MAJOR=	5
SRCS=	authfd.c authfile.c bufaux.c bufbn.c buffer.c \
	canohost.c channels.c cipher.c cipher-aes.c \
	cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \
	compat.c compress.c crc32.c deattack.c fatal.c hostfile.c \
	krl.c log.c match.c md-sha256.c moduli.c nchan.c packet.c \
	readpass.c rsa.c ttymodes.c xmalloc.c addrmatch.c \
	atomicio.c key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \
	monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-rsa.c dh.c \
	kexdh.c kexgex.c kexdhc.c kexgexc.c bufec.c kexecdh.c kexecdhc.c \
	msg.c progressmeter.c dns.c entropy.c umac.c umac128.c jpake.c \
	schnorr.c ssh-pkcs11.c

# gss-genr.c should be in $SRCS but causes linking problems, so it is
# compiled directly into sshd instead.

# Portability layer
SRCS+=	bsd-misc.c fmt_scaled.c getrrsetbyname.c glob.c \
	openssl-compat.c port-tun.c strtonum.c timingsafe_bcmp.c \
	vis.c xcrypt.c xmmap.c

.if defined(COMPAT_GETADDRINFO)
SRCS+=	getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c
.endif

CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
DPADD=	${LIBZ}
LDADD=	-lz

.if ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL
DPADD+=	${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
LDADD+=	-lgssapi -lkrb5 -lhx509 -lasn1 -lcom_err -lmd -lroken
.endif

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

NO_LINT=

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

.include <bsd.lib.mk>

.PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat

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


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


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

.include <bsd.own.mk>

LIB=	ssh
SHLIB_MAJOR=	5
SRCS=	acss.c authfd.c authfile.c bufaux.c bufbn.c buffer.c \
	canohost.c channels.c cipher.c cipher-acss.c cipher-aes.c \
	cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \
	compat.c compress.c crc32.c deattack.c fatal.c hostfile.c \
	log.c match.c md-sha256.c moduli.c nchan.c packet.c \
	readpass.c rsa.c ttymodes.c xmalloc.c addrmatch.c \
	atomicio.c key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \
	monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-rsa.c dh.c \
	kexdh.c kexgex.c kexdhc.c kexgexc.c bufec.c kexecdh.c kexecdhc.c \
	msg.c progressmeter.c dns.c entropy.c umac.c jpake.c \
	schnorr.c ssh-pkcs11.c

# gss-genr.c should be in $SRCS but causes linking problems, so it is
# compiled directly into sshd instead.

# Portability layer
SRCS+=	bsd-misc.c fmt_scaled.c getrrsetbyname.c glob.c \
	openssl-compat.c port-tun.c strtonum.c timingsafe_bcmp.c \
	vis.c xcrypt.c xmmap.c

.if defined(COMPAT_GETADDRINFO)
SRCS+=	getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c
.endif

CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
DPADD=	${LIBZ}
LDADD=	-lz

.if ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL
DPADD+=	${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
LDADD+=	-lgssapi -lkrb5 -lhx509 -lasn1 -lcom_err -lmd -lroken
.endif

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

NO_LINT=

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

.include <bsd.lib.mk>

.PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat

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


1.54
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/245527
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: head/secure/lib/libssh/Makefile 245527 2013-01-17 01:51:04Z bz $
d7 2
a8 2
SRCS=	acss.c authfd.c authfile.c bufaux.c bufbn.c buffer.c \
	canohost.c channels.c cipher.c cipher-acss.c cipher-aes.c \
d11 1
a11 1
	log.c match.c md-sha256.c moduli.c nchan.c packet.c \
d16 1
a16 1
	msg.c progressmeter.c dns.c entropy.c umac.c jpake.c \
@


1.53
log
@Switching exporter and resync
@
text
@d1 1
a1 1
# $FreeBSD: head/secure/lib/libssh/Makefile 240075 2012-09-03 16:51:41Z des $
d41 4
@


1.52
log
@SVN rev 240075 on 2012-09-03 16:51:41Z by des

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


1.51
log
@SVN rev 221420 on 2011-05-04 07:34:44Z by des

Upgrade to OpenSSH 5.8p2.
@
text
@a25 2
# FreeBSD additions
SRCS+=	version.c
@


1.51.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.51.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/lib/libssh/Makefile 221420 2011-05-04 07:34:44Z des $
@


1.51.2.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/247485
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/secure/lib/libssh/Makefile 247485 2013-02-28 18:43:50Z des $
d26 2
@


1.51.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/lib/libssh/Makefile 247515 2013-03-01 01:02:26Z des $
a40 4
.if ${MK_OPENSSH_NONE_CIPHER} != "no"
CFLAGS+= -DNONE_CIPHER_ENABLED
.endif

@


1.51.2.5
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/251135
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/secure/lib/libssh/Makefile 251135 2013-05-30 12:25:58Z des $
d7 2
a8 2
SRCS=	authfd.c authfile.c bufaux.c bufbn.c buffer.c \
	canohost.c channels.c cipher.c cipher-aes.c \
d11 1
a11 1
	krl.c log.c match.c md-sha256.c moduli.c nchan.c packet.c \
d16 1
a16 1
	msg.c progressmeter.c dns.c entropy.c umac.c umac128.c jpake.c \
@


1.51.2.6
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/lib/libssh/Makefile 263421 2014-03-20 10:56:05Z des $
a5 1
PRIVATELIB=	true
@


1.51.2.7
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/263970
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/secure/lib/libssh/Makefile 263970 2014-03-31 14:39:56Z des $
d12 1
a12 1
	log.c match.c md-sha256.c moduli.c nchan.c packet.c \
d17 2
a18 5
	msg.c progressmeter.c dns.c entropy.c umac.c umac128.c \
	ssh-pkcs11.c krl.c smult_curve25519_ref.c \
	kexc25519.c kexc25519c.c poly1305.c chacha.c cipher-chachapoly.c \
	ssh-ed25519.c digest-openssl.c hmac.c \
	sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c blocks.c
d24 3
a26 3
SRCS+=	bcrypt_pbkdf.c blowfish.c bsd-misc.c explicit_bzero.c fmt_scaled.c \
	glob.c openssl-compat.c port-tun.c strtonum.c timingsafe_bcmp.c \
	vis.c xcrypt.c xmmap.c getrrsetbyname.c
d28 3
a30 1
SRCS+=	getrrsetbyname.c
d33 2
d37 1
a37 1
CFLAGS+= -include krb5_config.h
d48 2
a49 2
DPADD+=	${LIBCRYPTO} ${LIBCRYPT} ${LIBZ}
LDADD+=	-lcrypto -lcrypt -lz
a55 3
.if ${MK_KERBEROS_SUPPORT} != "no"
${OBJS} ${POBJS} ${SOBJS}: krb5_config.h
.endif
@


1.51.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.51.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/secure/lib/libssh/Makefile 221420 2011-05-04 07:34:44Z des $
@


1.51.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.51.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/secure/lib/libssh/Makefile 221420 2011-05-04 07:34:44Z des $
@


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

Upgrade to OpenSSH 5.4p1.

MFC after:	1 month
@
text
@d14 4
a17 4
	monitor_fdpass.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c \
	kexgex.c kexdhc.c kexgexc.c msg.c progressmeter.c dns.c \
	entropy.c umac.c jpake.c schnorr.c \
	ssh-pkcs11.c
d24 2
a25 1
	openssl-compat.c port-tun.c strtonum.c vis.c xcrypt.c xmmap.c
@


1.49
log
@SVN rev 199131 on 2009-11-10 09:45:43Z by des

Fix globbing

Noticed by:	delphij, David Cornejo <dave@@dogwood.com>
Forgotten by:	des
@
text
@d15 3
a17 2
	kexgex.c kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \
	entropy.c scard-opensc.c umac.c jpake.c schnorr.c
@


1.48
log
@SVN rev 195767 on 2009-07-19 17:25:24Z by kensmith

Bump the version of all non-symbol-versioned shared libraries in
preparation for 8.0-RELEASE.  Add the previous version of those
libraries to ObsoleteFiles.inc and bump __FreeBSD_Version.

Reviewed by:    kib
Approved by:    re (rwatson)
@
text
@d22 1
a22 1
SRCS+=	bsd-misc.c fmt_scaled.c getrrsetbyname.c \
@


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

MFH OpenSSH 5.4p1
@
text
@d15 2
a16 3
	kexgex.c kexdhc.c kexgexc.c msg.c progressmeter.c dns.c \
	entropy.c umac.c jpake.c schnorr.c \
	ssh-pkcs11.c
d22 1
a22 1
SRCS+=	bsd-misc.c fmt_scaled.c getrrsetbyname.c glob.c \
@


1.48.2.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/lib/libssh/Makefile 206984 2010-04-21 06:33:10Z des $
@


1.48.2.4
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/lib/libssh/Makefile 247521 2013-03-01 02:06:04Z des $
d14 4
a17 4
	monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-rsa.c dh.c \
	kexdh.c kexgex.c kexdhc.c kexgexc.c bufec.c kexecdh.c kexecdhc.c \
	msg.c progressmeter.c dns.c entropy.c umac.c jpake.c \
	schnorr.c ssh-pkcs11.c
d24 3
a26 2
	openssl-compat.c port-tun.c strtonum.c timingsafe_bcmp.c \
	vis.c xcrypt.c xmmap.c
a41 4
.if ${MK_OPENSSH_NONE_CIPHER} != "no"
CFLAGS+= -DNONE_CIPHER_ENABLED
.endif

@


1.48.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.48.2.2.6.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/secure/lib/libssh/Makefile 206984 2010-04-21 06:33:10Z des $
@


1.48.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.48.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.48.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.47
log
@SVN rev 194297 on 2009-06-16 15:30:10Z by jhb

Use the closefrom(2) system call.

Reviewed by:	des
@
text
@d6 1
a6 1
SHLIB_MAJOR=	4
@


1.46
log
@SVN rev 192595 on 2009-05-22 18:46:28Z by des

Upgrade to OpenSSH 5.2p1.

MFC after:	3 months
@
text
@d22 1
a22 1
SRCS+=	bsd-closefrom.c bsd-misc.c fmt_scaled.c getrrsetbyname.c \
@


1.45
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
@d16 1
a16 1
	entropy.c scard-opensc.c umac.c
@


1.44
log
@Fix conflicts after heimdal-1.1 import and add build infrastructure. Import
all non-style changes made by heimdal to our own libgssapi.
@
text
@d12 1
a12 1
	readpass.c rsa.c ttymodes.c xmalloc.c \
d16 1
a16 1
	entropy.c scard-opensc.c
d22 2
a23 2
SRCS+=	bsd-closefrom.c bsd-misc.c getrrsetbyname.c \
	port-tun.c strtonum.c vis.c xcrypt.c xmmap.c
@


1.43
log
@- Bump share library version which were missed in last bump

Reported by: 	     jhb
Discussed with:	     deischen, des, doubg, harti
Approved by:	     re (kensmith)
@
text
@d37 2
a38 2
DPADD+=	${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
LDADD+=	-lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
@


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

MFH OpenSSH 5.1p1
@
text
@d12 1
a12 1
	readpass.c rsa.c ttymodes.c xmalloc.c addrmatch.c \
d16 1
a16 1
	entropy.c scard-opensc.c umac.c
d22 2
a23 3
SRCS+=	bsd-arc4random.c bsd-closefrom.c bsd-misc.c fmt_scaled.c \
	getrrsetbyname.c openssl-compat.c port-tun.c strtonum.c \
	vis.c xcrypt.c xmmap.c
@


1.43.2.2
log
@SVN rev 195696 on 2009-07-14 20:46:19Z by jhb

MFC: Use the closefrom(2) system call.
@
text
@d22 1
a22 1
SRCS+=	bsd-arc4random.c bsd-misc.c fmt_scaled.c \
@


1.43.2.3
log
@SVN rev 195802 on 2009-07-21 13:45:40Z by jhb

Revert to using the userland closefrom() stub instead of the system call
to give a longer grace time where newer ssh binaries work with older
kernels.

Requested by:	obrien
Approved by:	des
@
text
@d22 1
a22 1
SRCS+=	bsd-arc4random.c bsd-closefrom.c bsd-misc.c fmt_scaled.c \
@


1.43.2.4
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/secure/lib/libssh/Makefile 195802 2009-07-21 13:45:40Z jhb $
@


1.43.2.3.4.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.43.2.3.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/secure/lib/libssh/Makefile 195802 2009-07-21 13:45:40Z jhb $
@


1.43.2.3.2.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.43.2.1.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.43.2.1.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.42
log
@Update for OpenSSH 4.4p1.

MFC after:	1 week
@
text
@d6 1
a6 1
SHLIB_MAJOR=	3
@


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

Discussed with:	ru
@
text
@d7 1
a7 1
SRCS=	acss.c authfd.c authfile.c bufaux.c buffer.c \
d11 1
a11 1
	log.c match.c moduli.c nchan.c packet.c \
@


1.40
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
@d49 2
@


1.39
log
@Add port-tun.c.
@
text
@d31 1
a31 1
CFLAGS+= -I${SSHDIR}
@


1.38
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
@d23 1
a23 1
	strtonum.c vis.c xcrypt.c xmmap.c
@


1.37
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
@d3 2
d35 1
a35 1
.if !defined(NO_KERBEROS)
@


1.36
log
@Update for OpenSSH 4.2p1.
@
text
@d34 1
a34 1
CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL
@


1.35
log
@Bump the shared library version number of all libraries that have not
been bumped since RELENG_5.

Reviewed by:	ru
Approved by:	re (not needed for commit check but in principle...)
@
text
@d9 2
a10 2
	log.c match.c moduli.c mpaux.c nchan.c packet.c \
	readpass.c rsa.c tildexpand.c ttymodes.c xmalloc.c \
d20 2
a21 1
SRCS+=	bsd-closefrom.c bsd-misc.c getrrsetbyname.c vis.c xcrypt.c xmmap.c
@


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

Requested by:	ru
@
text
@d4 1
a4 1
SHLIB_MAJOR=	2
@


1.34.2.1
log
@Insta-MFC of the shared library version bump.  All shared libraries
whose version has not already been bumped since RELENG_5 are being
bumped.

Revisions of files being MFC-ed:

> Path						Revision
> src/gnu/lib/libdialog/Makefile		1.43
> src/gnu/lib/libg2c/Makefile			1.16
> src/gnu/lib/libobjc/Makefile			1.27
> src/gnu/lib/libreadline/Makefile.inc		1.12
> src/gnu/lib/libregex/Makefile			1.32
> src/gnu/lib/libstdc++/Makefile		1.56
> src/kerberos5/lib/Makefile.inc		1.7
> src/lib/Makefile.inc				1.3
> src/lib/libalias/Makefile			1.31
> src/lib/libarchive/Makefile			1.37
> src/lib/libbegemot/Makefile			1.3
> src/lib/libbluetooth/Makefile			1.2
> src/lib/libbsnmp/Makefile.inc			1.6
> src/lib/libbz2/Makefile			1.6
> src/lib/libc_r/Makefile			1.42
> src/lib/libcrypt/Makefile			1.36
> src/lib/libdevstat/Makefile			1.15
> src/lib/libdevstat/devstat.h			1.11
> src/lib/libedit/Makefile			1.29
> src/lib/libexpat/Makefile			1.5
> src/lib/libfetch/Makefile			1.45
> src/lib/libftpio/Makefile			1.14
> src/lib/libgpib/Makefile			1.2
> src/lib/libipsec/Makefile			1.17
> src/lib/libkiconv/Makefile			1.3
> src/lib/libmagic/Makefile			1.7
> src/lib/libmp/Makefile			1.10
> src/lib/libncp/Makefile			1.6
> src/lib/libncurses/Makefile			1.79
> src/lib/libnetgraph/Makefile			1.11
> src/lib/libngatm/Makefile			1.6
> src/lib/libopie/Makefile			1.21
> src/lib/libpam/Makefile.inc			1.17
> src/lib/libpthread/Makefile			1.54
> src/lib/libradius/Makefile			1.12
> src/lib/libsdp/Makefile			1.4
> src/lib/libsmb/Makefile			1.8
> src/lib/libtacplus/Makefile			1.7
> src/lib/libthr/Makefile			1.14
> src/lib/libthread_db/Makefile			1.6
> src/lib/libugidfw/Makefile			1.7
> src/lib/libusbhid/Makefile			1.10
> src/lib/libutil/Makefile			1.57
> src/lib/libvgl/Makefile			1.11
> src/lib/libwrap/Makefile			1.17
> src/lib/libypclnt/Makefile			1.13
> src/lib/msun/Makefile				1.72
> src/secure/lib/libcrypto/Makefile		1.74
> src/secure/lib/libssh/Makefile		1.35
> src/secure/lib/libssl/Makefile		1.22
> src/usr.sbin/bsnmpd/modules/Makefile.inc	1.10

Reviewed by:	ru
Approved by:	re (scottl)
@
text
@d4 1
a4 1
SHLIB_MAJOR=	3
@


1.34.2.2
log
@Upgrade to 4.2p1.

Approved by:	re (kensmith)
@
text
@d9 2
a10 2
	log.c match.c moduli.c nchan.c packet.c \
	readpass.c rsa.c ttymodes.c xmalloc.c \
d20 1
a20 2
SRCS+=	bsd-closefrom.c bsd-misc.c getrrsetbyname.c \
	strtonum.c vis.c xcrypt.c xmmap.c
@


1.34.2.3
log
@MFC: namespace munging hack
@
text
@d29 1
a29 1
CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
a46 2

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


1.34.2.4
log
@MFC: OpenSSH 4.4p1.

Approved by:	re (kensmith)
@
text
@d5 1
a5 1
SRCS=	acss.c authfd.c authfile.c bufaux.c bufbn.c buffer.c \
d9 1
a9 1
	log.c match.c md-sha256.c moduli.c nchan.c packet.c \
d21 1
a21 1
	port-tun.c strtonum.c vis.c xcrypt.c xmmap.c
@


1.34.2.5
log
@Fix NO_KERBEROS and static build.

Submitted by:	ru
Approved by:	re (hrs)
@
text
@d35 2
a36 2
DPADD+=	${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
LDADD+=	-lgssapi -lkrb5 -lasn1 -lcom_err -lroken
d41 2
a42 2
DPADD+=	${LIBCRYPTO} ${LIBCRYPT} ${LIBMD}
LDADD+=	-lcrypto -lcrypt -lmd
@


1.34.2.6
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/secure/lib/libssh/Makefile 163227 2006-10-11 09:31:49Z des $
@


1.34.2.5.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.33
log
@Make libssh an INTERNALLIB like it is in {Net,Open}BSD.
@
text
@a2 1
INTERNALLIB=
d4 1
d14 5
a18 1
	entropy.c scard-opensc.c gss-genr.c
@


1.32
log
@Update for OpenSSH 4.1p1.
@
text
@d3 1
a4 1
SHLIB_MAJOR=	2
d14 1
a14 5
	entropy.c scard-opensc.c

# gss-genr.c should be in $SRCS but causes linking problems, so it is
# compiled directly into sshd instead.

@


1.31
log
@NODOCCOMPRESS -> NO_DOCCOMPRESS
NOINFO -> NO_INFO
NOINFOCOMPRESS -> NO_INFOCOMPRESS
NOLINT -> NO_LINT
NOPIC -> NO_PIC
NOPROFILE -> NO_PROFILE
@
text
@d4 1
d15 4
d33 1
a33 1
CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL
@


1.30
log
@Update for OpenSSH 3.9p1.
@
text
@d33 1
a33 1
NOLINT=
@


1.29
log
@For variables that are only checked with defined(), don't provide
any fake value.
@
text
@d10 3
a12 3
	atomicio.c key.c dispatch.c kex.c mac.c uuencode.c misc.c \
	rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
	kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \
d15 1
a15 1
SRCS+=	bsd-misc.c getrrsetbyname.c vis.c xcrypt.c xmmap.c
@


1.28
log
@Update for 3.8p1, including workaround for a bug in gss-genr.c.
@
text
@d33 1
a33 1
NOLINT=	true
@


1.28.2.1
log
@MFC: For variables that are only checked with defined(), don't provide
     any fake value.
@
text
@d33 1
a33 1
NOLINT=
@


1.27
log
@Cosmetics: rearrange the dependency list to match that of ssh and sshd.

Reviewed by:	des
@
text
@d4 7
a10 6
SRCS=	authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
	cipher.c cipher-aes.c cipher-bf1.c cipher-ctr.c cipher-3des1.c \
	compat.c compress.c crc32.c deattack.c fatal.c \
	hostfile.c log.c match.c moduli.c mpaux.c nchan.c packet.c \
	readpass.c rsa.c tildexpand.c ttymodes.c xmalloc.c atomicio.c \
	key.c dispatch.c kex.c mac.c uuencode.c misc.c \
d13 1
a13 1
	entropy.c scard-opensc.c gss-genr.c
d15 1
a15 1
SRCS+=	bsd-misc.c vis.c xcrypt.c xmmap.c
@


1.26
log
@Use += instead of = with DPADD / LDADD.
@
text
@d23 3
d34 2
a35 2
DPADD+=	${LIBCRYPTO} ${LIBCRYPT} ${LIBZ}
LDADD+=	-lcrypto -lcrypt -lz
@


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

Submitted by:	[1] Bjrn Grnvall <bg@@sics.se>
@
text
@d31 2
a32 2
DPADD=	${LIBCRYPTO} ${LIBCRYPT} ${LIBZ}
LDADD=	-lcrypto -lcrypt -lz
@


1.24
log
@Previous commit erroneously listed some sources with .o suffixes.
@
text
@d24 3
a26 1
CFLAGS+= -DKRB5 -DHEIMDAL
@


1.23
log
@Update Makefiles for OpenSSH 3.7.1p2.
@
text
@d5 1
a5 1
	cipher.c cipher-aes.o cipher-bf1.o cipher-ctr.o cipher-3des1.o \
@


1.22
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
@d5 4
a8 3
	cipher.c compat.c compress.c crc32.c deattack.c fatal.c \
	hostfile.c log.c match.c mpaux.c nchan.c packet.c readpass.c \
	rsa.c tildexpand.c ttymodes.c xmalloc.c atomicio.c \
d11 2
a12 2
	kexdhc.c kexgexc.c scard.c msg.c progressmeter.c \
	entropy.c
d14 1
a14 1
SRCS+=	bsd-misc.c vis.c xmmap.c
d29 2
a30 2
DPADD=	${LIBCRYPTO} ${LIBZ}
LDADD=	-lcrypto -lz
@


1.21
log
@Update for 3.6.1p1; also remove Kerberos IV shims.
@
text
@d22 1
a22 1
.if defined(MAKE_KERBEROS5)
@


1.20
log
@Style sync with rest of FreeBSD.
@
text
@d10 2
a11 1
	scard.c monitor_wrap.c monitor_fdpass.c msg.c xmmap.c
d13 1
a13 1
SRCS+=	bsd-misc.c entropy.c
a21 3
.if defined(MAKE_KERBEROS4)
CFLAGS+= -DKRB4
.endif
@


1.19
log
@Update for OpenSSH 3.5p1.
@
text
@a1 1
#
a14 1
CFLAGS+=-I${SSHDIR}
d16 3
a18 1
NOLINT=	true
d20 1
a23 1

d28 1
a28 3
.if defined(COMPAT_GETADDRINFO)
SRCS+=	getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c
.endif
d35 1
a35 1
.PATH:	${SSHDIR} ${SSHDIR}/openbsd-compat
@


1.18
log
@Don't lint contrib'ed sources, even if the builder has asked for linting.
Its Just Too Noisy.
@
text
@d11 1
a11 1
	scard.c monitor_wrap.c monitor_fdpass.c msg.c
d19 8
@


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

Sponsored by:	DARPA, NAI Labs
@
text
@d18 2
@


1.16
log
@Update Makefiles for OpenSSH 3.3.
@
text
@d11 6
a16 2
	scard.c monitor_wrap.c monitor_fdpass.c msg.c \
	uidswap.c version.c
d27 1
a27 1
.PATH:	${SSHDIR} ${SSHDIR}/lib
@


1.15
log
@The library itself does not depend on Kerberos bits.
Otherwise, we would have broken krb4 and krb5 dists.
@
text
@d5 1
a5 1
SRCS=   authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
d8 1
a8 1
	rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c atomicio.c \
d11 2
a12 1
	version.c
@


1.14
log
@Adjust for OpenSSH 3.1.

Sponsored by:	DARPA, NAI Labs
@
text
@a16 10
.if defined(MAKE_KERBEROS4) && \
	((${MAKE_KERBEROS4} == "yes") || (${MAKE_KERBEROS4} == "YES"))
CFLAGS+= -DKRB4
.endif # MAKE_KERBEROS4

.if defined(MAKE_KERBEROS5) && \
	((${MAKE_KERBEROS5} == "yes") || (${MAKE_KERBEROS5} == "YES"))
CFLAGS+= -DKRB5
.endif # MAKE_KERBEROS5

@


1.13
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
@d6 1
a6 1
	cipher.c compat.c compress.c crc32.c deattack.c \
d10 1
a10 1
	cli.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
@


1.12
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
@d27 3
@


1.11
log
@Install libssh and libssh_pic. These are needed when building
statically, and when building things (like login(8)) standalone.
libssh_pic is needed for libpam and modules.

Requested by:	peter
@
text
@a12 2
INSTALL_PIC_ARCHIVE=	yes

@


1.10
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/lib/libssh/Makefile,v 1.9 2001/05/03 00:45:03 green Exp $
d13 1
a13 4

NOPIC=		yes
INTERNALLIB=	yes
INTERNALSTATICLIB=	yes
@


1.9
log
@Add the new version.c to libssh.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/libssh/Makefile,v 1.8 2001/03/26 14:53:24 ru Exp $
d9 4
a12 2
	key.c dispatch.c dsa.c kex.c hmac.c uuencode.c util.c \
	cli.c rijndael.c version.c
a30 5

CFLAGS+= -DSKEY
DPADD+=	${LIBOPIE}
LDADD+= -lopie
SRCS+=	auth-skey.c auth2-skey.c
@


1.8
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/lib/libssh/Makefile,v 1.7 2000/12/05 03:01:31 green Exp $
d10 1
a10 1
	cli.c rijndael.c
@


1.7
log
@Update for OpenSSH 2.3.0.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/libssh/Makefile,v 1.6 2000/09/10 09:43:29 kris Exp $
a3 2
SSHSRC=	${.CURDIR}/../../../crypto/openssh

d12 3
a14 3
NOPIC=	yes

install:
a19 5
.include <bsd.own.mk>

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

d34 1
d36 2
@


1.6
log
@Update for OpenSSH 2.2.0
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/libssh/Makefile,v 1.5 2000/07/16 05:52:54 peter Exp $
d11 2
a12 1
	key.c dispatch.c dsa.c kex.c hmac.c uuencode.c util.c
d40 1
a40 1
SRCS+=	auth-skey.c
@


1.5
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/lib/libssh/Makefile,v 1.4 2000/06/03 10:04:31 kris Exp $
d7 2
a8 2
SRCS=   authfd.c authfile.c aux.c bufaux.c buffer.c canohost.c channels.c \
	cipher.c compat.c compress.c crc32.c deattack.c fingerprint.c \
d11 1
a11 1
	key.c dispatch.c dsa.c kex.c hmac.c uuencode.c
@


1.4
log
@Add a new file to SRCS
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/libssh/Makefile,v 1.3 2000/05/15 05:26:50 kris Exp $
@


1.3
log
@Update for OpenSSH 2.1
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/libssh/Makefile,v 1.2 2000/02/24 22:39:24 markm Exp $
d7 1
a7 1
SRCS=   authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
@


1.2
log
@Remove port components not needed in 4.n+

Submitted by:	Half the freaking planet....
@
text
@d1 1
a1 1
# $FreeBSD$
d10 2
a11 1
	rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c atomicio.c
d36 4
@


1.2.2.1
log
@MFC: OpenSSH 2.1.0 snapshot
@
text
@d7 1
a7 1
SRCS=   authfd.c authfile.c aux.c bufaux.c buffer.c canohost.c channels.c \
d10 1
a10 2
	rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c atomicio.c \
	key.c dispatch.c dsa.c kex.c hmac.c uuencode.c
a34 4
CFLAGS+= -DSKEY
DPADD+=	${LIBOPIE}
LDADD+= -lopie
SRCS+=	auth-skey.c
@


1.2.2.2
log
@MFC: OpenSSH 2.2.0
@
text
@d7 2
a8 2
SRCS=   authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
	cipher.c compat.c compress.c crc32.c deattack.c \
d11 1
a11 1
	key.c dispatch.c dsa.c kex.c hmac.c uuencode.c util.c
@


1.2.2.3
log
@MFC: OpenSSH 2.3.0

Reviewed by:	freefall
@
text
@d11 1
a11 2
	key.c dispatch.c dsa.c kex.c hmac.c uuencode.c util.c \
	cli.c rijndael.c
d39 1
a39 1
SRCS+=	auth-skey.c auth2-skey.c
@


1.2.2.4
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
d11 2
a12 3
	key.c dispatch.c kex.c mac.c uuencode.c misc.c \
	cli.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
	version.c
d14 1
d16 1
a16 3
NOPIC=		yes
INTERNALLIB=	yes
INTERNALSTATICLIB=	yes
d22 5
d37 4
a41 2

.PATH:	${SSHDIR} ${SSHDIR}/lib
@


1.2.2.4.4.1
log
@Merge OpenSSH, OPIE, PAM and a number of dependencies from -STABLE.
@
text
@d5 2
a6 2
SRCS=	authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
	cipher.c compat.c compress.c crc32.c deattack.c fatal.c \
d8 1
a8 1
	rsa.c tildexpand.c ttymodes.c xmalloc.c atomicio.c \
d10 7
a16 7
	rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
	scard.c monitor_wrap.c monitor_fdpass.c msg.c
# Portability layer
SRCS+=	bsd-misc.c entropy.c
# FreeBSD additions
SRCS+=	version.c
CFLAGS+=-I${SSHDIR}
d22 9
a30 2
DPADD=	${LIBCRYPTO} ${LIBZ}
LDADD=	-lcrypto -lz
d34 1
a34 1
.PATH:	${SSHDIR} ${SSHDIR}/openbsd-compat
@


1.2.2.5
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
@d5 2
a6 2
SRCS=	authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
	cipher.c compat.c compress.c crc32.c deattack.c fatal.c \
d8 1
a8 1
	rsa.c tildexpand.c ttymodes.c xmalloc.c atomicio.c \
d10 7
a16 7
	rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
	scard.c monitor_wrap.c monitor_fdpass.c msg.c
# Portability layer
SRCS+=	bsd-misc.c entropy.c
# FreeBSD additions
SRCS+=	version.c
CFLAGS+=-I${SSHDIR}
d22 9
a30 2
DPADD=	${LIBCRYPTO} ${LIBZ}
LDADD+=	-lcrypto -lz
d34 1
a34 1
.PATH:	${SSHDIR} ${SSHDIR}/openbsd-compat
@


1.2.2.6
log
@More diff reduction.
@
text
@d23 1
a23 1
LDADD=	-lcrypto -lz
@


1.2.2.7
log
@MFC: OpenSSH 3.5p1, with all FreeBSD patches.
@
text
@d2 1
d11 1
a11 1
	scard.c monitor_wrap.c monitor_fdpass.c msg.c xmmap.c
d16 1
a21 10
CFLAGS+= -I${SSHDIR}
.if defined(MAKE_KERBEROS4)
CFLAGS+= -DKRB4
.endif
.if defined(MAKE_KERBEROS5)
CFLAGS+= -DKRB5 -DHEIMDAL
.endif

NOLINT=	true

d27 1
a27 1
.PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat
@


1.2.2.8
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/secure/lib/libssh/Makefile 110292 2003-02-03 17:31:12Z des $
@


1.1
log
@Add the OpenSSH userland-building Makefiles.
@
text
@d10 1
a10 2
	rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c atomicio.c \
	strlcat.c strlcpy.c
@

