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. --- secure/Makefile | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) (limited to 'secure/Makefile') 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 -- cgit v1.1