head	1.31;
access;
symbols
	RELENG_4_11_0_RELEASE:1.17.2.7
	RELENG_4_11:1.17.2.7.0.10
	RELENG_4_11_BP:1.17.2.7
	RELENG_4_10_0_RELEASE:1.17.2.7
	RELENG_4_10:1.17.2.7.0.8
	RELENG_4_10_BP:1.17.2.7
	RELENG_4_9_0_RELEASE:1.17.2.7
	RELENG_4_9:1.17.2.7.0.6
	RELENG_4_9_BP:1.17.2.7
	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.17.2.7
	RELENG_4_8:1.17.2.7.0.4
	RELENG_4_8_BP:1.17.2.7
	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.17.2.7
	RELENG_4_7:1.17.2.7.0.2
	RELENG_4_7_BP:1.17.2.7
	RELENG_4_6_2_RELEASE:1.17.2.5
	RELENG_4_6_1_RELEASE:1.17.2.5
	RELENG_4_6_0_RELEASE:1.17.2.5
	RELENG_4_6:1.17.2.5.0.2
	RELENG_4_6_BP:1.17.2.5
	RELENG_4_5_0_RELEASE:1.17.2.3
	RELENG_4_5:1.17.2.3.0.6
	RELENG_4_5_BP:1.17.2.3
	RELENG_4_4_0_RELEASE:1.17.2.3
	RELENG_4_4:1.17.2.3.0.4
	RELENG_4_4_BP:1.17.2.3
	RELENG_4_3_0_RELEASE:1.17.2.3
	RELENG_4_3:1.17.2.3.0.2
	RELENG_4_3_BP:1.17.2.3
	RELENG_4_2_0_RELEASE:1.17
	RELENG_4_1_1_RELEASE:1.17
	PRE_SMPNG:1.18
	RELENG_4_1_0_RELEASE:1.17
	RELENG_4_0_0_RELEASE:1.17
	RELENG_4:1.17.0.2
	RELENG_4_BP:1.17
	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.5
	RELENG_2_1_6_1_RELEASE:1.1.1.1.6.5
	RELENG_2_1_6_RELEASE:1.1.1.1.6.5
	RELENG_2_2:1.15.0.2
	RELENG_2_2_BP:1.15
	RELENG_2_1_5_RELEASE:1.1.1.1.6.5
	RELENG_2_1_0_RELEASE:1.1.1.1.6.3
	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
	BSD4_4Lite: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	2002.11.06.22.54.58;	author obrien;	state Exp;
branches;
next	1.29;

1.29
date	2002.05.13.11.09.06;	author ru;	state Exp;
branches;
next	1.28;

1.28
date	2002.05.12.16.00.56;	author ru;	state Exp;
branches;
next	1.27;

1.27
date	2001.11.30.21.10.57;	author markm;	state Exp;
branches;
next	1.26;

1.26
date	2001.09.29.13.17.53;	author ru;	state Exp;
branches;
next	1.25;

1.25
date	2001.08.20.12.32.38;	author markm;	state Exp;
branches;
next	1.24;

1.24
date	2001.08.03.16.03.23;	author markm;	state Exp;
branches;
next	1.23;

1.23
date	2001.04.05.14.09.15;	author nsayer;	state Exp;
branches;
next	1.22;

1.22
date	2001.03.28.12.15.22;	author ru;	state Exp;
branches;
next	1.21;

1.21
date	2001.03.28.12.08.18;	author ru;	state Exp;
branches;
next	1.20;

1.20
date	2001.03.26.14.53.25;	author ru;	state Exp;
branches;
next	1.19;

1.19
date	2001.03.23.19.38.21;	author assar;	state Exp;
branches;
next	1.18;

1.18
date	2000.07.16.05.52.55;	author peter;	state Exp;
branches;
next	1.17;

1.17
date	99.10.07.19.47.05;	author markm;	state Exp;
branches
	1.17.2.1;
next	1.16;

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

1.15
date	96.03.11.16.17.17;	author markm;	state Exp;
branches
	1.15.2.1;
next	1.14;

1.14
date	96.03.11.06.22.50;	author markm;	state Exp;
branches;
next	1.13;

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

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

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

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

1.9
date	95.08.05.19.10.17;	author ache;	state Exp;
branches;
next	1.8;

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

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

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

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

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

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

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

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

1.17.2.1
date	2001.04.05.00.37.06;	author assar;	state Exp;
branches;
next	1.17.2.2;

1.17.2.2
date	2001.04.05.17.27.07;	author nsayer;	state Exp;
branches;
next	1.17.2.3;

1.17.2.3
date	2001.04.18.00.10.32;	author nsayer;	state Exp;
branches;
next	1.17.2.4;

1.17.2.4
date	2002.03.22.18.26.54;	author ru;	state Exp;
branches;
next	1.17.2.5;

1.17.2.5
date	2002.04.13.11.00.49;	author markm;	state Exp;
branches;
next	1.17.2.6;

1.17.2.6
date	2002.07.19.18.46.27;	author ru;	state Exp;
branches;
next	1.17.2.7;

1.17.2.7
date	2002.07.22.14.21.51;	author ru;	state Exp;
branches;
next	1.17.2.8;

1.17.2.8
date	2012.11.17.07.24.38;	author svnexp;	state Exp;
branches;
next	;

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

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

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

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

1.1.1.1.6.3
date	95.10.29.06.54.59;	author davidg;	state Exp;
branches;
next	1.1.1.1.6.4;

1.1.1.1.6.4
date	96.06.21.17.29.02;	author markm;	state Exp;
branches;
next	1.1.1.1.6.5;

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

1.1.1.1.6.6
date	99.09.05.11.51.45;	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/lib/libtelnet/Makefile,v 1.30 2002/11/06 22:54:58 obrien Exp $

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
@


1.30
log
@Style sync with rest of FreeBSD.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.29
log
@Removed now unused INTERNALSTATICLIB.
INTERNALLIB now implies NOPIC and NOPROFILE.
Removed gratuitous NOMAN.
@
text
@d1 1
a1 3
#	$FreeBSD$

LIB=		telnet
d3 1
d6 1
a6 5
SRCS=		genget.c getent.c misc.c encrypt.c auth.c \
		enc_des.c sra.c pk.c

CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DSRA \
		-I${TELNETDIR} -I${TELNETDIR}/libtelnet
d8 3
a10 1
WARNS?=		2
d12 2
a13 2
INCS=		${TELNETDIR}/arpa/telnet.h
INCSDIR=	${INCLUDEDIR}/arpa
@


1.28
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.27
log
@Clean up makefiles, and turn on WARNS=2. Take into account the telnet
#if cleanup.
@
text
@d18 1
a18 1
INCDIR=		/usr/include/arpa
@


1.26
log
@Fix cross-building, etc:

1.  To cross-build, one now needs to set TARGET_ARCH, and not the
    MACHINE_ARCH.  MACHINE_ARCH should never be changed manually!

2.  Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
    and cross-tools stages.  This fixes broken header and library
    dependencies problem.  We build them in the host environment,
    and obviously want them to depend on host headers and libraries.
    The problem with broken header dependencies for bootstrap-tools
    and cross-tools was already partially solved (see BOOTSTRAPPING
    tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
    build-tools if the user ran "make world DESTDIR=/foo".  Also,
    for all of these stages, the library dependencies were broken
    because of how bsd.libnames.mk define DPADD members.

    We still provide a glue to install bootstrap- and cross-tools
    under the ${WORLDTMP}.

    Removed PATH overrides for bootstrap-, build-, and cross-tools
    stages.  There is just no reason why we would need to override
    it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
    case are no longer needed with fixes from this step.

    That is, we now never use ${WORLDTMP} headers and libraries,
    and we don't use any ${WORLDTMP} installed binaries during
    these stages.  Again, these stages depend solely on the host
    environment, including compiler, headers, and libraries.

3.  Moved "miniperl" back from cross-tools (it has nothing to do
    with a cross-compiler) to build-tools where it belongs.  The
    change from step 1 let to do this.  Also, to make this work,
    build-tools targets of "cc_tools" and "miniperl" were modified
    to call "depend".  Here follow the detailed explanations.

    There are two categories of build tools, for now.  In the first
    category there are "cc_tools" and "miniperl".  They occupy the
    whole (sub)directory, and nothing needs to be done in this
    subdirectory later during the "all" stage.  They are also
    constructed using system makefiles.  We must build the .depend
    early in the build-tools stage because:

    1)  They use (and depend on) the host environment.

    2)  If we don't do this in build-tools, the "depend" stage of
        buildworld will do this for us; wrong library and header
        dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
        what's worse, the "all" stage may then clobber the
        build-architecture format tools (that we built in the
        build-tools stage) with the target-architecture format
        ones, breaking cross build.

    In the second category there are all other build-tools.  They
    share their directory with the "main" module that needs them
    in the "all" stage, and they don't show up themselves in the
    .depend file.  The portion of this fix was already committed
    in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.

4.  "libperl" is no longer a build tool, and "miniperl" is the
    stand-alone application.  I had to make this change because
    build-tools and "all" stages share the same object directory.
    Without this change, if we cross compile, libperl.a is first
    built for the build architecture during the build-tools stage
    (for the purposes of immediate linkage with "miniperl").
    Later on, the "all" stage sees this library as up-to-date,
    and doesn't rebuild it.  The effect is that the wrong format
    static libperl library is installed with installworld.

5.  Fixed "includes" to install secure/lib/libtelnet headers if
    required.

Reviewed by:	bde
@
text
@d1 1
a1 1
#	$FreeBSD: src/secure/lib/libtelnet/Makefile,v 1.25 2001/08/20 12:32:38 markm Exp $
d12 4
a15 2
CFLAGS+=	-DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
		-DSRA -I${TELNETDIR}
@


1.25
log
@Diff reduce all the crypto telnet Makefiles.
@
text
@d1 1
a1 1
#	$FreeBSD: src/secure/lib/libtelnet/Makefile,v 1.24 2001/08/03 16:03:23 markm Exp $
d18 4
d27 4
a30 1
beforeinstall:
d32 1
a32 4

.include <bsd.lib.mk>

.PATH:	${TELNETDIR}/libtelnet
@


1.24
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/lib/libtelnet/Makefile,v 1.23 2001/04/05 14:09:15 nsayer Exp $
d12 1
a12 1
CFLAGS=		-DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
@


1.23
log
@Reactivate SRA.

Make handling of SIGINT and SIGQUIT follow SIGTSTP in TerminalNewMode().
This allows people to break out of SRA authentication if they wish to.
@
text
@d1 1
a1 1
#	$FreeBSD: src/secure/lib/libtelnet/Makefile,v 1.22 2001/03/28 12:15:22 ru Exp $
d12 2
a13 2
CFLAGS+=        -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
                -DSRA -I${TELNETDIR}
@


1.22
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.

Also, backout the beforeinstall -> afterinstall change in rev.1.20
that was required to install proper telnet.h into /usr/include/arpa.
The actual problem is in <bsd.lib.mk>, and I am going to fix it.
@
text
@d1 1
a1 1
#	$FreeBSD: src/secure/lib/libtelnet/Makefile,v 1.21 2001/03/28 12:08:18 ru Exp $
d10 1
a10 1
		enc_des.c pk.c
d13 1
a13 1
                -I${TELNETDIR}
@


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

Approved by:	markm
@
text
@d1 1
a1 1
#	$FreeBSD: src/secure/lib/libtelnet/Makefile,v 1.20 2001/03/26 14:53:25 ru Exp $
d19 3
a21 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).
d23 2
a24 2
afterinstall:
	rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
@


1.20
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/lib/libtelnet/Makefile,v 1.19 2001/03/23 19:38:21 assar Exp $
d5 4
a13 2

NOPIC=          yes
@


1.19
log
@disable SRA
this impacts negatively to POLA since once autologin is enabled,
telnet will prompt for a password using getpass() and thus not allow
the usual signal characters or C-]
@
text
@d1 1
a1 1
#	$FreeBSD: src/secure/lib/libtelnet/Makefile,v 1.18 2000/07/16 05:52:55 peter Exp $
d9 1
a9 1
                -I${TELNETDIR} \
d13 2
a14 1
INCLUDES=       ${TELNETDIR}/arpa/telnet.h 
d24 1
a24 1
beforeinstall:
@


1.18
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/lib/libtelnet/Makefile,v 1.17 1999/10/07 19:47:05 markm Exp $
d6 1
a6 1
		enc_des.c sra.c pk.c
d9 1
a9 1
                -DSRA -I${TELNETDIR} \
@


1.17
log
@Make telnet with SRA work.

Submitted by:	Nick Sayer
@
text
@d1 1
a1 1
#	$FreeBSD$
@


1.17.2.1
log
@MFC: 1.19: disable RSA

Approved by:	jkh
@
text
@d6 1
a6 1
		enc_des.c pk.c
d9 1
a9 1
                -I${TELNETDIR} \
@


1.17.2.2
log
@1. Revert the removal of SRA

2. MFC sys_bsd.c v1.5 - fix the bug that started the fuss. Make SIGINT
and SIGQUIT follow the state of SIGTSTP, thus making SRA abortable.

Approved by:	jkh
@
text
@d1 1
a1 1
#	$FreeBSD: src/secure/lib/libtelnet/Makefile,v 1.17.2.1 2001/04/05 00:37:06 assar Exp $
d6 1
a6 1
		enc_des.c sra.c pk.c
d13 1
a13 1
INCLUDES=       -DSRA ${TELNETDIR}/arpa/telnet.h 
@


1.17.2.3
log
@Actually correctly turn SRA back on by placing the revert correctly.

Approved by:	jkh
@
text
@d1 1
a1 1
#	$FreeBSD: src/secure/lib/libtelnet/Makefile,v 1.17.2.2 2001/04/05 17:27:07 nsayer Exp $
d9 1
a9 1
                -DSRA -I${TELNETDIR} \
d13 1
a13 1
INCLUDES=       ${TELNETDIR}/arpa/telnet.h 
@


1.17.2.4
log
@MFC: Fixed "includes" to install secure/lib/libtelnet headers if required.
@
text
@d1 1
a1 1
#	$FreeBSD$
d13 1
a13 6
INCS=		${TELNETDIR}/arpa/telnet.h
INCDIR=		/usr/include/arpa

.include <bsd.lib.mk>

.PATH:	${TELNETDIR}/libtelnet
d25 4
@


1.17.2.5
log
@MFC: Merge infrastucture for cleaned-up secure telnet.
@
text
@a4 4
INTERNALLIB=	yes
INTERNALSTATICLIB=yes
NOPIC=		yes

d8 2
a9 2
CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DSRA \
		-I${TELNETDIR} -I${TELNETDIR}/libtelnet
d11 1
a11 1
WARNS?=		2
d21 6
a26 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.
d28 2
a29 6
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.17.2.6
log
@MFC: new bsd.lib.mk API.
@
text
@d6 2
@


1.17.2.7
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
@d16 1
a16 1
INCSDIR=	${INCLUDEDIR}/arpa
@


1.17.2.8
log
@Switch importer
@
text
@d1 1
a1 1
#	$FreeBSD: stable/4/secure/lib/libtelnet/Makefile 100501 2002-07-22 14:21:52Z ru $
@


1.16
log
@Secure telnet is now in eBones.
@
text
@d1 1
a1 2
#	From: @@(#)Makefile	8.2 (Berkeley) 12/15/93
#	$Id: Makefile,v 1.15 1996/03/11 16:17:17 markm Exp markm $
d3 1
a3 2
LIB=	telnet
SRCS=   encrypt.c genget.c getent.c misc.c
d5 2
a6 1
CFLAGS+= -DHAS_CGETENT -DENCRYPTION
d8 17
a24 13
.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_EBONES)
CFLAGS+= -DDES_ENCRYPTION -DAUTHENTICATION -DKRB4 -I/usr/include/kerberosIV
SRCS+=  auth.c kerberos.c enc_des.c
LDADD+= -ldes -lkrb
DPADD+= ${LIBDES} ${LIBKRB}
.endif

# Not Yet
#SRCS += spx.c rsaencpwd.c read_password.c

# KRB4_ENCPWD not yet defined
# Used only in krb4encpwd.c and rsaencpwd.c, not yet active
#LDADD+= -ldescrypt
d27 2
@


1.15
log
@Big clean-up job. Remove ancient and never-to-be used stuff.
The look much more like BSD Makefiles now.
@
text
@d2 1
a2 1
#	$Id$
@


1.15.2.1
log
@YAMFC
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.15 1996/03/11 16:17:17 markm Exp $
@


1.14
log
@Fix typo #ifdef -> .if defined().
Tidy uo this file a bit.
@
text
@a5 1
CFLAGS+= -DHAS_CGETENT
d7 1
a7 3
.if defined(MAKE_EBONES)

CFLAGS+= -DENCRYPTION
d10 1
a10 3
CFLAGS+= -DDES_ENCRYPTION -DAUTHENTICATION
CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
# KRB4_ENCPWD not yet defined
d19 1
a22 8
.endif	/* ENCRYPTION */

# These are the sources that have encryption stuff in them.
CRYPT_SRC= auth.c enc-proto.h enc_des.c encrypt.c
CRYPT_SRC+= encrypt.h kerberos.c kerberos5.c krb4encpwd.c
CRYPT_SRC+= misc.c spx.c Makefile
NOCRYPT_DIR=${.CURDIR}/Nocrypt

a23 17

nocrypt:
.if defined(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
	@@echo "Encryption code already removed."
.endif
@


1.13
log
@Fix typo - -des -> -ldes
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.12 1996/03/09 13:36:34 ache Exp $
d8 1
a8 1
#ifdef	ENCRYPTION
d12 1
a12 2
.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES) \
	|| defined(MAKE_KERBEROS))
a15 1
#CFLAGS+= -DKRB4_ENCPWD
a16 2
# KRB4_ENCPWD not yet defined
#SRCS+=   krb4encpwd.c read_password.c
a20 9
#.if exists(${DESTDIR}/usr/lib/libkrb5.a) && (defined(MAKE_EBONES) \
#        || defined(MAKE_KERBEROS))
#CFLAGS+= -DDES_ENCRYPTION -DAUTHENTICATION
#CFLAGS+= -DKRB5 -DFORWARD
#SRCS+=  auth.c kerberos5.c forward.c enc_des.c
#LDADD+= -ldes -lkrb5
#DPADD+= ${LIBDES}
#.endif

d27 1
a27 1
#endif	/* ENCRYPTION */
d38 1
a38 1
#ifdef	ENCRYPTION
d50 1
a50 1
#else	/* ENCRYPTION */
d52 1
a52 1
#endif	/* ENCRYPTION */
@


1.12
log
@Sense MAKE_EBONES, DESTDIR
SRCS cleanup
DPADD cleanup
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.11 1995/10/11 00:03:59 gibbs Exp $
d21 1
a21 1
LDADD+= -des -lkrb
@


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
@d2 1
a2 1
#	$Id: Makefile,v 1.10 1995/09/14 21:29:05 gibbs Exp $
d5 1
a5 3
SRCS=   auth.c encrypt.c genget.c getent.c misc.c
SRCS+=  enc_des.c
SRCS+=	spx.c rsaencpwd.c read_password.c
d10 1
a10 1
CFLAGS+= -DENCRYPTION -DAUTHENTICATION
d12 4
a15 2
.if exists(/usr/lib/libkrb.a)
CFLAGS+= -DKRB4 -I/usr/include/kerberosIV -DDES_ENCRYPTION
d18 1
a18 1
SRCS+=  kerberos.c
d20 3
a22 2
#SRCS+=   krb4encpwd.c
LDADD+= -ldes -lkrb
d25 11
a35 5
.if exists(/usr/lib/libkrb5.a)
CFLAGS+= -DKRB5 -DFORWARD -DDES_ENCRYPTION
SRCS+=	kerberos5.c forward.c
LDADD+= -ldes -lkrb5
.endif
@


1.10
log
@Enable kerberosIV authentication/encryption conditionalized on MAKE_EBONES.
Fix up some of the des calls to be compatible with eBones.
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.9 1995/08/05 19:10:17 ache Exp $
a13 1
.ifdef  MAKE_EBONES
a21 1
.endif
@


1.9
log
@Comment out LDADD+=-ldescrypt, it is not yet active due to
missng defines for krb4encpwd and rsaencpwd and missing rsa library too.
@
text
@d2 1
a2 5
#	$Id: Makefile,v 1.8 1995/07/24 22:55:35 ache Exp $

# 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
d14 1
a14 1
.ifdef  MAKE_KERBEROS
@


1.8
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
@d2 1
a2 1
#	$Id: Makefile,v 1.7 1995/07/24 21:57:58 ache Exp $
d36 2
a37 1
LDADD+= -ldescrypt
@


1.7
log
@Add LDADD+= -ldescrypt
Reviewed by:
Submitted by:
Obtained from:
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.6 1995/07/24 21:49:06 ache Exp $
d15 2
a16 2
CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DDES_ENCRYPTION
LDADD+= -ldescrypt
d20 1
a20 1
CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
d26 1
a26 1
LDADD+= -lkrb -ldes
d31 1
a31 1
CFLAGS+= -DKRB5 -DFORWARD
d33 1
a33 1
LDADD+= -lkrb5 -ldes
d35 2
@


1.6
log
@Move -ldes under kerb stuff, my fault
Reviewed by:
Submitted by:
Obtained from:
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.5 1995/07/24 21:38:32 ache Exp $
d16 1
@


1.5
log
@Since this stuff not works with eBones, ifdef kerberos stuff
with MAKE_KERBEROS to allow other things to live
Submitted by:
Obtained from:
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.4 1995/07/24 21:10:47 ache Exp $
d25 1
a25 1
LDADD+= -lkrb
d32 1
a32 1
LDADD+= -lkrb5
a33 2

LDADD+= -ldes
@


1.4
log
@Add comment about new_rbd_key.c module needed from
original libdes
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.3 1995/07/24 20:29:12 ache Exp $
d6 1
d17 1
d26 1
@


1.3
log
@Fix many bogus things, typing error, dependance errors, etc.,
now it compiles.
Note: this stuff requires original libdes, not libdes from
Eric Yang which we have in eBones.
@
text
@d2 4
a5 1
#	$Id: Makefile,v 1.2 1995/07/20 11:39:16 pst Exp $
@


1.2
log
@Update telnet to the 95.05.31 release.

Obtained from:	Dave Borman <dab@@cray.com>
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.1.1.1 1994/08/12 22:02:57 csgr Exp $
d5 2
a6 2
SRCS=	auth.c encrypt.c genget.c getent.c misc.c
SRCS+=	kerberos.c enc_des.c
d11 1
a11 1
CFLAGS+= -DENCRYPTION -DAUTHENTICATION
d14 7
a20 2
CFLAGS+= -DKRB4 -DKRB4_ENCPWD -DDES_ENCRYPTION -I/usr/include/kerberosIV
SRCS+=   krb4encpwd.c
d24 1
a24 1
CFLAGS+= -DKRB5 -DDES_ENCRYPTION -DFORWARD
d26 1
d28 3
@


1.1
log
@Initial revision
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.2 1994/08/05 02:02:36 wollman Exp $
d7 1
a7 1
#SRCS+=	kerberos5.c
d9 14
@


1.1.1.1
log
@Libtelnet with encryption goes walkies to src/secure/lib
Reviewed by:	Geoff Rehmet
@
text
@@


1.1.1.1.6.1
log
@Merge with HEAD.  Brings in new secure telnet suite + eBones fixes.
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.10 1995/09/14 21:29:05 gibbs Exp $
d5 3
a7 3
SRCS=   auth.c encrypt.c genget.c getent.c misc.c
SRCS+=  enc_des.c
SRCS+=	spx.c rsaencpwd.c read_password.c
a8 27

#ifdef	ENCRYPTION

CFLAGS+= -DENCRYPTION -DAUTHENTICATION

.ifdef  MAKE_EBONES
.if exists(/usr/lib/libkrb.a)
CFLAGS+= -DKRB4 -I/usr/include/kerberosIV -DDES_ENCRYPTION
# KRB4_ENCPWD not yet defined
#CFLAGS+= -DKRB4_ENCPWD
SRCS+=  kerberos.c
# KRB4_ENCPWD not yet defined
#SRCS+=   krb4encpwd.c
LDADD+= -ldes -lkrb
.endif
.endif

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

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

#endif	/* ENCRYPTION */
@


1.1.1.1.6.2
log
@Remove MAKE_EBONES conditionals.  Besides being wrong, this was what screwed
up secure telnet in the previous snapshots.
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.11 1995/10/11 00:03:59 gibbs Exp $
d14 1
d23 1
@


1.1.1.1.6.3
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
@d2 1
a2 1
#	$Id: Makefile,v 1.1.1.1.6.2 1995/10/11 00:12:10 gibbs Exp $
a4 1
DISTRIBUTION= krb
@


1.1.1.1.6.4
log
@Merge with HEAD
@
text
@d2 1
a2 1
#	$Id$
d5 5
a9 1
SRCS=   encrypt.c genget.c getent.c misc.c
d11 1
a11 1
CFLAGS+= -DHAS_CGETENT -DENCRYPTION
d13 9
a21 3
.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_EBONES)
CFLAGS+= -DDES_ENCRYPTION -DAUTHENTICATION -DKRB4 -I/usr/include/kerberosIV
SRCS+=  auth.c kerberos.c enc_des.c
a22 1
DPADD+= ${LIBDES} ${LIBKRB}
d25 5
a29 2
# Not Yet
#SRCS += spx.c rsaencpwd.c read_password.c
a30 1
# KRB4_ENCPWD not yet defined
d34 8
d43 17
@


1.1.1.1.6.5
log
@Make telnet part of the krb distribution
@
text
@a3 2
DISTRIBUTION=	krb

@


1.1.1.1.6.6
log
@$Id$ -> $FreeBSD$
@
text
@d2 1
a2 1
# $FreeBSD$
@

