From 5609a371c9f46af2c448d58332a0e29543e0a0c5 Mon Sep 17 00:00:00 2001 From: mrg Date: Sun, 25 Jun 2006 03:02:19 +0000 Subject: [PATCH] make MKCRYPTO=no work again. --- dist/ntp/ntpd/ntp_control.c | 6 +++++- distrib/sets/lists/base/mi | 6 +++--- distrib/sets/lists/man/mi | 10 +++++----- lib/libtelnet/Makefile | 4 ++-- usr.bin/moduli/Makefile | 6 +++++- usr.sbin/bind/Makefile.inc | 11 ++++++++--- usr.sbin/wpa/Makefile.inc | 6 +++++- 7 files changed, 33 insertions(+), 16 deletions(-) diff --git a/dist/ntp/ntpd/ntp_control.c b/dist/ntp/ntpd/ntp_control.c index 5f2c8851f2db..68d52cea54e1 100644 --- a/dist/ntp/ntpd/ntp_control.c +++ b/dist/ntp/ntpd/ntp_control.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_control.c,v 1.7 2006/06/11 19:34:11 kardel Exp $ */ +/* $NetBSD: ntp_control.c,v 1.8 2006/06/25 03:02:19 mrg Exp $ */ /* * ntp_control.c - respond to control messages and send async traps @@ -62,7 +62,9 @@ static void ctl_putid P((const char *, char *)); static void ctl_putarray P((const char *, double *, int)); static void ctl_putsys P((int)); static void ctl_putpeer P((int, struct peer *)); +#ifdef OPENSSL static void ctl_putfs P((const char *, tstamp_t)); +#endif /* OPENSSL */ #ifdef REFCLOCK static void ctl_putclock P((int, struct refclockstat *, int)); #endif /* REFCLOCK */ @@ -1003,6 +1005,7 @@ ctl_putuint( ctl_putdata(buffer, (unsigned)( cp - buffer ), 0); } +#ifdef OPENSSL /* * ctl_putfs - write a decoded filestamp into the response */ @@ -1035,6 +1038,7 @@ ctl_putfs( cp++; ctl_putdata(buffer, (unsigned)( cp - buffer ), 0); } +#endif /* OPENSSL */ /* diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index c3829f5e2b8c..02be673b0543 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.633 2006/06/24 05:11:40 mrg Exp $ +# $NetBSD: mi,v 1.634 2006/06/25 03:02:19 mrg Exp $ . base-sys-root ./altroot base-sys-root ./bin base-sys-root @@ -571,8 +571,8 @@ ./usr/bin/progress base-util-bin ./usr/bin/purgestat base-mailwrapper-bin ./usr/bin/pwhash base-util-bin -./usr/bin/qsafe base-util-bin -./usr/bin/qsieve base-util-bin +./usr/bin/qsafe base-util-bin crypto +./usr/bin/qsieve base-util-bin crypto ./usr/bin/qsubst base-util-bin ./usr/bin/quota base-util-bin ./usr/bin/radioctl base-audio-bin diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi index f65e6e24f721..729469af3c6a 100644 --- a/distrib/sets/lists/man/mi +++ b/distrib/sets/lists/man/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.900 2006/06/24 12:38:29 kardel Exp $ +# $NetBSD: mi,v 1.901 2006/06/25 03:02:19 mrg Exp $ ./etc/mtree/set.man man-sys-root ./usr/share/info/am-utils.info man-amd-info info ./usr/share/info/as.info man-computil-info bfd,info @@ -356,8 +356,8 @@ ./usr/share/man/cat1/pushd.0 man-util-catman .cat ./usr/share/man/cat1/pwd.0 man-util-catman .cat ./usr/share/man/cat1/pwhash.0 man-util-catman .cat -./usr/share/man/cat1/qsafe.0 man-util-catman .cat -./usr/share/man/cat1/qsieve.0 man-util-catman .cat +./usr/share/man/cat1/qsafe.0 man-util-catman crypto.cat +./usr/share/man/cat1/qsieve.0 man-util-catman crypto.cat ./usr/share/man/cat1/qsubst.0 man-util-catman .cat ./usr/share/man/cat1/quota.0 man-util-catman .cat ./usr/share/man/cat1/radioctl.0 man-audio-catman .cat @@ -2710,8 +2710,8 @@ ./usr/share/man/man1/pushd.1 man-util-man .man ./usr/share/man/man1/pwd.1 man-util-man .man ./usr/share/man/man1/pwhash.1 man-util-man .man -./usr/share/man/man1/qsafe.1 man-util-man .man -./usr/share/man/man1/qsieve.1 man-util-man .man +./usr/share/man/man1/qsafe.1 man-util-man crypto.man +./usr/share/man/man1/qsieve.1 man-util-man crypto.man ./usr/share/man/man1/qsubst.1 man-util-man .man ./usr/share/man/man1/quota.1 man-util-man .man ./usr/share/man/man1/radioctl.1 man-audio-man .man diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile index c655d38b4eef..0d7f583dd326 100644 --- a/lib/libtelnet/Makefile +++ b/lib/libtelnet/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 8.2 (Berkeley) 12/15/93 -# $NetBSD: Makefile,v 1.26 2006/05/11 23:16:29 mrg Exp $ +# $NetBSD: Makefile,v 1.27 2006/06/25 03:02:19 mrg Exp $ MKPRIVATELIB= yes @@ -23,7 +23,7 @@ CPPFLAGS+= -DKRB5 CPPFLAGS+= -I${DESTDIR}/usr/include/krb5 .endif -.if (${USE_PAM} != "no") +.if ${USE_PAM} != "no" && ${MKCRYPTO} != "no" SRCS+= sra.c pk.c CPPFLAGS+= -DSRA .endif diff --git a/usr.bin/moduli/Makefile b/usr.bin/moduli/Makefile index 18fc09208825..1393a3ed64ad 100644 --- a/usr.bin/moduli/Makefile +++ b/usr.bin/moduli/Makefile @@ -1,5 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2006/01/24 18:59:23 elad Exp $ +# $NetBSD: Makefile,v 1.2 2006/06/25 03:02:19 mrg Exp $ +.include + +.if ${MKCRYPTO} != "no" SUBDIR= qsieve qsafe +.endif .include diff --git a/usr.sbin/bind/Makefile.inc b/usr.sbin/bind/Makefile.inc index 850e7593210b..a75b6907dac8 100644 --- a/usr.sbin/bind/Makefile.inc +++ b/usr.sbin/bind/Makefile.inc @@ -1,15 +1,20 @@ -# $NetBSD: Makefile.inc,v 1.22 2006/05/11 23:16:30 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.23 2006/06/25 03:02:19 mrg Exp $ .if !defined(BIND9_MAKEFILE_INC) BIND9_MAKEFILE_INC=yes WARNS?= 1 WFORMAT?=2 -NAMED_USE_PTHREADS?=yes -NAMED_USE_OPENSSL?=yes .include +.if ${MKCRYPTO} == "no" +NAMED_USE_OPENSSL?=no +.endif + +NAMED_USE_PTHREADS?=yes +NAMED_USE_OPENSSL?=yes + IDIST= ${NETBSDSRCDIR}/dist/bind BIND_SRCDIR= ${NETBSDSRCDIR}/usr.sbin/bind BIND_HTMLDIR= /usr/share/doc/html/bind9 diff --git a/usr.sbin/wpa/Makefile.inc b/usr.sbin/wpa/Makefile.inc index 3690e7d82df9..7fddbcd911c0 100644 --- a/usr.sbin/wpa/Makefile.inc +++ b/usr.sbin/wpa/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.4 2006/04/12 15:31:51 rpaulo Exp $ +# $NetBSD: Makefile.inc,v 1.5 2006/06/25 03:02:19 mrg Exp $ BINDIR?= /usr/sbin @@ -6,3 +6,7 @@ BINDIR?= /usr/sbin WPA_SUPPLICANT_DISTDIR?= ${.CURDIR}/../../../dist/wpa_supplicant HOSTAPD_DISTDIR?= ${.CURDIR}/../../../dist/hostapd + +.if ${MKCRYPTO} == "no" +NO_OPENSSL= # defined +.endif