d/freebsd-nq
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:
Dag-Erling Smørgrav 2003-05-19 15:52:01 +00:00
parent e5b4d90497
commit 7691f66abf
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 # -DNOCRYPT will prevent building of crypt versions
# -DNOMAN do not build the manual pages # -DNOMAN do not build the manual pages
# -DNOPROFILE do not build profiled libraries # -DNOPROFILE do not build profiled libraries
# -DNOSECURE do not go into secure subdir
# -DNOGAMES do not go into games subdir # -DNOGAMES do not go into games subdir
# -DNOSHARE do not go into share subdir # -DNOSHARE do not go into share subdir
# -DNOINFO do not make or install info files # -DNOINFO do not make or install info files
@ -70,7 +69,7 @@ SUBDIR+= libexec
.if exists(${.CURDIR}/sbin) .if exists(${.CURDIR}/sbin)
SUBDIR+= sbin SUBDIR+= sbin
.endif .endif
.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) .if exists(${.CURDIR}/secure) && !defined(NOCRYPT)
SUBDIR+= secure SUBDIR+= secure
.endif .endif
.if exists(${.CURDIR}/share) && !defined(NOSHARE) .if exists(${.CURDIR}/share) && !defined(NOSHARE)
@ -803,7 +802,7 @@ lib/libypclnt__L: lib/librpcsvc__L
_generic_libs+= lib _generic_libs+= lib
.if !defined(NOCRYPT) && !defined(NOSECURE) .if !defined(NOCRYPT)
.if !defined(NO_OPENSSL) .if !defined(NO_OPENSSL)
_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl
.if !defined(NO_OPENSSH) .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 LINKS= ${BINDIR}/ed ${BINDIR}/red
MLINKS= ed.1 red.1 MLINKS= ed.1 red.1
.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) .if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT)
DISTRIBUTION=crypto DISTRIBUTION=crypto
CFLAGS+=-DDES CFLAGS+=-DDES
DPADD= ${LIBCIPHER} DPADD= ${LIBCIPHER}

6
lib/Makefile
View File

@ -79,13 +79,11 @@ _libdisk= libdisk
.if defined(RELEASEDIR) || \ .if defined(RELEASEDIR) || \
(!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
defined(NOCRYPT) || defined(NO_OPENSSL) || \ defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS)
(defined(NOSECURE) && defined(NO_KERBEROS))
_libtelnet= libtelnet _libtelnet= libtelnet
.endif .endif
.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) \ .if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
&& !defined(NOSECURE)
_libmp= libmp _libmp= libmp
.endif .endif

2
lib/libcrypt/Makefile
View File

@ -13,7 +13,7 @@ CFLAGS+= -I${.CURDIR}/../libmd -I${.CURDIR}/../libutil
CFLAGS+= -DLIBC_SCCS -Wall CFLAGS+= -DLIBC_SCCS -Wall
# Pull in the crypt-des.c source, assuming it is present. # Pull in the crypt-des.c source, assuming it is present.
.if exists(${.CURDIR}/../../secure/lib/libcrypt/crypt-des.c) && \ .if exists(${.CURDIR}/../../secure/lib/libcrypt/crypt-des.c) && \
!defined(NOSECURE) && !defined(NOCRYPT) !defined(NOCRYPT)
.PATH: ${.CURDIR}/../../secure/lib/libcrypt .PATH: ${.CURDIR}/../../secure/lib/libcrypt
SRCS+= crypt-des.c crypt-blowfish.c blowfish.c SRCS+= crypt-des.c crypt-blowfish.c blowfish.c
CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH

2
lib/libfetch/Makefile
View File

@ -9,7 +9,7 @@ INCS= fetch.h
MAN= fetch.3 MAN= fetch.3
CLEANFILES= ftperr.h httperr.h CLEANFILES= ftperr.h httperr.h
.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) .if !defined(NOCRYPT) && !defined(NO_OPENSSL)
CFLAGS+= -DWITH_SSL CFLAGS+= -DWITH_SSL
DPADD= ${LIBSSL} ${LIBCRYPTO} DPADD= ${LIBSSL} ${LIBCRYPTO}
LDADD= -lssl -lcrypto LDADD= -lssl -lcrypto

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

@ -24,8 +24,7 @@ MODULES += pam_rhosts
MODULES += pam_rootok MODULES += pam_rootok
MODULES += pam_securetty MODULES += pam_securetty
MODULES += pam_self MODULES += pam_self
.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) && \ .if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
!defined(NOSECURE)
MODULES += pam_ssh MODULES += pam_ssh
.endif .endif
MODULES += pam_tacplus MODULES += pam_tacplus

3
libexec/Makefile
View File

@ -43,8 +43,7 @@ SUBDIR+=mail.local smrsh
.if defined(RELEASEDIR) || \ .if defined(RELEASEDIR) || \
(!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
defined(NOCRYPT) || defined(NO_OPENSSL) || \ defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS)
(defined(NOSECURE) && defined(NO_KERBEROS))
# make release needs both # make release needs both
SUBDIR+=telnetd SUBDIR+=telnetd
.endif .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) #NOLIBC_R= true # do not build libc_r (re-entrant version of libc)
#NOMAN= true # do not build manual pages #NOMAN= true # do not build manual pages
#NOPROFILE= true # Avoid compiling profiled libraries #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 #NOSHARE= true # do not go into the share subdir
# #
# To build sys/modules when building the world (our old way of doing things) # 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 .It Va NOPROFILE
.Pq Vt bool .Pq Vt bool
Set to avoid compiling profiled libraries. 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 .It Va NOSHARE
.Pq Vt bool .Pq Vt bool
Set to not build in the Set to not build in the

6
usr.bin/Makefile
View File

@ -218,8 +218,7 @@ SUBDIR= alias \
.if defined(RELEASEDIR) || \ .if defined(RELEASEDIR) || \
(!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
defined(NOCRYPT) || defined(NO_OPENSSL) || \ defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS)
(defined(NOSECURE) && defined(NO_KERBEROS))
# make release needs both # make release needs both
SUBDIR+=telnet SUBDIR+=telnet
.endif .endif
@ -248,8 +247,7 @@ SUBDIR+=doscmd \
SUBDIR+=uac SUBDIR+=uac
.endif .endif
.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) \ .if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
&& !defined(NOSECURE)
SUBDIR+=chkey newkey SUBDIR+=chkey newkey
.endif .endif

2
usr.bin/fetch/Makefile
View File

@ -5,7 +5,7 @@ CSTD?= c99
WARNS?= 6 WARNS?= 6
DPADD= ${LIBFETCH} DPADD= ${LIBFETCH}
LDADD= -lfetch LDADD= -lfetch
.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) .if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO} DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto LDADD+= -lssl -lcrypto
.endif .endif

2
usr.sbin/pkg_install/Makefile
View File

@ -2,7 +2,7 @@
SUBDIR= lib add create delete info version SUBDIR= lib add create delete info version
.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) .if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DISTRIBUTION= crypto DISTRIBUTION= crypto
SUBDIR+= sign SUBDIR+= sign
.endif .endif

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

@ -10,7 +10,7 @@ WARNS?= 2
DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD}
LDADD= ${LIBINSTALL} -lfetch -lmd LDADD= ${LIBINSTALL} -lfetch -lmd
.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) .if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO} DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto LDADD+= -lssl -lcrypto
.endif .endif

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

@ -10,7 +10,7 @@ WARNS?= 2
DPADD= ${LIBINSTALL} ${LIBMD} DPADD= ${LIBINSTALL} ${LIBMD}
LDADD= ${LIBINSTALL} -lmd LDADD= ${LIBINSTALL} -lmd
.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) .if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO} DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto LDADD+= -lssl -lcrypto
.endif .endif

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

@ -10,7 +10,7 @@ WARNS?= 4
DPADD= ${LIBINSTALL} ${LIBMD} DPADD= ${LIBINSTALL} ${LIBMD}
LDADD= ${LIBINSTALL} -lmd LDADD= ${LIBINSTALL} -lmd
.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) .if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO} DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto LDADD+= -lssl -lcrypto
.endif .endif

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

@ -10,7 +10,7 @@ WARNS?= 2
DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD}
LDADD= ${LIBINSTALL} -lfetch -lmd LDADD= ${LIBINSTALL} -lfetch -lmd
.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) .if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO} DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto LDADD+= -lssl -lcrypto
.endif .endif

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

@ -10,7 +10,7 @@ WARNS?= 2
DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD}
LDADD= ${LIBINSTALL} -lfetch -lmd LDADD= ${LIBINSTALL} -lfetch -lmd
.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) .if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO} DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto LDADD+= -lssl -lcrypto
.endif .endif

3
usr.sbin/ppp/Makefile
View File

@ -15,7 +15,6 @@ NOI4B= true
NONAT= true NONAT= true
NOKLDLOAD= true NOKLDLOAD= true
NORADIUS= true NORADIUS= true
NOSECURE= true
NOSUID= true NOSUID= true
.endif .endif
@ -70,7 +69,7 @@ CFLAGS+=-DNOSUID
SRCS+= id.c SRCS+= id.c
.endif .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 CFLAGS+=-DNODES
.else .else
DISTRIBUTION=crypto DISTRIBUTION=crypto

2
usr.sbin/pppd/Makefile
View File

@ -30,7 +30,7 @@ DPADD+= ${LIBPCAP}
LDADD+= -lpcap LDADD+= -lpcap
# MS-CHAP support. Requires the DES library. # 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 DISTRIBUTION=crypto
CFLAGS+= -DCHAPMS CFLAGS+= -DCHAPMS
SRCS+= chap_ms.c SRCS+= chap_ms.c

5
usr.sbin/sendmail/Makefile
View File

@ -58,9 +58,8 @@ LDADD+= ${LIBSMUTIL} ${LIBSM}
SRCS+= sm_os.h SRCS+= sm_os.h
CLEANFILES+=sm_os.h CLEANFILES+=sm_os.h
.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && \ .if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && \
!defined(NOSECURE) && !defined(NO_OPENSSL) && \ !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
!defined(RELEASE_CRUNCH)
# STARTTLS support # STARTTLS support
DISTRIBUTION= crypto DISTRIBUTION= crypto
CFLAGS+= -DSTARTTLS -D_FFR_TLS_1 CFLAGS+= -DSTARTTLS -D_FFR_TLS_1

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

@ -39,7 +39,7 @@ CFLAGS+= -DLBL_ALIGN
DPADD= ${LIBL} ${LIBPCAP} DPADD= ${LIBL} ${LIBPCAP}
LDADD= -ll -lpcap LDADD= -ll -lpcap
.if exists(../../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && \ .if exists(../../../crypto) && !defined(NOCRYPT) && \
!defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
DISTRIBUTION=crypto DISTRIBUTION=crypto
DPADD+= ${LIBCRYPTO} DPADD+= ${LIBCRYPTO}