head	1.19;
access;
symbols
	RELENG_4_11_0_RELEASE:1.14.2.4
	RELENG_4_11:1.14.2.4.0.6
	RELENG_4_11_BP:1.14.2.4
	RELENG_4_10_0_RELEASE:1.14.2.4
	RELENG_4_10:1.14.2.4.0.4
	RELENG_4_10_BP:1.14.2.4
	RELENG_4_9_0_RELEASE:1.14.2.4
	RELENG_4_9:1.14.2.4.0.2
	RELENG_4_9_BP:1.14.2.4
	RELENG_5_1_0_RELEASE:1.18
	RELENG_5_1:1.18.0.2
	RELENG_5_1_BP:1.18
	RELENG_4_8_0_RELEASE:1.14.2.3
	RELENG_4_8:1.14.2.3.0.4
	RELENG_4_8_BP:1.14.2.3
	RELENG_5_0_0_RELEASE:1.16
	RELENG_5_0:1.16.0.2
	RELENG_5_0_BP:1.16
	RELENG_4_7_0_RELEASE:1.14.2.3
	RELENG_4_7:1.14.2.3.0.2
	RELENG_4_7_BP:1.14.2.3
	RELENG_4_6_2_RELEASE:1.14.2.1
	RELENG_4_6_1_RELEASE:1.14.2.1
	RELENG_4_6_0_RELEASE:1.14.2.1
	RELENG_4_6:1.14.2.1.0.2
	RELENG_4_6_BP:1.14.2.1
	RELENG_4:1.14.0.2
	old_RELENG_4_3_0_RELEASE:1.7
	old_RELENG_4_3:1.7.0.4
	old_RELENG_4_3_BP:1.7
	old_RELENG_4_2_0_RELEASE:1.7
	old_RELENG_4_1_1_RELEASE:1.7
	old_PRE_SMPNG:1.7
	old_RELENG_4_1_0_RELEASE:1.7
	old_RELENG_3_5_0_RELEASE:1.4.2.1
	old_RELENG_4_0_0_RELEASE:1.7
	old_RELENG_4:1.7.0.2
	old_RELENG_4_BP:1.7
	old_RELENG_3_4_0_RELEASE:1.4.2.1
	old_RELENG_3_3_0_RELEASE:1.4.2.1
	old_RELENG_3_2_PAO:1.4.0.4
	old_RELENG_3_2_PAO_BP:1.4
	old_RELENG_3_2_0_RELEASE:1.4
	old_RELENG_3_1_0_RELEASE:1.4
	old_RELENG_3:1.4.0.2
	old_RELENG_3_BP:1.4
	old_RELENG_2_2_8_RELEASE:1.2
	old_RELENG_3_0_0_RELEASE:1.4
	old_RELENG_2_2_7_RELEASE:1.2
	old_RELENG_2_2_6_RELEASE:1.2
	old_RELENG_2_2:1.2.0.2
	old_markm_1_0:1.1.1.1
	old_MARKM:1.1.1;
locks; strict;
comment	@# @;


1.19
date	2003.07.16.20.59.13;	author markm;	state dead;
branches;
next	1.18;

1.18
date	2003.03.09.21.56.51;	author markm;	state Exp;
branches;
next	1.17;

1.17
date	2003.03.06.13.41.52;	author nectar;	state Exp;
branches;
next	1.16;

1.16
date	2002.05.13.11.09.04;	author ru;	state Exp;
branches;
next	1.15;

1.15
date	2002.05.12.16.00.50;	author ru;	state Exp;
branches;
next	1.14;

1.14
date	2001.12.17.01.33.20;	author assar;	state Exp;
branches
	1.14.2.1;
next	1.13;

1.13
date	2001.12.03.17.45.03;	author jhay;	state Exp;
branches;
next	1.12;

1.12
date	2001.11.30.21.14.44;	author markm;	state Exp;
branches;
next	1.11;

1.11
date	2001.11.01.03.16.02;	author assar;	state Exp;
branches;
next	1.10;

1.10
date	2001.08.20.12.32.43;	author markm;	state Exp;
branches;
next	1.9;

1.9
date	2001.08.03.16.03.24;	author markm;	state Exp;
branches;
next	1.8;

1.8
date	2001.03.28.12.08.20;	author ru;	state Exp;
branches;
next	1.7;

1.7
date	99.10.07.18.59.54;	author markm;	state Exp;
branches;
next	1.6;

1.6
date	99.09.13.16.38.58;	author bde;	state Exp;
branches;
next	1.5;

1.5
date	99.08.28.01.31.21;	author peter;	state Exp;
branches;
next	1.4;

1.4
date	98.08.30.13.08.54;	author markm;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	98.08.29.20.24.54;	author markm;	state Exp;
branches;
next	1.2;

1.2
date	97.10.02.15.03.19;	author markm;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	97.09.24.20.37.13;	author markm;	state Exp;
branches
	1.1.1.1;
next	;

1.14.2.1
date	2002.04.30.14.57.41;	author nectar;	state Exp;
branches;
next	1.14.2.2;

1.14.2.2
date	2002.07.19.18.46.25;	author ru;	state Exp;
branches;
next	1.14.2.3;

1.14.2.3
date	2002.07.22.14.21.47;	author ru;	state Exp;
branches
	1.14.2.3.4.1;
next	1.14.2.4;

1.14.2.4
date	2003.04.24.19.13.59;	author nectar;	state Exp;
branches;
next	1.14.2.5;

1.14.2.5
date	2012.11.17.07.23.14;	author svnexp;	state Exp;
branches;
next	;

1.14.2.3.4.1
date	2003.04.24.19.00.37;	author nectar;	state Exp;
branches;
next	1.14.2.3.4.2;

1.14.2.3.4.2
date	2003.04.24.19.05.09;	author nectar;	state Exp;
branches;
next	;

1.4.2.1
date	99.08.29.14.40.45;	author peter;	state Exp;
branches;
next	1.4.2.2;

1.4.2.2
date	2000.07.04.15.22.58;	author assar;	state Exp;
branches;
next	;

1.2.2.1
date	99.09.05.11.48.05;	author peter;	state Exp;
branches;
next	;

1.1.1.1
date	97.09.24.20.37.13;	author markm;	state Exp;
branches;
next	;


desc
@@


1.19
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/kerberos5/lib/libtelnet/Makefile,v 1.18 2003/03/09 21:56:51 markm Exp $

LIB=		telnet

INTERNALLIB=	yes

SRCS=		genget.c getent.c misc.c encrypt.c auth.c \
		enc_des.c sra.c pk.c
SRCS+=		kerberos5.c

#WARNS?=		2

CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DSRA -I${TELNETDIR}
CFLAGS+=	-DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR}
CFLAGS+=	-DFORWARD -Dnet_write=telnet_net_write

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
@


1.18
log
@Post KerberosIV de-orbit: Clean up Kerberos5. We dont need KerberosIV
compatiblity mode anymore. Rename the k5foo utils to kfoo (after
repo-copy).
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.17
log
@Unbreak Kerberos 5 authentication in telnet.
(Credential forwarding is still broken.)

PR:	bin/45397
@
text
@a8 4
.if defined(MAKE_KERBEROS4)
SRCS+=		kerberos.c
CFLAGS+=	-DKRB4 -I${KRB4DIR}/lib/krb
.endif
@


1.16
log
@Removed now unused INTERNALSTATICLIB.
INTERNALLIB now implies NOPIC and NOPROFILE.
Removed gratuitous NOMAN.
@
text
@d19 1
@


1.15
log
@Added new bsd.incs.mk which handles installing of header files
via INCS.  Implemented INCSLINKS (equivalent to SYMLINKS) to
handle symlinking include files.  Allow for multiple groups of
include files to be installed, with the powerful INCSGROUPS knob.
Documentation to follow.

Added standard `includes' and `incsinstall' targets, use them
in Makefile.inc1.  Headers from the following makefiles were
not installed before (during `includes' in Makefile.inc1):

	kerberos5/lib/libtelnet/Makefile
	lib/libbz2/Makefile
	lib/libdevinfo/Makefile
	lib/libform/Makefile
	lib/libisc/Makefile
	lib/libmenu/Makefile
	lib/libmilter/Makefile
	lib/libpanel/Makefile

Replaced all `beforeinstall' targets for installing includes
with the INCS stuff.

Renamed INCDIR to INCSDIR, for consistency with FILES and SCRIPTS,
and for compatibility with NetBSD.  Similarly for INCOWN, INCGRP,
and INCMODE.

Consistently use INCLUDEDIR instead of /usr/include.

gnu/lib/libstdc++/Makefile and gnu/lib/libsupc++/Makefile changes
were only lightly tested due to the missing contrib/libstdc++-v3.
I fully tested the pre-WIP_GCC31 version of this patch with the
contrib/libstdc++.295 stuff.

These changes have been tested on i386 with the -DNO_WERROR "make
world" and "make release".
@
text
@a5 2
INTERNALSTATICLIB=yes
NOPIC=		yes
@


1.14
log
@add krb4 libraries
@
text
@d23 1
a23 1
INCDIR=		/usr/include/arpa
@


1.14.2.1
log
@MFC: Update build for Heimdal Kerberos 0.4e around 2002/02/17.
@
text
@@


1.14.2.2
log
@MFC: new bsd.lib.mk API.
@
text
@d6 2
@


1.14.2.3
log
@MFC: bsd.incs.mk support and assorted header fixes:

Install sys/<arch>/include/pc/*.h to /usr/include/machine/pc/.

Install sys/netatm/*/*.h to /usr/include/netatm/*/.

Don't install compatibility symlinks for <machine/soundcard.h>
and <machine/joystick.h>.

Don't install IPFILTER headers.  Userland utilities fetch them
directly, and they were not visible in the SHARED=symlinks case.

Resurrect SHARED=symlinks in Makefile.inc1.

PR:		docs/29534, bin/28002
@
text
@d21 1
a21 1
INCSDIR=	${INCLUDEDIR}/arpa
@


1.14.2.4
log
@MFC 1.7  src/crypto/telnet/libtelnet/kerberos5.c
    1.17 src/kerberos5/lib/libtelnet/Makefile
    1.16 src/kerberos5/libexec/telnetd/Makefile
    1.17 src/kerberos5/usr.bin/telnet/Makefile:
Unbreak Kerberos 5 authentication in telnet.

Requested by:   Tim Kientzle <kientzle@@acm.org>
@
text
@a18 1
CFLAGS+=	-DFORWARD -Dnet_write=telnet_net_write
@


1.14.2.5
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/kerberos5/lib/libtelnet/Makefile 113982 2003-04-24 19:14:00Z nectar $
@


1.14.2.3.4.1
log
@MFC 1.7  src/crypto/telnet/libtelnet/kerberos5.c
    1.17 src/kerberos5/lib/libtelnet/Makefile
    1.16 src/kerberos5/libexec/telnetd/Makefile
    1.17 src/kerberos5/usr.bin/telnet/Makefile:
Unbreak Kerberos 5 authentication in telnet.

Requested by:	Tim Kientzle <kientzle@@acm.org>
@
text
@a18 1
CFLAGS+=	-DFORWARD -Dnet_write=telnet_net_write
@


1.14.2.3.4.2
log
@Back out previous commit (wrong branch).

Must love pointy hats:	nectar
@
text
@d19 1
@


1.13
log
@Add the necessary paths to the kerberos libraries and includes.

This fix "make release".

Reviewed by:	markm
@
text
@d11 4
@


1.12
log
@Style clean-up, and diff-reduce WRT src/secure/*telnet*/Makefile

Lost in this commit - KerberosIV compatability. This will be
re-added later.
@
text
@d16 1
a16 1
CFLAGS+=	-DKRB5 -I${KRB5DIR}/lib/krb5
@


1.11
log
@make libtelnet (and telnet, telnetd) use libkrb when required
@
text
@d11 1
a11 4
.if defined(MAKE_KERBEROS4)
SRCS+=		kerberos.c
CFLAGS+=	-DKRB4 -I${KRB4DIR}/lib/krb
.endif
d13 1
a13 1
#SRCS+=		kerberos5.c
d15 2
a16 3
CFLAGS+=	-DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
		-DSRA -I${TELNETDIR}
#CFLAGS+=	-DKRB5 -I${KRB5DIR}/lib/krb5
d21 4
d30 4
a33 1
beforeinstall:
d35 1
a35 4

.include <bsd.lib.mk>

.PATH:	${TELNETDIR}/libtelnet
@


1.10
log
@Diff reduce all the crypto telnet Makefiles.
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberos5/lib/libtelnet/Makefile,v 1.9 2001/08/03 16:03:24 markm Exp $
d11 5
@


1.9
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/kerberos5/lib/libtelnet/Makefile,v 1.8 2001/03/28 12:08:20 ru Exp $
d13 1
a13 1
CFLAGS=		-DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
@


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

Approved by:	markm
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberosIV/lib/libtelnet/Makefile,v 1.7 1999/10/07 18:59:54 markm Exp $
d9 7
a15 2
SRCS=		genget.c getent.c misc.c encrypt.c auth.c kerberos.c \
		enc_des.c pk.c sra.c
d17 1
a17 5
CFLAGS+=	-DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
		-DKRB4 -DSRA -I${TELNETDIR} \
		-I${KRB4DIR}/lib/krb

INCS=		${TELNETDIR}/arpa/telnet.h 
d22 1
a22 1
# to/usr/lib/compat, since they were only used by telnet, telnetd and
@


1.7
log
@Bring in SRA for telnet.

Submitted by:	Nick Sayer
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberosIV/lib/libtelnet/Makefile,v 1.6 1999/09/13 16:38:58 bde Exp $
d5 4
d16 2
a17 3
NOPIC=		yes

INCLUDES=	${TELNETDIR}/arpa/telnet.h 
@


1.6
log
@Merged src/lib/libtelnet rev.1.9 (fixed removing of obsolete shared
library: wrong library directory, wrong library extension and wrong
comment).  This is mainly of historical interest, if any.  The library
that gets removed is aout.
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberosIV/lib/libtelnet/Makefile,v 1.5 1999/08/28 01:31:21 peter Exp $
d5 2
a6 1
SRCS=		genget.c getent.c misc.c encrypt.c auth.c kerberos.c enc_des.c
d9 1
a9 1
		-DKRB4 -I${TELNETDIR} \
@


1.5
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
d16 3
a18 6
# Before complaining about this, please *double-check* that you have
# updated the ldconfig path in /etc/rc to include /usr/lib/compat that
# was added in src/etc/rc rev 1.98.
# This is so that `ld' will not continue to generate binaries linked
# shared against libtelnet, so that in a future release we can move this
# off to a compat dist (like compat22).
d21 1
a21 1
	rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
@


1.4
log
@While I am no longer making a shared library, nuke the old one to prevent
ld from picking it up spuriously.
@
text
@d1 1
a1 1
#	$Id$
@


1.4.2.1
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.4.2.2
log
@update build infrastructure to work with the krb4-1.0 now in crypto

Reviewed by:	kris, markm
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberosIV/lib/libtelnet/Makefile,v 1.4.2.1 1999/08/29 14:40:45 peter Exp $
d5 1
a5 2
SRCS=		genget.c getent.c misc.c encrypt.c auth.c kerberos.c \
		enc_des.c
d8 1
a8 1
		-DKRB4 -DSRA -I${TELNETDIR} \
d16 6
a21 3
# 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.
d24 1
a24 1
	rm -f ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0
@


1.3
log
@Stop making the shared library for libtelnet (crypto version). This
should have happened years ago.
@
text
@d15 11
@


1.2
log
@Fix a break in the includes where the build blows chunks if it is
being built in a totally clean environment.

Found by: jkh and "make release"
@
text
@d11 2
@


1.2.2.1
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.1
log
@Initial revision
@
text
@d8 2
a9 1
		-DKRB4 -I${TELNETDIR}
@


1.1.1.1
log
@Initial import of the new kerberosIV Makefiles.

I will follow up with the userland sources over the next few days.
The impatient of you can play with this, but you do this without
support or blessing until I am finished ;-)
@
text
@@
