head	1.36;
access;
symbols
	RELENG_8_4:1.36.0.2
	RELENG_9_1_0_RELEASE:1.35.2.1.4.2
	RELENG_9_1:1.35.2.1.0.4
	RELENG_9_1_BP:1.35.2.1
	RELENG_8_3_0_RELEASE:1.34.2.1.8.1
	RELENG_8_3:1.34.2.1.0.8
	RELENG_8_3_BP:1.34.2.1
	RELENG_9_0_0_RELEASE:1.35.2.1.2.1
	RELENG_9_0:1.35.2.1.0.2
	RELENG_9_0_BP:1.35.2.1
	RELENG_9:1.35.0.2
	RELENG_9_BP:1.35
	RELENG_7_4_0_RELEASE:1.33.12.1
	RELENG_8_2_0_RELEASE:1.34.2.1.6.1
	RELENG_7_4:1.33.0.12
	RELENG_7_4_BP:1.33
	RELENG_8_2:1.34.2.1.0.6
	RELENG_8_2_BP:1.34.2.1
	RELENG_8_1_0_RELEASE:1.34.2.1.4.1
	RELENG_8_1:1.34.2.1.0.4
	RELENG_8_1_BP:1.34.2.1
	RELENG_7_3_0_RELEASE:1.33.10.1
	RELENG_7_3:1.33.0.10
	RELENG_7_3_BP:1.33
	RELENG_8_0_0_RELEASE:1.34.2.1.2.1
	RELENG_8_0:1.34.2.1.0.2
	RELENG_8_0_BP:1.34.2.1
	RELENG_8:1.34.0.2
	RELENG_8_BP:1.34
	RELENG_7_2_0_RELEASE:1.33.8.1
	RELENG_7_2:1.33.0.8
	RELENG_7_2_BP:1.33
	RELENG_7_1_0_RELEASE:1.33.6.1
	RELENG_6_4_0_RELEASE:1.28.12.1
	RELENG_7_1:1.33.0.6
	RELENG_7_1_BP:1.33
	RELENG_6_4:1.28.0.12
	RELENG_6_4_BP:1.28
	RELENG_7_0_0_RELEASE:1.33
	RELENG_6_3_0_RELEASE:1.28
	RELENG_7_0:1.33.0.4
	RELENG_7_0_BP:1.33
	RELENG_6_3:1.28.0.10
	RELENG_6_3_BP:1.28
	RELENG_7:1.33.0.2
	RELENG_7_BP:1.33
	RELENG_6_2_0_RELEASE:1.28
	RELENG_6_2:1.28.0.8
	RELENG_6_2_BP:1.28
	RELENG_5_5_0_RELEASE:1.26
	RELENG_5_5:1.26.0.8
	RELENG_5_5_BP:1.26
	RELENG_6_1_0_RELEASE:1.28
	RELENG_6_1:1.28.0.6
	RELENG_6_1_BP:1.28
	RELENG_6_0_0_RELEASE:1.28
	RELENG_6_0:1.28.0.4
	RELENG_6_0_BP:1.28
	RELENG_6:1.28.0.2
	RELENG_6_BP:1.28
	RELENG_5_4_0_RELEASE:1.26
	RELENG_5_4:1.26.0.6
	RELENG_5_4_BP:1.26
	RELENG_4_11_0_RELEASE:1.14.2.2
	RELENG_4_11:1.14.2.2.0.12
	RELENG_4_11_BP:1.14.2.2
	RELENG_5_3_0_RELEASE:1.26
	RELENG_5_3:1.26.0.4
	RELENG_5_3_BP:1.26
	RELENG_5:1.26.0.2
	RELENG_5_BP:1.26
	RELENG_4_10_0_RELEASE:1.14.2.2
	RELENG_4_10:1.14.2.2.0.10
	RELENG_4_10_BP:1.14.2.2
	RELENG_5_2_1_RELEASE:1.25
	RELENG_5_2_0_RELEASE:1.25
	RELENG_5_2:1.25.0.2
	RELENG_5_2_BP:1.25
	RELENG_4_9_0_RELEASE:1.14.2.2
	RELENG_4_9:1.14.2.2.0.8
	RELENG_4_9_BP:1.14.2.2
	RELENG_5_1_0_RELEASE:1.21
	RELENG_5_1:1.21.0.4
	RELENG_5_1_BP:1.21
	RELENG_4_8_0_RELEASE:1.14.2.2
	RELENG_4_8:1.14.2.2.0.6
	RELENG_4_8_BP:1.14.2.2
	RELENG_5_0_0_RELEASE:1.21
	RELENG_5_0:1.21.0.2
	RELENG_5_0_BP:1.21
	RELENG_4_7_0_RELEASE:1.14.2.2
	RELENG_4_7:1.14.2.2.0.4
	RELENG_4_7_BP:1.14.2.2
	RELENG_4_6_2_RELEASE:1.14.2.2
	RELENG_4_6_1_RELEASE:1.14.2.2
	RELENG_4_6_0_RELEASE:1.14.2.2
	RELENG_4_6:1.14.2.2.0.2
	RELENG_4_6_BP:1.14.2.2
	RELENG_4_5_0_RELEASE:1.14.2.1
	RELENG_4_5:1.14.2.1.0.6
	RELENG_4_5_BP:1.14.2.1
	RELENG_4_4_0_RELEASE:1.14.2.1
	RELENG_4_4:1.14.2.1.0.4
	RELENG_4_4_BP:1.14.2.1
	RELENG_4_3_0_RELEASE:1.14.2.1
	RELENG_4_3:1.14.2.1.0.2
	RELENG_4_3_BP:1.14.2.1
	RELENG_4_2_0_RELEASE:1.14.2.1
	RELENG_4_1_1_RELEASE:1.14.2.1
	PRE_SMPNG:1.15
	RELENG_4_1_0_RELEASE:1.14.2.1
	RELENG_3_5_0_RELEASE:1.10
	RELENG_4_0_0_RELEASE:1.14
	RELENG_4:1.14.0.2
	RELENG_4_BP:1.14
	RELENG_3_4_0_RELEASE:1.10
	RELENG_3_3_0_RELEASE:1.10
	RELENG_3_2_PAO:1.10.0.4
	RELENG_3_2_PAO_BP:1.10
	RELENG_3_2_0_RELEASE:1.10
	RELENG_3_1_0_RELEASE:1.10
	RELENG_3:1.10.0.2
	RELENG_3_BP:1.10
	RELENG_2_2_8_RELEASE:1.8.2.1
	RELENG_3_0_0_RELEASE:1.10
	RELENG_2_2_7_RELEASE:1.8.2.1
	RELENG_2_2_6_RELEASE:1.8.2.1
	RELENG_2_2_5_RELEASE:1.8.2.1
	bsd_44_lite_2:1.1.1.1
	RELENG_2_2_2_RELEASE:1.8.2.1
	RELENG_2_2_1_RELEASE:1.8.2.1
	RELENG_2_2_0_RELEASE:1.8.2.1
	RELENG_2_1_7_RELEASE:1.3.6.3
	RELENG_2_1_6_1_RELEASE:1.3.6.2
	RELENG_2_1_6_RELEASE:1.3.6.2
	RELENG_2_2:1.8.0.2
	RELENG_2_2_BP:1.8
	RELENG_2_1_5_RELEASE:1.3.6.2
	RELENG_2_1_0_RELEASE:1.3.6.2
	RELENG_2_1_0:1.3.0.6
	RELENG_2_1_0_BP:1.3
	RELENG_2_0_5_RELEASE:1.3
	RELENG_2_0_5:1.3.0.4
	RELENG_2_0_5_BP:1.3
	RELENG_2_0_5_ALPHA:1.3
	RELEASE_2_0:1.3
	BETA_2_0:1.3
	ALPHA_2_0:1.3.0.2
	bsd_44_lite:1.1.1.1
	CSRG:1.1.1;
locks; strict;
comment	@# @;


1.36
date	2012.11.17.01.54.31;	author svnexp;	state Exp;
branches
	1.36.2.1;
next	1.35;

1.35
date	2010.01.02.10.27.05;	author ed;	state Exp;
branches
	1.35.2.1;
next	1.34;

1.34
date	2008.05.07.13.53.12;	author dfr;	state Exp;
branches
	1.34.2.1;
next	1.33;

1.33
date	2007.07.05.08.56.45;	author bz;	state Exp;
branches
	1.33.2.1
	1.33.6.1
	1.33.8.1
	1.33.10.1
	1.33.12.1;
next	1.32;

1.32
date	2007.07.01.12.08.08;	author gnn;	state Exp;
branches;
next	1.31;

1.31
date	2006.07.31.13.29.36;	author yar;	state Exp;
branches;
next	1.30;

1.30
date	2006.07.27.14.19.30;	author yar;	state Exp;
branches;
next	1.29;

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

1.28
date	2005.06.10.06.12.51;	author des;	state Exp;
branches
	1.28.2.1
	1.28.12.1;
next	1.27;

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

1.26
date	2004.08.06.07.27.06;	author cperciva;	state Exp;
branches;
next	1.25;

1.25
date	2003.07.24.17.19.15;	author markm;	state Exp;
branches;
next	1.24;

1.24
date	2003.07.24.07.19.55;	author markm;	state Exp;
branches;
next	1.23;

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

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

1.21
date	2001.12.12.00.06.51;	author markm;	state Exp;
branches;
next	1.20;

1.20
date	2001.11.30.21.34.51;	author markm;	state Exp;
branches;
next	1.19;

1.19
date	2001.08.20.12.21.30;	author markm;	state Exp;
branches;
next	1.18;

1.18
date	2001.03.31.17.04.49;	author ru;	state Exp;
branches;
next	1.17;

1.17
date	2001.03.28.12.08.22;	author ru;	state Exp;
branches;
next	1.16;

1.16
date	2001.02.18.07.28.31;	author luigi;	state Exp;
branches;
next	1.15;

1.15
date	2000.03.27.16.37.32;	author bde;	state Exp;
branches;
next	1.14;

1.14
date	2000.02.24.21.06.22;	author markm;	state Exp;
branches
	1.14.2.1;
next	1.13;

1.13
date	2000.01.29.13.45.44;	author shin;	state Exp;
branches;
next	1.12;

1.12
date	2000.01.27.09.28.31;	author shin;	state Exp;
branches;
next	1.11;

1.11
date	99.08.30.10.03.27;	author peter;	state Exp;
branches;
next	1.10;

1.10
date	97.01.10.00.27.50;	author ache;	state Exp;
branches;
next	1.9;

1.9
date	97.01.07.19.47.55;	author pst;	state Exp;
branches;
next	1.8;

1.8
date	96.09.05.17.15.06;	author bde;	state Exp;
branches
	1.8.2.1;
next	1.7;

1.7
date	96.05.30.03.09.17;	author pst;	state Exp;
branches;
next	1.6;

1.6
date	96.04.23.05.18.40;	author pst;	state Exp;
branches;
next	1.5;

1.5
date	95.08.28.17.52.39;	author jkh;	state Exp;
branches;
next	1.4;

1.4
date	95.08.28.17.47.39;	author jkh;	state Exp;
branches;
next	1.3;

1.3
date	94.08.27.15.46.18;	author csgr;	state Exp;
branches
	1.3.6.1;
next	1.2;

1.2
date	94.08.05.20.47.28;	author wollman;	state Exp;
branches;
next	1.1;

1.1
date	94.05.27.12.32.48;	author rgrimes;	state Exp;
branches
	1.1.1.1;
next	;

1.36.2.1
date	2012.11.17.01.54.31;	author svnexp;	state dead;
branches;
next	1.36.2.2;

1.36.2.2
date	2013.03.28.13.06.09;	author svnexp;	state Exp;
branches;
next	;

1.35.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.35.2.1.2.1
	1.35.2.1.4.1;
next	1.35.2.2;

1.35.2.2
date	2012.11.17.11.37.41;	author svnexp;	state Exp;
branches;
next	;

1.35.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.35.2.1.2.2;

1.35.2.1.2.2
date	2012.11.17.08.37.37;	author svnexp;	state Exp;
branches;
next	;

1.35.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.35.2.1.4.2;

1.35.2.1.4.2
date	2012.11.17.08.48.29;	author svnexp;	state Exp;
branches;
next	;

1.34.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.34.2.1.2.1
	1.34.2.1.4.1
	1.34.2.1.6.1
	1.34.2.1.8.1;
next	1.34.2.2;

1.34.2.2
date	2012.11.17.10.37.19;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.34.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.34.2.1.8.2;

1.34.2.1.8.2
date	2012.11.17.08.25.52;	author svnexp;	state Exp;
branches;
next	;

1.33.2.1
date	2012.11.17.08.08.44;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.33.12.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.33.12.2;

1.33.12.2
date	2012.11.17.08.17.44;	author svnexp;	state Exp;
branches;
next	;

1.28.2.1
date	2012.11.17.07.45.57;	author svnexp;	state Exp;
branches;
next	;

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

1.14.2.1
date	2000.07.04.01.04.55;	author ps;	state Exp;
branches;
next	1.14.2.2;

1.14.2.2
date	2002.04.13.11.03.30;	author markm;	state Exp;
branches;
next	1.14.2.3;

1.14.2.3
date	2012.11.17.07.27.51;	author svnexp;	state Exp;
branches;
next	;

1.8.2.1
date	97.02.05.06.00.59;	author pst;	state Exp;
branches;
next	;

1.3.6.1
date	95.08.28.17.48.47;	author jkh;	state Exp;
branches;
next	1.3.6.2;

1.3.6.2
date	95.08.28.17.53.34;	author jkh;	state Exp;
branches;
next	1.3.6.3;

1.3.6.3
date	97.02.05.05.20.06;	author pst;	state Exp;
branches;
next	;

1.1.1.1
date	94.05.27.12.32.49;	author rgrimes;	state Exp;
branches;
next	;


desc
@@


1.36
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/usr.bin/telnet/Makefile 201386 2010-01-02 10:27:05Z ed $

.include <bsd.own.mk>

TELNETDIR=	${.CURDIR}/../../contrib/telnet
.PATH:		${TELNETDIR}/telnet

PROG=		telnet

SRCS=		commands.c main.c network.c ring.c sys_bsd.c \
		telnet.c terminal.c utilities.c

CFLAGS+=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \
		-I${TELNETDIR} -I${TELNETDIR}/libtelnet/

.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+=	-DINET6
.endif

WARNS?=		2

LIBTELNET=	${.OBJDIR}/../../lib/libtelnet/libtelnet.a

DPADD=		${LIBTERMCAP} ${LIBTELNET}
LDADD=		-ltermcap ${LIBTELNET}

.if !defined(RELEASE_CRUNCH)
CFLAGS+=	-DIPSEC
DPADD+=		${LIBIPSEC}
LDADD+=		-lipsec
.else
.PATH:         ${TELNETDIR}/libtelnet
SRCS+=		genget.c getent.c misc.c
CFLAGS+=	-DHAS_CGETENT
.endif

.if !defined(RELEASE_CRUNCH)
.if ${MK_OPENSSL} != "no"
SRCS+=		authenc.c 
CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DIPSEC
DPADD+=		${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
LDADD+=		-lmp -lcrypto -lcrypt -lipsec ${MINUSLPAM}
.endif

.if ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+=	-DKRB5 -DFORWARD -Dnet_write=telnet_net_write
DPADD+=		${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
LDADD+=		-lkrb5 -lhx509 -lasn1 -lcom_err -lroken
.endif
.endif

.include <bsd.prog.mk>
@


1.36.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:09 +0000
@
text
@d1 52
@


1.36.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 50
# $FreeBSD: releng/8.4/usr.bin/telnet/Makefile 178828 2008-05-07 13:53:12Z dfr $

.include <bsd.own.mk>

TELNETDIR=	${.CURDIR}/../../contrib/telnet
.PATH:		${TELNETDIR}/telnet

PROG=		telnet

SRCS=		commands.c main.c network.c ring.c sys_bsd.c \
		telnet.c terminal.c utilities.c

CFLAGS+=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \
		-I${TELNETDIR} -I${TELNETDIR}/libtelnet/

.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+=	-DINET6
.endif

LIBTELNET=	${.OBJDIR}/../../lib/libtelnet/libtelnet.a

DPADD=		${LIBTERMCAP} ${LIBTELNET}
LDADD=		-ltermcap ${LIBTELNET}

.if !defined(RELEASE_CRUNCH)
CFLAGS+=	-DIPSEC
DPADD+=		${LIBIPSEC}
LDADD+=		-lipsec
.else
.PATH:         ${TELNETDIR}/libtelnet
SRCS+=		genget.c getent.c misc.c
CFLAGS+=	-DHAS_CGETENT
.endif

.if !defined(RELEASE_CRUNCH)
.if ${MK_OPENSSL} != "no"
SRCS+=		authenc.c 
CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DIPSEC
DPADD+=		${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
LDADD+=		-lmp -lcrypto -lcrypt -lipsec ${MINUSLPAM}
.endif

.if ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+=	-DKRB5 -DFORWARD -Dnet_write=telnet_net_write
DPADD+=		${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
LDADD+=		-lkrb5 -lhx509 -lasn1 -lcom_err -lroken
.endif
.endif

.include <bsd.prog.mk>
@


1.35
log
@SVN rev 201386 on 2010-01-02 10:27:05Z by ed

Build usr.bin/ with WARNS=6 by default.

Also add some missing $FreeBSD$ to keep svn happy.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.35.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.35.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/usr.bin/telnet/Makefile 201386 2010-01-02 10:27:05Z ed $
@


1.35.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.35.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/usr.bin/telnet/Makefile 201386 2010-01-02 10:27:05Z ed $
@


1.35.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.35.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/usr.bin/telnet/Makefile 201386 2010-01-02 10:27:05Z ed $
@


1.34
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
@d20 2
@


1.34.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.34.2.2
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/usr.bin/telnet/Makefile 178828 2008-05-07 13:53:12Z dfr $
@


1.34.2.1.8.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.34.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/usr.bin/telnet/Makefile 178828 2008-05-07 13:53:12Z dfr $
@


1.34.2.1.6.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.34.2.1.4.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.34.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.33
log
@Remove the -DFAST_IPSEC from Makefiles again.

This was needed during the IPSEC->FAST_IPSEC->IPSEC transition
period to not break the build after picking up netipsec header
files. Now that the FAST_IPSEC kernel option is gone and the
default is IPSEC again those defines are superfluous.

Approved by:	re (rwatson)
@
text
@d45 2
a46 2
DPADD+=		${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
LDADD+=		-lkrb5 -lasn1 -lcom_err -lroken
@


1.33.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/usr.bin/telnet/Makefile 171246 2007-07-05 08:56:46Z bz $
@


1.33.12.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.33.12.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/usr.bin/telnet/Makefile 171246 2007-07-05 08:56:46Z bz $
@


1.33.10.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.33.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.33.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.32
log
@Commit IPv6 support for FAST_IPSEC to the tree.
This commit includes all remaining changes for the time being including
user space updates.

Submitted by:    bz
Approved by:    re
@
text
@d26 1
a26 1
CFLAGS+=	-DIPSEC -DFAST_IPSEC
d38 1
a38 1
CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DIPSEC -DFAST_IPSEC
@


1.31
log
@Stop enforcing dependencies between MK_* options at Makefile level.
All the dependencies are satisfied now in <bsd.own.mk>.
@
text
@d26 1
a26 1
CFLAGS+=	-DIPSEC
d38 1
a38 1
CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DIPSEC
@


1.30
log
@Respect MK_INET6_SUPPORT.
Move INET6 out of the RELEASE_CRUNCH conditional block
because it saves as little as 2% of the binary size and
IPv6 is rather popular today.  (Some other binaries, e.g.,
telnetd, include INET6 for RELEASE_CRUNCH already.)
@
text
@d41 2
a48 1
.endif
@


1.29
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
@d16 4
d26 1
a26 1
CFLAGS+=	-DINET6 -DIPSEC
@


1.28
log
@Remove kludges intended to support src trees with partial obj trees.

Discussed with:	ru
@
text
@d3 2
d32 1
a32 1
.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
d37 1
a37 1
.if !defined(NO_KERBEROS)
@


1.28.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/usr.bin/telnet/Makefile 147225 2005-06-10 06:12:53Z des $
@


1.28.12.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.27
log
@NOCRYPT -> NO_CRYPT
@
text
@a13 1
.if exists(${.OBJDIR}/../../lib/libtelnet)
a14 3
.else
LIBTELNET=	${.CURDIR}/../../lib/libtelnet/libtelnet.a
.endif
@


1.26
log
@Join the 21st century: Cryptography is no longer an optional component
of releases.  The -DNOCRYPT build option still exists for anyone who
really wants to build non-cryptographic binaries, but the "crypto"
release distribution is now part of "base", and anyone installing from a
release will get cryptographic binaries.

Approved by:	re (scottl), markm
Discussed on:	freebsd-current, in late April 2004
@
text
@d34 1
a34 1
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
@


1.25
log
@Make sure that a "make release" (more accurately the bit that makes
the crunched binary) get a non-cryptographic telnet. This is overkill
in that it covers stuff that is not normally used in a crunched binary.
@
text
@a34 1
DISTRIBUTION=	crypto
@


1.24
log
@Ensure that for the cryptographic instances of *telnet*, the "crypto"
distribution is used. This only affects release-building.
@
text
@d33 1
d44 1
@


1.23
log
@Test correct macro for "without crypto" option(s).
@
text
@d34 1
@


1.22
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
@d33 1
a33 1
.if !defined(NO_CRYPTO)
@


1.21
log
@Remove WARNS?=2 and -Wall. WARNS?=2 is going to be the default.
@
text
@d3 3
d12 1
a12 1
		-I${.CURDIR}/../../lib -I${.CURDIR}/../../lib/libtelnet/
d28 1
a28 2
.PATH:		${.CURDIR}/../../lib/libtelnet
# XXX This was copied from lib/libtelnet/Makefile.
d33 11
a43 8
unifdef:
	-cd ${.CURDIR} ; \
	( for i in *.[ch] ; do \
		unifdef -UAUTHENTICATION -UENCRYPTION \
			${.CURDIR}/../../crypto/telnet/telnet/$$i \
				> ${.CURDIR}/$$i ; \
		echo $$i ; \
	done )
@


1.20
log
@Diff-reduce WRT src/secure/*telnet*/Makefile.

Also, add an "unifdef:" target, so that the telnet sources can
be remade from the crypto sources in src/crypto/telnet.
@
text
@a10 2
WARNS?=		2

@


1.19
log
@Code merge and diff reduction between this and crypto telnet.

Also remove useless AUTHENTICATION code. We have never compiled this
here, and it is doubtful that it even works without crypto.
@
text
@d5 3
d9 1
a9 1
		-I${.CURDIR}/../../lib
d11 1
a11 2
SRCS=		commands.c main.c network.c ring.c sys_bsd.c \
		telnet.c terminal.c tn3270.c utilities.c
d32 9
@


1.18
log
@libtelnet.a is gone; add a special hack for `make release' fixit floppy.
@
text
@d1 9
a9 45
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the distribution.
# 3. All advertising materials mentioning features or use of this software
#    must display the following acknowledgement:
#	This product includes software developed by the University of
#	California, Berkeley and its contributors.
# 4. Neither the name of the University nor the names of its contributors
#    may be used to endorse or promote products derived from this software
#    without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
#	@@(#)Makefile	8.1 (Berkeley) 6/6/93
# $FreeBSD: src/usr.bin/telnet/Makefile,v 1.17 2001/03/28 12:08:22 ru Exp $
#

PROG=	telnet

SRCS=	authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
	terminal.c tn3270.c utilities.c

CFLAGS+=-DKLUDGELINEMODE -DUSE_TERMIO #-DAUTHENTICATION -DENCRYPTION
CFLAGS+=-DENV_HACK
CFLAGS+=-DSKEY
CFLAGS+=-I${.CURDIR}/../../lib
d17 2
a18 2
DPADD=	${LIBTERMCAP} ${LIBTELNET}
LDADD=	-ltermcap ${LIBTELNET}
d21 3
a23 4
CFLAGS+=-DINET6
CFLAGS+=-DIPSEC
DPADD+=	${LIBIPSEC}
LDADD+=	-lipsec
d25 1
a25 1
.PATH:	${.CURDIR}/../../lib/libtelnet
d27 2
a28 2
SRCS+=	genget.c getent.c misc.c
CFLAGS+= -DHAS_CGETENT
a30 5
# These are the sources that have encryption stuff in them.
CRYPT_SRC= authenc.c commands.c externs.h main.c network.c
CRYPT_SRC+= ring.c ring.h telnet.c terminal.c utilities.c Makefile
NOCRYPT_DIR=${.CURDIR}/Nocrypt

a31 3

nocrypt:
	@@echo "Encryption code already removed."
@


1.17
log
@Bye-bye /usr/lib/libtelnet.a.  This should fix ``make release'' brokeness.

Approved by:	markm
@
text
@d34 1
a34 1
# $FreeBSD: src/usr.bin/telnet/Makefile,v 1.16 2001/02/18 07:28:31 luigi Exp $
d39 3
d61 5
a66 3

SRCS=	authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
	terminal.c tn3270.c utilities.c
@


1.16
log
@Do not compile INET6 support if RELEASE_CRUNCH is defined
(used by install floppy/picobsd)
@
text
@d34 1
a34 1
# $FreeBSD: src/usr.bin/telnet/Makefile,v 1.15 2000/03/27 16:37:32 bde Exp $
d44 6
d51 1
a51 1
LDADD=	-ltermcap -ltelnet
@


1.15
log
@Fixed misspelling of DPADD as DPADDA.

Fixed some misformattings.
@
text
@d34 1
a34 1
# $FreeBSD$
a42 1
CFLAGS+=-DINET6
d48 1
@


1.14
log
@Use libcrypto in place of libdes.
@
text
@d34 1
a34 1
#	$FreeBSD: src/usr.bin/telnet/Makefile,v 1.13 2000/01/29 13:45:44 shin Exp $
d50 1
a50 1
DPADDA+=${LIBIPSEC}
a65 1

@


1.14.2.1
log
@MFC: Fix misspelling of DPADD as DPADDA and some misformattings.
@
text
@d34 1
a34 1
# $FreeBSD$
d50 1
a50 1
DPADD+=	${LIBIPSEC}
d66 1
@


1.14.2.2
log
@MFC: build infrastructure for cleaned up telnet, including
new "make unifdef" target to ease merge-from-secure-telnet.
@
text
@d1 33
d35 1
d37 1
a37 1
PROG=		telnet
d39 5
a43 2
SRCS=		commands.c main.c network.c ring.c sys_bsd.c \
		telnet.c terminal.c utilities.c
d45 2
a46 2
CFLAGS+=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \
		-I${.CURDIR}/../../lib -I${.CURDIR}/../../lib/libtelnet/
d48 4
a51 4
.if exists(${.OBJDIR}/../../lib/libtelnet)
LIBTELNET=	${.OBJDIR}/../../lib/libtelnet/libtelnet.a
.else
LIBTELNET=	${.CURDIR}/../../lib/libtelnet/libtelnet.a
d54 2
a55 2
DPADD=		${LIBTERMCAP} ${LIBTELNET}
LDADD=		-ltermcap ${LIBTELNET}
d57 4
a60 10
.if !defined(RELEASE_CRUNCH)
CFLAGS+=	-DINET6 -DIPSEC
DPADD+=		${LIBIPSEC}
LDADD+=		-lipsec
.else
.PATH:		${.CURDIR}/../../lib/libtelnet
# XXX This was copied from lib/libtelnet/Makefile.
SRCS+=		genget.c getent.c misc.c
CFLAGS+=	-DHAS_CGETENT
.endif
d62 1
a62 8
unifdef:
	-cd ${.CURDIR} ; \
	( for i in *.[ch] ; do \
		unifdef -UAUTHENTICATION -UENCRYPTION \
			${.CURDIR}/../../crypto/telnet/telnet/$$i \
				> ${.CURDIR}/$$i ; \
		echo $$i ; \
	done )
d64 2
a65 1
.include <bsd.prog.mk>
@


1.14.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/usr.bin/telnet/Makefile 94592 2002-04-13 11:03:30Z markm $
@


1.13
log
@fix breakage of make release.

Confirmed by: German Tischler <tanis@@gaspode.franken.de>
@
text
@d34 1
a34 1
#	$FreeBSD: src/usr.bin/telnet/Makefile,v 1.12 2000/01/27 09:28:31 shin Exp $
a44 2
#CFLAGS+= -DKRB4

a46 2
#DPADD+=	${LIBKRB} ${LIBDES}
#LDADD+=	-lkrb -ldes
@


1.12
log
@another tcp apps IPv6 updates.(should be make world safe)
  ftp, telnet, ftpd, faithd
  also telnet related sync with crypto, secure, kerberosIV

Obtained from: KAME project
@
text
@d34 1
a34 1
#	$FreeBSD$
d43 1
a43 1
CFLAGS+=-DIPSEC -DINET6
d47 2
a48 2
DPADD=	${LIBTERMCAP} ${LIBTELNET} ${LIBIPSEC}
LDADD=	-ltermcap -ltelnet -lipsec
d52 6
d70 1
@


1.11
log
@Nearly missed this one. Turn off -DTERMCAP otherwise it defines a bunch
of conflicting symbols with ncurses.
@
text
@d34 1
d43 1
d47 2
a48 2
DPADD=	${LIBTERMCAP} ${LIBTELNET}
LDADD=	-ltermcap -ltelnet
@


1.10
log
@Use -DSKEY instead of wrong -DPATH_SKEY
@
text
@d38 1
a38 1
CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO #-DAUTHENTICATION -DENCRYPTION
@


1.9
log
@Import a few relatively minor fixes from current Borman telnet.
Add some buffer overrun fixes from OpenBSD and myself.
Add skey calculator kludge from OpenBSD.

TODO: do a real merge of dab's sources... probably just make telnet and
	telnetd contrib software.

Obtained from: OpenBSD, dab@@bsdi.com
@
text
@d40 1
a40 1
CFLAGS+=-DPATH_SKEY
@


1.8
log
@Fixed DPADD.
@
text
@d40 1
@


1.8.2.1
log
@Merge with -current
@
text
@a39 1
CFLAGS+=-DSKEY
@


1.7
log
@Remove obsolete SOCKSv4 support
@
text
@d44 1
d46 1
a47 1
DPADD=	${LIBTERMCAP}
@


1.6
log
@Add support for socks
@
text
@d45 1
a45 1
#LDADD+=-lkrb -ldes
a54 7

.if defined(SOCKS)
CFLAGS+=-DSOCKS
CFLAGS+=-Dconnect=Rconnect -Dgetsockname=Rgetsockname -Dlisten=Rlisten \
	-Daccept=Raccept -Drcmd=Rrcmd -Dbind=Rbind -Dselect=Rselect
LDADD+=	-lsocks
.endif
@


1.5
log
@Oh foo.  I should a) learn to read.  b) learn to think. :-)
Telnet has nothing to do with this, it's telnetd and telnetd
doesn't use KLUDGELINEMODE so that theory is washed up.  Anyway,
back out previous commit and slink away with red face.
@
text
@d45 1
a45 1
#LDADD+=	-lkrb -ldes
d55 7
@


1.4
log
@Remove -DKLUDGELINEMODE again; it's breaking things and Paul T. says
it's a bug anyway.
@
text
@d38 1
a38 1
CFLAGS+=-DTERMCAP -DUSE_TERMIO #-DAUTHENTICATION -DENCRYPTION
@


1.3
log
@Fix big f*ckup by doing "make nocrypt"
(Don't think I don't realize what a big f*ckup this was.)
Submitted by:	geoff.
@
text
@d38 1
a38 1
CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO #-DAUTHENTICATION -DENCRYPTION
@


1.3.6.1
log
@Take -DKLUDGELINEMODE out of 2.0.5 Makefile
@
text
@d38 1
a38 1
CFLAGS+=-DTERMCAP -DUSE_TERMIO #-DAUTHENTICATION -DENCRYPTION
@


1.3.6.2
log
@Same for this branch.  Back out previous change.
@
text
@d38 1
a38 1
CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO #-DAUTHENTICATION -DENCRYPTION
@


1.3.6.3
log
@Merge from -current
@
text
@a39 1
CFLAGS+=-DSKEY
@


1.2
log
@Don't do Kerberos yet, we aren't ready for it.
@
text
@a58 13
#ifdef	ENCRYPTION
	@@for i in ${CRYPT_SRC}; do \
	    if [ ! -d ${NOCRYPT_DIR} ]; then \
		echo Creating subdirectory ${NOCRYPT_DIR}; \
		mkdir ${NOCRYPT_DIR}; \
	    fi; \
	    echo ${NOCRYPT_DIR}/$$i; \
	    unifdef -UENCRYPTION ${.CURDIR}/$$i | \
		sed "s/ || defined(ENCRYPTION)//" > ${NOCRYPT_DIR}/$$i; \
	done

placeholder:
#else	/* ENCRYPTION */
a59 1
#endif	/* ENCRYPTION */
@


1.1
log
@Initial revision
@
text
@d38 1
a38 1
CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DAUTHENTICATION -DENCRYPTION
d42 1
a42 1
CFLAGS+= -DKRB4
d45 1
a45 1
LDADD+=	-lkrb -ldes
@


1.1.1.1
log
@BSD 4.4 Lite Usr.bin Sources
@
text
@@
