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/usr.bin | |
| 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/usr.bin')
| -rw-r--r-- | kerberos5/usr.bin/Makefile | 2 | ||||
| -rw-r--r-- | kerberos5/usr.bin/telnet/Makefile | 25 |
2 files changed, 1 insertions, 26 deletions
diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile index 89c7503..86dea8a 100644 --- a/kerberos5/usr.bin/Makefile +++ b/kerberos5/usr.bin/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= kadmin kdestroy kinit klist kpasswd ksu krb5-config telnet +SUBDIR= kadmin kdestroy kinit klist kpasswd ksu krb5-config .include <bsd.subdir.mk> diff --git a/kerberos5/usr.bin/telnet/Makefile b/kerberos5/usr.bin/telnet/Makefile deleted file mode 100644 index 329283b..0000000 --- a/kerberos5/usr.bin/telnet/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# $FreeBSD$ - -PROG= telnet - -SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \ - telnet.c terminal.c utilities.c - -CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \ - -DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \ - -I${TELNETDIR} -I${TELNETDIR}/libtelnet/ - -CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write - -WARNS?= 2 - -DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \ - ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} \ - ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM} -LDADD= -ltermcap ${LIBTELNET} -lmp \ - -lkrb5 -lasn1 -lcom_err -lroken \ - -lcrypto -lcrypt -lipsec ${MINUSLPAM} - -.include <bsd.prog.mk> - -.PATH: ${TELNETDIR}/telnet |
