From d6aec2b6d60b4b7b11a4a51d8a87a963e942803c Mon Sep 17 00:00:00 2001 From: markm Date: Wed, 16 Jul 2003 20:59:15 +0000 Subject: 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. --- usr.bin/Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'usr.bin/Makefile') diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 4680121..c630576 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -167,6 +167,7 @@ SUBDIR= alias \ talk \ tcopy \ tee \ + telnet \ tftp \ time \ tip \ @@ -217,13 +218,6 @@ SUBDIR= alias \ ypmatch \ ypwhich -.if defined(RELEASEDIR) || \ - (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ - defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS) -# make release needs both -SUBDIR+=telnet -.endif - .if !defined(NO_BIND) SUBDIR+=dig \ dnskeygen \ -- cgit v1.1