From 4afa3718327563c785b2961410b6ea85d6ddf3ca Mon Sep 17 00:00:00 2001 From: Mark Murray 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. --- libexec/Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'libexec/Makefile') diff --git a/libexec/Makefile b/libexec/Makefile index 97903815ab64..c4c3c13499c2 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -1,7 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -# Present but disabled: kpasswdd SUBDIR= atrun \ bootpd \ comsat \ @@ -26,6 +25,7 @@ SUBDIR= atrun \ save-entropy \ talkd \ tcpd \ + telnetd \ tftpd \ ypxfr @@ -41,13 +41,6 @@ SUBDIR+=named-xfer SUBDIR+=mail.local smrsh .endif -.if defined(RELEASEDIR) || \ - (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ - defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS) -# make release needs both -SUBDIR+=telnetd -.endif - .if defined(WANT_LUKEMFTPD) SUBDIR+=lukemftpd .endif -- cgit v1.3