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, 7 insertions, 113 deletions

diff --git a/secure/Makefile b/secure/Makefile
index 4155dae3816f..95ef72725170 100644
--- a/secure/Makefile
+++ b/secure/Makefile
@@ -6,26 +6,12 @@
 
 SUBDIR= lib libexec usr.bin usr.sbin
 
-SDIR= ${.CURDIR}/..
-
-CODAI=	${MAKE} ${MFLAGS} cleandir; \
-	${MAKE} ${MFLAGS} obj; \
-	${MAKE} ${MFLAGS} depend all install
-
-CODAD=	${MAKE} ${MFLAGS} cleandir; \
-	${MAKE} ${MFLAGS} obj; \
-	${MAKE} ${MFLAGS} depend all distribute
-
-# These are the programs which depend on secure libs
-sprog:
-	cd ${SDIR}/bin/ed; ${CODAI}
-	cd ${SDIR}/sbin/init; ${CODAI}
-
-bootstrap:
-	( cd include; ${MAKE} ${MFLAGS} install )
-	( cd lib; ${MAKE} ${MFLAGS} depend all install )
-	${MAKE} ${MFLAGS} cleandir
-	${MAKE} ${MFLAGS} obj
-	${MAKE} ${MFLAGS} depend all install sprog
+# These are programs which depend on crypto, but not Kerberos.
+SPROGS=	bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpdump \
+	lib/libfetch usr.bin/fetch \
+	lib/libtelnet libexec/telnetd usr.bin/telnet
+.if !defined(NO_SENDMAIL)
+SPROGS+=usr.sbin/sendmail
+.endif
 
 .include <bsd.subdir.mk>
diff --git a/secure/Makefile.inc b/secure/Makefile.inc
index 0f19a7bb99ec..658101a1df9d 100644
--- a/secure/Makefile.inc
+++ b/secure/Makefile.inc
@@ -2,13 +2,6 @@
 
 DISTRIBUTION?=crypto
 
-TELNETDIR=	${.CURDIR}/../../../crypto/telnet
-.if exists(${.OBJDIR}/../../lib/libtelnet)
-LIBTELNET=	${.OBJDIR}/../../lib/libtelnet/libtelnet.a
-.else
-LIBTELNET=	${.CURDIR}/../../lib/libtelnet/libtelnet.a
-.endif
-
 .if exists(${.CURDIR}/../../lib/libcrypt/obj)
 CRYPTOBJDIR=	${.CURDIR}/../../lib/libcrypt/obj
 .else
diff --git a/secure/lib/Makefile b/secure/lib/Makefile
index 56b98e59e3a8..049fd398f31c 100644
--- a/secure/lib/Makefile
+++ b/secure/lib/Makefile
@@ -6,9 +6,6 @@ SUBDIR+=libcrypto libssl
 .if !defined(NO_OPENSSH)
 SUBDIR+=libssh
 .endif
-.if defined(NO_KERBEROS)
-SUBDIR+=libtelnet
-.endif
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile
deleted file mode 100644
index 67d5d474c65e..000000000000
--- a/secure/lib/libtelnet/Makefile
+++ /dev/null
@@ -1,29 +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
-
-WARNS?=	2
-CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA \
-	 -I${TELNETDIR} -I${TELNETDIR}/libtelnet
-
-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/secure/libexec/Makefile b/secure/libexec/Makefile
index 56d09b763832..b60b4cea0d06 100644
--- a/secure/libexec/Makefile
+++ b/secure/libexec/Makefile
@@ -5,9 +5,6 @@ SUBDIR=
 .if !defined(NO_OPENSSH)
 SUBDIR+=sftp-server ssh-keysign
 .endif
-.if defined(NO_KERBEROS)
-SUBDIR+=telnetd
-.endif
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile
deleted file mode 100644
index 07378fd6d137..000000000000
--- a/secure/libexec/telnetd/Makefile
+++ /dev/null
@@ -1,26 +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
-
-WARNS?=		2
-WFORMAT?=	0
-
-DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
-		${LIBCRYPT} ${LIBPAM}
-LDADD=		-lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
-		-lcrypt ${MINUSLPAM}
-
-.include <bsd.prog.mk>
-
-.PATH:	${TELNETDIR}/telnetd
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
index 77674ab5a606..4d78845f6c6f 100644
--- a/secure/usr.bin/Makefile
+++ b/secure/usr.bin/Makefile
@@ -6,9 +6,6 @@ SUBDIR+=bdes openssl
 .if !defined(NO_OPENSSH)
 SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan
 .endif
-.if defined(NO_KERBEROS)
-SUBDIR+=telnet
-.endif
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile
deleted file mode 100644
index 74cf075d18d9..000000000000
--- a/secure/usr.bin/telnet/Makefile
+++ /dev/null
@@ -1,21 +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/
-
-WARNS?=		2
-
-DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
-		${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
-LDADD=		-ltermcap ${LIBTELNET} -lmp \
-		-lcrypto -lcrypt -lipsec ${MINUSLPAM}
-
-.include <bsd.prog.mk>
-
-.PATH:	${TELNETDIR}/telnet