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 /kerberos5/Makefile.inc | |
| 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 'kerberos5/Makefile.inc')
| -rw-r--r-- | kerberos5/Makefile.inc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index 111f943..d4e46cb 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -7,7 +7,6 @@ NOLINT= true KRB5DIR= ${.CURDIR}/../../../crypto/heimdal ROKENDIR= ${.CURDIR}/../../lib/libroken -TELNETDIR= ${.CURDIR}/../../../crypto/telnet CFLAGS+=-I${INCLUDEOBJDIR} -DHAVE_CONFIG_H @@ -62,12 +61,6 @@ LIBSL= ${.OBJDIR}/../../lib/libsl/libsl.a LIBSL= ${.CURDIR}/../../lib/libsl/libsl.a .endif -.if exists(${.OBJDIR}/../../lib/libtelnet) -LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a -.else -LIBTELNET= ${.CURDIR}/../../lib/libtelnet/libtelnet.a -.endif - COMPILE_ET= compile_et .ORDER: asn1_err.c asn1_err.h |
