summaryrefslogtreecommitdiffstats
path: root/libexec/Makefile
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2003-07-16 20:59:15 +0000
committermarkm <markm@FreeBSD.org>2003-07-16 20:59:15 +0000
commitd6aec2b6d60b4b7b11a4a51d8a87a963e942803c (patch)
treed0941cea5c5d555255e1721af0d195e7b1148f6a /libexec/Makefile
parent23022fa9406006dadd2eafdf36b94c737d737135 (diff)
downloadFreeBSD-src-d6aec2b6d60b4b7b11a4a51d8a87a963e942803c.zip
FreeBSD-src-d6aec2b6d60b4b7b11a4a51d8a87a963e942803c.tar.gz
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.
Diffstat (limited to 'libexec/Makefile')
-rw-r--r--libexec/Makefile9
1 files changed, 1 insertions, 8 deletions
diff --git a/libexec/Makefile b/libexec/Makefile
index 9790381..c4c3c13 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
OpenPOWER on IntegriCloud