Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src Update from trunk:
details: https://anonhg.NetBSD.org/src/rev/10ceab084cd5
branches: netbsd-1-5
changeset: 488244:10ceab084cd5
user: thorpej <thorpej%NetBSD.org@localhost>
date: Sat Jun 24 06:59:31 2000 +0000
description:
Update from trunk:
Add MK... variables to enable/disable various aspects of building
crypto support into the system. See share/mk/bsd.README for more
a full description.
diffstat:
bin/ed/Makefile | 8 +++-
bin/rcp/Makefile | 24 ++++++++++
lib/Makefile | 31 +++++++++++++
lib/libcrypto/Makefile | 27 +++++++---
lib/libcrypto/srcs.inc | 15 +++--
lib/libtelnet/Makefile | 11 +++-
libexec/Makefile | 16 +++++++
libexec/telnetd/Makefile | 11 +++-
share/mk/bsd.README | 106 ++++++++++++----------------------------------
share/mk/bsd.own.mk | 37 +++++++++++++---
usr.bin/Makefile | 35 +++++++++++++++
usr.bin/login/Makefile | 31 +++++++++++++
usr.bin/openssl/Makefile | 6 +-
usr.bin/su/Makefile | 39 +++++++++++++++++
usr.bin/telnet/Makefile | 6 ++-
usr.sbin/Makefile | 34 +++++++++++++++
16 files changed, 327 insertions(+), 110 deletions(-)
diffs (truncated from 664 to 300 lines):
diff -r 703fcf6aa567 -r 10ceab084cd5 bin/ed/Makefile
--- a/bin/ed/Makefile Fri Jun 23 18:01:14 2000 +0000
+++ b/bin/ed/Makefile Sat Jun 24 06:59:31 2000 +0000
@@ -1,8 +1,14 @@
-# $NetBSD: Makefile,v 1.31 2000/06/16 16:33:06 thorpej Exp $
+# $NetBSD: Makefile,v 1.31.2.1 2000/06/24 06:59:31 thorpej Exp $
+
+.include <bsd.own.mk>
PROG= ed
CPPFLAGS+=-DBACKWARDS
+
+.if (${MKCRYPTO} != "no")
CPPFLAGS+=-DDES
+.endif
+
SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
LDADD+= -lcrypt
diff -r 703fcf6aa567 -r 10ceab084cd5 bin/rcp/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/rcp/Makefile Sat Jun 24 06:59:31 2000 +0000
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.17.2.2 2000/06/24 06:59:32 thorpej Exp $
+# @(#)Makefile 8.1 (Berkeley) 7/19/93
+
+.include <bsd.own.mk>
+
+PROG= rcp
+SRCS= rcp.c util.c
+
+# XXX Kerberos support broken right now.
+MKKERBEROS=no
+
+.if (${MKKERBEROS} != "no")
+
+RLOGIN= ${.CURDIR}/../../usr.bin/rlogin
+SRCS+= krcmd.c kcmd.c
+CPPFLAGS+= -DKERBEROS -DCRYPT -I${RLOGIN}
+
+LDADD+= -lkrb -ldes
+DPADD+= ${LIBKRB} ${LIBDES}
+
+.PATH: ${RLOGIN}
+.endif
+
+.include <bsd.prog.mk>
diff -r 703fcf6aa567 -r 10ceab084cd5 lib/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/Makefile Sat Jun 24 06:59:31 2000 +0000
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.61.2.2 2000/06/24 06:59:33 thorpej Exp $
+# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
+
+.include <bsd.own.mk>
+
+SUBDIR= csu libarch libbz2 libc libcompat libcrypt libcurses libedit \
+ libkvm libl libm libmenu libossaudio libpcap libposix \
+ libresolv librmt librpcsvc libskey libterm libusb libutil libwrap \
+ liby libz
+
+# XXX Crypto bits must be done before libtelnet.
+
+.if (${MKCRYPTO} != "no")
+# OpenSSL libraries. NOTE! WE DO NOT TRAVERSE INTO libdes FOR A REASON!
+SUBDIR+= libcrypto libssl
+
+# Heimdal Kerberos 5 libraries
+SUBDIR+= libroken libcom_err libsl libss libasn1 libkrb5 libhdb libkadm5 \
+ libkadm5srv libkadm5clnt libgssapi
+
+# KTH Kerberos 4 libraries
+SUBDIR+= libkrb libkdb libkadm libkafs
+SUBDIR+= libkstream
+.endif # MKCRYPTO != no
+
+SUBDIR+= libtelnet
+
+# IPv6/IPsec
+SUBDIR+= libipsec
+
+.include <bsd.subdir.mk>
diff -r 703fcf6aa567 -r 10ceab084cd5 lib/libcrypto/Makefile
--- a/lib/libcrypto/Makefile Fri Jun 23 18:01:14 2000 +0000
+++ b/lib/libcrypto/Makefile Sat Jun 24 06:59:31 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.2.2 2000/06/21 04:24:46 thorpej Exp $
+# $NetBSD: Makefile,v 1.3.2.3 2000/06/24 06:59:33 thorpej Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -16,6 +16,8 @@
# sjg%quick.com.au@localhost
#
+.include <bsd.own.mk>
+
# XXX There's a bit of work to do before we can enable warnings.
WARNS=0
@@ -29,6 +31,9 @@
.include "srcs.inc"
+# NetBSD local addition to des library.
+SRCS+= rnd_keys.c
+
# XXX
.if ${OBJECT_FMT} == "ELF"
AFLAGS+=-DELF
@@ -56,18 +61,24 @@
INCS+= ripemd.h safestack.h sha.h stack.h tmdiff.h
INCS+= txt_db.h x509.h x509_vfy.h x509v3.h
-.if !defined(USELESS_CRYPTO)
-INCS+= rsa.h rc5.h idea.h
-INCS+= rsaref.h
+.if (${MKCRYPTO_RSA} != "no")
+INCS+= rsa.h rsaref.h
+.PATH: ${OPENSSLSRC}/rsaref
+.endif
-.PATH: ${OPENSSLSRC}/rsaref
+.if (${MKCRYPTO_IDEA} != "no")
+INCS+= idea.h
+.endif
+
+.if (${MKCRYPTO_RC5} != "no")
+INCS+= rc5.h
.endif
INCSDIR=/usr/include/openssl
# this rebuilds the `srcs.inc' and the .inc files it reads.
-# note that we have no idea, rc5 or rsa here so we include
-# them explicitely above if we are using these ciphers.
+# note that the resulting `srcs.inc' file needs to be modified
+# to deal with our MKCRYPTO_* configuration variables.
update_inc:
(cd ${.CURDIR}; find ${OPENSSLSRC}/crypto \
@@ -79,8 +90,6 @@
LINKS+= ${LIBDIR}/libcrypto.a ${LIBDIR}/libdes.a
-.include <bsd.own.mk>
-
.if ${MKPROFILE} != "no"
LINKS+= ${LIBDIR}/libcrypto_p.a ${LIBDIR}/libdes_p.a
.endif
diff -r 703fcf6aa567 -r 10ceab084cd5 lib/libcrypto/srcs.inc
--- a/lib/libcrypto/srcs.inc Fri Jun 23 18:01:14 2000 +0000
+++ b/lib/libcrypto/srcs.inc Sat Jun 24 06:59:31 2000 +0000
@@ -7,11 +7,7 @@
.include "cast.inc"
.include "comp.inc"
.include "conf.inc"
-
.include "des.inc"
-# NetBSD local addition to des library.
-SRCS+= rnd_keys.c
-
.include "dh.inc"
.include "dsa.inc"
.include "err.inc"
@@ -34,8 +30,15 @@
.include "txt_db.inc"
.include "x509.inc"
.include "x509v3.inc"
-.if !defined(USELESS_CRYPTO)
+
+.if (${MKCRYPTO_RSA} != "no")
.include "rsa.inc"
-.include "rc5.inc"
+.endif
+
+.if (${MKCRYPTO_IDEA} != "no")
.include "idea.inc"
.endif
+
+.if (${MKCRYPTO_RC5} != "no")
+.include "rc5.inc"
+.endif
diff -r 703fcf6aa567 -r 10ceab084cd5 lib/libtelnet/Makefile
--- a/lib/libtelnet/Makefile Fri Jun 23 18:01:14 2000 +0000
+++ b/lib/libtelnet/Makefile Sat Jun 24 06:59:31 2000 +0000
@@ -1,18 +1,23 @@
# from: @(#)Makefile 8.2 (Berkeley) 12/15/93
-# $NetBSD: Makefile,v 1.10.2.2 2000/06/22 07:09:02 thorpej Exp $
+# $NetBSD: Makefile,v 1.10.2.3 2000/06/24 06:59:34 thorpej Exp $
+
+.include <bsd.own.mk>
LIB= telnet
SRCS= auth.c encrypt.c genget.c getent.c misc.c
+CPPFLAGS+= -DHAS_CGETENT
+CPPFLAGS+= -I${.CURDIR}
+
+.if (${MKKERBEROS} != "no")
SRCS+= enc_des.c kerberos.c
SRCS+= kerberos5.c
-CPPFLAGS+= -DHAS_CGETENT
CPPFLAGS+= -DENCRYPTION -DAUTHENTICATION
CPPFLAGS+= -DKRB4 -DDES_ENCRYPTION
CPPFLAGS+= -DKRB5
CPPFLAGS+= -I${DESTDIR}/usr/include/krb5
CPPFLAGS+= -I${DESTDIR}/usr/include/kerberosIV
-CPPFLAGS+= -I${.CURDIR}
+.endif
.include <bsd.lib.mk>
diff -r 703fcf6aa567 -r 10ceab084cd5 libexec/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/libexec/Makefile Sat Jun 24 06:59:31 2000 +0000
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.37.2.2 2000/06/24 06:59:34 thorpej Exp $
+# @(#)Makefile 8.1 (Berkeley) 6/4/93
+
+.include <bsd.own.mk>
+
+SUBDIR= atrun comsat fingerd ftpd getNAME getty identd ld.aout_so \
+ ld.elf_so lfs_cleanerd mail.local makekey makewhatis rexecd \
+ rlogind rmail rshd rpc.rquotad rpc.rstatd rpc.rusersd rpc.rwalld \
+ rpc.sprayd talkd telnetd tftpd uucpd
+
+.if (${MKCRYPTO} != "no")
+# Heimdal/KTH Kerberos
+SUBDIR+= hprop hpropd kadmind kdc kfd kpasswdd
+.endif
+
+.include <bsd.subdir.mk>
diff -r 703fcf6aa567 -r 10ceab084cd5 libexec/telnetd/Makefile
--- a/libexec/telnetd/Makefile Fri Jun 23 18:01:14 2000 +0000
+++ b/libexec/telnetd/Makefile Sat Jun 24 06:59:31 2000 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.23.2.2 2000/06/22 07:09:04 thorpej Exp $
+# $NetBSD: Makefile,v 1.23.2.3 2000/06/24 06:59:35 thorpej Exp $
# from: @(#)Makefile 8.2 (Berkeley) 12/15/93
+.include <bsd.own.mk>
+
MAN= telnetd.8
CPPFLAGS+=-DINET6
@@ -13,13 +15,16 @@
DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
LDADD+= -lutil -ltermcap -ltelnet
+CPPFLAGS+=-I${.CURDIR}/../../lib
+CPPFLAGS+=-I${.CURDIR}
+
+.if (${MKKERBEROS} != "no")
CPPFLAGS+=-DAUTHENTICATION -DENCRYPTION
CPPFLAGS+=-I${DESTDIR}/usr/include/krb5
-CPPFLAGS+=-I${.CURDIR}/../../lib
CPPFLAGS+=-DKRB5
-CPPFLAGS+=-I${.CURDIR}
LDADD+= -lkrb5 -lkrb -lcrypto -lasn1 -lcom_err -lroken
DPADD+= ${LIBKRB5} ${LIBKRB} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
+.endif
.include <bsd.prog.mk>
diff -r 703fcf6aa567 -r 10ceab084cd5 share/mk/bsd.README
--- a/share/mk/bsd.README Fri Jun 23 18:01:14 2000 +0000
+++ b/share/mk/bsd.README Sat Jun 24 06:59:31 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.63 2000/05/07 01:19:58 sjg Exp $
+# $NetBSD: bsd.README,v 1.63.4.1 2000/06/24 06:59:38 thorpej Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the new make "include" files for the BSD
@@ -231,22 +231,39 @@
process (default values are in brackets along with comments, if set by
bsd.own.mk):
-CRYPTOBASE Select which cryptography code base to use when building
- cryptography support into the system. See the
- bsd.crypto.mk section for more information.
+MKCRYPTO If set to "no", no cryptography support will be built
+ into the system. Defaults to "yes".
+
+NOCRYPTO If set, it is equivalent to setting MKCRYPTO to "no".
+
+MKCRYPTO_RSA If set to "no", RSA support will not be built into
+ the system's cryptography libraries. This implies
+ that SSLv2 support will not be present. Defaults to "yes".
+
+NOCRYPTO_RSA If set, it is equivalent to setting MKCRYPTO_RSA to "no".
+
+MKCRYPTO_IDEA If set to "no", IDEA support will not be built into
+ the system's cryptography libraries. Defaults to "yes".
-EXPORTABLE_SYSTEM
- Forces CRYPTOBASE to the value "none" for compatibility
- with older NetBSD build environments. See the bsd.crypto.mk
- section for more information.
+NOCRYPTO_IDEA If set, it is equivalent to setting MKCRYPTO_IDEA to "no".
Home |
Main Index |
Thread Index |
Old Index