head	1.18;
access;
symbols
	perseant-exfatfs-base-20250801:1.18
	perseant-exfatfs-base-20240630:1.18
	perseant-exfatfs:1.18.0.22
	perseant-exfatfs-base:1.18
	cjep_sun2x:1.18.0.20
	cjep_sun2x-base:1.18
	cjep_staticlib_x-base1:1.18
	cjep_staticlib_x:1.18.0.18
	cjep_staticlib_x-base:1.18
	phil-wifi-20200421:1.18
	phil-wifi-20200411:1.18
	phil-wifi-20200406:1.18
	pgoyette-compat-merge-20190127:1.18
	pgoyette-compat-20190127:1.18
	pgoyette-compat-20190118:1.18
	pgoyette-compat-1226:1.18
	pgoyette-compat-1126:1.18
	pgoyette-compat-1020:1.18
	pgoyette-compat-0930:1.18
	pgoyette-compat-0906:1.18
	pgoyette-compat-0728:1.18
	pgoyette-compat-0625:1.18
	pgoyette-compat-0521:1.18
	pgoyette-compat-0502:1.18
	pgoyette-compat-0422:1.18
	pgoyette-compat-0415:1.18
	pgoyette-compat-0407:1.18
	pgoyette-compat-0330:1.18
	pgoyette-compat-0322:1.18
	pgoyette-compat-0315:1.18
	pgoyette-compat:1.18.0.16
	pgoyette-compat-base:1.18
	prg-localcount2-base3:1.18
	prg-localcount2-base2:1.18
	prg-localcount2-base1:1.18
	prg-localcount2:1.18.0.14
	prg-localcount2-base:1.18
	pgoyette-localcount-20170426:1.18
	bouyer-socketcan-base1:1.18
	pgoyette-localcount-20170320:1.18
	bouyer-socketcan:1.18.0.12
	bouyer-socketcan-base:1.18
	pgoyette-localcount-20170107:1.18
	pgoyette-localcount-20161104:1.18
	localcount-20160914:1.18
	pgoyette-localcount-20160806:1.18
	pgoyette-localcount-20160726:1.18
	pgoyette-localcount:1.18.0.10
	pgoyette-localcount-base:1.18
	netbsd-5-2-3-RELEASE:1.16
	netbsd-5-1-5-RELEASE:1.16
	yamt-pagecache-base9:1.18
	yamt-pagecache-tag8:1.18
	tls-earlyentropy:1.18.0.6
	tls-earlyentropy-base:1.18
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.18
	riastradh-drm2-base3:1.18
	netbsd-5-2-2-RELEASE:1.16
	netbsd-5-1-4-RELEASE:1.16
	netbsd-5-2-1-RELEASE:1.16
	netbsd-5-1-3-RELEASE:1.16
	agc-symver:1.18.0.8
	agc-symver-base:1.18
	tls-maxphys-base:1.18
	yamt-pagecache-base8:1.18
	netbsd-5-2:1.16.0.2
	yamt-pagecache-base7:1.18
	netbsd-5-2-RELEASE:1.16
	netbsd-5-2-RC1:1.16
	yamt-pagecache-base6:1.18
	yamt-pagecache-base5:1.18
	yamt-pagecache-base4:1.18
	netbsd-5-1-2-RELEASE:1.16
	netbsd-5-1-1-RELEASE:1.16
	yamt-pagecache-base3:1.18
	yamt-pagecache-base2:1.18
	yamt-pagecache:1.18.0.4
	yamt-pagecache-base:1.18
	bouyer-quota2-nbase:1.18
	bouyer-quota2:1.18.0.2
	bouyer-quota2-base:1.18
	matt-nb5-mips64-premerge-20101231:1.16
	matt-nb5-pq3:1.16.0.14
	matt-nb5-pq3-base:1.16
	netbsd-5-1:1.16.0.12
	netbsd-5-1-RELEASE:1.16
	netbsd-5-1-RC4:1.16
	matt-nb5-mips64-k15:1.16
	netbsd-5-1-RC3:1.16
	netbsd-5-1-RC2:1.16
	netbsd-5-1-RC1:1.16
	netbsd-5-0-2-RELEASE:1.16
	matt-nb5-mips64-premerge-20091211:1.16
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.16
	matt-nb4-mips64-k7-u2a-k9b:1.16
	matt-nb5-mips64-u1-k1-k5:1.16
	matt-nb5-mips64:1.16.0.10
	netbsd-5-0-1-RELEASE:1.16
	jym-xensuspend-nbase:1.17
	netbsd-5-0:1.16.0.8
	netbsd-5-0-RELEASE:1.16
	netbsd-5-0-RC4:1.16
	netbsd-5-0-RC3:1.16
	netbsd-5-0-RC2:1.16
	jym-xensuspend:1.16.0.6
	jym-xensuspend-base:1.17
	netbsd-5-0-RC1:1.16
	netbsd-5:1.16.0.4
	netbsd-5-base:1.16
	matt-mips64-base2:1.16
	matt-mips64:1.10.0.8
	netbsd-4-0-1-RELEASE:1.9
	wrstuden-revivesa-base-3:1.16
	wrstuden-revivesa-base-2:1.16
	wrstuden-fixsa-newbase:1.9
	wrstuden-revivesa-base-1:1.13
	yamt-pf42-base4:1.12
	yamt-pf42-base3:1.12
	hpcarm-cleanup-nbase:1.12
	yamt-pf42-baseX:1.12
	yamt-pf42-base2:1.12
	wrstuden-revivesa:1.12.0.6
	wrstuden-revivesa-base:1.13
	yamt-pf42:1.12.0.4
	yamt-pf42-base:1.12
	keiichi-mipv6:1.12.0.2
	keiichi-mipv6-base:1.12
	matt-armv6-nbase:1.12
	matt-armv6-prevmlocking:1.10
	wrstuden-fixsa-base-1:1.9
	netbsd-4-0:1.9.0.6
	netbsd-4-0-RELEASE:1.9
	cube-autoconf:1.10.0.6
	cube-autoconf-base:1.10
	netbsd-4-0-RC5:1.9
	netbsd-4-0-RC4:1.9
	netbsd-4-0-RC3:1.9
	netbsd-4-0-RC2:1.9
	netbsd-4-0-RC1:1.9
	matt-armv6:1.10.0.4
	matt-armv6-base:1.12
	matt-mips64-base:1.10
	hpcarm-cleanup:1.10.0.2
	hpcarm-cleanup-base:1.12
	netbsd-3-1-1-RELEASE:1.4
	netbsd-3-0-3-RELEASE:1.4
	wrstuden-fixsa:1.9.0.4
	wrstuden-fixsa-base:1.9
	abandoned-netbsd-4-base:1.7
	abandoned-netbsd-4:1.7.0.2
	netbsd-3-1:1.4.0.6
	netbsd-3-1-RELEASE:1.4
	netbsd-3-0-2-RELEASE:1.4
	netbsd-3-1-RC4:1.4
	netbsd-3-1-RC3:1.4
	netbsd-3-1-RC2:1.4
	netbsd-3-1-RC1:1.4
	netbsd-4:1.9.0.2
	netbsd-4-base:1.9
	netbsd-3-0-1-RELEASE:1.4
	netbsd-3-0:1.4.0.4
	netbsd-3-0-RELEASE:1.4
	netbsd-3-0-RC6:1.4
	netbsd-3-0-RC5:1.4
	netbsd-3-0-RC4:1.4
	netbsd-3-0-RC3:1.4
	netbsd-3-0-RC2:1.4
	netbsd-3-0-RC1:1.4
	netbsd-3:1.4.0.2
	netbsd-3-base:1.4;
locks; strict;
comment	@# @;


1.18
date	2009.07.20.17.37.40;	author christos;	state dead;
branches;
next	1.17;

1.17
date	2009.02.16.20.55.45;	author christos;	state Exp;
branches;
next	1.16;

1.16
date	2008.08.29.00.02.22;	author gmcgarry;	state Exp;
branches
	1.16.6.1;
next	1.15;

1.15
date	2008.07.12.12.29.42;	author gmcgarry;	state Exp;
branches;
next	1.14;

1.14
date	2008.06.23.14.52.11;	author christos;	state Exp;
branches;
next	1.13;

1.13
date	2008.06.22.15.43.40;	author christos;	state Exp;
branches;
next	1.12;

1.12
date	2007.12.20.14.14.04;	author martin;	state Exp;
branches
	1.12.6.1;
next	1.11;

1.11
date	2007.12.18.02.34.32;	author christos;	state Exp;
branches;
next	1.10;

1.10
date	2007.05.28.12.06.21;	author tls;	state Exp;
branches
	1.10.4.1;
next	1.9;

1.9
date	2006.11.09.20.45.01;	author christos;	state Exp;
branches;
next	1.8;

1.8
date	2006.09.28.21.24.33;	author christos;	state Exp;
branches;
next	1.7;

1.7
date	2006.05.11.23.16.29;	author mrg;	state Exp;
branches;
next	1.6;

1.6
date	2006.02.04.22.34.16;	author christos;	state Exp;
branches;
next	1.5;

1.5
date	2005.04.23.16.53.47;	author christos;	state Exp;
branches;
next	1.4;

1.4
date	2005.03.09.03.11.21;	author christos;	state Exp;
branches;
next	1.3;

1.3
date	2005.02.13.22.42.24;	author christos;	state Exp;
branches;
next	1.2;

1.2
date	2005.02.13.06.06.48;	author christos;	state Exp;
branches;
next	1.1;

1.1
date	2005.01.03.06.00.12;	author lukem;	state Exp;
branches;
next	;

1.16.6.1
date	2009.05.13.19.18.36;	author jym;	state Exp;
branches;
next	;

1.12.6.1
date	2008.06.23.04.29.54;	author wrstuden;	state Exp;
branches;
next	1.12.6.2;

1.12.6.2
date	2008.09.18.04.39.25;	author wrstuden;	state Exp;
branches;
next	;

1.10.4.1
date	2008.01.09.01.36.55;	author matt;	state Exp;
branches;
next	;


desc
@@


1.18
log
@ssh has moved
@
text
@#	$NetBSD: Makefile,v 1.17 2009/02/16 20:55:45 christos Exp $

.include <bsd.own.mk>

LIB=	ssh
SRCS=	authfd.c authfile.c bufaux.c bufbn.c buffer.c canohost.c channels.c \
	cipher.c cipher-3des1.c cipher-ctr.c cipher-ctr-mt.c cipher-bf1.c \
	cleanup.c compat.c compress.c crc32.c deattack.c dns.c fatal.c \
	hostfile.c log.c match.c md-sha256.c nchan.c packet.c readpass.c \
	rsa.c strtonum.c ttymodes.c xmalloc.c atomicio.c \
	key.c dispatch.c kex.c mac.c uuencode.c misc.c \
	ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
	kexdhc.c kexgexc.c scard.c msg.c progressmeter.c \
	monitor_fdpass.c uidswap.c addrmatch.c
#	umac.c
SRCS+=	random.c
SRCS+=	readpassphrase.c getpeereid.c getrrsetbyname.c
COPTS.monitor_fdpass.c = -Wno-stack-protector

WARNS=	1

SSHDIST=	${NETBSDSRCDIR}/crypto/dist/ssh
CPPFLAGS+=	-I${SSHDIST}
.PATH:		${SSHDIST}


LIBDPLIBS+=	crypto	${.CURDIR}/../libcrypto \
		crypt	${.CURDIR}/../libcrypt \
		z	${.CURDIR}/../libz

.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
.for f in dns channels hostfile
COPTS.${f}.c+=	-Wno-pointer-sign
.endfor
.endif

.include <bsd.lib.mk>
@


1.17
log
@changes for openssh-5.1
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.16 2008/08/29 00:02:22 gmcgarry Exp $
@


1.16
log
@Wrap compiler-specific flags with HAVE_GCC and HAVE_PCC as necessary. Add a few flags for PCC.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.15 2008/07/12 12:29:42 gmcgarry Exp $
d14 1
a14 1
	monitor_fdpass.c uidswap.c
@


1.16.6.1
log
@Sync with HEAD.

Third (and last) commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.17 2009/02/16 20:55:45 christos Exp $
d14 1
a14 1
	monitor_fdpass.c uidswap.c addrmatch.c
@


1.15
log
@Add test for HAVE_PCC with HAVE_GCC which turn off compiler warning flags.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.14 2008/06/23 14:52:11 christos Exp $
d31 1
a31 1
.if ${HAVE_GCC} == 4 || defined(HAVE_PCC)
@


1.14
log
@No need for pthread anymore.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.13 2008/06/22 15:43:40 christos Exp $
d31 1
a31 1
.if ${HAVE_GCC} == 4
@


1.13
log
@bump libssh because of HPN and add pthreads dependency.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.12 2007/12/20 14:14:04 martin Exp $
d29 1
a29 2
		z	${.CURDIR}/../libz \
		pthread	${.CURDIR}/../libpthread
@


1.12
log
@Disable the umac-64 MAC for now, it needs to be rewritten from scractch.
Addresses PR bin/37562.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.11 2007/12/18 02:34:32 christos Exp $
d7 2
a8 2
	cipher.c cipher-3des1.c cipher-ctr.c cipher-bf1.c cleanup.c \
	compat.c compress.c crc32.c deattack.c dns.c fatal.c \
d29 2
a30 1
		z	${.CURDIR}/../libz
@


1.12.6.1
log
@Sync w/ -current. 34 merge conflicts to follow.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.12 2007/12/20 14:14:04 martin Exp $
d7 2
a8 2
	cipher.c cipher-3des1.c cipher-ctr.c cipher-ctr-mt.c cipher-bf1.c \
	cleanup.c compat.c compress.c crc32.c deattack.c dns.c fatal.c \
d29 1
a29 2
		z	${.CURDIR}/../libz \
		pthread	${.CURDIR}/../libpthread
@


1.12.6.2
log
@Sync with wrstuden-revivesa-base-2.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.12.6.1 2008/06/23 04:29:54 wrstuden Exp $
d29 2
a30 1
		z	${.CURDIR}/../libz
d32 1
a32 1
.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
@


1.11
log
@update to 4.7
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.10 2007/05/28 12:06:21 tls Exp $
d14 2
a15 1
	monitor_fdpass.c uidswap.c umac.c
@


1.10
log
@Add new Makefile knob, USE_FORT, which extends USE_SSP by turning on the
FORTIFY_SOURCE feature of libssp, thus checking the size of arguments to
various string and memory copy and set functions (as well as a few system
calls and other miscellany) where known at function entry.  RedHat has
evidently built all "core system packages" with this option for some time.

This option should be used at the top of Makefiles (or Makefile.inc where
this is used for subdirectories) but after any setting of LIB.

This is only useful for userland code, and cannot be used in libc or in
any code which includes the libc internals, because it overrides certain
libc functions with macros.  Some effort has been made to make USE_FORT=yes
work correctly for a full-system build by having the bsd.sys.mk logic
disable the feature where it should not be used (libc, libssp iteself,
the kernel) but no attempt has been made to build the entire system with
USE_FORT and doing so will doubtless expose numerous bugs and misfeatures.

Adjust the system build so that all programs and libraries that are setuid,
directly handle network data (including serial comm data), perform
authentication, or appear likely to have (or have a history of having)
data-driven bugs (e.g. file(1)) are built with USE_FORT=yes by default,
with the exception of libc, which cannot use USE_FORT and thus uses
only USE_SSP by default.  Tested on i386 with no ill results; USE_FORT=no
per-directory or in a system build will disable if desired.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.9 2006/11/09 20:45:01 christos Exp $
d14 1
a14 1
	monitor_fdpass.c uidswap.c
@


1.10.4.1
log
@sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD$
a14 1
#	umac.c
@


1.9
log
@compile alloca using code -Wno-stack-protector
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.8 2006/09/28 21:24:33 christos Exp $
d26 1
a26 1
LIBDPLIBS=	crypto	${.CURDIR}/../libcrypto \
@


1.8
log
@new files and bump for 4.4
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2006/05/11 23:16:29 mrg Exp $
d17 1
@


1.7
log
@sprinkle some -fno-strict-aliasing and -Wno-pointer-sign with GCC4.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.6 2006/02/04 22:34:16 christos Exp $
d6 1
a6 1
SRCS=	authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
d9 1
a9 1
	hostfile.c log.c match.c nchan.c packet.c readpass.c \
@


1.6
log
@Update shared library version and adjust for new and removed files.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2005/04/23 16:53:47 christos Exp $
d29 6
@


1.5
log
@Update for 4.0, bump version.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2005/03/09 03:11:21 christos Exp $
d10 1
a10 1
	rsa.c tildexpand.c ttymodes.c xmalloc.c atomicio.c \
@


1.4
log
@Add -lcrypt where -lcrypto is specified.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2005/02/13 22:42:24 christos Exp $
d12 1
a12 1
	rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
d14 1
a14 1
	monitor_fdpass.c
@


1.3
log
@Remove HAVE_LOGIN_CAP it is not used.
Remove radix.c and kerberos glue; we'll put it in the programs themselves.
from Love.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2005/02/13 06:06:48 christos Exp $
d26 1
@


1.2
log
@Update for OpenSSH-3.9; bump major.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 2005/01/03 06:00:12 lukem Exp $
d21 1
a21 1
CPPFLAGS+=	-I${SSHDIST} -DHAVE_LOGIN_CAP
a27 12
.if (${USE_KERBEROS} != "no")
CPPFLAGS+=	-DKRB5 -I${DESTDIR}/usr/include/krb5
.if (${USE_KERBEROS4} != "no")
SRCS+=		radix.c
CPPFLAGS+=	-DKRB4 -DAFS -I${DESTDIR}/usr/include/kerberosIV
LIBDPLIBS+=	krb	${.CURDIR}/../libkrb \
		des	${.CURDIR}/../libdes
.endif	# ${USE_KERBEROS4} != "no"
LIBDPLIBS+=	com_err	${.CURDIR}/../libcom_err \
		roken	${.CURDIR}/../libroken
.endif	# ${USE_KERBEROS} != "no"

@


1.1
log
@Implement libssh as a public library, as pam_ssh needs it.
@
text
@d1 1
a1 1
#	$NetBSD$
d7 3
a9 2
	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 \
d13 2
a14 1
	kexdhc.c kexgexc.c scard.c msg.c progressmeter.c
d16 1
a16 1
SRCS+=	readpassphrase.c getpeereid.c
@
