head	1.19;
access;
symbols
	RELENG_4_11_0_RELEASE:1.15.2.2
	RELENG_4_11:1.15.2.2.0.6
	RELENG_4_11_BP:1.15.2.2
	RELENG_4_10_0_RELEASE:1.15.2.2
	RELENG_4_10:1.15.2.2.0.4
	RELENG_4_10_BP:1.15.2.2
	RELENG_4_9_0_RELEASE:1.15.2.2
	RELENG_4_9:1.15.2.2.0.2
	RELENG_4_9_BP:1.15.2.2
	RELENG_5_1_0_RELEASE:1.17
	RELENG_5_1:1.17.0.2
	RELENG_5_1_BP:1.17
	RELENG_4_8_0_RELEASE:1.15.2.1
	RELENG_4_8:1.15.2.1.0.6
	RELENG_4_8_BP:1.15.2.1
	RELENG_5_0_0_RELEASE:1.15
	RELENG_5_0:1.15.0.4
	RELENG_5_0_BP:1.15
	RELENG_4_7_0_RELEASE:1.15.2.1
	RELENG_4_7:1.15.2.1.0.4
	RELENG_4_7_BP:1.15.2.1
	RELENG_4_6_2_RELEASE:1.15.2.1
	RELENG_4_6_1_RELEASE:1.15.2.1
	RELENG_4_6_0_RELEASE:1.15.2.1
	RELENG_4_6:1.15.2.1.0.2
	RELENG_4_6_BP:1.15.2.1
	RELENG_4:1.15.0.2
	old_RELENG_4_3_0_RELEASE:1.7
	old_RELENG_4_3:1.7.0.4
	old_RELENG_4_3_BP:1.7
	old_RELENG_4_2_0_RELEASE:1.7
	old_RELENG_4_1_1_RELEASE:1.7
	old_PRE_SMPNG:1.7
	old_RELENG_4_1_0_RELEASE:1.7
	old_RELENG_3_5_0_RELEASE:1.1.1.1.4.2
	old_RELENG_4_0_0_RELEASE:1.7
	old_RELENG_4:1.7.0.2
	old_RELENG_4_BP:1.7
	old_RELENG_3_4_0_RELEASE:1.1.1.1.4.2
	old_RELENG_3_3_0_RELEASE:1.1.1.1.4.2
	old_RELENG_3_2_PAO:1.1.1.1.4.1.0.2
	old_RELENG_3_2_PAO_BP:1.1.1.1.4.1
	old_RELENG_3_2_0_RELEASE:1.1.1.1.4.1
	old_RELENG_3_1_0_RELEASE:1.1.1.1.4.1
	old_RELENG_3:1.1.1.1.0.4
	old_RELENG_3_BP:1.1.1.1
	old_RELENG_2_2_8_RELEASE:1.1.1.1
	old_RELENG_3_0_0_RELEASE:1.1.1.1
	old_RELENG_2_2_7_RELEASE:1.1.1.1
	old_RELENG_2_2_6_RELEASE:1.1.1.1
	old_RELENG_2_2:1.1.1.1.0.2
	old_markm_1_0:1.1.1.1
	old_MARKM:1.1.1;
locks; strict;
comment	@# @;


1.19
date	2003.07.16.20.59.13;	author markm;	state dead;
branches;
next	1.18;

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

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

1.16
date	2003.03.06.13.41.52;	author nectar;	state Exp;
branches;
next	1.15;

1.15
date	2001.12.17.01.33.20;	author assar;	state Exp;
branches
	1.15.2.1;
next	1.14;

1.14
date	2001.12.03.17.45.25;	author jhay;	state Exp;
branches;
next	1.13;

1.13
date	2001.11.30.21.14.44;	author markm;	state Exp;
branches;
next	1.12;

1.12
date	2001.11.01.03.16.03;	author assar;	state Exp;
branches;
next	1.11;

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

1.10
date	2001.05.11.09.39.10;	author markm;	state Exp;
branches;
next	1.9;

1.9
date	2001.03.28.12.08.20;	author ru;	state Exp;
branches;
next	1.8;

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

1.7
date	2000.02.24.20.56.44;	author markm;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2000.01.27.09.28.17;	author shin;	state Exp;
branches;
next	1.5;

1.5
date	99.10.07.18.59.55;	author markm;	state Exp;
branches;
next	1.4;

1.4
date	99.09.05.14.05.59;	author markm;	state Exp;
branches;
next	1.3;

1.3
date	99.08.28.01.31.25;	author peter;	state Exp;
branches;
next	1.2;

1.2
date	99.01.25.06.49.39;	author markm;	state Exp;
branches;
next	1.1;

1.1
date	97.09.24.20.37.13;	author markm;	state Exp;
branches
	1.1.1.1;
next	;

1.15.2.1
date	2002.04.30.14.57.42;	author nectar;	state Exp;
branches
	1.15.2.1.6.1;
next	1.15.2.2;

1.15.2.2
date	2003.04.24.19.14.00;	author nectar;	state Exp;
branches;
next	1.15.2.3;

1.15.2.3
date	2012.11.17.07.23.14;	author svnexp;	state Exp;
branches;
next	;

1.15.2.1.6.1
date	2003.04.24.19.00.37;	author nectar;	state Exp;
branches;
next	1.15.2.1.6.2;

1.15.2.1.6.2
date	2003.04.24.19.05.09;	author nectar;	state Exp;
branches;
next	;

1.7.2.1
date	2001.04.25.09.36.01;	author ru;	state Exp;
branches;
next	1.7.2.2;

1.7.2.2
date	2001.05.31.22.55.45;	author nsayer;	state Exp;
branches;
next	1.7.2.3;

1.7.2.3
date	2001.06.03.23.00.42;	author jwd;	state Exp;
branches;
next	;

1.1.1.1
date	97.09.24.20.37.13;	author markm;	state Exp;
branches
	1.1.1.1.2.1
	1.1.1.1.4.1;
next	;

1.1.1.1.2.1
date	99.09.05.11.48.07;	author peter;	state Exp;
branches;
next	;

1.1.1.1.4.1
date	99.01.25.06.59.40;	author markm;	state Exp;
branches;
next	1.1.1.1.4.2;

1.1.1.1.4.2
date	99.08.29.14.40.49;	author peter;	state Exp;
branches;
next	1.1.1.1.4.3;

1.1.1.1.4.3
date	2000.07.04.15.23.00;	author assar;	state Exp;
branches;
next	;


desc
@@


1.19
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
@# $FreeBSD: src/kerberos5/libexec/telnetd/Makefile,v 1.18 2003/07/02 23:46:38 ru Exp $

# 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 authenc.c

CFLAGS+=	-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
		-DENV_HACK -DAUTHENTICATION -DENCRYPTION \
		-I${TELNETDIR} -DINET6
CFLAGS+=	-DKRB5 -DFORWARD -Dnet_write=telnet_net_write

WARNS?=		2

DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
		${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} \
		${LIBCRYPT} ${LIBPAM}
LDADD=		-lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
		-lkrb5 -lasn1 -lroken -lcom_err \
		-lcrypt ${MINUSLPAM}

.include <bsd.prog.mk>

.PATH:	${TELNETDIR}/telnetd
@


1.18
log
@Fixed "make checkdpadd".

OK'ed by:	markm
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.17
log
@Post KerberosIV de-orbit: Clean up Kerberos5. We dont need KerberosIV
compatiblity mode anymore. Rename the k5foo utils to kfoo (after
repo-copy).
@
text
@d23 1
a23 2
		-L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 \
		-L${ROKENOBJDIR} -lroken -lcom_err \
@


1.16
log
@Unbreak Kerberos 5 authentication in telnet.
(Credential forwarding is still broken.)

PR:	bin/45397
@
text
@d19 1
a19 9
DPADD=
LDADD=

.if defined(MAKE_KERBEROS4)
DPADD+=		${LIBKRB} ${LIBCOM_ERR}
LDADD+=		-lkrb -lcom_err
.endif

DPADD+=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
d22 1
a22 1
LDADD+=		-lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
@


1.15
log
@add krb4 libraries
@
text
@d15 1
a15 1
CFLAGS+=	-DKRB5
@


1.15.2.1
log
@MFC: Update build for Heimdal Kerberos 0.4e around 2002/02/17.
@
text
@@


1.15.2.2
log
@MFC 1.7  src/crypto/telnet/libtelnet/kerberos5.c
    1.17 src/kerberos5/lib/libtelnet/Makefile
    1.16 src/kerberos5/libexec/telnetd/Makefile
    1.17 src/kerberos5/usr.bin/telnet/Makefile:
Unbreak Kerberos 5 authentication in telnet.

Requested by:   Tim Kientzle <kientzle@@acm.org>
@
text
@d15 1
a15 1
CFLAGS+=	-DKRB5 -DFORWARD -Dnet_write=telnet_net_write
@


1.15.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/kerberos5/libexec/telnetd/Makefile 113982 2003-04-24 19:14:00Z nectar $
@


1.15.2.1.6.1
log
@MFC 1.7  src/crypto/telnet/libtelnet/kerberos5.c
    1.17 src/kerberos5/lib/libtelnet/Makefile
    1.16 src/kerberos5/libexec/telnetd/Makefile
    1.17 src/kerberos5/usr.bin/telnet/Makefile:
Unbreak Kerberos 5 authentication in telnet.

Requested by:	Tim Kientzle <kientzle@@acm.org>
@
text
@d15 1
a15 1
CFLAGS+=	-DKRB5 -DFORWARD -Dnet_write=telnet_net_write
@


1.15.2.1.6.2
log
@Back out previous commit (wrong branch).

Must love pointy hats:	nectar
@
text
@d15 1
a15 1
CFLAGS+=	-DKRB5
@


1.14
log
@Add the necessary paths to the kerberos libraries and includes.

This fix "make release".

Reviewed by:	markm
@
text
@d19 9
a27 1
DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
d30 1
a30 1
LDADD=		-lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
@


1.13
log
@Style clean-up, and diff-reduce WRT src/secure/*telnet*/Makefile

Lost in this commit - KerberosIV compatability. This will be
re-added later.
@
text
@d23 2
a24 1
		-lkrb5 -lasn1 -lroken -lcom_err \
@


1.12
log
@make libtelnet (and telnet, telnetd) use libkrb when required
@
text
@d9 3
d15 1
d17 1
a17 10
SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
		termstat.c utility.c authenc.c

DPADD=
LDADD=

.if defined(MAKE_KERBEROS4)
DPADD+=		${LIBKRB} ${LIBCOM_ERR}
LDADD+=		-lkrb -lcom_err
.endif
d19 2
a20 1
DPADD+=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
d22 2
a23 1
LDADD+=		-lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
@


1.11
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/kerberos5/libexec/telnetd/Makefile,v 1.10 2001/05/11 09:39:10 markm Exp $
d16 9
a24 1
DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
d26 1
a26 1
LDADD=		-lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
@


1.10
log
@Fix PAMized telnet in exactly the same way as BDE did it for the other
telnet instances.
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberosIV/libexec/telnetd/Makefile,v 1.9 2001/03/28 12:08:20 ru Exp $
d16 4
a19 4
DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} \
		${LIBCRYPT} ${LIBCOM_ERR} ${LIBMP} ${LIBPAM}
LDADD=		-lutil -ltermcap ${LIBTELNET} -lcrypto \
		-L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp ${MINUSLPAM}
@


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

Approved by:	markm
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberosIV/libexec/telnetd/Makefile,v 1.8 2001/03/27 13:58:16 ru Exp $
d17 1
a17 1
		${LIBCRYPT} ${LIBCOM_ERR}
d19 1
a19 1
		-L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp
@


1.8
log
@MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberosIV/libexec/telnetd/Makefile,v 1.7 2000/02/24 20:56:44 markm Exp $
d18 1
a18 1
LDADD=		-lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto \
@


1.7
log
@Use libcrypto in place of libdes.
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberosIV/libexec/telnetd/Makefile,v 1.6 2000/01/27 09:28:17 shin Exp $
d7 1
a7 1
MAN8=		telnetd.8
@


1.7.2.1
log
@MFC: MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberosIV/libexec/telnetd/Makefile,v 1.7 2000/02/24 20:56:44 markm Exp $
d7 1
a7 1
MAN=		telnetd.8
@


1.7.2.2
log
@Add -lpam to telnet build to fix world breakage caused by SRA MFC.

Submitted by: jwd
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberosIV/libexec/telnetd/Makefile,v 1.7.2.1 2001/04/25 09:36:01 ru Exp $
d19 1
a19 1
		-L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp -lpam
@


1.7.2.3
log
@Clean up my previous patch (committed by nsayer).
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberosIV/libexec/telnetd/Makefile,v 1.7.2.2 2001/05/31 22:55:45 nsayer Exp $
d19 1
a19 7
		-L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp

.if !defined(NOPAM)
CFLAGS+=-DUSE_PAM
DPADD+= ${LIBPAM}
LDADD+= ${MINUSLPAM}
.endif
@


1.6
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
@d1 1
a1 1
# $FreeBSD: src/kerberosIV/libexec/telnetd/Makefile,v 1.5 1999/10/07 18:59:55 markm Exp $
d16 1
a16 1
DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} \
d18 1
a18 1
LDADD=		-lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \
@


1.5
log
@Bring in SRA for telnet.

Submitted by:	Nick Sayer
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberosIV/libexec/telnetd/Makefile,v 1.4 1999/09/05 14:05:59 markm Exp $
d11 1
a11 1
		-I${TELNETDIR}
@


1.4
log
@Fix for new Common Error system.
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberosIV/libexec/telnetd/Makefile,v 1.3 1999/08/28 01:31:25 peter Exp $
d19 1
a19 1
		-L${KRBOBJDIR} -lkrb -lcrypt -lcom_err
@


1.3
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
d17 1
a17 1
		${LIBCRYPT}
d19 1
a19 1
		-L${KRBOBJDIR} -lkrb -lcrypt
@


1.2
log
@Link everything against libcrypt. ELF builds complain without it.
Clean up the master makefile a bit and add a "dekerberise" target
for those who have shot themselves in the foot.

Thanks to:	Randy Bush
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.1.1.1 1997/09/24 20:37:13 markm Exp $
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
#	$Id$
d16 2
a17 1
DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB}
d19 1
a19 1
		-L${KRBOBJDIR} -lkrb
@


1.1.1.1
log
@Initial import of the new kerberosIV Makefiles.

I will follow up with the userland sources over the next few days.
The impatient of you can play with this, but you do this without
support or blessing until I am finished ;-)
@
text
@@


1.1.1.1.2.1
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.1.1.1.4.1
log
@MFC: link everything against libcrypt and  provide a dekerberise target for
the foot-shooters.
@
text
@d16 1
a16 2
DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} \
		${LIBCRYPT}
d18 1
a18 1
		-L${KRBOBJDIR} -lkrb -lcrypt
@


1.1.1.1.4.2
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.1.1.1.4.3
log
@update build infrastructure to work with the krb4-1.0 now in crypto

Reviewed by:	kris, markm
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberosIV/libexec/telnetd/Makefile,v 1.1.1.1.4.2 1999/08/29 14:40:49 peter Exp $
d11 1
a11 1
		-I${TELNETDIR} -DINET6
@


