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.

1 files changed, 0 insertions, 7 deletions

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