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.

2 files changed, 1 insertions, 35 deletions

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