head	1.31;
access;
symbols
	RELENG_4_11_0_RELEASE:1.21.2.4
	RELENG_4_11:1.21.2.4.0.10
	RELENG_4_11_BP:1.21.2.4
	RELENG_4_10_0_RELEASE:1.21.2.4
	RELENG_4_10:1.21.2.4.0.8
	RELENG_4_10_BP:1.21.2.4
	RELENG_4_9_0_RELEASE:1.21.2.4
	RELENG_4_9:1.21.2.4.0.6
	RELENG_4_9_BP:1.21.2.4
	RELENG_5_1_0_RELEASE:1.30
	RELENG_5_1:1.30.0.4
	RELENG_5_1_BP:1.30
	RELENG_4_8_0_RELEASE:1.21.2.4
	RELENG_4_8:1.21.2.4.0.4
	RELENG_4_8_BP:1.21.2.4
	RELENG_5_0_0_RELEASE:1.30
	RELENG_5_0:1.30.0.2
	RELENG_5_0_BP:1.30
	RELENG_4_7_0_RELEASE:1.21.2.4
	RELENG_4_7:1.21.2.4.0.2
	RELENG_4_7_BP:1.21.2.4
	RELENG_4_6_2_RELEASE:1.21.2.2
	RELENG_4_6_1_RELEASE:1.21.2.2
	RELENG_4_6_0_RELEASE:1.21.2.2
	RELENG_4_6:1.21.2.2.0.2
	RELENG_4_6_BP:1.21.2.2
	RELENG_4_5_0_RELEASE:1.21.2.1
	RELENG_4_5:1.21.2.1.0.4
	RELENG_4_5_BP:1.21.2.1
	RELENG_4_4_0_RELEASE:1.21.2.1
	RELENG_4_4:1.21.2.1.0.2
	RELENG_4_4_BP:1.21.2.1
	RELENG_4_3_0_RELEASE:1.21
	RELENG_4_3:1.21.0.4
	RELENG_4_3_BP:1.21
	RELENG_4_2_0_RELEASE:1.21
	RELENG_4_1_1_RELEASE:1.21
	PRE_SMPNG:1.22
	RELENG_4_1_0_RELEASE:1.21
	RELENG_4_0_0_RELEASE:1.21
	RELENG_4:1.21.0.2
	RELENG_4_BP:1.21
	RELENG_2_2_8_RELEASE:1.15.2.1
	RELENG_2_2_7_RELEASE:1.15.2.1
	RELENG_2_2_6_RELEASE:1.15.2.1
	RELENG_2_2_5_RELEASE:1.15.2.1
	RELENG_2_2_2_RELEASE:1.15.2.1
	RELENG_2_2_1_RELEASE:1.15.2.1
	RELENG_2_1_7_RELEASE:1.1.1.1.6.7
	RELENG_2_1_6_1_RELEASE:1.1.1.1.6.6
	RELENG_2_1_6_RELEASE:1.1.1.1.6.6
	RELENG_2_2:1.15.0.2
	RELENG_2_2_BP:1.15
	RELENG_2_1_5_RELEASE:1.1.1.1.6.6
	RELENG_2_1_0_RELEASE:1.1.1.1.6.4
	RELENG_2_1_0:1.1.1.1.0.6
	RELENG_2_1_0_BP:1.1.1.1
	RELENG_2_0_5_RELEASE:1.1.1.1
	RELENG_2_0_5:1.1.1.1.0.4
	RELENG_2_0_5_BP:1.1.1.1
	RELENG_2_0_5_ALPHA:1.1.1.1
	RELEASE_2_0:1.1.1.1
	BETA_2_0:1.1.1.1
	ALPHA_2_0:1.1.1.1.0.2
	BSD_4_4_Lite_crypt:1.1.1.1
	CSRG:1.1.1;
locks; strict;
comment	@# @;


1.31
date	2003.07.16.20.59.15;	author markm;	state dead;
branches;
next	1.30;

1.30
date	2001.11.30.21.10.58;	author markm;	state Exp;
branches;
next	1.29;

1.29
date	2001.08.20.12.32.42;	author markm;	state Exp;
branches;
next	1.28;

1.28
date	2001.08.03.16.03.24;	author markm;	state Exp;
branches;
next	1.27;

1.27
date	2001.07.30.14.36.19;	author bde;	state Exp;
branches;
next	1.26;

1.26
date	2001.05.09.14.30.49;	author bde;	state Exp;
branches;
next	1.25;

1.25
date	2001.05.07.20.38.39;	author nsayer;	state Exp;
branches;
next	1.24;

1.24
date	2001.03.28.12.08.19;	author ru;	state Exp;
branches;
next	1.23;

1.23
date	2001.03.26.14.53.31;	author ru;	state Exp;
branches;
next	1.22;

1.22
date	2000.07.16.05.53.09;	author peter;	state Exp;
branches;
next	1.21;

1.21
date	2000.02.24.18.59.34;	author markm;	state Exp;
branches
	1.21.2.1;
next	1.20;

1.20
date	2000.01.27.09.28.23;	author shin;	state Exp;
branches;
next	1.19;

1.19
date	99.12.18.16.42.32;	author peter;	state Exp;
branches;
next	1.18;

1.18
date	99.12.17.11.45.28;	author marcel;	state Exp;
branches;
next	1.17;

1.17
date	99.10.07.19.47.09;	author markm;	state Exp;
branches;
next	1.16;

1.16
date	96.11.07.14.42.39;	author markm;	state dead;
branches;
next	1.15;

1.15
date	96.06.05.22.48.03;	author nate;	state Exp;
branches
	1.15.2.1;
next	1.14;

1.14
date	96.04.23.05.18.42;	author pst;	state Exp;
branches;
next	1.13;

1.13
date	96.03.11.16.17.58;	author markm;	state Exp;
branches;
next	1.12;

1.12
date	96.03.09.13.26.21;	author ache;	state Exp;
branches;
next	1.11;

1.11
date	95.10.11.00.04.09;	author gibbs;	state Exp;
branches;
next	1.10;

1.10
date	95.09.16.03.04.10;	author gibbs;	state Exp;
branches;
next	1.9;

1.9
date	95.09.14.21.29.21;	author gibbs;	state Exp;
branches;
next	1.8;

1.8
date	95.08.05.19.10.25;	author ache;	state Exp;
branches;
next	1.7;

1.7
date	95.07.24.22.55.59;	author ache;	state Exp;
branches;
next	1.6;

1.6
date	95.07.24.22.01.01;	author ache;	state Exp;
branches;
next	1.5;

1.5
date	95.07.24.21.47.30;	author ache;	state Exp;
branches;
next	1.4;

1.4
date	95.07.24.21.12.57;	author ache;	state Exp;
branches;
next	1.3;

1.3
date	95.07.24.20.40.03;	author ache;	state Exp;
branches;
next	1.2;

1.2
date	95.07.20.11.39.51;	author pst;	state Exp;
branches;
next	1.1;

1.1
date	94.08.27.15.48.52;	author csgr;	state Exp;
branches
	1.1.1.1;
next	;

1.21.2.1
date	2001.05.30.20.46.48;	author nsayer;	state Exp;
branches;
next	1.21.2.2;

1.21.2.2
date	2002.04.13.11.00.50;	author markm;	state Exp;
branches;
next	1.21.2.3;

1.21.2.3
date	2002.07.03.22.13.26;	author des;	state Exp;
branches;
next	1.21.2.4;

1.21.2.4
date	2002.07.03.22.20.33;	author des;	state Exp;
branches;
next	1.21.2.5;

1.21.2.5
date	2012.11.17.07.24.39;	author svnexp;	state Exp;
branches;
next	;

1.15.2.1
date	96.11.13.20.29.52;	author phk;	state dead;
branches;
next	;

1.1.1.1
date	94.08.27.15.48.53;	author csgr;	state Exp;
branches
	1.1.1.1.6.1;
next	;

1.1.1.1.6.1
date	95.09.15.18.19.24;	author gibbs;	state Exp;
branches;
next	1.1.1.1.6.2;

1.1.1.1.6.2
date	95.09.16.03.13.38;	author gibbs;	state Exp;
branches;
next	1.1.1.1.6.3;

1.1.1.1.6.3
date	95.10.11.00.12.21;	author gibbs;	state Exp;
branches;
next	1.1.1.1.6.4;

1.1.1.1.6.4
date	95.10.29.06.55.03;	author davidg;	state Exp;
branches;
next	1.1.1.1.6.5;

1.1.1.1.6.5
date	96.06.21.17.29.14;	author markm;	state Exp;
branches;
next	1.1.1.1.6.6;

1.1.1.1.6.6
date	96.06.30.12.50.58;	author markm;	state Exp;
branches;
next	1.1.1.1.6.7;

1.1.1.1.6.7
date	97.02.10.20.58.30;	author markm;	state Exp;
branches;
next	1.1.1.1.6.8;

1.1.1.1.6.8
date	99.09.05.11.51.47;	author peter;	state Exp;
branches;
next	;


desc
@@


1.31
log
@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.
@
text
@# $FreeBSD: src/secure/usr.bin/telnet/Makefile,v 1.30 2001/11/30 21:10:58 markm Exp $

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/

WARNS?=		2

DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
		${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
LDADD=		-ltermcap ${LIBTELNET} -lmp \
		-lcrypto -lcrypt -lipsec ${MINUSLPAM}

.include <bsd.prog.mk>

.PATH:	${TELNETDIR}/telnet
@


1.30
log
@Clean up makefiles, and turn on WARNS=2. Take into account the telnet
#if cleanup.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.29
log
@Diff reduce all the crypto telnet Makefiles.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/telnet/Makefile,v 1.28 2001/08/03 16:03:24 markm Exp $
d5 3
d10 1
a10 1
		-I${TELNETDIR}
d12 1
a12 2
SRCS=		authenc.c commands.c main.c network.c ring.c sys_bsd.c \
		telnet.c terminal.c tn3270.c utilities.c
d14 4
a17 4
DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} \
		${LIBIPSEC} ${LIBPAM}
LDADD=		-ltermcap ${LIBTELNET} -lmp -lcrypto -lcrypt \
		-lipsec ${MINUSLPAM}
@


1.28
log
@Revamp and diff-reduce the various secure telnets. Make sure that
Kerberos5 has _a_ telnet (which is not currently K5 enabled).
Incorporate BDE's static linking fixes.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/telnet/Makefile,v 1.27 2001/07/30 14:36:19 bde Exp $
d5 1
a5 1
CFLAGS=		-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
@


1.27
log
@Fixed world breakage when NOSHARED=yes.  libmp now depends on libcrypto,
so it must be linked before libcrypto to work right.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/telnet/Makefile,v 1.26 2001/05/09 14:30:49 bde Exp $
d5 3
a7 3
CFLAGS+=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
                -DENCRYPTION -DAUTHENTICATION -I${TELNETDIR}
CFLAGS+=	-DIPSEC -DINET6
@


1.26
log
@Fixed world breakage in previous commit.  -lpam must never be used
directly (except in the definition of MINUSLPAM in bsd.libnames.mk)
since it doesn't give all the libraries necessary for static linkage.

Fixed missing ${LIBPAM} in DPADD.

Fixed some style bugs in DPADD and LDADD.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/telnet/Makefile,v 1.25 2001/05/07 20:38:39 nsayer Exp $
d12 1
a12 1
DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMP} \
d14 1
a14 1
LDADD=		-ltermcap ${LIBTELNET} -lcrypto -lcrypt -lmp \
@


1.25
log
@Add PAM support to SRA authentication. Cribbed mostly from ftpd. This
doesn't solve the problem of root being allowed to log in, but that sort
of thing is something PAM should be doing anyway.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/telnet/Makefile,v 1.24 2001/03/28 12:08:19 ru Exp $
d12 4
a15 4
DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMP}
DPADD+=		${LIBIPSEC}
LDADD=		-ltermcap ${LIBTELNET} -lcrypto -lcrypt -lmp
LDADD+=		-lipsec -lpam
@


1.24
log
@Bye-bye /usr/lib/libtelnet.a.  This should fix ``make release'' brokeness.

Approved by:	markm
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/telnet/Makefile,v 1.23 2001/03/26 14:53:31 ru Exp $
d15 1
a15 1
LDADD+=		-lipsec
@


1.23
log
@secure/ build fixes:

- TELNETOBJDIR is gone.  `buildworld' already installs libtelnet.a
  in ${WORLDTMP}/usr/lib, and we have LIBRARY_PATH pointing there.

- SSHDIR (formerly SSHSRC) is now shared between all SSH modules.
  New LIBSSH is introduced for libssh.a (an internal static lib).
  Previously, build without prior `obj' was broken; SSH modules
  always looked for libssh.a in ${.OBJDIR}.  Also, the dependancies
  on the libssh.a were missing.

- libtelnet/ did not install the crypto version of telnet.h into
  /usr/include/arpa.

- Removed BINOWN, BINMODE, BINDIR and SRCS with default values.

Reviewed by:	markm

- MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/telnet/Makefile,v 1.22 2000/07/16 05:53:09 peter Exp $
d14 1
a14 1
LDADD=		-ltermcap -ltelnet -lcrypto -lcrypt -lmp
@


1.22
log
@Forced commit.  This is to try and help folks that used the international
crypto repo and have slightly different files but with the same version.
cvsup in 'checkout mode' has no trouble with this, but cvs can get really
silly about it.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/telnet/Makefile,v 1.21 2000/02/24 18:59:34 markm Exp $
d14 1
a14 1
LDADD=		-ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto -lcrypt -lmp
@


1.21
log
@Build everything properly. This means:

o Don't b uild libdes.

o Crypto is now housed in libcrypto (with a compatability symlink to
  libdes)

o RSA may depend on RSAREF at your locale.

o OpenSSH is now a part of the base system.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.21.2.1
log
@MFC: Security fixes to SRA telnet:

1. Add PAM support to SRA. Includes adding telnetd to /etc/pam.conf and
-lpam to the secure telnetd/telnet Makefiles.

2. Insist on secure tty before allowing root login. This should be
replaced with a suitable PAM module at some point.

3. Make sure not to overflow the xuser/xpass buffers. Since they were
malloc()ed (check for malloc failure and abort, too, btw) this was
likely not exploitable, but it is best to be safe.

Submitted by: kris
Review timeout: security-officer
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/telnet/Makefile,v 1.21 2000/02/24 18:59:34 markm Exp $
d15 1
a15 1
LDADD+=		-lipsec -lpam
@


1.21.2.2
log
@MFC: Merge infrastucture for cleaned-up secure telnet.
@
text
@d1 1
a1 1
# $FreeBSD$
d5 4
d10 1
a10 7
		telnet.c terminal.c utilities.c

CFLAGS+=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \
		-DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \
		-I${TELNETDIR} -I${TELNETDIR}/libtelnet/

WARNS?=		2
d12 4
a15 4
DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
		${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
LDADD=		-ltermcap ${LIBTELNET} -lmp \
		-lcrypto -lcrypt -lipsec ${MINUSLPAM}
@


1.21.2.3
log
@Update Makefiles for OpenSSH 3.4p1.  Remove some hacks made superfluous
by an earlier commit to src/Makefile.inc1.  Reduce diffs against -CURRENT.

Sponsored by:	DARPA, NAI Labs
@
text
@d16 1
a16 1
LDADD+=		-ltermcap ${LIBTELNET} -lmp \
@


1.21.2.4
log
@More diff reduction.
@
text
@d16 1
a16 1
LDADD=		-ltermcap ${LIBTELNET} -lmp \
@


1.21.2.5
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/secure/usr.bin/telnet/Makefile 99394 2002-07-03 22:20:33Z des $
@


1.20
log
@another tcp apps IPv6 updates.(should be make world safe)
  ftp, telnet, ftpd, faithd
  also telnet related sync with crypto, secure, kerberosIV

Obtained from: KAME project
@
text
@d1 1
a1 1
#       $FreeBSD: src/secure/usr.bin/telnet/Makefile,v 1.19 1999/12/18 16:42:32 peter Exp $
d12 1
a12 1
DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBCRYPT} ${LIBMP}
d14 1
a14 1
LDADD=		-ltermcap -L${TELNETOBJDIR} -ltelnet -ldes -lcrypt -lmp
@


1.19
log
@Revert -lmd changes now that libcrypt doesn't expose this binutils/ld
bug any more.
@
text
@d1 1
a1 1
#       $FreeBSD: src/secure/usr.bin/telnet/Makefile,v 1.18 1999/12/17 11:45:28 marcel Exp $
d7 1
d13 1
d15 1
@


1.18
log
@Add libmd to DPADD and LDADD.
@
text
@d1 1
a1 1
#       $FreeBSD: src/secure/usr.bin/telnet/Makefile,v 1.17 1999/10/07 19:47:09 markm Exp $
d11 2
a12 2
DPADD=	${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBCRYPT} ${LIBMP} ${LIBMD}
LDADD=	-ltermcap -L${TELNETOBJDIR} -ltelnet -ldes -lcrypt -lmp -lmd
@


1.17
log
@Make telnet with SRA work.

Submitted by:	Nick Sayer
@
text
@d1 1
a1 1
#       $FreeBSD$
d11 2
a12 2
DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBCRYPT} ${LIBMP}
LDADD=		-ltermcap -L${TELNETOBJDIR} -ltelnet -ldes -lcrypt -lmp
@


1.16
log
@Secure telnet is now in eBones.
@
text
@d1 1
a1 51
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the distribution.
# 3. All advertising materials mentioning features or use of this software
#    must display the following acknowledgement:
#	This product includes software developed by the University of
#	California, Berkeley and its contributors.
# 4. Neither the name of the University nor the names of its contributors
#    may be used to endorse or promote products derived from this software
#    without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
#	@@(#)Makefile	8.1 (Berkeley) 6/6/93
#	$Id: Makefile,v 1.15 1996/06/05 22:48:03 nate Exp markm $
#

PROG=	telnet

SRCS=	authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
	terminal.c tn3270.c utilities.c

CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DENCRYPTION
CFLAGS+=-I${.CURDIR}/../../lib
LDADD+= -L${TELNETOBJDIR} -ltermcap -ltelnet
DPADD+= ${TELNETOBJDIR}/libtelnet.a ${LIBTERMCAP}

.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES))
CFLAGS+=-DAUTHENTICATION -DKRB4
LDADD+= -ldes -lkrb
DPADD+= ${LIBDES} ${LIBKRB}
.endif
d3 10
a12 2
# Used only in krb4encpwd.c and rsaencpwd.c (libtelnet), not yet active
#LDADD+= -ldescrypt
d15 2
@


1.15
log
@Bring in a change that got lost when we spammed over the CVS repository
to fix the mega-commits spamming.

pst         96/05/29 20:09:25

  Modified:    secure/usr.bin/telnet  Makefile main.c
  Log:
  Remove obsolete SOCKSv4 support

Submitted by:	pst
Obtained from:  A mirrored CVS repository that will disappear next SUP
@
text
@d34 1
a34 1
#	$Id: Makefile,v 1.14 1996/04/23 05:18:42 pst Exp $
@


1.15.2.1
log
@YAMFC
@
text
@d34 1
a34 1
#	$Id: Makefile,v 1.15 1996/06/05 22:48:03 nate Exp $
@


1.14
log
@Add support for socks
@
text
@d34 1
a34 1
#	$Id: Makefile,v 1.13 1996/03/11 16:17:58 markm Exp $
a54 7

.if defined(SOCKS)
CFLAGS+=-DSOCKS
CFLAGS+=-Dconnect=Rconnect -Dgetsockname=Rgetsockname -Dlisten=Rlisten \
	-Daccept=Raccept -Drcmd=Rrcmd -Dbind=Rbind -Dselect=Rselect
LDADD+=	-lsocks
.endif
@


1.13
log
@Big clean-up job. Remove ancient and never-to-be used stuff.
The look much more like BSD Makefiles now.
@
text
@d34 1
a34 1
#	$Id$
d55 7
@


1.12
log
@Sense MAKE_EBONES, DESTDIR
SRCS cleanup
DPADD cleanup
@
text
@d34 1
d39 4
a42 2
CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO
CFLAGS+=-DENV_HACK
d45 1
a45 3
DPADD+= ${TELNETOBJDIR}/libtelnet.a

#ifdef	ENCRYPTION
d47 2
a48 6
CFLAGS += -DENCRYPTION

.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES) \
	|| defined(MAKE_KERBEROS))
CFLAGS+=-DAUTHENTICATION
CFLAGS+= -DKRB4
a52 8
#.if exists(${DESTDIR}/usr/lib/libkrb5.a) && (defined(MAKE_EBONES) \
#       || defined(MAKE_KERBEROS))
#CFLAGS+=-DAUTHENTICATION
#CFLAGS+= -DKRB5 -DFORWARD
#LDADD+= -ldes -lkrb5
#DPADD+= ${LIBDES}
#.endif

a55 12
#endif	/* ENCRYPTION */

DPADD+=  ${LIBTERMCAP}

SRCS=	authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
	terminal.c tn3270.c utilities.c

# These are the sources that have encryption stuff in them.
CRYPT_SRC= authenc.c commands.c externs.h main.c network.c
CRYPT_SRC+= ring.c ring.h telnet.c terminal.c utilities.c Makefile
NOCRYPT_DIR=${.CURDIR}/Nocrypt

a56 17

nocrypt:
#ifdef	ENCRYPTION
	@@for i in ${CRYPT_SRC}; do \
	    if [ ! -d ${NOCRYPT_DIR} ]; then \
		echo Creating subdirectory ${NOCRYPT_DIR}; \
		mkdir ${NOCRYPT_DIR}; \
	    fi; \
	    echo ${NOCRYPT_DIR}/$$i; \
	    unifdef -UENCRYPTION ${.CURDIR}/$$i | \
		sed "s/ || defined(ENCRYPTION)//" > ${NOCRYPT_DIR}/$$i; \
	done

placeholder:
#else	/* ENCRYPTION */
	@@echo "Encryption code already removed."
#endif	/* ENCRYPTION */
@


1.11
log
@Remove MAKE_EBONES conditionals.  They were originally placed here because
of missing functionality in our libkrb which is no longer a problem.
@
text
@d46 1
a46 1
CFLAGS+=-DAUTHENTICATION -DENCRYPTION
d48 3
a50 1
.if exists(/usr/lib/libkrb.a)
d53 1
d56 7
a62 4
.if exists(/usr/lib/libkrb5.a)
CFLAGS+= -DKRB5 -DFORWARD
LDADD+=  -ldes -lkrb5
.endif
d69 1
a69 1
DPADD=	${LIBTERMCAP}
@


1.10
log
@Add TELNETOBJDIR and CRYPTOBJDIR for use in LDADD entries.  This makes
secure reference the libraries that were just build instead of in /usr/lib.
@
text
@a47 1
.ifdef MAKE_EBONES
a50 1
.endif
@


1.9
log
@Enable kerberosIV authentication/encryption conditionalized on MAKE_EBONES.
@
text
@d41 2
a42 1
LDADD+= -ltermcap -ltelnet
@


1.8
log
@Comment out LDADD+=-ldescrypt, it is not yet active due to
missng defines for krb4encpwd and rsaencpwd and missing rsa library too.
@
text
@a35 4
# This stuff need original libdes to run (new_rnd_key.c module),
# current eBones/des lib don't have it
# Kerberos4 stuff ifdefed by MAKE_KERBEROS (make.conf) because of it

d47 1
a47 1
.ifdef MAKE_KERBEROS
@


1.7
log
@Final cleanup pass through Makefiles, now this stuff
autodetect kerberos/eBones and work even with eBones,
but with reduced functionality (don't pick up des/krb stuff
in this case)
@
text
@d63 2
a64 1
LDADD+= -ldescrypt
@


1.6
log
@Add -ldescrypt, or wrong crypt version can be picked from libc
Reviewed by:
Submitted by:
Obtained from:
@
text
@a49 1
LDADD+= -ldescrypt
d54 1
a54 1
LDADD+= -lkrb -ldes
d60 1
a60 1
LDADD+=  -lkrb5 -ldes
d62 2
@


1.5
log
@Since this stuff not works with eBones, ifdef kerberos stuff
with MAKE_KERBEROS to allow other things to live
Reviewed by:
Submitted by:
Obtained from:
@
text
@d50 1
@


1.4
log
@Add comment about new_rnd_key.c module needed from original
libdes (and not present in eBones libdes)
@
text
@d38 1
d51 1
d54 2
a55 1
LDADD+= -lkrb
d60 1
a60 1
LDADD+=  -lkrb5
a61 2

LDADD+= -ldes
@


1.3
log
@Fix dependances, typing errors, etc.
Note: this thing need original libdes not Eric Young libdes from eBones
Submitted by:
Obtained from:
@
text
@d36 3
@


1.2
log
@Update telnet to the 95.05.31 release.

Obtained from:	Dave Borman <dab@@cray.com>
@
text
@d41 1
d49 1
a49 1
LDADD+=	-lkrb -ldes
d52 1
a52 1
.if exists(/usr/lib/libkrb4.a)
d54 1
a54 1
LDADD+=  -lkrb5 -ldes
d57 2
a60 1
LDADD=	-ltermcap -ltelnet
@


1.1
log
@Initial revision
@
text
@d38 1
a38 1
CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO #-DAUTHENTICATION -DENCRYPTION
d42 15
a56 1
#CFLAGS+= -DKRB4
a58 1
#LDADD+=	-lkrb -ldes
@


1.1.1.1
log
@The telnet version with encryption in in.
Reviewed by:	geoff.
@
text
@@


1.1.1.1.6.1
log
@Merge with HEAD.  Brings in new secure telnet suite + eBones fixes.
@
text
@d38 1
a38 1
CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO
a40 1
LDADD+= -ltermcap -ltelnet
d42 1
a42 20
#ifdef	ENCRYPTION

CFLAGS+=-DAUTHENTICATION -DENCRYPTION

.ifdef MAKE_EBONES
.if exists(/usr/lib/libkrb.a)
CFLAGS+= -DKRB4
LDADD+= -ldes -lkrb
.endif
.endif

.if exists(/usr/lib/libkrb5.a)
CFLAGS+= -DKRB5 -DFORWARD
LDADD+=  -ldes -lkrb5
.endif

# Used only in krb4encpwd.c and rsaencpwd.c (libtelnet), not yet active
#LDADD+= -ldescrypt

#endif	/* ENCRYPTION */
d44 2
@


1.1.1.1.6.2
log
@Merge with Head:
Add TELNETOBJDIR and CRYPTOBJDIR for use in LDADD entries.  This makes
secure reference the libraries that were just built instead of in /usr/lib.
@
text
@d41 1
a41 2
LDADD+= -L${TELNETOBJDIR} -ltermcap -ltelnet
DPADD+= ${TELNETOBJDIR}/libtelnet.a
@


1.1.1.1.6.3
log
@Remove MAKE_EBONES conditionals.  Besides being wrong, this was what screwed
up secure telnet in the previous snapshots.
@
text
@d48 1
d52 1
@


1.1.1.1.6.4
log
@Put telnet, telnetd, and libtelnet in the krb distribution where they
belong. They should be actually moved in the source tree to be under
eBones, but I don't want to mess with that now. This should hopefully
fix the main problem people were having when they selected the "des"
distribution and not krb, but got the Kerberos version of telnet and
friends as a side effect.

Submitted by:	Justin Gibbs <gibbs>
@
text
@a36 1
DISTRIBUTION= krb
@


1.1.1.1.6.5
log
@Merge with HEAD
@
text
@a33 1
#	$Id$
d37 1
d39 2
a40 4
SRCS=	authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
	terminal.c tn3270.c utilities.c

CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DENCRYPTION
d43 3
a45 1
DPADD+= ${TELNETOBJDIR}/libtelnet.a ${LIBTERMCAP}
d47 4
a50 2
.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES))
CFLAGS+=-DAUTHENTICATION -DKRB4
d52 5
a56 1
DPADD+= ${LIBDES} ${LIBKRB}
d62 12
d75 17
@


1.1.1.1.6.6
log
@Make telnet part of the krb distribution
@
text
@a36 2
DISTRIBUTION=	krb

@


1.1.1.1.6.7
log
@YAMFC (buffer overruns and other security fixes)

Tested on: thingy
@
text
@d45 1
a45 1
CFLAGS+=-DSKEY -I${.CURDIR}/../../lib
@


1.1.1.1.6.8
log
@$Id$ -> $FreeBSD$
@
text
@d34 1
a34 1
# $FreeBSD$
@

