diff options
-rw-r--r-- | Makefile.inc1 | 5 | ||||
-rw-r--r-- | bin/ed/Makefile | 2 | ||||
-rw-r--r-- | lib/Makefile | 6 | ||||
-rw-r--r-- | lib/libcrypt/Makefile | 2 | ||||
-rw-r--r-- | lib/libfetch/Makefile | 2 | ||||
-rw-r--r-- | lib/libpam/modules/modules.inc | 3 | ||||
-rw-r--r-- | libexec/Makefile | 3 | ||||
-rw-r--r-- | share/examples/etc/make.conf | 1 | ||||
-rw-r--r-- | share/man/man5/make.conf.5 | 5 | ||||
-rw-r--r-- | usr.bin/Makefile | 6 | ||||
-rw-r--r-- | usr.bin/fetch/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/pkg_install/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/pkg_install/add/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/pkg_install/create/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/pkg_install/delete/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/pkg_install/info/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/pkg_install/version/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/ppp/Makefile | 3 | ||||
-rw-r--r-- | usr.sbin/pppd/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/sendmail/Makefile | 5 | ||||
-rw-r--r-- | usr.sbin/tcpdump/tcpdump/Makefile | 2 |
21 files changed, 23 insertions, 38 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index d4f8588..b0cba4c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -8,7 +8,6 @@ # -DNOCRYPT will prevent building of crypt versions # -DNOMAN do not build the manual pages # -DNOPROFILE do not build profiled libraries -# -DNOSECURE do not go into secure subdir # -DNOGAMES do not go into games subdir # -DNOSHARE do not go into share subdir # -DNOINFO do not make or install info files @@ -70,7 +69,7 @@ SUBDIR+= libexec .if exists(${.CURDIR}/sbin) SUBDIR+= sbin .endif -.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) +.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) SUBDIR+= secure .endif .if exists(${.CURDIR}/share) && !defined(NOSHARE) @@ -803,7 +802,7 @@ lib/libypclnt__L: lib/librpcsvc__L _generic_libs+= lib -.if !defined(NOCRYPT) && !defined(NOSECURE) +.if !defined(NOCRYPT) .if !defined(NO_OPENSSL) _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl .if !defined(NO_OPENSSH) diff --git a/bin/ed/Makefile b/bin/ed/Makefile index 00f47da..2b612b9 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -5,7 +5,7 @@ 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 exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) +.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) DISTRIBUTION=crypto CFLAGS+=-DDES DPADD= ${LIBCIPHER} diff --git a/lib/Makefile b/lib/Makefile index 7312a9e..d36a427 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -79,13 +79,11 @@ _libdisk= libdisk .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ - defined(NOCRYPT) || defined(NO_OPENSSL) || \ - (defined(NOSECURE) && defined(NO_KERBEROS)) + defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS) _libtelnet= libtelnet .endif -.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) \ - && !defined(NOSECURE) +.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) _libmp= libmp .endif diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index ed4b292..eda43f6 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -13,7 +13,7 @@ CFLAGS+= -I${.CURDIR}/../libmd -I${.CURDIR}/../libutil CFLAGS+= -DLIBC_SCCS -Wall # Pull in the crypt-des.c source, assuming it is present. .if exists(${.CURDIR}/../../secure/lib/libcrypt/crypt-des.c) && \ - !defined(NOSECURE) && !defined(NOCRYPT) + !defined(NOCRYPT) .PATH: ${.CURDIR}/../../secure/lib/libcrypt SRCS+= crypt-des.c crypt-blowfish.c blowfish.c CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile index 02c11f6..3f9ca1c 100644 --- a/lib/libfetch/Makefile +++ b/lib/libfetch/Makefile @@ -9,7 +9,7 @@ INCS= fetch.h MAN= fetch.3 CLEANFILES= ftperr.h httperr.h -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) CFLAGS+= -DWITH_SSL DPADD= ${LIBSSL} ${LIBCRYPTO} LDADD= -lssl -lcrypto diff --git a/lib/libpam/modules/modules.inc b/lib/libpam/modules/modules.inc index 3a54d3c..c139818 100644 --- a/lib/libpam/modules/modules.inc +++ b/lib/libpam/modules/modules.inc @@ -24,8 +24,7 @@ MODULES += pam_rhosts MODULES += pam_rootok MODULES += pam_securetty MODULES += pam_self -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) && \ - !defined(NOSECURE) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) MODULES += pam_ssh .endif MODULES += pam_tacplus diff --git a/libexec/Makefile b/libexec/Makefile index 29b87de..66a4a01 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -43,8 +43,7 @@ SUBDIR+=mail.local smrsh .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ - defined(NOCRYPT) || defined(NO_OPENSSL) || \ - (defined(NOSECURE) && defined(NO_KERBEROS)) + defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS) # make release needs both SUBDIR+=telnetd .endif diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 18a4190..bc8bbba 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -124,7 +124,6 @@ #NOLIBC_R= true # do not build libc_r (re-entrant version of libc) #NOMAN= true # do not build manual pages #NOPROFILE= true # Avoid compiling profiled libraries -#NOSECURE= true # do not build crypto code in secure/ subdir #NOSHARE= true # do not go into the share subdir # # To build sys/modules when building the world (our old way of doing things) diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 4ca86b1..09ba2916 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -536,11 +536,6 @@ Set to install man pages uncompressed. .It Va NOPROFILE .Pq Vt bool Set to avoid compiling profiled libraries. -.It Va NOSECURE -.Pq Vt bool -set to not build crypto code in -.Pa secure -subdir. .It Va NOSHARE .Pq Vt bool Set to not build in the diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 725cbdf..6b413de 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -218,8 +218,7 @@ SUBDIR= alias \ .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ - defined(NOCRYPT) || defined(NO_OPENSSL) || \ - (defined(NOSECURE) && defined(NO_KERBEROS)) + defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS) # make release needs both SUBDIR+=telnet .endif @@ -248,8 +247,7 @@ SUBDIR+=doscmd \ SUBDIR+=uac .endif -.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) \ - && !defined(NOSECURE) +.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) SUBDIR+=chkey newkey .endif diff --git a/usr.bin/fetch/Makefile b/usr.bin/fetch/Makefile index 276947e..7b92352 100644 --- a/usr.bin/fetch/Makefile +++ b/usr.bin/fetch/Makefile @@ -5,7 +5,7 @@ CSTD?= c99 WARNS?= 6 DPADD= ${LIBFETCH} LDADD= -lfetch -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) DPADD+= ${LIBSSL} ${LIBCRYPTO} LDADD+= -lssl -lcrypto .endif diff --git a/usr.sbin/pkg_install/Makefile b/usr.sbin/pkg_install/Makefile index 6ffecc2..f93fadb 100644 --- a/usr.sbin/pkg_install/Makefile +++ b/usr.sbin/pkg_install/Makefile @@ -2,7 +2,7 @@ SUBDIR= lib add create delete info version -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) DISTRIBUTION= crypto SUBDIR+= sign .endif diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile index 6788852..55c5388 100644 --- a/usr.sbin/pkg_install/add/Makefile +++ b/usr.sbin/pkg_install/add/Makefile @@ -10,7 +10,7 @@ WARNS?= 2 DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) DPADD+= ${LIBSSL} ${LIBCRYPTO} LDADD+= -lssl -lcrypto .endif diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile index 08173e5..e6c252b 100644 --- a/usr.sbin/pkg_install/create/Makefile +++ b/usr.sbin/pkg_install/create/Makefile @@ -10,7 +10,7 @@ WARNS?= 2 DPADD= ${LIBINSTALL} ${LIBMD} LDADD= ${LIBINSTALL} -lmd -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) DPADD+= ${LIBSSL} ${LIBCRYPTO} LDADD+= -lssl -lcrypto .endif diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile index 954e5e6..39bd1f4 100644 --- a/usr.sbin/pkg_install/delete/Makefile +++ b/usr.sbin/pkg_install/delete/Makefile @@ -10,7 +10,7 @@ WARNS?= 4 DPADD= ${LIBINSTALL} ${LIBMD} LDADD= ${LIBINSTALL} -lmd -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) DPADD+= ${LIBSSL} ${LIBCRYPTO} LDADD+= -lssl -lcrypto .endif diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile index d3b16b8..76f9864 100644 --- a/usr.sbin/pkg_install/info/Makefile +++ b/usr.sbin/pkg_install/info/Makefile @@ -10,7 +10,7 @@ WARNS?= 2 DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) DPADD+= ${LIBSSL} ${LIBCRYPTO} LDADD+= -lssl -lcrypto .endif diff --git a/usr.sbin/pkg_install/version/Makefile b/usr.sbin/pkg_install/version/Makefile index f18bedf..8a80e49 100644 --- a/usr.sbin/pkg_install/version/Makefile +++ b/usr.sbin/pkg_install/version/Makefile @@ -10,7 +10,7 @@ WARNS?= 2 DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) DPADD+= ${LIBSSL} ${LIBCRYPTO} LDADD+= -lssl -lcrypto .endif diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index 86a22ab..a26d235 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -15,7 +15,6 @@ NOI4B= true NONAT= true NOKLDLOAD= true NORADIUS= true -NOSECURE= true NOSUID= true .endif @@ -70,7 +69,7 @@ CFLAGS+=-DNOSUID SRCS+= id.c .endif -.if !exists(${.CURDIR}/../../secure) || defined(NOCRYPT) || defined(NOSECURE) || defined(NO_OPENSSL) || defined(NODES) +.if !exists(${.CURDIR}/../../crypto) || defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NODES) CFLAGS+=-DNODES .else DISTRIBUTION=crypto diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile index 4432435..7c5f3029 100644 --- a/usr.sbin/pppd/Makefile +++ b/usr.sbin/pppd/Makefile @@ -30,7 +30,7 @@ DPADD+= ${LIBPCAP} LDADD+= -lpcap # MS-CHAP support. Requires the DES library. -.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) +.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) DISTRIBUTION=crypto CFLAGS+= -DCHAPMS SRCS+= chap_ms.c diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index 7411ef3..3dfd707 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -58,9 +58,8 @@ LDADD+= ${LIBSMUTIL} ${LIBSM} SRCS+= sm_os.h CLEANFILES+=sm_os.h -.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && \ - !defined(NOSECURE) && !defined(NO_OPENSSL) && \ - !defined(RELEASE_CRUNCH) +.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && \ + !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) # STARTTLS support DISTRIBUTION= crypto CFLAGS+= -DSTARTTLS -D_FFR_TLS_1 diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index bb6968a..8b1063a 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -39,7 +39,7 @@ CFLAGS+= -DLBL_ALIGN DPADD= ${LIBL} ${LIBPCAP} LDADD= -ll -lpcap -.if exists(../../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && \ +.if exists(../../../crypto) && !defined(NOCRYPT) && \ !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) DISTRIBUTION=crypto DPADD+= ${LIBCRYPTO} |