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.

8 files changed, 5 insertions, 98 deletions

diff --git a/kerberos5/Makefile b/kerberos5/Makefile
index 3681fbd..2bdbd25 100644
--- a/kerberos5/Makefile
+++ b/kerberos5/Makefile
@@ -3,7 +3,8 @@
 SUBDIR=	doc lib libexec usr.bin usr.sbin
 
 # These are the programs which depend on Kerberos.
-KPROGS=	lib/libpam secure/lib/libssh secure/usr.bin/ssh secure/usr.sbin/sshd
+KPROGS=	lib/libpam \
+	secure/lib/libssh secure/usr.bin/ssh secure/usr.sbin/sshd
 
 # This target is used to rebuild these programs WITH Kerberos.
 kerberize:
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index 111f943..d4e46cb 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -7,7 +7,6 @@ NOLINT=		true
 
 KRB5DIR=	${.CURDIR}/../../../crypto/heimdal
 ROKENDIR=	${.CURDIR}/../../lib/libroken
-TELNETDIR=	${.CURDIR}/../../../crypto/telnet
 
 CFLAGS+=-I${INCLUDEOBJDIR} -DHAVE_CONFIG_H
 
@@ -62,12 +61,6 @@ LIBSL=		${.OBJDIR}/../../lib/libsl/libsl.a
 LIBSL=		${.CURDIR}/../../lib/libsl/libsl.a
 .endif
 
-.if exists(${.OBJDIR}/../../lib/libtelnet)
-LIBTELNET=	${.OBJDIR}/../../lib/libtelnet/libtelnet.a
-.else
-LIBTELNET=	${.CURDIR}/../../lib/libtelnet/libtelnet.a
-.endif
-
 COMPILE_ET=     compile_et
 
 .ORDER: asn1_err.c asn1_err.h
diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile
index f94bb0a..7223a5d 100644
--- a/kerberos5/lib/Makefile
+++ b/kerberos5/lib/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl libgssapi libtelnet
+SUBDIR=	libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl libgssapi
 
 .include <bsd.subdir.mk>
diff --git a/kerberos5/lib/libtelnet/Makefile b/kerberos5/lib/libtelnet/Makefile
deleted file mode 100644
index 223df03..0000000
--- a/kerberos5/lib/libtelnet/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $FreeBSD$
-
-LIB=		telnet
-
-INTERNALLIB=	yes
-
-SRCS=		genget.c getent.c misc.c encrypt.c auth.c \
-		enc_des.c sra.c pk.c
-SRCS+=		kerberos5.c
-
-#WARNS?=		2
-
-CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DSRA -I${TELNETDIR}
-CFLAGS+=	-DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR}
-CFLAGS+=	-DFORWARD -Dnet_write=telnet_net_write
-
-INCS=		${TELNETDIR}/arpa/telnet.h
-INCSDIR=	${INCLUDEDIR}/arpa
-
-.include <bsd.lib.mk>
-
-.PATH:	${TELNETDIR}/libtelnet
-
-#
-# Remove obsolete shared libraries, if any.  We don't bother moving them
-# to /usr/lib/compat, since they were only used by telnet, telnetd and
-# tn3270.
-#
-beforeinstall: __remove-stale-libs
-__remove-stale-libs: .PHONY
-.if exists(${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0)
-	-chflags noschg ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0
-	rm -f ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0
-.endif
diff --git a/kerberos5/libexec/Makefile b/kerberos5/libexec/Makefile
index b81f769..adaa8cd 100644
--- a/kerberos5/libexec/Makefile
+++ b/kerberos5/libexec/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	ipropd-master ipropd-slave hpropd kadmind kdc kpasswdd telnetd
+SUBDIR=	ipropd-master ipropd-slave hpropd kadmind kdc kpasswdd
 
 .include <bsd.subdir.mk>
diff --git a/kerberos5/libexec/telnetd/Makefile b/kerberos5/libexec/telnetd/Makefile
deleted file mode 100644
index 9bf0356..0000000
--- a/kerberos5/libexec/telnetd/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $FreeBSD$
-
-# 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
diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile
index 89c7503..86dea8a 100644
--- a/kerberos5/usr.bin/Makefile
+++ b/kerberos5/usr.bin/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	kadmin kdestroy kinit klist kpasswd ksu krb5-config telnet
+SUBDIR=	kadmin kdestroy kinit klist kpasswd ksu krb5-config
 
 .include <bsd.subdir.mk>
diff --git a/kerberos5/usr.bin/telnet/Makefile b/kerberos5/usr.bin/telnet/Makefile
deleted file mode 100644
index 329283b..0000000
--- a/kerberos5/usr.bin/telnet/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $FreeBSD$
-
-PROG=		telnet
-
-SRCS=		authenc.c commands.c main.c network.c ring.c sys_bsd.c \
-		telnet.c terminal.c utilities.c
-
-CFLAGS+=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \
-		-DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \
-		-I${TELNETDIR} -I${TELNETDIR}/libtelnet/
-
-CFLAGS+=	-DKRB5 -DFORWARD -Dnet_write=telnet_net_write
-
-WARNS?=		2
-
-DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
-		${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} \
-		${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
-LDADD=		-ltermcap ${LIBTELNET} -lmp \
-		-lkrb5 -lasn1 -lcom_err -lroken \
-		-lcrypto -lcrypt -lipsec ${MINUSLPAM}
-
-.include <bsd.prog.mk>
-
-.PATH:	${TELNETDIR}/telnet