head	1.34;
access;
symbols
	RELENG_8_4:1.34.0.2
	RELENG_9_1_0_RELEASE:1.33.4.1.4.2
	RELENG_9_1:1.33.4.1.0.4
	RELENG_9_1_BP:1.33.4.1
	RELENG_8_3_0_RELEASE:1.33.2.1.8.1
	RELENG_8_3:1.33.2.1.0.8
	RELENG_8_3_BP:1.33.2.1
	RELENG_9_0_0_RELEASE:1.33.4.1.2.1
	RELENG_9_0:1.33.4.1.0.2
	RELENG_9_0_BP:1.33.4.1
	RELENG_9:1.33.0.4
	RELENG_9_BP:1.33
	RELENG_7_4_0_RELEASE:1.31.12.1
	RELENG_8_2_0_RELEASE:1.33.2.1.6.1
	RELENG_7_4:1.31.0.12
	RELENG_7_4_BP:1.31
	RELENG_8_2:1.33.2.1.0.6
	RELENG_8_2_BP:1.33.2.1
	RELENG_8_1_0_RELEASE:1.33.2.1.4.1
	RELENG_8_1:1.33.2.1.0.4
	RELENG_8_1_BP:1.33.2.1
	RELENG_7_3_0_RELEASE:1.31.10.1
	RELENG_7_3:1.31.0.10
	RELENG_7_3_BP:1.31
	RELENG_8_0_0_RELEASE:1.33.2.1.2.1
	RELENG_8_0:1.33.2.1.0.2
	RELENG_8_0_BP:1.33.2.1
	RELENG_8:1.33.0.2
	RELENG_8_BP:1.33
	RELENG_7_2_0_RELEASE:1.31.8.1
	RELENG_7_2:1.31.0.8
	RELENG_7_2_BP:1.31
	RELENG_7_1_0_RELEASE:1.31.6.1
	RELENG_6_4_0_RELEASE:1.26.12.1
	RELENG_7_1:1.31.0.6
	RELENG_7_1_BP:1.31
	RELENG_6_4:1.26.0.12
	RELENG_6_4_BP:1.26
	RELENG_7_0_0_RELEASE:1.31
	RELENG_6_3_0_RELEASE:1.26
	RELENG_7_0:1.31.0.4
	RELENG_7_0_BP:1.31
	RELENG_6_3:1.26.0.10
	RELENG_6_3_BP:1.26
	RELENG_7:1.31.0.2
	RELENG_7_BP:1.31
	RELENG_6_2_0_RELEASE:1.26
	RELENG_6_2:1.26.0.8
	RELENG_6_2_BP:1.26
	RELENG_5_5_0_RELEASE:1.24
	RELENG_5_5:1.24.0.8
	RELENG_5_5_BP:1.24
	RELENG_6_1_0_RELEASE:1.26
	RELENG_6_1:1.26.0.6
	RELENG_6_1_BP:1.26
	RELENG_6_0_0_RELEASE:1.26
	RELENG_6_0:1.26.0.4
	RELENG_6_0_BP:1.26
	RELENG_6:1.26.0.2
	RELENG_6_BP:1.26
	RELENG_5_4_0_RELEASE:1.24
	RELENG_5_4:1.24.0.6
	RELENG_5_4_BP:1.24
	RELENG_4_11_0_RELEASE:1.13.2.2
	RELENG_4_11:1.13.2.2.0.12
	RELENG_4_11_BP:1.13.2.2
	RELENG_5_3_0_RELEASE:1.24
	RELENG_5_3:1.24.0.4
	RELENG_5_3_BP:1.24
	RELENG_5:1.24.0.2
	RELENG_5_BP:1.24
	RELENG_4_10_0_RELEASE:1.13.2.2
	RELENG_4_10:1.13.2.2.0.10
	RELENG_4_10_BP:1.13.2.2
	RELENG_5_2_1_RELEASE:1.23
	RELENG_5_2_0_RELEASE:1.23
	RELENG_5_2:1.23.0.2
	RELENG_5_2_BP:1.23
	RELENG_4_9_0_RELEASE:1.13.2.2
	RELENG_4_9:1.13.2.2.0.8
	RELENG_4_9_BP:1.13.2.2
	RELENG_5_1_0_RELEASE:1.19
	RELENG_5_1:1.19.0.4
	RELENG_5_1_BP:1.19
	RELENG_4_8_0_RELEASE:1.13.2.2
	RELENG_4_8:1.13.2.2.0.6
	RELENG_4_8_BP:1.13.2.2
	RELENG_5_0_0_RELEASE:1.19
	RELENG_5_0:1.19.0.2
	RELENG_5_0_BP:1.19
	RELENG_4_7_0_RELEASE:1.13.2.2
	RELENG_4_7:1.13.2.2.0.4
	RELENG_4_7_BP:1.13.2.2
	RELENG_4_6_2_RELEASE:1.13.2.2
	RELENG_4_6_1_RELEASE:1.13.2.2
	RELENG_4_6_0_RELEASE:1.13.2.2
	RELENG_4_6:1.13.2.2.0.2
	RELENG_4_6_BP:1.13.2.2
	RELENG_4_5_0_RELEASE:1.13.2.1
	RELENG_4_5:1.13.2.1.0.4
	RELENG_4_5_BP:1.13.2.1
	RELENG_4_4_0_RELEASE:1.13.2.1
	RELENG_4_4:1.13.2.1.0.2
	RELENG_4_4_BP:1.13.2.1
	RELENG_4_3_0_RELEASE:1.13
	RELENG_4_3:1.13.0.4
	RELENG_4_3_BP:1.13
	RELENG_4_2_0_RELEASE:1.13
	RELENG_4_1_1_RELEASE:1.13
	PRE_SMPNG:1.13
	RELENG_4_1_0_RELEASE:1.13
	RELENG_3_5_0_RELEASE:1.11.2.1
	RELENG_4_0_0_RELEASE:1.13
	RELENG_4:1.13.0.2
	RELENG_4_BP:1.13
	RELENG_3_4_0_RELEASE:1.11.2.1
	RELENG_3_3_0_RELEASE:1.11.2.1
	RELENG_3_2_PAO:1.11.0.4
	RELENG_3_2_PAO_BP:1.11
	RELENG_3_2_0_RELEASE:1.11
	RELENG_3_1_0_RELEASE:1.11
	RELENG_3:1.11.0.2
	RELENG_3_BP:1.11
	RELENG_2_2_8_RELEASE:1.8.2.1
	RELENG_3_0_0_RELEASE:1.11
	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
	bsd_44_lite_2:1.1.1.1
	RELENG_2_2_2_RELEASE:1.8
	RELENG_2_2_1_RELEASE:1.8
	RELENG_2_2_0_RELEASE:1.8
	RELENG_2_1_7_RELEASE:1.6.6.1
	RELENG_2_1_6_1_RELEASE:1.6
	RELENG_2_1_6_RELEASE:1.6
	RELENG_2_2:1.8.0.2
	RELENG_2_2_BP:1.8
	RELENG_2_1_5_RELEASE:1.6
	RELENG_2_1_0_RELEASE:1.6
	RELENG_2_1_0:1.6.0.6
	RELENG_2_1_0_BP:1.6
	RELENG_2_0_5_RELEASE:1.6
	RELENG_2_0_5:1.6.0.4
	RELENG_2_0_5_BP:1.6
	RELENG_2_0_5_ALPHA:1.6
	RELEASE_2_0:1.6
	BETA_2_0:1.6
	ALPHA_2_0:1.6.0.2
	bsd_44_lite:1.1.1.1
	CSRG:1.1.1;
locks; strict;
comment	@# @;


1.34
date	2012.11.17.01.50.12;	author svnexp;	state Exp;
branches
	1.34.2.1;
next	1.33;

1.33
date	2008.11.13.19.05.27;	author ed;	state Exp;
branches
	1.33.2.1
	1.33.4.1;
next	1.32;

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

1.31
date	2006.07.31.19.15.09;	author yar;	state Exp;
branches
	1.31.2.1
	1.31.6.1
	1.31.8.1
	1.31.10.1
	1.31.12.1;
next	1.30;

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

1.29
date	2006.07.31.13.20.44;	author yar;	state Exp;
branches;
next	1.28;

1.28
date	2006.07.27.12.15.37;	author yar;	state Exp;
branches;
next	1.27;

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

1.26
date	2005.06.10.06.12.51;	author des;	state Exp;
branches
	1.26.2.1
	1.26.12.1;
next	1.25;

1.25
date	2004.12.21.10.16.01;	author ru;	state Exp;
branches;
next	1.24;

1.24
date	2004.08.06.07.27.05;	author cperciva;	state Exp;
branches;
next	1.23;

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

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

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

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

1.19
date	2002.02.06.11.07.55;	author kris;	state Exp;
branches;
next	1.18;

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

1.17
date	2001.08.20.12.12.27;	author markm;	state Exp;
branches;
next	1.16;

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

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

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

1.13
date	2000.01.25.14.51.59;	author shin;	state Exp;
branches
	1.13.2.1;
next	1.12;

1.12
date	99.08.28.00.10.22;	author peter;	state Exp;
branches;
next	1.11;

1.11
date	97.09.28.08.40.54;	author markm;	state Exp;
branches
	1.11.2.1;
next	1.10;

1.10
date	97.02.22.14.22.28;	author peter;	state Exp;
branches;
next	1.9;

1.9
date	97.01.14.06.21.03;	author jkh;	state Exp;
branches;
next	1.8;

1.8
date	96.09.22.21.55.29;	author wosch;	state Exp;
branches
	1.8.2.1;
next	1.7;

1.7
date	96.09.05.17.14.34;	author bde;	state Exp;
branches;
next	1.6;

1.6
date	94.09.11.21.51.12;	author rgrimes;	state Exp;
branches
	1.6.6.1;
next	1.5;

1.5
date	94.09.05.20.36.34;	author csgr;	state Exp;
branches;
next	1.4;

1.4
date	94.08.12.22.59.58;	author csgr;	state Exp;
branches;
next	1.3;

1.3
date	94.08.10.04.55.19;	author jkh;	state Exp;
branches;
next	1.2;

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

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

1.34.2.1
date	2012.11.17.01.50.12;	author svnexp;	state dead;
branches;
next	1.34.2.2;

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

1.33.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.33.2.1.2.1
	1.33.2.1.4.1
	1.33.2.1.6.1
	1.33.2.1.8.1;
next	1.33.2.2;

1.33.2.2
date	2012.11.17.10.36.13;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.33.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.33.2.1.8.2;

1.33.2.1.8.2
date	2012.11.17.08.24.53;	author svnexp;	state Exp;
branches;
next	;

1.33.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.33.4.1.2.1
	1.33.4.1.4.1;
next	1.33.4.2;

1.33.4.2
date	2012.11.17.11.36.29;	author svnexp;	state Exp;
branches;
next	;

1.33.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.33.4.1.2.2;

1.33.4.1.2.2
date	2012.11.17.08.36.29;	author svnexp;	state Exp;
branches;
next	;

1.33.4.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.33.4.1.4.2;

1.33.4.1.4.2
date	2012.11.17.08.47.18;	author svnexp;	state Exp;
branches;
next	;

1.31.2.1
date	2012.11.17.08.03.20;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.31.12.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.31.12.2;

1.31.12.2
date	2012.11.17.08.16.52;	author svnexp;	state Exp;
branches;
next	;

1.26.2.1
date	2012.11.17.07.40.57;	author svnexp;	state Exp;
branches;
next	;

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

1.13.2.1
date	2001.04.25.10.41.02;	author ru;	state Exp;
branches;
next	1.13.2.2;

1.13.2.2
date	2002.04.13.11.03.30;	author markm;	state Exp;
branches;
next	1.13.2.3;

1.13.2.3
date	2012.11.17.07.24.14;	author svnexp;	state Exp;
branches;
next	;

1.11.2.1
date	99.08.29.15.04.18;	author peter;	state Exp;
branches;
next	;

1.8.2.1
date	98.03.06.01.47.51;	author jkh;	state Exp;
branches;
next	1.8.2.2;

1.8.2.2
date	99.09.05.11.20.25;	author peter;	state Exp;
branches;
next	;

1.6.6.1
date	97.02.05.06.10.36;	author pst;	state Exp;
branches;
next	;

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


desc
@@


1.34
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/libexec/telnetd/Makefile 184935 2008-11-13 19:05:27Z ed $

# Do not define -DKLUDGELINEMODE, as it does not interact well with many
# telnet implementations.

.include <bsd.own.mk>

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

PROG=		telnetd
MAN=		telnetd.8

SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
		termstat.c utility.c

WARNS?=		2
WFORMAT?=	0

CFLAGS+=	-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
		-DENV_HACK -DSTREAMSPTY

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

CFLAGS+=	-I${TELNETDIR}

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

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

# XXX for src/release/picobsd
.if !defined(RELEASE_CRUNCH)
.if ${MK_OPENSSL} != "no"
SRCS+=		authenc.c
CFLAGS+=	-DAUTHENTICATION -DENCRYPTION
DPADD+=		${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM}
LDADD+=		-lmp -lcrypto -lcrypt ${MINUSLPAM}
.endif

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

.include <bsd.prog.mk>
@


1.34.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:03:27 +0000
@
text
@d1 50
@


1.34.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/libexec/telnetd/Makefile 184935 2008-11-13 19:05:27Z ed $

# Do not define -DKLUDGELINEMODE, as it does not interact well with many
# telnet implementations.

.include <bsd.own.mk>

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

PROG=		telnetd
MAN=		telnetd.8

SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
		termstat.c utility.c

WARNS?=		2
WFORMAT?=	0

CFLAGS+=	-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
		-DENV_HACK -DSTREAMSPTY

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

CFLAGS+=	-I${TELNETDIR}

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

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

# XXX for src/release/picobsd
.if !defined(RELEASE_CRUNCH)
.if ${MK_OPENSSL} != "no"
SRCS+=		authenc.c
CFLAGS+=	-DAUTHENTICATION -DENCRYPTION
DPADD+=		${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM}
LDADD+=		-lmp -lcrypto -lcrypt ${MINUSLPAM}
.endif

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

.include <bsd.prog.mk>
@


1.33
log
@SVN rev 184935 on 2008-11-13 19:05:27Z by ed

Convert telnetd(8) to use posix_openpt(2).

Some time ago I got some reports MPSAFE TTY broke telnetd(8). Even
though it turned out to be a different problem within the TTY code, I
spotted a small issue with telnetd(8). Instead of allocating PTY's using
openpty(3) or posix_openpt(2), it used its own PTY allocation routine.
This means that telnetd(8) still uses /dev/ptyXX-style devices.

I've also increased the size of line[]. Even though 16 should be enough,
we already use 13 bytes ("/dev/pts/999", including '\0'). 32 bytes gives
us a little more freedom.

Also enable -DSTREAMSPTY. Otherwise telnetd(8) strips the PTY's pathname
to the latest slash instead of just removing "/dev/" (e.g. /dev/pts/0 ->
0, instead of pts/0).

Reviewed by:	rink
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.33.4.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.33.4.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/libexec/telnetd/Makefile 184935 2008-11-13 19:05:27Z ed $
@


1.33.4.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.33.4.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/libexec/telnetd/Makefile 184935 2008-11-13 19:05:27Z ed $
@


1.33.4.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.33.4.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/libexec/telnetd/Makefile 184935 2008-11-13 19:05:27Z ed $
@


1.33.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.33.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/libexec/telnetd/Makefile 184935 2008-11-13 19:05:27Z ed $
@


1.33.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.33.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/libexec/telnetd/Makefile 184935 2008-11-13 19:05:27Z ed $
@


1.33.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.33.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.33.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.32
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
a21 1
CFLAGS+=	-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON -DENV_HACK
@


1.31
log
@inetd and telnetd are not included in the standard release
crunched floppies, but they can be included as options in
src/release/picobsd (omitted by default though.)  Therefore
preserve the RELEASE_CRUNCH knob in their Makefiles, but
tell its real purpose in a comment.
@
text
@d44 2
a45 2
DPADD+=		${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR}
LDADD+=		-lkrb5 -lasn1 -lroken -lcom_err
@


1.31.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/libexec/telnetd/Makefile 160866 2006-07-31 19:15:10Z yar $
@


1.31.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.31.12.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/libexec/telnetd/Makefile 160866 2006-07-31 19:15:10Z yar $
@


1.31.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.31.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.31.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.30
log
@Stop enforcing dependencies between MK_* options at Makefile level.
All the dependencies are satisfied now in <bsd.own.mk>.
@
text
@d33 2
d47 1
@


1.29
log
@telnetd(8) doesn't really go to the crunched floppies,
so its Makefile needn't test for RELEASE_CRUNCH.

Suggested by:	ru
@
text
@d38 2
a44 1
.endif
@


1.28
log
@Respect MK_INET6_SUPPORT.
Apply style.Makefile(5).
@
text
@a32 1
.if !defined(RELEASE_CRUNCH)
a43 1
.endif
@


1.27
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
@a16 4
CFLAGS+=	-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
		-DENV_HACK \
		-I${TELNETDIR} -DINET6

d20 8
@


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

Discussed with:	ru
@
text
@d6 2
d30 1
a30 1
.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
d35 1
a35 1
.if !defined(NO_KERBEROS)
@


1.26.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/libexec/telnetd/Makefile 147225 2005-06-10 06:12:53Z des $
@


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


1.24
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
@d32 1
a32 1
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
@


1.23
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
@a32 1
DISTRIBUTION=	crypto
@


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


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


1.20
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
@d31 1
a31 1
.if !defined(NO_CRYPTO)
@


1.19
log
@Set WFORMAT=0, overlooked in previous commits to libexec/.

Reported by:	jhay
@
text
@d6 3
d17 1
a17 1
		-I${.CURDIR}/../../lib -DINET6
d31 11
a41 8
unifdef:
	-cd ${.CURDIR} ; \
	( for i in *.[ch] ; do \
		unifdef -UAUTHENTICATION -UENCRYPTION \
			${.CURDIR}/../../crypto/telnet/telnetd/$$i \
				> ${.CURDIR}/$$i ; \
		echo $$i ; \
	done )
@


1.18
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
@d17 1
@


1.17
log
@Feature merging and diff reduction between this code and crypto telnet.
Also remove conditional (AUTHENTICATION) code as we have never compiled
it here, and it is doubtful that it even works in this scenario.
@
text
@d9 3
d16 1
a16 2
SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
		termstat.c utility.c
d26 9
@


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

Approved by:	markm
@
text
@d1 1
a1 2
#	@@(#)Makefile	8.2 (Berkeley) 12/15/93
# $FreeBSD: src/libexec/telnetd/Makefile,v 1.15 2001/03/26 14:22:10 ru Exp $
d3 12
a14 8
PROG=	telnetd
CFLAGS+=-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS
#CFLAGS+=-DKLUDGELINEMODE
CFLAGS+=-DOLD_ENVIRON -DENV_HACK
CFLAGS+=-I${.CURDIR}/../../lib
CFLAGS+=-DINET6
SRCS=	global.c slc.c state.c sys_term.c telnetd.c \
	termstat.c utility.c
d22 2
a23 3
DPADD=	${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
LDADD=	-lutil -ltermcap ${LIBTELNET}
MAN=	telnetd.8
@


1.15
log
@- Backout botched attempt to intoduce MANSECT feature.
- MAN[1-9] -> MAN.
@
text
@d2 1
a2 1
# $FreeBSD: src/libexec/telnetd/Makefile,v 1.14 2001/03/20 18:10:10 ru Exp $
d12 7
d20 1
a20 1
LDADD=	-lutil -ltermcap -ltelnet
@


1.14
log
@Set the default manual section for libexec/ to 8.
@
text
@d2 1
a2 1
# $FreeBSD: src/libexec/telnetd/Makefile,v 1.13 2000/01/25 14:51:59 shin Exp $
d14 1
@


1.13
log
@several tcp apps IPv6 update
 -inetd
 -rshd
 -rlogind
 -telnetd
 -rsh
 -rlogin

Reviewed by: freebsd-arch, cvs-committers
Obtained from: KAME project
@
text
@d2 1
a2 1
# $FreeBSD: src/libexec/telnetd/Makefile,v 1.12 1999/08/28 00:10:22 peter Exp $
a13 1
MAN8=	telnetd.8
@


1.13.2.1
log
@MFC: MAN[1-9] -> MAN.
@
text
@d2 1
a2 1
# $FreeBSD: src/libexec/telnetd/Makefile,v 1.13 2000/01/25 14:51:59 shin Exp $
d14 1
a14 1
MAN=	telnetd.8
@


1.13.2.2
log
@MFC: build infrastructure for cleaned up telnet, including
new "make unifdef" target to ease merge-from-secure-telnet.
@
text
@d1 2
a2 1
# $FreeBSD$
d4 11
a14 33
# Do not define -DKLUDGELINEMODE, as it does not interact well with many
# telnet implementations.

PROG=		telnetd
MAN=		telnetd.8

SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
		termstat.c utility.c

CFLAGS+=	-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
		-DENV_HACK \
		-I${.CURDIR}/../../lib -DINET6

WARNS?=		2
WFORMAT?=	0

.if exists(${.OBJDIR}/../../lib/libtelnet)
LIBTELNET=	${.OBJDIR}/../../lib/libtelnet/libtelnet.a
.else
LIBTELNET=	${.CURDIR}/../../lib/libtelnet/libtelnet.a
.endif

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

unifdef:
	-cd ${.CURDIR} ; \
	( for i in *.[ch] ; do \
		unifdef -UAUTHENTICATION -UENCRYPTION \
			${.CURDIR}/../../crypto/telnet/telnetd/$$i \
				> ${.CURDIR}/$$i ; \
		echo $$i ; \
	done )
@


1.13.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/libexec/telnetd/Makefile 94592 2002-04-13 11:03:30Z markm $
@


1.12
log
@$Id$ -> $FreeBSD$
@
text
@d2 1
a2 1
# $FreeBSD$
d9 1
@


1.11
log
@There is a clear separation of the crypto telnet and the non-crypto telnet.
As this is the non-crypto version, remove the useless (commented out)
directives and macros.
@
text
@d2 1
a2 1
#	$Id$
@


1.11.2.1
log
@$Id$ -> $FreeBSD$
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.10
log
@Revert $FreeBSD$ to $Id$
@
text
@a8 1
#CFLAGS+=-DAUTHENTICATION -DENCRYPTION
a10 1
#SRCS+=	authenc.c
a12 2
#DPADD+=	$LIBKRB} ${LIBDES}
#LDADD+=	-lkrb -ldes
@


1.9
log
@Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
@
text
@d2 1
a2 1
#	$FreeBSD$
@


1.8
log
@add forgotten $Id$
@
text
@d2 1
a2 1
#	$Id$
@


1.8.2.1
log
@MFC: use linemode by default.
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.8 1996/09/22 21:55:29 wosch Exp $
d9 1
d12 1
d15 2
@


1.8.2.2
log
@$Id$ -> $FreeBSD$
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.7
log
@Fixed DPADD.
@
text
@d2 1
@


1.6
log
@Change all references to LIBTERM and -ltermlib to LIBTERMCAP and -ltermcap
@
text
@d12 1
a12 1
DPADD=	${LIBUTIL} ${LIBTERMCAP}
d14 1
a16 1

@


1.6.6.1
log
@Merge appropriate bits from -current
@
text
@d12 1
a12 1
DPADD=	${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
a13 1
#DPADD+=	$LIBKRB} ${LIBDES}
d16 1
@


1.5
log
@Don't define KLUDGELINEMODE.
(If you do, you will have problems trying to telnet into a FreeBSD-2.0
box from a Sun, and I WANT TO DO THAT.)
Submitted by:	Geoff
@
text
@d12 1
a12 1
DPADD=	${LIBUTIL} ${LIBTERM}
@


1.4
log
@Remove the scary bits from telnetd - no more encryption left here.
Only crypt.c in libc remains.
Reviewed by:	Geoff Rehmet
@
text
@d4 2
a5 1
CFLAGS+=-DLINEMODE -DKLUDGELINEMODE -DUSE_TERMIO -DDIAGNOSTICS
@


1.3
log
@Change bogus --I to -I to make compilation happen again.
Submitted by:	jkh
@
text
@d8 1
a8 1
SRCS=	authenc.c global.c slc.c state.c sys_term.c telnetd.c \
d10 1
a15 4
# These are the sources that have encryption stuff in them.
CRYPT_SRC= authenc.c ext.h state.c telnetd.c termstat.c
CRYPT_SRC+= utility.c Makefile
NOCRYPT_DIR=${.CURDIR}/Nocrypt
a17 17

nocrypt:
#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 */
	@@echo "Encryption code already removed."
#endif	/* ENCRYPTION */
@


1.2
log
@Update to new make macros and disable Kerberos because we haven't got it
set up right yet.
@
text
@d6 1
a6 1
CFLAGS+=--I${.CURDIR}/../../lib
@


1.1
log
@Initial revision
@
text
@d6 2
a7 1
CFLAGS+=-DAUTHENTICATION -DENCRYPTION -I${.CURDIR}/../../lib
d12 2
a13 2
LDADD+=	-lkrb -ldes
MAN8=	telnetd.0
@


1.1.1.1
log
@BSD 4.4 Lite Libexec Sources
@
text
@@
