head	1.20;
access;
symbols
	RELENG_8_4:1.20.0.2
	RELENG_9_1_0_RELEASE:1.19.2.1.4.2
	RELENG_9_1:1.19.2.1.0.4
	RELENG_9_1_BP:1.19.2.1
	RELENG_8_3_0_RELEASE:1.16.10.2.6.1
	RELENG_8_3:1.16.10.2.0.6
	RELENG_8_3_BP:1.16.10.2
	RELENG_9_0_0_RELEASE:1.19.2.1.2.1
	RELENG_9_0:1.19.2.1.0.2
	RELENG_9_0_BP:1.19.2.1
	RELENG_9:1.19.0.2
	RELENG_9_BP:1.19
	RELENG_7_4_0_RELEASE:1.16.14.1
	RELENG_8_2_0_RELEASE:1.16.10.2.4.1
	RELENG_7_4:1.16.0.14
	RELENG_7_4_BP:1.16
	RELENG_8_2:1.16.10.2.0.4
	RELENG_8_2_BP:1.16.10.2
	RELENG_8_1_0_RELEASE:1.16.10.2.2.1
	RELENG_8_1:1.16.10.2.0.2
	RELENG_8_1_BP:1.16.10.2
	RELENG_7_3_0_RELEASE:1.16.12.1
	RELENG_7_3:1.16.0.12
	RELENG_7_3_BP:1.16
	RELENG_8_0_0_RELEASE:1.16.10.1.2.1
	RELENG_8_0:1.16.10.1.0.2
	RELENG_8_0_BP:1.16.10.1
	RELENG_8:1.16.0.10
	RELENG_8_BP:1.16
	RELENG_7_2_0_RELEASE:1.16.8.1
	RELENG_7_2:1.16.0.8
	RELENG_7_2_BP:1.16
	RELENG_7_1_0_RELEASE:1.16.6.1
	RELENG_6_4_0_RELEASE:1.15.22.1
	RELENG_7_1:1.16.0.6
	RELENG_7_1_BP:1.16
	RELENG_6_4:1.15.0.22
	RELENG_6_4_BP:1.15
	RELENG_7_0_0_RELEASE:1.16
	RELENG_6_3_0_RELEASE:1.15
	RELENG_7_0:1.16.0.4
	RELENG_7_0_BP:1.16
	RELENG_6_3:1.15.0.20
	RELENG_6_3_BP:1.15
	RELENG_7:1.16.0.2
	RELENG_7_BP:1.16
	RELENG_6_2_0_RELEASE:1.15
	RELENG_6_2:1.15.0.18
	RELENG_6_2_BP:1.15
	RELENG_5_5_0_RELEASE:1.15
	RELENG_5_5:1.15.0.16
	RELENG_5_5_BP:1.15
	RELENG_6_1_0_RELEASE:1.15
	RELENG_6_1:1.15.0.14
	RELENG_6_1_BP:1.15
	RELENG_6_0_0_RELEASE:1.15
	RELENG_6_0:1.15.0.12
	RELENG_6_0_BP:1.15
	RELENG_6:1.15.0.10
	RELENG_6_BP:1.15
	RELENG_5_4_0_RELEASE:1.15
	RELENG_5_4:1.15.0.8
	RELENG_5_4_BP:1.15
	RELENG_4_11_0_RELEASE:1.4.2.6
	RELENG_4_11:1.4.2.6.0.10
	RELENG_4_11_BP:1.4.2.6
	RELENG_5_3_0_RELEASE:1.15
	RELENG_5_3:1.15.0.6
	RELENG_5_3_BP:1.15
	RELENG_5:1.15.0.4
	RELENG_5_BP:1.15
	RELENG_4_10_0_RELEASE:1.4.2.6
	RELENG_4_10:1.4.2.6.0.8
	RELENG_4_10_BP:1.4.2.6
	RELENG_5_2_1_RELEASE:1.15
	RELENG_5_2_0_RELEASE:1.15
	RELENG_5_2:1.15.0.2
	RELENG_5_2_BP:1.15
	RELENG_4_9_0_RELEASE:1.4.2.6
	RELENG_4_9:1.4.2.6.0.6
	RELENG_4_9_BP:1.4.2.6
	RELENG_5_1_0_RELEASE:1.14
	RELENG_5_1:1.14.0.2
	RELENG_5_1_BP:1.14
	RELENG_4_8_0_RELEASE:1.4.2.6
	RELENG_4_8:1.4.2.6.0.4
	RELENG_4_8_BP:1.4.2.6
	RELENG_5_0_0_RELEASE:1.10
	RELENG_5_0:1.10.0.2
	RELENG_5_0_BP:1.10
	RELENG_4_7_0_RELEASE:1.4.2.6
	RELENG_4_7:1.4.2.6.0.2
	RELENG_4_7_BP:1.4.2.6
	RELENG_4_6_2_RELEASE:1.4.2.4.8.1
	RELENG_4_6_1_RELEASE:1.4.2.4.8.1
	RELENG_4_6_0_RELEASE:1.4.2.4
	RELENG_4_6:1.4.2.4.0.8
	RELENG_4_6_BP:1.4.2.4
	RELENG_4_5_0_RELEASE:1.4.2.4
	RELENG_4_5:1.4.2.4.0.6
	RELENG_4_5_BP:1.4.2.4
	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.4
	RELENG_4_1_1_RELEASE:1.4.2.3
	PRE_SMPNG:1.6
	RELENG_4_1_0_RELEASE:1.4.2.3
	RELENG_4_0_0_RELEASE:1.4
	RELENG_4:1.4.0.2
	RELENG_4_BP:1.4
	RELENG_2_1_6_1_RELEASE:1.1.2.1
	RELENG_2_1_6_RELEASE:1.1.2.1
	RELENG_2_1_5_RELEASE:1.1.2.1
	RELENG_2_1_0_RELEASE:1.1
	RELENG_2_1_0:1.1.0.2;
locks; strict;
comment	@# @;


1.20
date	2012.11.17.01.50.27;	author svnexp;	state Exp;
branches
	1.20.2.1;
next	1.19;

1.19
date	2010.03.10.11.33.15;	author des;	state Exp;
branches
	1.19.2.1;
next	1.18;

1.18
date	2010.03.10.02.17.57;	author dougb;	state Exp;
branches;
next	1.17;

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

1.16
date	2006.03.17.18.54.32;	author ru;	state Exp;
branches
	1.16.2.1
	1.16.6.1
	1.16.8.1
	1.16.10.1
	1.16.12.1
	1.16.14.1;
next	1.15;

1.15
date	2003.07.16.20.59.15;	author markm;	state Exp;
branches
	1.15.10.1
	1.15.22.1;
next	1.14;

1.14
date	2003.05.05.07.58.44;	author markm;	state Exp;
branches;
next	1.13;

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

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

1.11
date	2003.04.23.17.26.01;	author des;	state Exp;
branches;
next	1.10;

1.10
date	2002.07.05.08.39.08;	author des;	state Exp;
branches;
next	1.9;

1.9
date	2001.08.03.16.03.23;	author markm;	state Exp;
branches;
next	1.8;

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

1.7
date	2000.09.15.01.04.32;	author ache;	state Exp;
branches;
next	1.6;

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

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

1.4
date	99.10.12.19.48.04;	author markm;	state Exp;
branches
	1.4.2.1;
next	1.3;

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

1.2
date	95.12.30.18.52.39;	author peter;	state dead;
branches;
next	1.1;

1.1
date	95.07.29.12.49.20;	author markm;	state Exp;
branches
	1.1.2.1;
next	;

1.20.2.1
date	2012.11.17.01.50.27;	author svnexp;	state dead;
branches;
next	1.20.2.2;

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

1.19.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.19.2.1.2.1
	1.19.2.1.4.1;
next	1.19.2.2;

1.19.2.2
date	2012.11.17.11.36.33;	author svnexp;	state Exp;
branches;
next	;

1.19.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.19.2.1.2.2;

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

1.19.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.19.2.1.4.2;

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

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

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

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

1.16.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.16.10.1.2.1;
next	1.16.10.2;

1.16.10.2
date	2010.04.21.06.33.10;	author des;	state Exp;
branches
	1.16.10.2.2.1
	1.16.10.2.4.1
	1.16.10.2.6.1;
next	1.16.10.3;

1.16.10.3
date	2012.11.17.10.36.17;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.16.10.2.6.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.16.10.2.6.2;

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

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

1.16.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.16.14.2;

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

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

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

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

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

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

1.4.2.4
date	2000.10.28.23.05.13;	author kris;	state Exp;
branches
	1.4.2.4.8.1;
next	1.4.2.5;

1.4.2.5
date	2002.07.03.22.13.22;	author des;	state Exp;
branches;
next	1.4.2.6;

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

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

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

1.1.2.1
date	96.06.21.17.29.04;	author markm;	state dead;
branches;
next	;


desc
@@


1.20
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/secure/libexec/Makefile 204949 2010-03-10 11:33:15Z des $

.include <bsd.own.mk>

SUBDIR=
.if ${MK_OPENSSH} != "no"
SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper
.endif

.include <bsd.subdir.mk>
@


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


1.20.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 10
# $FreeBSD: releng/8.4/secure/libexec/Makefile 206984 2010-04-21 06:33:10Z des $

.include <bsd.own.mk>

SUBDIR=
.if ${MK_OPENSSH} != "no"
SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper
.endif

.include <bsd.subdir.mk>
@


1.19
log
@SVN rev 204949 on 2010-03-10 11:33:15Z by des

Revert r204939
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.19.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.19.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/libexec/Makefile 204949 2010-03-10 11:33:15Z des $
@


1.19.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.19.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/secure/libexec/Makefile 204949 2010-03-10 11:33:15Z des $
@


1.19.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.19.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/secure/libexec/Makefile 204949 2010-03-10 11:33:15Z des $
@


1.18
log
@SVN rev 204939 on 2010-03-10 02:17:57Z by dougb

Fix the build. The ssh-pkcs11-helper directory is empty, which is
causing confusion.
@
text
@d7 1
a7 1
SUBDIR+=sftp-server ssh-keysign
@


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

Upgrade to OpenSSH 5.4p1.

MFC after:	1 month
@
text
@d7 1
a7 1
SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper
@


1.16
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
SUBDIR+=sftp-server ssh-keysign
@


1.16.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/secure/libexec/Makefile 156813 2006-03-17 18:54:44Z ru $
@


1.16.14.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.16.14.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/secure/libexec/Makefile 156813 2006-03-17 18:54:44Z ru $
@


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

MFH OpenSSH 5.4p1
@
text
@d7 1
a7 1
SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper
@


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


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


1.16.10.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.16.10.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.16.10.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.16.8.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.16.6.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.15
log
@Very big makeover in the way telnet, telnetd and libtelnet are built.

Previously, there were two copies of telnet; a non-crypto version
that lived in the usual places, and a crypto version that lived in
crypto/telnet/. The latter was built in a broken manner somewhat akin
to other "contribified" sources. This meant that there were 4 telnets
competing with each other at build time - KerberosIV, Kerberos5,
plain-old-secure and base. KerberosIV is no longer in the running, but
the other three took it in turns to jump all over each other during a
"make buildworld".

As the crypto issue has been clarified, and crypto _calls_ are not
a problem, crypto/telnet has been repo-copied to contrib/telnet,
and with this commit, all telnets are now "contribified". The contrib
path was chosen to not destroy history in the repository, and differs
from other contrib/ entries in that it may be worked on as "normal"
BSD code. There is no dangerous crypto in these sources, only a
very weak system less strong than enigma(1).

Kerberos5 telnet and Secure telnet are now selected by using the usual
macros in /etc/make.conf, and the build process is unsurprising and
less treacherous.
@
text
@d3 2
d6 1
a6 2
.if !defined(NO_OPENSSL)
.if !defined(NO_OPENSSH)
a8 1
.endif
@


1.15.10.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/secure/libexec/Makefile 117675 2003-07-16 20:59:15Z markm $
@


1.15.22.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.14
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
@a7 3
.if defined(NO_KERBEROS)
SUBDIR+=telnetd
.endif
@


1.13
log
@Most things depend on !defined(NO_OPENSSL); make it look so.
@
text
@d8 1
a8 1
.if !defined(MAKE_KERBEROS5)
@


1.12
log
@NOSECURE is implied by NOCRYPT, meaning if the latter is defined
we won't be here.
@
text
@d3 7
a9 2
.if !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS5)
SUBDIR= telnetd
a10 2
.if !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
SUBDIR+=sftp-server ssh-keysign
@


1.11
log
@Remove Kerberos IV shims.
@
text
@d3 1
a3 1
.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS5) && !defined(NO_OPENSSL)
@


1.10
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
@d3 1
a3 1
.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5) && !defined(NO_OPENSSL)
@


1.9
log
@Revamp and diff-reduce the various secure telnets. Make sure that
Kerberos5 has _a_ telnet (which is not currently K5 enabled).
Incorporate BDE's static linking fixes.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/libexec/Makefile,v 1.8 2000/09/16 22:43:00 kris Exp $
d7 1
a7 1
SUBDIR+=sftp-server
@


1.8
log
@Only build sftp-server conditionally
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/libexec/Makefile,v 1.7 2000/09/15 01:04:32 ache Exp $
d3 1
a3 1
.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL)
@


1.7
log
@Add sftp-server
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/libexec/Makefile,v 1.6 2000/07/25 01:11:17 kris Exp $
d6 3
a8 1
SUBDIR+= sftp-server
@


1.6
log
@Don't build crypto-enabled telnetd if NO_OPENSSL is defined, since it
attempts to link against libcrypto.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/libexec/Makefile,v 1.5 2000/07/16 05:52:56 peter Exp $
d6 1
@


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/libexec/Makefile,v 1.4 1999/10/12 19:48:04 markm Exp $
d3 1
a3 1
.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4)
@


1.4
log
@Dont build telenet if we are going for kerberised telnet; this just
jumps all over kerberised telnet otherwise.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.4.2.1
log
@Don't build crypto-enabled telnetd if NO_OPENSSL is defined, since it
attempts to link against libcrypto.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/libexec/Makefile,v 1.4 1999/10/12 19:48:04 markm Exp $
d3 1
a3 1
.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL)
@


1.4.2.2
log
@Back out previous unapproved commit, it went to the wrong branch.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/libexec/Makefile,v 1.4.2.1 2000/07/25 01:08:09 kris Exp $
d3 1
a3 1
.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4)
@


1.4.2.3
log
@MFC: Don't build telnetd if NO_OPENSSL defined (now that I have permission :-)

Approved by:	jkh
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/libexec/Makefile,v 1.4.2.2 2000/07/25 01:08:49 kris Exp $
d3 1
a3 1
.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL)
@


1.4.2.4
log
@MFC: OpenSSH 2.2.0
@
text
@d1 1
a1 1
# $FreeBSD$
a4 3
.endif
.if !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
SUBDIR+=sftp-server
@


1.4.2.4.8.1
log
@Merge OpenSSH, OPIE, PAM and a number of dependencies from -STABLE.
@
text
@d3 1
a3 1
.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5) && !defined(NO_OPENSSL)
d7 1
a7 1
SUBDIR+=sftp-server ssh-keysign
@


1.4.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
@d3 1
a3 1
.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5) && !defined(NO_OPENSSL)
@


1.4.2.6
log
@MFC: install ssh-keysign in /usr/libexec, move setuid bit from ssh(1) to
ssh-keysign(8).
@
text
@d7 1
a7 1
SUBDIR+=sftp-server ssh-keysign
@


1.4.2.7
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/secure/libexec/Makefile 99444 2002-07-05 11:11:02Z des $
@


1.3
log
@Make telnet with SRA work.

Submitted by:	Nick Sayer
@
text
@d1 1
a1 1
#	$FreeBSD$
d3 1
d5 1
a7 1

@


1.2
log
@recording cvs-1.6 file death
@
text
@d1 1
a1 2
#	From: @@(#)Makefile	8.1 (Berkeley) 5/31/93
#	$Id: Makefile,v 1.1 1995/07/29 12:49:20 markm Exp peter $
d3 1
a3 1
SUBDIR=	telnetd
d6 1
@


1.1
log
@After pst and ache fixed secure telnet, it was still not in the main
makefiles. This puts it in.

PLEASE NOTE - YOU WILL NEED TO BUILD AND INSTALL THE libtelnet IN secure/
Reviewed by:
Submitted by:
Obtained from:
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.2 1995/07/25 14:03:35 mark Exp $
@


1.1.2.1
log
@Merge with HEAD
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.1 1995/07/29 12:49:20 markm Exp $
@
