diff options
author | markm <markm@FreeBSD.org> | 2003-07-16 20:59:15 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 2003-07-16 20:59:15 +0000 |
commit | d6aec2b6d60b4b7b11a4a51d8a87a963e942803c (patch) | |
tree | d0941cea5c5d555255e1721af0d195e7b1148f6a /secure/Makefile | |
parent | 23022fa9406006dadd2eafdf36b94c737d737135 (diff) | |
download | FreeBSD-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 'secure/Makefile')
-rw-r--r-- | secure/Makefile | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/secure/Makefile b/secure/Makefile index 4155dae..95ef727 100644 --- a/secure/Makefile +++ b/secure/Makefile @@ -6,26 +6,12 @@ SUBDIR= lib libexec usr.bin usr.sbin -SDIR= ${.CURDIR}/.. - -CODAI= ${MAKE} ${MFLAGS} cleandir; \ - ${MAKE} ${MFLAGS} obj; \ - ${MAKE} ${MFLAGS} depend all install - -CODAD= ${MAKE} ${MFLAGS} cleandir; \ - ${MAKE} ${MFLAGS} obj; \ - ${MAKE} ${MFLAGS} depend all distribute - -# These are the programs which depend on secure libs -sprog: - cd ${SDIR}/bin/ed; ${CODAI} - cd ${SDIR}/sbin/init; ${CODAI} - -bootstrap: - ( cd include; ${MAKE} ${MFLAGS} install ) - ( cd lib; ${MAKE} ${MFLAGS} depend all install ) - ${MAKE} ${MFLAGS} cleandir - ${MAKE} ${MFLAGS} obj - ${MAKE} ${MFLAGS} depend all install sprog +# These are programs which depend on crypto, but not Kerberos. +SPROGS= bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpdump \ + lib/libfetch usr.bin/fetch \ + lib/libtelnet libexec/telnetd usr.bin/telnet +.if !defined(NO_SENDMAIL) +SPROGS+=usr.sbin/sendmail +.endif .include <bsd.subdir.mk> |