head	1.35;
access;
symbols
	RELENG_8_4:1.35.0.2
	RELENG_9_1_0_RELEASE:1.34.16.1.4.2
	RELENG_9_1:1.34.16.1.0.4
	RELENG_9_1_BP:1.34.16.1
	RELENG_8_3_0_RELEASE:1.34.10.1.8.1
	RELENG_8_3:1.34.10.1.0.8
	RELENG_8_3_BP:1.34.10.1
	RELENG_9_0_0_RELEASE:1.34.16.1.2.1
	RELENG_9_0:1.34.16.1.0.2
	RELENG_9_0_BP:1.34.16.1
	RELENG_9:1.34.0.16
	RELENG_9_BP:1.34
	RELENG_7_4_0_RELEASE:1.34.14.1
	RELENG_8_2_0_RELEASE:1.34.10.1.6.1
	RELENG_7_4:1.34.0.14
	RELENG_7_4_BP:1.34
	RELENG_8_2:1.34.10.1.0.6
	RELENG_8_2_BP:1.34.10.1
	RELENG_8_1_0_RELEASE:1.34.10.1.4.1
	RELENG_8_1:1.34.10.1.0.4
	RELENG_8_1_BP:1.34.10.1
	RELENG_7_3_0_RELEASE:1.34.12.1
	RELENG_7_3:1.34.0.12
	RELENG_7_3_BP:1.34
	RELENG_8_0_0_RELEASE:1.34.10.1.2.1
	RELENG_8_0:1.34.10.1.0.2
	RELENG_8_0_BP:1.34.10.1
	RELENG_8:1.34.0.10
	RELENG_8_BP:1.34
	RELENG_7_2_0_RELEASE:1.34.8.1
	RELENG_7_2:1.34.0.8
	RELENG_7_2_BP:1.34
	RELENG_7_1_0_RELEASE:1.34.6.1
	RELENG_6_4_0_RELEASE:1.33.22.1
	RELENG_7_1:1.34.0.6
	RELENG_7_1_BP:1.34
	RELENG_6_4:1.33.0.22
	RELENG_6_4_BP:1.33
	RELENG_7_0_0_RELEASE:1.34
	RELENG_6_3_0_RELEASE:1.33
	RELENG_7_0:1.34.0.4
	RELENG_7_0_BP:1.34
	RELENG_6_3:1.33.0.20
	RELENG_6_3_BP:1.33
	RELENG_7:1.34.0.2
	RELENG_7_BP:1.34
	RELENG_6_2_0_RELEASE:1.33
	RELENG_6_2:1.33.0.18
	RELENG_6_2_BP:1.33
	RELENG_5_5_0_RELEASE:1.33
	RELENG_5_5:1.33.0.16
	RELENG_5_5_BP:1.33
	RELENG_6_1_0_RELEASE:1.33
	RELENG_6_1:1.33.0.14
	RELENG_6_1_BP:1.33
	RELENG_6_0_0_RELEASE:1.33
	RELENG_6_0:1.33.0.12
	RELENG_6_0_BP:1.33
	RELENG_6:1.33.0.10
	RELENG_6_BP:1.33
	RELENG_5_4_0_RELEASE:1.33
	RELENG_5_4:1.33.0.8
	RELENG_5_4_BP:1.33
	RELENG_4_11_0_RELEASE:1.19.2.5
	RELENG_4_11:1.19.2.5.0.6
	RELENG_4_11_BP:1.19.2.5
	RELENG_5_3_0_RELEASE:1.33
	RELENG_5_3:1.33.0.6
	RELENG_5_3_BP:1.33
	RELENG_5:1.33.0.4
	RELENG_5_BP:1.33
	RELENG_4_10_0_RELEASE:1.19.2.5
	RELENG_4_10:1.19.2.5.0.4
	RELENG_4_10_BP:1.19.2.5
	RELENG_5_2_1_RELEASE:1.33
	RELENG_5_2_0_RELEASE:1.33
	RELENG_5_2:1.33.0.2
	RELENG_5_2_BP:1.33
	RELENG_4_9_0_RELEASE:1.19.2.5
	RELENG_4_9:1.19.2.5.0.2
	RELENG_4_9_BP:1.19.2.5
	RELENG_5_1_0_RELEASE:1.31
	RELENG_5_1:1.31.0.2
	RELENG_5_1_BP:1.31
	RELENG_4_8_0_RELEASE:1.19.2.4
	RELENG_4_8:1.19.2.4.0.4
	RELENG_4_8_BP:1.19.2.4
	RELENG_5_0_0_RELEASE:1.26
	RELENG_5_0:1.26.0.2
	RELENG_5_0_BP:1.26
	RELENG_4_7_0_RELEASE:1.19.2.4
	RELENG_4_7:1.19.2.4.0.2
	RELENG_4_7_BP:1.19.2.4
	RELENG_4_6_2_RELEASE:1.19.2.3.8.1
	RELENG_4_6_1_RELEASE:1.19.2.3.8.1
	RELENG_4_6_0_RELEASE:1.19.2.3
	RELENG_4_6:1.19.2.3.0.8
	RELENG_4_6_BP:1.19.2.3
	RELENG_4_5_0_RELEASE:1.19.2.3
	RELENG_4_5:1.19.2.3.0.6
	RELENG_4_5_BP:1.19.2.3
	RELENG_4_4_0_RELEASE:1.19.2.3
	RELENG_4_4:1.19.2.3.0.4
	RELENG_4_4_BP:1.19.2.3
	RELENG_4_3_0_RELEASE:1.19.2.3
	RELENG_4_3:1.19.2.3.0.2
	RELENG_4_3_BP:1.19.2.3
	RELENG_4_2_0_RELEASE:1.19.2.3
	RELENG_4_1_1_RELEASE:1.19.2.3
	PRE_SMPNG:1.23
	RELENG_4_1_0_RELEASE:1.19.2.1
	RELENG_3_5_0_RELEASE:1.7.2.1
	RELENG_4_0_0_RELEASE:1.19
	RELENG_4:1.19.0.2
	RELENG_4_BP:1.19
	RELENG_3_4_0_RELEASE:1.7.2.1
	RELENG_3_3_0_RELEASE:1.7.2.1
	RELENG_3_2_PAO:1.7.0.4
	RELENG_3_2_PAO_BP:1.7
	RELENG_3_2_0_RELEASE:1.7
	RELENG_3_1_0_RELEASE:1.7
	RELENG_3:1.7.0.2
	RELENG_3_BP:1.7
	RELENG_2_2_8_RELEASE:1.5
	RELENG_3_0_0_RELEASE:1.7
	RELENG_2_2_7_RELEASE:1.5
	RELENG_2_2_6_RELEASE:1.5
	RELENG_2_2_5_RELEASE:1.5
	RELENG_2_2_2_RELEASE:1.5
	RELENG_2_2_1_RELEASE:1.5
	RELENG_2_2_0_RELEASE:1.5
	RELENG_2_1_7_RELEASE:1.2.6.2
	RELENG_2_1_6_1_RELEASE:1.2.6.2
	RELENG_2_1_6_RELEASE:1.2.6.2
	RELENG_2_2:1.5.0.2
	RELENG_2_2_BP:1.5
	RELENG_2_1_5_RELEASE:1.2.6.2
	RELENG_2_1_0_RELEASE:1.2.6.1
	RELENG_2_1_0:1.2.0.6
	RELENG_2_1_0_BP:1.2
	RELENG_2_0_5_RELEASE:1.2
	RELENG_2_0_5:1.2.0.4
	RELENG_2_0_5_BP:1.2
	RELENG_2_0_5_ALPHA:1.2
	RELEASE_2_0:1.2
	BETA_2_0:1.2
	ALPHA_2_0:1.2.0.2;
locks; strict;
comment	@# @;


1.35
date	2012.11.17.01.50.26;	author svnexp;	state Exp;
branches
	1.35.2.1;
next	1.34;

1.34
date	2006.03.17.18.54.31;	author ru;	state Exp;
branches
	1.34.2.1
	1.34.6.1
	1.34.8.1
	1.34.10.1
	1.34.12.1
	1.34.14.1
	1.34.16.1;
next	1.33;

1.33
date	2003.07.16.20.59.14;	author markm;	state Exp;
branches
	1.33.10.1
	1.33.22.1;
next	1.32;

1.32
date	2003.06.02.20.03.32;	author markm;	state Exp;
branches;
next	1.31;

1.31
date	2003.05.05.07.58.43;	author markm;	state Exp;
branches;
next	1.30;

1.30
date	2003.04.30.07.51.50;	author ru;	state Exp;
branches;
next	1.29;

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

1.28
date	2003.04.23.17.26.01;	author des;	state Exp;
branches;
next	1.27;

1.27
date	2003.04.01.12.50.40;	author ru;	state Exp;
branches;
next	1.26;

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

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

1.24
date	2000.09.10.00.09.35;	author kris;	state Exp;
branches;
next	1.23;

1.23
date	2000.09.06.23.46.50;	author kris;	state Exp;
branches;
next	1.22;

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

1.21
date	2000.07.03.06.26.30;	author peter;	state Exp;
branches;
next	1.20;

1.20
date	2000.07.03.06.24.23;	author peter;	state Exp;
branches;
next	1.19;

1.19
date	2000.02.26.13.12.52;	author peter;	state Exp;
branches
	1.19.2.1;
next	1.18;

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

1.17
date	2000.02.25.08.18.30;	author peter;	state Exp;
branches;
next	1.16;

1.16
date	2000.02.24.18.59.29;	author markm;	state Exp;
branches;
next	1.15;

1.15
date	2000.01.30.04.11.37;	author kris;	state Exp;
branches;
next	1.14;

1.14
date	2000.01.20.07.27.49;	author kris;	state Exp;
branches;
next	1.13;

1.13
date	2000.01.16.05.24.47;	author kris;	state Exp;
branches;
next	1.12;

1.12
date	2000.01.15.18.02.04;	author green;	state Exp;
branches;
next	1.11;

1.11
date	2000.01.14.08.01.47;	author kris;	state Exp;
branches;
next	1.10;

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

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

1.8
date	99.08.28.01.30.18;	author peter;	state Exp;
branches;
next	1.7;

1.7
date	97.02.22.14.40.13;	author peter;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	97.01.14.06.25.37;	author jkh;	state Exp;
branches;
next	1.5;

1.5
date	96.02.11.08.46.59;	author markm;	state Exp;
branches
	1.5.2.1;
next	1.4;

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

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

1.2
date	94.09.08.19.06.58;	author csgr;	state Exp;
branches
	1.2.6.1;
next	1.1;

1.1
date	94.08.08.17.42.35;	author csgr;	state Exp;
branches;
next	;

1.35.2.1
date	2012.11.17.01.50.26;	author svnexp;	state dead;
branches;
next	1.35.2.2;

1.35.2.2
date	2013.03.28.13.03.36;	author svnexp;	state Exp;
branches;
next	;

1.34.2.1
date	2012.11.17.08.03.43;	author svnexp;	state Exp;
branches;
next	;

1.34.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.34.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.34.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.34.10.1.2.1
	1.34.10.1.4.1
	1.34.10.1.6.1
	1.34.10.1.8.1;
next	1.34.10.2;

1.34.10.2
date	2012.11.17.10.36.17;	author svnexp;	state Exp;
branches;
next	;

1.34.10.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.34.10.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.34.10.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.34.10.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.34.10.1.8.2;

1.34.10.1.8.2
date	2012.11.17.08.24.57;	author svnexp;	state Exp;
branches;
next	;

1.34.12.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.34.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.34.14.2;

1.34.14.2
date	2012.11.17.08.16.55;	author svnexp;	state Exp;
branches;
next	;

1.34.16.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.34.16.1.2.1
	1.34.16.1.4.1;
next	1.34.16.2;

1.34.16.2
date	2012.11.17.11.36.33;	author svnexp;	state Exp;
branches;
next	;

1.34.16.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.34.16.1.2.2;

1.34.16.1.2.2
date	2012.11.17.08.36.32;	author svnexp;	state Exp;
branches;
next	;

1.34.16.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.34.16.1.4.2;

1.34.16.1.4.2
date	2012.11.17.08.47.22;	author svnexp;	state Exp;
branches;
next	;

1.33.10.1
date	2012.11.17.07.41.24;	author svnexp;	state Exp;
branches;
next	;

1.33.22.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.19.2.1
date	2000.07.03.22.53.31;	author peter;	state Exp;
branches;
next	1.19.2.2;

1.19.2.2
date	2000.09.07.04.02.06;	author peter;	state Exp;
branches;
next	1.19.2.3;

1.19.2.3
date	2000.09.18.03.00.05;	author kris;	state Exp;
branches
	1.19.2.3.8.1;
next	1.19.2.4;

1.19.2.4
date	2002.07.03.22.13.21;	author des;	state Exp;
branches;
next	1.19.2.5;

1.19.2.5
date	2003.04.04.21.33.15;	author ru;	state Exp;
branches;
next	1.19.2.6;

1.19.2.6
date	2012.11.17.07.24.37;	author svnexp;	state Exp;
branches;
next	;

1.19.2.3.8.1
date	2002.07.16.12.33.26;	author des;	state Exp;
branches;
next	;

1.7.2.1
date	99.08.29.15.16.56;	author peter;	state Exp;
branches;
next	;

1.5.2.1
date	99.09.05.11.48.52;	author peter;	state Exp;
branches;
next	;

1.2.6.1
date	95.09.15.18.18.40;	author gibbs;	state Exp;
branches;
next	1.2.6.2;

1.2.6.2
date	96.06.21.17.28.56;	author markm;	state Exp;
branches;
next	1.2.6.3;

1.2.6.3
date	99.09.05.11.51.42;	author peter;	state Exp;
branches;
next	;


desc
@@


1.35
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/secure/lib/Makefile 156813 2006-03-17 18:54:44Z ru $

.include <bsd.own.mk>

SUBDIR= 
.if ${MK_OPENSSL} != "no"
SUBDIR+=libcrypto libssl
.if ${MK_OPENSSH} != "no"
SUBDIR+=libssh
.endif
.endif

.include <bsd.subdir.mk>
@


1.35.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:03:36 +0000
@
text
@d1 13
@


1.35.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 13
# $FreeBSD: releng/8.4/secure/lib/Makefile 156813 2006-03-17 18:54:44Z ru $

.include <bsd.own.mk>

SUBDIR= 
.if ${MK_OPENSSL} != "no"
SUBDIR+=libcrypto libssl
.if ${MK_OPENSSH} != "no"
SUBDIR+=libssh
.endif
.endif

.include <bsd.subdir.mk>
@


1.34
log
@Reimplementation of world/kernel build options.  For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by:	imp, jhb, kris, phk, ru (all bugs are mine)
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.34.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/secure/lib/Makefile 156813 2006-03-17 18:54:44Z ru $
@


1.34.16.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.34.16.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/secure/lib/Makefile 156813 2006-03-17 18:54:44Z ru $
@


1.34.16.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.34.16.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/secure/lib/Makefile 156813 2006-03-17 18:54:44Z ru $
@


1.34.16.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.34.16.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/secure/lib/Makefile 156813 2006-03-17 18:54:44Z ru $
@


1.34.14.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.34.14.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/secure/lib/Makefile 156813 2006-03-17 18:54:44Z ru $
@


1.34.12.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.34.10.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.34.10.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/secure/lib/Makefile 156813 2006-03-17 18:54:44Z ru $
@


1.34.10.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.34.10.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/secure/lib/Makefile 156813 2006-03-17 18:54:44Z ru $
@


1.34.10.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.34.10.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.34.10.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.34.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.34.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.33
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
@d3 2
d6 1
a6 1
.if !defined(NO_OPENSSL)
d8 1
a8 1
.if !defined(NO_OPENSSH)
@


1.33.10.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/secure/lib/Makefile 117675 2003-07-16 20:59:15Z markm $
@


1.33.22.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.32
log
@Disconnect libcipher from the build. It only does DES, and we already
have libcrypto to do that. Both consumers of this lib have been
converted to use libcrypto. (bin/ed and secure/usr.bin/bdes).
@
text
@a8 3
.if defined(NO_KERBEROS)
SUBDIR+=libtelnet
.endif
@


1.31
log
@Turn MAKE_KERBEROS5 into NO_KERBEROS by negating the logic. Some extra
cleanups were necessary in release/Makefile, and the tinderbox code
was syntax checked, not run checked.
@
text
@d3 1
a3 1
SUBDIR= libcipher
@


1.30
log
@Most things depend on !defined(NO_OPENSSL); make it look so.
@
text
@d9 1
a9 1
.if !defined(MAKE_KERBEROS5)
@


1.29
log
@NOSECURE is implied by NOCRYPT, meaning if the latter is defined
we won't be here.
@
text
@a3 3
.if !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS5)
SUBDIR+=libtelnet
.endif
d8 3
@


1.28
log
@Remove Kerberos IV shims.
@
text
@d4 1
a4 1
.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS5)
@


1.27
log
@libtelnet depends on OpenSSL.

PR:	50507
@
text
@d4 1
a4 1
.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5)
@


1.26
log
@Make NO_OPENSSL actually imply NO_OPENSSH, as documented in make.conf(5).
@
text
@d4 1
a4 1
.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5)
@


1.25
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/Makefile,v 1.24 2000/09/10 00:09:35 kris Exp $
a8 1
.endif
d11 1
@


1.24
log
@Nuke RSAREF support from orbit.

It's the only way to be sure.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/Makefile,v 1.23 2000/09/06 23:46:50 kris Exp $
d4 1
a4 1
.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4)
@


1.23
log
@``Anyone is now free to rub two primes together for their own gratification''
    -- Unknown

Now that the RSA algorithm is released into the public domain, build
librsaintl by default unless NO_RSAINTL is set in make.conf.

The native OpenSSL implementation of RSA is much faster, doesn't have
an artificial keysize limitation, has 30% fewer calories and tastes great!
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/Makefile,v 1.22 2000/07/16 05:52:48 peter Exp $
d8 1
a8 8
SUBDIR+=libcrypto librsaglue libssl
.if exists(${.CURDIR}/../../crypto/openssl/rsaref)
SUBDIR+=librsausa
.endif
.if exists(${.CURDIR}/../../crypto/openssl/crypto/rsa/rsa_eay.c) && \
    !defined(NO_RSAINTL)
SUBDIR+=librsaintl
.endif
@


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/lib/Makefile,v 1.21 2000/07/03 06:26:30 peter Exp $
d13 1
a13 1
    (${USA_RESIDENT} != YES || defined(MAKE_RSAINTL))
@


1.21
log
@Argh. Cut/paste transcription error.  Fix syntax of previous commit.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/Makefile,v 1.20 2000/07/03 06:24:23 peter Exp $
@


1.20
log
@USA_RESIDENT is forced to YES or NO at the start of Makefile.inc1
Use that to be the final arbiter of whether or not to build the
librsaintl.so plugin for openssl/openssh.  Add a magic WANT_RSAINTL flag
to force building even if USA_RESIDENT=YES.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/Makefile,v 1.19 2000/02/26 13:12:52 peter Exp $
d12 1
a12 1
.if exists(${.CURDIR}/../../crypto/openssl/crypto/rsa/rsa_eay.c) &&
@


1.19
log
@Merge from internat.freebsd.org repo, minus change to rsa_eay.c (missing)

Reorganize and unify libcrypto's interface so that the RSA implementation
is chosen at runtime via dlopen().

This is a checkpoint and may require more tweaks still.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/Makefile,v 1.18 2000/02/25 09:47:04 peter Exp $
d12 2
a13 1
.if exists(${.CURDIR}/../../crypto/openssl/crypto/rsa/rsa_eay.c)
@


1.19.2.1
log
@MFC: deal with rsa_eay.c using USA_RESIDENT to set a safe default.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/Makefile,v 1.19 2000/02/26 13:12:52 peter Exp $
d12 1
a12 2
.if exists(${.CURDIR}/../../crypto/openssl/crypto/rsa/rsa_eay.c) && \
    (${USA_RESIDENT} != YES || defined(MAKE_RSAINTL))
@


1.19.2.2
log
@MFC: build librsaintl by default now that RSA Security Inc have waived
all rights to the patent.
@
text
@d1 1
a1 1
# $FreeBSD$
d13 1
a13 1
    !defined(NO_RSAINTL)
@


1.19.2.3
log
@MFC: Roll librsa* back into libcrypto
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/Makefile,v 1.19.2.2 2000/09/07 04:02:06 peter Exp $
d8 8
a15 1
SUBDIR+=libcrypto libssl
@


1.19.2.3.8.1
log
@Merge OpenSSH, OPIE, PAM and a number of dependencies from -STABLE.
@
text
@d1 1
a1 1
# $FreeBSD$
d4 1
a4 1
.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5)
d9 1
a11 1
.endif
@


1.19.2.4
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
@d1 1
a1 1
# $FreeBSD$
d4 1
a4 1
.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5)
d9 1
a11 1
.endif
@


1.19.2.5
log
@MFC: revision 1.27 (libtelnet depends on OpenSSL).
@
text
@d4 1
a4 1
.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5)
@


1.19.2.6
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/secure/lib/Makefile 113097 2003-04-04 21:33:15Z ru $
@


1.18
log
@Create a stub libRSAglue for bsd.port.mk's sake
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/Makefile,v 1.17 2000/02/25 08:18:30 peter Exp $
d9 6
@


1.17
log
@Fold libRSAglue into libcrypto so we don't have to special-case
all the builds.  There is still no actual RSA implementation code
in libcrypto or src/* on US code trees.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/Makefile,v 1.16 2000/02/24 18:59:29 markm Exp $
d8 1
a8 1
SUBDIR+=libcrypto libssl
@


1.16
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$
a8 3
.if defined(RSAREF) && ${RSAREF} == YES
SUBDIR+=librsaglue
.endif
@


1.15
log
@Add NO_OPENSSL knob to turn off building of openssl

Requested by:	wollman
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/Makefile,v 1.14 2000/01/20 07:27:49 kris Exp $
d3 1
a3 1
SUBDIR= libcipher libdes
d8 7
a14 1
SUBDIR+=libcrypto librsaglue libssl
@


1.14
log
@Activate librsaglue
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/Makefile,v 1.13 2000/01/16 05:24:47 kris Exp $
d3 1
a3 1
SUBDIR= libcipher libcrypto libdes librsaglue libssl
d6 3
@


1.13
log
@Turn back on libcrypto and libssl building.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/Makefile,v 1.12 2000/01/15 18:02:04 green Exp $
d3 1
a3 1
SUBDIR= libcipher libcrypto libdes libssl
@


1.12
log
@We cannot have libcrypto, and therefore OpenSSL at all, without RSA.
If you need examples of breakage, I'm ready to provide more than a
few.
@
text
@d1 1
a1 1
# $FreeBSD$
d3 1
a3 1
SUBDIR= libcipher libdes
@


1.11
log
@Connect OpenSSL to the build.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/Makefile,v 1.10 1999/10/12 19:47:55 markm Exp $
d3 1
a3 1
SUBDIR= libcipher libcrypto libdes libssl
@


1.10
log
@Dont build telenet if we are going for kerberised telnet; this just
jumps all over kerberised telnet otherwise.
@
text
@d1 1
a1 1
# $FreeBSD$
d3 1
a3 1
SUBDIR= libcipher libdes
@


1.9
log
@Make telnet with SRA work.

Submitted by:	Nick Sayer
@
text
@d3 4
a6 1
SUBDIR= libcipher libdes libtelnet
a8 1

@


1.8
log
@$Id$ -> $FreeBSD$
@
text
@d3 1
a3 1
SUBDIR= libcipher libdes
@


1.7
log
@Revert $FreeBSD$ to $Id$
@
text
@d1 1
a1 1
#	$Id$
@


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


1.6
log
@Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
@
text
@d1 1
a1 1
#	$FreeBSD$
@


1.5
log
@Add the new libdes to the build
@
text
@d1 1
a1 1
#	$Id$
@


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


1.4
log
@Remove duplicated targets which now build from main tree
if available and allowed
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.3 1995/07/29 12:49:14 markm Exp $
d3 1
a3 1
SUBDIR= libcipher
@


1.3
log
@After pst and ache fixed secure telnet, it was still not in the main
makefiles. This puts it in.

PLEASE NOTE - YOU WILL NEED TO BUILD AND INSTALL THE libtelnet IN secure/
Reviewed by:
Submitted by:
Obtained from:
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.2 1994/09/08 19:06:58 csgr Exp $
d3 1
a3 1
SUBDIR=	libcipher libcrypt libtelnet
@


1.2
log
@add libcipher to Makefile
Submitted by:	Geoff.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.1 1994/08/08 17:42:35 csgr Exp $
d3 1
a3 1
SUBDIR=	libcipher libcrypt
@


1.2.6.1
log
@Merge with HEAD.  Brings in new secure telnet suite + eBones fixes.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.3 1995/07/29 12:49:14 markm Exp $
d3 1
a3 1
SUBDIR=	libcipher libcrypt libtelnet
@


1.2.6.2
log
@Merge with HEAD
@
text
@d1 1
a1 1
#	$Id$
d3 1
a3 1
SUBDIR= libcipher libdes
@


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


1.1
log
@add Makefiles for secure/lib.  Makefile.inc just includes src/lib/Makefile.inc
in order to get things like SHLIB_MAJOR etc.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.1 1994/08/07 19:04:08 wollman Exp $
d3 1
a3 1
SUBDIR=	libcrypt
@
