Okay, these patches were sufficient to allow me to build world with
NO_OPENSSL defined. I'd like to commit these ASAP.
After the release, I want to look at condensing the mass of
.if defined(...) options we have, at least with respect to crypto. At the
moment we have to test everywhere for things like
.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) &&
defined(MAKE_KERBEROS4)
when all we really want to know is whether or not OpenSSL is available to
be linked with.
In addition to normalizing all of the NO* options to NO_* (or other way
round if I get shouted down :), they should obey the correct covering
hierarchy automatically so we don't have to explicitly test for all the
covering options in each instance. For example, NO_CRYPT should imply
NO_OPENSSL, which in turn implies NO_OPENSSH, etc. NOSECURE should be
removed since it's nonfunctional. NO_CRYPT or NO_OPENSSL should conflict
with MAKE_KERBEROS?, etc.
Kris
Index: Makefile.inc1
===================================================================
RCS file: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.140
diff -u -r1.140 Makefile.inc1
--- Makefile.inc1 2000/02/28 21:04:38 1.140
+++ Makefile.inc1 2000/03/05 22:32:04
@@ -57,11 +57,11 @@
SUBDIR+= gnu
.endif
.if exists(${.CURDIR}/kerberosIV) && exists(${.CURDIR}/crypto) && \
- !defined(NOCRYPT) && defined(MAKE_KERBEROS4)
+ !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS4)
SUBDIR+= kerberosIV
.endif
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
- !defined(NOCRYPT) && defined(MAKE_KERBEROS5)
+ !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5)
SUBDIR+= kerberos5
.endif
.if exists(${.CURDIR}/libexec)
@@ -203,7 +203,7 @@
# success, regardless of how old your existing system is.
#
buildworld:
-.if !defined(NOSECURE) && exists(${.CURDIR}/secure) && \
+.if !defined(NOSECURE) && !defined(NO_OPENSSL) && exists(${.CURDIR}/secure) && \
(!defined(USA_RESIDENT) || (${USA_RESIDENT} != NO && \
${USA_RESIDENT} != YES))
@echo
Index: lib/Makefile
===================================================================
RCS file: /home/ncvs/src/lib/Makefile,v
retrieving revision 1.106
diff -u -r1.106 Makefile
--- lib/Makefile 2000/01/21 02:00:53 1.106
+++ lib/Makefile 2000/02/27 00:21:50
@@ -43,7 +43,7 @@
.endif
_libcrypt= libcrypt
-.if exists(${.CURDIR}/../secure) && !defined(NOSECURE) && !defined(NOCRYPT)
+.if exists(${.CURDIR}/../secure) && !defined(NOSECURE) && !defined(NOCRYPT) &&
+!defined(NO_DESCRYPT)
# Build both libraries. They have different names, so no harm,
# and this avoids having stale libscrypt.*
_libcrypt+= ../secure/lib/libcrypt
Index: lib/libpam/libpam/Makefile
===================================================================
RCS file: /home/ncvs/src/lib/libpam/libpam/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- lib/libpam/libpam/Makefile 2000/02/28 21:00:48 1.11
+++ lib/libpam/libpam/Makefile 2000/03/05 22:32:04
@@ -62,16 +62,16 @@
# Static PAM modules:
STATIC_MODULES+= ${MODOBJDIR}/pam_cleartext_pass_ok/libpam_cleartext_pass_ok.a
STATIC_MODULES+= ${MODOBJDIR}/pam_deny/libpam_deny.a
-.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT)
+.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
STATIC_MODULES+= ${MODOBJDIR}/pam_kerberosIV/libpam_kerberosIV.a
.endif
-.if defined(MAKE_KERBEROS5__) && !defined(NOCRYPT)
+.if defined(MAKE_KERBEROS5__) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
STATIC_MODULES+= ${MODOBJDIR}/pam_kerberos5/libpam_kerberos5.a
.endif
STATIC_MODULES+= ${MODOBJDIR}/pam_permit/libpam_permit.a
STATIC_MODULES+= ${MODOBJDIR}/pam_radius/libpam_radius.a
STATIC_MODULES+= ${MODOBJDIR}/pam_skey/libpam_skey.a
-.if exists(${.CURDIR}/../../../crypto/openssh) && !defined(NO_OPENSSL)
+.if exists(${.CURDIR}/../../../crypto/openssh) && !defined(NOCRYPT) &&
+!defined(NO_OPENSSL)
STATIC_MODULES+= ${MODOBJDIR}/pam_ssh/libpam_ssh.a
.endif
STATIC_MODULES+= ${MODOBJDIR}/pam_tacplus/libpam_tacplus.a
Index: lib/libpam/modules/Makefile
===================================================================
RCS file: /home/ncvs/src/lib/libpam/modules/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- lib/libpam/modules/Makefile 2000/02/28 21:00:50 1.7
+++ lib/libpam/modules/Makefile 2000/03/05 22:32:04
@@ -26,16 +26,16 @@
SUBDIR+= pam_cleartext_pass_ok
SUBDIR+= pam_deny
-.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT)
+.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
SUBDIR+= pam_kerberosIV
.endif
-.if defined(MAKE_KERBEROS5__) && !defined(NOCRYPT)
+.if defined(MAKE_KERBEROS5__) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
SUBDIR+= pam_kerberos5
.endif
SUBDIR+= pam_permit
SUBDIR+= pam_radius
SUBDIR+= pam_skey
-.if exists(${.CURDIR}/../../../crypto/openssh) && !defined(NO_OPENSSL)
+.if exists(${.CURDIR}/../../../crypto/openssh) && !defined(NOCRYPT) &&
+!defined(NO_OPENSSL)
SUBDIR+= pam_ssh
.endif
SUBDIR+= pam_tacplus
Index: secure/usr.bin/Makefile
===================================================================
RCS file: /home/ncvs/src/secure/usr.bin/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- secure/usr.bin/Makefile 2000/02/24 18:59:33 1.13
+++ secure/usr.bin/Makefile 2000/03/05 22:36:02
@@ -1,14 +1,14 @@
# $FreeBSD: src/secure/usr.bin/Makefile,v 1.13 2000/02/24 18:59:33 markm Exp $
SUBDIR= bdes
-.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS4) &&
+!defined(MAKE_KERBEROS5)
SUBDIR+=telnet
.endif
.if !defined(NO_OPENSSL)
SUBDIR+=openssl
-.endif
.if !defined(NO_OPENSSH)
SUBDIR+=scp ssh ssh-add ssh-agent ssh-keygen
+.endif
.endif
.include <bsd.subdir.mk>
Index: usr.bin/passwd/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.bin/passwd/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- usr.bin/passwd/Makefile 2000/02/24 21:06:16 1.39
+++ usr.bin/passwd/Makefile 2000/03/05 22:35:04
@@ -79,7 +79,7 @@
LINKS=${BINDIR}/passwd ${BINDIR}/yppasswd
MLINKS=passwd.1 yppasswd.1
-.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && (defined(MAKE_KERBEROS4))
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+&& defined(MAKE_KERBEROS4)
SRCS+= kpasswd_standalone.c
.PATH: ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
${.CURDIR}/../../usr.bin/rlogin ${.CURDIR}/../../usr.bin/passwd \
Index: usr.bin/rlogin/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.bin/rlogin/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- usr.bin/rlogin/Makefile 2000/02/24 21:06:17 1.20
+++ usr.bin/rlogin/Makefile 2000/03/05 22:32:04
@@ -9,7 +9,7 @@
BINMODE=4555
INSTALLFLAGS=-fschg
-.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) &&
+!defined(NO_OPENSSL) && !defined(NOCRYPT)
SRCS+= krcmd.c kcmd.c rcmd_util.c
DPADD= ${LIBUTIL} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
Index: usr.bin/rsh/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.bin/rsh/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- usr.bin/rsh/Makefile 2000/02/24 21:06:19 1.16
+++ usr.bin/rsh/Makefile 2000/03/05 22:32:04
@@ -6,7 +6,7 @@
CFLAGS+=-Wall
CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
-.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) &&
+!defined(NO_OPENSSL) && !defined(NOCRYPT)
SRCS+= krcmd.c kcmd.c rcmd_util.c
CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
-I${.CURDIR}/../rlogin -I${.CURDIR} -I- \
Index: usr.sbin/ppp/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ppp/Makefile,v
retrieving revision 1.71
diff -u -r1.71 Makefile
--- usr.sbin/ppp/Makefile 2000/02/29 11:44:18 1.71
+++ usr.sbin/ppp/Makefile 2000/03/05 22:32:04
@@ -33,7 +33,7 @@
.endif
.endif
-.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) &&
!defined(RELEASE_CRUNCH)
+.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) &&
+!defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
DISTRIBUTION=crypto
CFLAGS+=-DHAVE_DES
SRCS+= chap_ms.c
Index: usr.sbin/pppd/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/pppd/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- usr.sbin/pppd/Makefile 2000/02/29 11:45:48 1.17
+++ usr.sbin/pppd/Makefile 2000/03/05 22:32:04
@@ -28,7 +28,7 @@
DPADD+= ${LIBPCAP}
# MS-CHAP support. Requires the DES library.
-.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) &&
!defined(RELEASE_CRUNCH)
+.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) &&
+!defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
DISTRIBUTION=crypto
CFLAGS+=-DCHAPMS
SRCS+= chap_ms.c
----
In God we Trust -- all others must submit an X.509 certificate.
-- Charles Forsythe <[EMAIL PROTECTED]>
To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message
