diff options
author | des <des@FreeBSD.org> | 2003-05-19 15:52:01 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2003-05-19 15:52:01 +0000 |
commit | e5d2d778eb86b85f35d40aef94a1f354ae0a5ef2 (patch) | |
tree | 9be45a94055cfc0506641b2e8790903643f53b99 /usr.sbin | |
parent | 9926b9490a4913a931ead2024b8b8fcc4b71a3c0 (diff) | |
download | FreeBSD-src-e5d2d778eb86b85f35d40aef94a1f354ae0a5ef2.zip FreeBSD-src-e5d2d778eb86b85f35d40aef94a1f354ae0a5ef2.tar.gz |
Retire the useless NOSECURE knob.
Approved by: re (scottl)
Diffstat (limited to 'usr.sbin')
-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 |
10 files changed, 11 insertions, 13 deletions
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} |