d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Retire the useless NOSECURE knob.

Browse Source 
Approved by:	re (scottl)
This commit is contained in:
des 2003-05-19 15:52:01 +00:00
parent 713d0a3c00
commit f57ad275c4
21 changed files with 23 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.inc1
View File

@ -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)

2
bin/ed/Makefile
View File

@ -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}

6
lib/Makefile
View File

@ -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

2
lib/libcrypt/Makefile
View File

@ -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

2
lib/libfetch/Makefile
View File

@ -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

3
lib/libpam/modules/modules.inc
View File

@ -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

3
libexec/Makefile
View File

@ -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

1
share/examples/etc/make.conf
View File

@ -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)

5
share/man/man5/make.conf.5
View File

@ -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

6
usr.bin/Makefile
View File

@ -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

2
usr.bin/fetch/Makefile
View File

@ -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

2
usr.sbin/pkg_install/Makefile
View File

@ -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

2
usr.sbin/pkg_install/add/Makefile
View File

@ -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

2
usr.sbin/pkg_install/create/Makefile
View File

@ -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

2
usr.sbin/pkg_install/delete/Makefile
View File

@ -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

2
usr.sbin/pkg_install/info/Makefile
View File

@ -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

2
usr.sbin/pkg_install/version/Makefile
View File

@ -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

3
usr.sbin/ppp/Makefile
View File

@ -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

2
usr.sbin/pppd/Makefile
View File

@ -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

5
usr.sbin/sendmail/Makefile
View File

@ -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

2
usr.sbin/tcpdump/tcpdump/Makefile
View File

@ -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}