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/lib | |
| 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/lib')
| -rw-r--r-- | secure/lib/Makefile | 3 | ||||
| -rw-r--r-- | secure/lib/libtelnet/Makefile | 29 |
2 files changed, 0 insertions, 32 deletions
diff --git a/secure/lib/Makefile b/secure/lib/Makefile index 56b98e5..049fd39 100644 --- a/secure/lib/Makefile +++ b/secure/lib/Makefile @@ -6,9 +6,6 @@ SUBDIR+=libcrypto libssl .if !defined(NO_OPENSSH) SUBDIR+=libssh .endif -.if defined(NO_KERBEROS) -SUBDIR+=libtelnet -.endif .endif .include <bsd.subdir.mk> diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile deleted file mode 100644 index 67d5d47..0000000 --- a/secure/lib/libtelnet/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# $FreeBSD$ - -LIB= telnet -INTERNALLIB= yes - -SRCS= genget.c getent.c misc.c encrypt.c auth.c enc_des.c sra.c pk.c - -WARNS?= 2 -CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA \ - -I${TELNETDIR} -I${TELNETDIR}/libtelnet - -INCS= ${TELNETDIR}/arpa/telnet.h -INCSDIR=${INCLUDEDIR}/arpa - -.include <bsd.lib.mk> - -.PATH: ${TELNETDIR}/libtelnet - -# -# Remove obsolete shared libraries, if any. We don't bother moving them -# to /usr/lib/compat, since they were only used by telnet, telnetd and -# tn3270. -# -beforeinstall: __remove-stale-libs -__remove-stale-libs: .PHONY -.if exists(${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0) - -chflags noschg ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0 - rm -f ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0 -.endif |
