From: Sascha Wildner Date: Sat, 18 Nov 2017 12:01:04 +0000 (+0100) Subject: Remove the NO_CRYPT build option. X-Git-Tag: v5.3.0~804 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/fef7d5c7c737268396453f20ad42104230fa160e Remove the NO_CRYPT build option. It has been broken for a long time without anyone complaining about and we don't want to maintain it either. In-discussion-with: zrj --- diff --git a/Makefile.inc1 b/Makefile.inc1 index a0674266fd..037c390f95 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1059,12 +1059,10 @@ lib/libopie__L lib/libradius__L lib/libtacplus__L: lib/libmd__L _generic_libs+= lib -.if !defined(NO_CRYPT) _prebuild_libs+= lib/librecrypto lib/libressl _prebuild_libs+= lib/libssh lib/libssh__L: lib/librecrypto__L lib/libz__L lib/libopie__L: lib/librecrypto__L -.endif _prebuild_libs+= lib/libopie diff --git a/bin/ed/Makefile b/bin/ed/Makefile index 6fc278aa97..f145520c18 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -6,11 +6,9 @@ SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 -.if !defined(NO_CRYPT) CFLAGS+= -DDES -I${.CURDIR}/../../crypto/libressl/include DPADD= ${LIBRECRYPTO} LDADD= -lprivate_crypto LDFLAGS+= ${PRIVATELIB_LDFLAGS} -.endif .include diff --git a/etc/Makefile b/etc/Makefile index 560ace9975..710fe9bd85 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -39,12 +39,7 @@ BIN1+= manpath.config BIN1+= ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config .endif -.if !defined(NO_CRYPT) -DIRS+= lib/libssh \ - usr.bin/openssl \ - usr.bin/ssh \ - usr.sbin/sshd -.endif +DIRS+= lib/libssh usr.bin/openssl usr.bin/ssh usr.sbin/sshd # Files that should be installed read-only-executable (555) root:wheel # diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index 55f4d46fdc..fc5f711639 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -114,7 +114,6 @@ THREAD_LIB?= thread_xu # To avoid building various parts of the base system: #NO_ALTBINUTILS=true # do not build the alternative set of binutils #NO_ALTCOMPILER=true # do not build GCC 4.7 and other alt compilers -#NO_CRYPT= true # do not build crypto code #NO_CVS= true # do not build CVS #NO_GAMES= true # do not enter the games subdirectory #NO_GDB= true # do not build GDB diff --git a/games/factor/Makefile b/games/factor/Makefile index 5263908eb1..b72bc38876 100644 --- a/games/factor/Makefile +++ b/games/factor/Makefile @@ -5,12 +5,10 @@ PROG= factor SRCS= factor.c pr_tbl.c CFLAGS+=-I${.CURDIR}/../primes -.if !defined(NO_CRYPT) CFLAGS+= -DHAVE_OPENSSL -I${.CURDIR}/../../crypto/libressl/include LDADD= -lprivate_crypto DPADD= ${LIBRECRYPTO} LDFLAGS+= ${PRIVATELIB_LDFLAGS} -.endif MAN= factor.6 MLINKS+=factor.6 primes.6 diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 951ad6cbf9..a424f4aa5e 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,7 +1,4 @@ -# The libobjc header conflict between base compilers has been resolved -# Maximum parallelism can be restored by setting SUBDIR_ORDERED to null - -SUBDIR= gcc50 +SUBDIR= gcc50 libcryptsetup libdevmapper libdialog libluks liblvm .if !defined(NO_ALTCOMPILER) . if defined(WORLD_ALTCOMPILER) && (${WORLD_ALTCOMPILER} == "all" || ${WORLD_ALTCOMPILER:Mgcc47}) @@ -9,15 +6,6 @@ SUBDIR+= gcc47 . endif .endif -.if !defined(NO_CRYPT) -SUBDIR+= libcryptsetup -SUBDIR+= libluks -.endif - -SUBDIR+= libdevmapper -SUBDIR+= libdialog -SUBDIR+= liblvm - SUBDIR_ORDERED= .include diff --git a/gnu/sbin/Makefile b/gnu/sbin/Makefile index 0cfc0089b4..3827afb924 100644 --- a/gnu/sbin/Makefile +++ b/gnu/sbin/Makefile @@ -1,10 +1,6 @@ # $FreeBSD: src/gnu/usr.bin/Makefile,v 1.51 2000/01/16 00:11:34 obrien Exp $ -SUBDIR= dmsetup lvm - -.if !defined(NO_CRYPT) -SUBDIR+= cryptsetup -.endif +SUBDIR= cryptsetup dmsetup lvm # maximum parallelism # diff --git a/lib/Makefile b/lib/Makefile index a69faab640..c021ac135c 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -22,13 +22,11 @@ # # Otherwise, the SUBDIR list should be in alphabetical order. -SUBDIR_ORDERED= ${_libc_r} - -.if !defined(NO_CRYPT) -SUBDIR_ORDERED+=librecrypto libressl libssh -.endif - -SUBDIR_ORDERED+= \ +SUBDIR_ORDERED= \ + ${_libc_r} \ + librecrypto \ + libressl \ + libssh \ libcrypt \ libarchive \ libz \ @@ -106,12 +104,10 @@ SUBDIR= ${SUBDIR_ORDERED} \ SUBDIR:= libc ${SUBDIR:Nlibc} .endif -.if !defined(NO_CRYPT) _libdmsg= libdmsg SUBDIR+= libldns \ libtcplay -.endif .if !defined(NO_LIBC_R) _libc_r= libc_r diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index 657a48fc78..0b69169dc6 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -7,7 +7,7 @@ LIB= crypt SHLIBDIR?= /lib .PATH: ${.CURDIR}/../libmd -SRCS= crypt.c crypt-md5.c \ +SRCS= blowfish.c crypt.c crypt-blowfish.c crypt-des.c crypt-md5.c \ crypt-sha256.c crypt-sha512.c \ deprecated-crypt-sha256.c deprecated-crypt-sha512.c \ md5c.c misc.c @@ -19,10 +19,7 @@ MLINKS= crypt.3 crypt_get_format.3 crypt.3 crypt_set_format.3 CFLAGS+= -I${.CURDIR}/../libmd -I${.CURDIR}/../libutil CFLAGS+= -I${.CURDIR}/../../crypto/libressl/include CFLAGS+= -D_CTYPE_H_DISABLE_MACROS_ -.if !defined(NO_CRYPT) -SRCS+= crypt-des.c crypt-blowfish.c blowfish.c CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH -.endif # And the auth_getval() code and support. .PATH: ${.CURDIR}/../libutil SRCS+= auth.c property.c diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile index 8682390f63..b591448812 100644 --- a/lib/libfetch/Makefile +++ b/lib/libfetch/Makefile @@ -10,17 +10,10 @@ MAN= fetch.3 CLEANFILES= ftperr.h httperr.h NO_STRICT_ALIASING= -.if !defined(NO_CRYPT) CFLAGS+= -DWITH_SSL -I${.CURDIR}/../../crypto/libressl/include DPADD= ${LIBRESSL} ${LIBRECRYPTO} LDADD= -lprivate_ssl -lprivate_crypto LDFLAGS+= ${PRIVATELIB_LDFLAGS} -.else -# XXX sys/md5.h shim errata for bootstrap REMOVE_OPENSSL_FILES -CFLAGS+= -I${_SHLIBDIRPREFIX}/usr/include/priv -DPADD= ${LIBMD} -LDADD= -lmd -.endif SHLIB_MAJOR= 4 diff --git a/lib/libpam/modules/Makefile b/lib/libpam/modules/Makefile index 64fa681455..594791653f 100644 --- a/lib/libpam/modules/Makefile +++ b/lib/libpam/modules/Makefile @@ -1,4 +1,3 @@ - SUBDIR= pam_chroot \ pam_deny \ pam_echo \ @@ -18,13 +17,10 @@ SUBDIR= pam_chroot \ pam_rootok \ pam_securetty \ pam_self \ + pam_ssh \ pam_tacplus \ pam_unix -.if !defined(NO_CRYPT) -SUBDIR+= pam_ssh -.endif - # maximum parallelism # SUBDIR_ORDERED= diff --git a/lib/libpam/static_libpam/Makefile b/lib/libpam/static_libpam/Makefile index 6e4f107cc1..5a46976ea8 100644 --- a/lib/libpam/static_libpam/Makefile +++ b/lib/libpam/static_libpam/Makefile @@ -37,13 +37,10 @@ MODULES= pam_chroot \ pam_rootok \ pam_securetty \ pam_self \ + pam_ssh \ pam_tacplus \ pam_unix -.if !defined(NO_CRYPT) -MODULES+= pam_ssh -.endif - STATIC_MODULES= ${MODULES:C/.*/${MODULESDIR}\/&\/lib&.a/} STATICOBJS+= openpam_static_modules.o CLEANFILES+= openpam_static.o openpam_static.po \ diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile index 8d1a86612c..14273df0fc 100644 --- a/lib/libradius/Makefile +++ b/lib/libradius/Makefile @@ -28,17 +28,10 @@ LIB= radius SRCS= radlib.c INCS= radlib.h radlib_vs.h -.if !defined(NO_CRYPT) DPADD= ${LIBRECRYPTO} LDADD= -lprivate_crypto LDFLAGS+= ${PRIVATELIB_LDFLAGS} CFLAGS+= -DWITH_SSL -I${.CURDIR}/../../crypto/libressl/include -.else -# XXX sys/md5.h shim errata for bootstrap REMOVE_OPENSSL_FILES -CFLAGS+= -I${_SHLIBDIRPREFIX}/usr/include/priv -DPADD= ${LIBMD} -LDADD= -lmd -.endif SHLIB_MAJOR= 3 MAN= libradius.3 radius.conf.5 diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile index 17b985361c..76ecaa2f7c 100644 --- a/lib/libtelnet/Makefile +++ b/lib/libtelnet/Makefile @@ -5,14 +5,11 @@ LIB= telnet INTERNALLIB= -SRCS= genget.c getent.c misc.c +SRCS= auth.c enc_des.c encrypt.c genget.c getent.c misc.c sra.c pk.c WARNS?= 2 -.if !defined(NO_CRYPT) -SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA CFLAGS+= -I${.CURDIR}/../../crypto/libressl/include -.endif .include diff --git a/libexec/Makefile b/libexec/Makefile index af70d53e10..c0dbf3745d 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -24,6 +24,9 @@ SUBDIR= atrun \ rpc.sprayd \ rshd \ rtld-elf \ + sftp-server \ + ssh-keysign \ + ssh-pkcs11-helper \ talkd \ tcpd \ telnetd \ @@ -31,12 +34,6 @@ SUBDIR= atrun \ utmp_update \ ypxfr -.if !defined(NO_CRYPT) -SUBDIR+= sftp-server \ - ssh-keysign \ - ssh-pkcs11-helper -.endif - # maximum parallelism # SUBDIR_ORDERED= diff --git a/libexec/dma/Makefile b/libexec/dma/Makefile index 30f2f572c3..629cac0ff5 100644 --- a/libexec/dma/Makefile +++ b/libexec/dma/Makefile @@ -1,8 +1,4 @@ -SUBDIR= dma-mbox-create default-conf mailer-conf - -.if !defined(NO_CRYPT) -SUBDIR+= dma -.endif +SUBDIR= dma dma-mbox-create default-conf mailer-conf # maximum parallelism # diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index d1675af264..a73ebe5a08 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -6,7 +6,7 @@ PROG= telnetd MAN= telnetd.8 -SRCS= global.c slc.c state.c sys_term.c telnetd.c \ +SRCS= authenc.c global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c WARNS?= 2 @@ -25,12 +25,9 @@ LDADD= -lutil -lprivate_ncurses ${LIBTELNET} LDFLAGS+= ${PRIVATELIB_LDFLAGS} CFLAGS+= -I${_SHLIBDIRPREFIX}/usr/include/priv/ncurses -.if !defined(NO_CRYPT) -SRCS+= authenc.c CFLAGS+= -DAUTHENTICATION -DENCRYPTION CFLAGS+= -I${.CURDIR}/../../crypto/libressl/include DPADD+= ${LIBRECRYPTO} ${LIBCRYPT} ${LIBPAM} LDADD+= -lprivate_crypto -lcrypt ${MINUSLPAM} -.endif .include diff --git a/sbin/Makefile b/sbin/Makefile index 56019f5299..5102a0c88d 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -9,6 +9,7 @@ SUBDIR= adjkerntz \ ccdconfig \ clri \ comcontrol \ + cryptdisks \ devattr \ devd \ devfsctl \ @@ -30,7 +31,7 @@ SUBDIR= adjkerntz \ growfs \ gpt \ hammer \ - ${_hammer2} \ + hammer2 \ ifconfig \ init \ ip6fw \ @@ -53,7 +54,7 @@ SUBDIR= adjkerntz \ mount_dirfs \ mount_ext2fs \ mount_hammer \ - ${_mount_hammer2} \ + mount_hammer2 \ mount_hpfs \ mount_msdos \ mount_nfs \ @@ -68,7 +69,7 @@ SUBDIR= adjkerntz \ newbtconf \ newfs \ newfs_hammer \ - ${_newfs_hammer2} \ + newfs_hammer2 \ newfs_msdos \ nfsd \ nfsiod \ @@ -94,6 +95,7 @@ SUBDIR= adjkerntz \ swapon \ sysctl \ svc \ + tcplay \ tunefs \ udevd \ umount \ @@ -114,17 +116,6 @@ SUBDIR+= ${MACHINE} SUBDIR+= ${MACHINE_ARCH} .endif -.if !defined(NO_CRYPT) -SUBDIR+=cryptdisks \ - tcplay - -# include hammer2 utilities (requires LibreSSL/OpenSSL) -# -_mount_hammer2= mount_hammer2 -_newfs_hammer2= newfs_hammer2 -_hammer2= hammer2 -.endif - # maximum parallelism # SUBDIR_ORDERED= diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 9746d15a73..e9aa3711c2 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $ .\" -.Dd December 19, 2016 +.Dd November 18, 2017 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -395,9 +395,6 @@ Set to not build the alternative (non-default) set of binutils. .It Va NO_ALTCOMPILER .Pq Vt bool Set to not build the designated secondary compiler (GCC 4.7 and others). -.It Va NO_CRYPT -.Pq Vt bool -Set to not build crypto code. .It Va NO_CVS .Pq Vt bool Set to not build CVS. diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 0adf92dbc8..6402ec6d36 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -63,10 +63,8 @@ LIBOPIE?= ${DESTDIR}${LIBDIR}/libopie.a LIBPAM?= ${DESTDIR}${LIBDIR}/libpam.a MINUSLPAM?= -lpam .if defined(NOSHARED) && ${NOSHARED} != "no" && ${NOSHARED} != "NO" -.if !defined(NO_CRYPT) LIBPAM+= ${LIBSSH} MINUSLPAM+= -lprivate_ssh -.endif LIBPAM+= ${LIBRADIUS} ${LIBTACPLUS} ${LIBOPIE} ${LIBYPCLNT} \ ${LIBCRYPT} ${LIBMD} ${LIBRECRYPTO} ${LIBUTIL} MINUSLPAM+= -lradius -ltacplus -lopie -lypclnt \ diff --git a/sys/netgraph/Makefile b/sys/netgraph/Makefile index 79c130caf9..c832ddcd4d 100644 --- a/sys/netgraph/Makefile +++ b/sys/netgraph/Makefile @@ -28,7 +28,7 @@ SUBDIR= UI \ tty \ vjc -.if !defined(NO_CRYPT) && exists(${.CURDIR}/../crypto/rc4/rc4.c) +.if exists(${.CURDIR}/../crypto/rc4/rc4.c) SUBDIR+= mppc .endif diff --git a/sys/netgraph7/Makefile b/sys/netgraph7/Makefile index dcadeccf5c..829354794b 100644 --- a/sys/netgraph7/Makefile +++ b/sys/netgraph7/Makefile @@ -34,7 +34,7 @@ SUBDIR= UI \ # sync_ar \ # sync_sr \ -.if !defined(NO_CRYPT) && exists(${.CURDIR}/../crypto/rc4/rc4.c) +.if exists(${.CURDIR}/../crypto/rc4/rc4.c) SUBDIR+= mppc .endif diff --git a/tools/tools/net80211/Makefile b/tools/tools/net80211/Makefile index 0769608bd3..4285a8c5d0 100644 --- a/tools/tools/net80211/Makefile +++ b/tools/tools/net80211/Makefile @@ -1,10 +1,6 @@ # $FreeBSD: src/tools/tools/net80211/Makefile,v 1.6 2009/01/12 22:50:55 sam Exp $ -SUBDIR= stumbler wesside wlaninject wlanstats wlantxtime wlanwatch wlanwds - -.if !defined(NO_CRYPT) -SUBDIR+= w00t -.endif +SUBDIR= stumbler wesside wlaninject wlanstats wlantxtime wlanwatch wlanwds w00t # maximum parallelism # diff --git a/usr.bin/Makefile b/usr.bin/Makefile index cf1441e754..99b8d3ba02 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -20,6 +20,7 @@ SUBDIR= alias \ banner \ basename \ bc \ + bdes \ biff \ bmake \ brandelf \ @@ -36,6 +37,7 @@ SUBDIR= alias \ checknr \ checkpt \ chflags \ + chkey \ chpass \ cksum \ cmp \ @@ -50,8 +52,10 @@ SUBDIR= alias \ csplit \ ctags \ cut \ + dc \ dfregress \ dirname \ + drill \ du \ ee \ enigma \ @@ -59,6 +63,7 @@ SUBDIR= alias \ evtranalyze \ expand \ false \ + fetch \ file \ file2c \ find \ @@ -69,6 +74,7 @@ SUBDIR= alias \ from \ fstat \ fsync \ + ftp \ gcore \ gencat \ getconf \ @@ -132,11 +138,13 @@ SUBDIR= alias \ ncal \ netstat \ newgrp \ + newkey \ nfsstat \ nice \ nl \ nohup \ objformat \ + openssl \ opieinfo \ opiekey \ opiepasswd \ @@ -167,10 +175,12 @@ SUBDIR= alias \ rusers \ rwall \ rwho \ + scp \ script \ sdpquery \ sed \ seq \ + sftp \ shar \ shlock \ showmount \ @@ -179,6 +189,11 @@ SUBDIR= alias \ soelim \ sort \ split \ + ssh \ + ssh-add \ + ssh-agent \ + ssh-keygen \ + ssh-keyscan \ stat \ strfile \ su \ @@ -190,6 +205,7 @@ SUBDIR= alias \ tar \ tcopy \ tee \ + telnet \ tftp \ time \ tic \ @@ -250,27 +266,4 @@ SUBDIR= alias \ SUBDIR+=hesinfo .endif -# Uses lib[re]ssl but can build without it -SUBDIR+=ftp \ - telnet - -# Requires lib[re]ssl -# -.if !defined(NO_CRYPT) -SUBDIR+=chkey \ - dc \ - drill \ - fetch \ - newkey \ - bdes \ - openssl \ - scp \ - sftp \ - ssh \ - ssh-add \ - ssh-agent \ - ssh-keygen \ - ssh-keyscan -.endif - .include diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile index 09a9134fd3..1c82914475 100644 --- a/usr.bin/ftp/Makefile +++ b/usr.bin/ftp/Makefile @@ -11,7 +11,7 @@ CONTRIBDIR= ${.CURDIR}/../../contrib/tnftp PROG= ftp SRCS= cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c \ - progressbar.c ruserpass.c util.c + progressbar.c ruserpass.c ssl.c util.c CFLAGS+=-I${.CURDIR} -I${.OBJDIR} -I${CONTRIBDIR} \ -I${.CURDIR}/../../lib/libc/stdtime \ @@ -26,12 +26,9 @@ DPADD= ${LIBEDIT} ${LIBNCURSES} ${LIBUTIL} CFLAGS+= -I${_SHLIBDIRPREFIX}/usr/include/priv/ncurses LDFLAGS+= ${PRIVATELIB_LDFLAGS} -.if !defined(NO_CRYPT) -SRCS+= ssl.c CFLAGS+= -DWITH_SSL -I${.CURDIR}/../../crypto/libressl/include LDADD+= -lprivate_ssl -lprivate_crypto DPADD+= ${LIBRESSL} ${LIBRECRYPTO} -.endif LINKS= ${BINDIR}/ftp ${BINDIR}/pftp \ ${BINDIR}/ftp ${BINDIR}/gate-ftp diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index 19cd6ec693..5cbb6461fa 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -2,7 +2,7 @@ PROG= telnet -SRCS= commands.c main.c network.c ring.c sys_bsd.c \ +SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \ telnet.c terminal.c utilities.c CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \ @@ -25,12 +25,9 @@ CFLAGS+= -DIPSEC DPADD+= ${LIBIPSEC} LDADD+= -lipsec -.if !defined(NO_CRYPT) -SRCS+= authenc.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION DPADD+= ${LIBRECRYPTO} ${LIBCRYPT} ${LIBPAM} LDADD+= -lprivate_crypto -lcrypt ${MINUSLPAM} CFLAGS+= -I${.CURDIR}/../../crypto/libressl/include -.endif .include diff --git a/usr.sbin/802_11/Makefile b/usr.sbin/802_11/Makefile index 8381c26450..68be828809 100644 --- a/usr.sbin/802_11/Makefile +++ b/usr.sbin/802_11/Makefile @@ -1,8 +1,4 @@ -SUBDIR= ndis_events wpa_cli wpa_passphrase - -.if !defined(NO_CRYPT) -SUBDIR+= wpa_supplicant -.endif +SUBDIR= ndis_events wpa_cli wpa_passphrase wpa_supplicant SUBDIR_ORDERED= # maximum parallelism diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 4d20c3f9f3..46e136d6bc 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -51,6 +51,7 @@ SUBDIR= 802_11 \ jls \ kbdcontrol \ kbdmap \ + keyserv \ lastlogin \ mailwrapper \ makewhatis \ @@ -151,10 +152,6 @@ SUBDIR+=ppp \ # SUBDIR+=sshd -.if !defined(NO_CRYPT) -SUBDIR+=keyserv -.endif - .if !defined(NO_LPR) SUBDIR+=lpr .endif diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index 4d2b7b887e..e286a28324 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -54,7 +54,7 @@ CFLAGS+=-DNOSUID SRCS+= id.c .endif -.if defined(NO_CRYPT) || defined(NODES) +.if defined(NODES) CFLAGS+=-DNODES .else SRCS+= chap_ms.c mppe.c diff --git a/usr.sbin/tcpdump/Makefile b/usr.sbin/tcpdump/Makefile index 43c789c8f9..548aa58bd4 100644 --- a/usr.sbin/tcpdump/Makefile +++ b/usr.sbin/tcpdump/Makefile @@ -51,13 +51,11 @@ CFLAGS+= -DINET6 -DHAVE_GETNAMEINFO DPADD= ${LIBL} ${LIBPCAP} LDADD= -ll -lpcap -.if !defined(NO_CRYPT) DPADD+= ${LIBRECRYPTO} LDADD+= -lprivate_crypto CFLAGS+= -DHAVE_LIBCRYPTO -DHAVE_OPENSSL_EVP_H CFLAGS+= -I${.CURDIR}/../../crypto/libressl/include LDFLAGS+= ${PRIVATELIB_LDFLAGS} -.endif WARNS?= 2 NO_STRICT_ALIASING=