diff options
Diffstat (limited to 'secure')
-rw-r--r-- | secure/Makefile | 14 | ||||
-rw-r--r-- | secure/Makefile.inc | 6 | ||||
-rw-r--r-- | secure/lib/Makefile | 6 | ||||
-rw-r--r-- | secure/lib/libcrypto/Makefile | 8 | ||||
-rw-r--r-- | secure/lib/libcrypto/Makefile.inc | 4 | ||||
-rw-r--r-- | secure/lib/libssh/Makefile | 4 | ||||
-rw-r--r-- | secure/libexec/Makefile | 6 | ||||
-rw-r--r-- | secure/usr.bin/Makefile | 6 | ||||
-rw-r--r-- | secure/usr.bin/ssh/Makefile | 4 | ||||
-rw-r--r-- | secure/usr.sbin/Makefile | 4 | ||||
-rw-r--r-- | secure/usr.sbin/sshd/Makefile | 6 |
11 files changed, 44 insertions, 24 deletions
diff --git a/secure/Makefile b/secure/Makefile index c6d2ff4..7a78d94 100644 --- a/secure/Makefile +++ b/secure/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + SUBDIR= lib libexec usr.bin usr.sbin # These are the programs which depend on crypto, but not Kerberos. @@ -7,7 +9,7 @@ SPROGS= lib/libfetch lib/libpam lib/libradius lib/libtelnet \ bin/ed libexec/telnetd usr.bin/fetch usr.bin/telnet \ usr.sbin/pkg_install usr.sbin/ppp usr.sbin/pppd \ usr.sbin/tcpdump/tcpdump -.if !defined(NO_SENDMAIL) +.if ${MK_SENDMAIL} != "no" SPROGS+=usr.sbin/sendmail .endif @@ -26,11 +28,11 @@ secure: insecure: .for entry in ${SPROGS} cd ${.CURDIR}/../${entry}; \ - ${MAKE} -DNO_CRYPT cleandir; \ - ${MAKE} -DNO_CRYPT obj; \ - ${MAKE} -DNO_CRYPT depend; \ - ${MAKE} -DNO_CRYPT all; \ - ${MAKE} -DNO_CRYPT install + ${MAKE} -DWITHOUT_CRYPT cleandir; \ + ${MAKE} -DWITHOUT_CRYPT obj; \ + ${MAKE} -DWITHOUT_CRYPT depend; \ + ${MAKE} -DWITHOUT_CRYPT all; \ + ${MAKE} -DWITHOUT_CRYPT install .endfor .include <bsd.subdir.mk> diff --git a/secure/Makefile.inc b/secure/Makefile.inc index 346c0ee..7b9cb98 100644 --- a/secure/Makefile.inc +++ b/secure/Makefile.inc @@ -1,15 +1,17 @@ # $FreeBSD$ +.include <bsd.own.mk> + .if exists(${.CURDIR}/../../lib/libcrypt/obj) CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt/obj .else CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt .endif -.if !defined(MAKE_IDEA) +.if ${MK_IDEA} == "no" CFLAGS+= -DNO_IDEA .endif -.if !defined(NO_OPENSSH) +.if ${MK_OPENSSH} != "no" SSHDIR= ${.CURDIR}/../../../crypto/openssh .endif diff --git a/secure/lib/Makefile b/secure/lib/Makefile index 049fd39..e27bcc3 100644 --- a/secure/lib/Makefile +++ b/secure/lib/Makefile @@ -1,9 +1,11 @@ # $FreeBSD$ +.include <bsd.own.mk> + SUBDIR= -.if !defined(NO_OPENSSL) +.if ${MK_OPENSSL} != "no" SUBDIR+=libcrypto libssl -.if !defined(NO_OPENSSH) +.if ${MK_OPENSSH} != "no" SUBDIR+=libssh .endif .endif diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 5c22f97..8dbd0e5 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + LIB= crypto SHLIBDIR?= /lib SHLIB_MAJOR= 4 @@ -164,7 +166,7 @@ SRCS+= hmac.c INCS+= hmac.h # idea -.if defined(MAKE_IDEA) +.if ${MK_IDEA} != "no" SRCS+= i_cbc.c i_cfb64.c i_ecb.c i_ofb64.c i_skey.c INCS+= idea.h .endif @@ -313,7 +315,7 @@ opensslconf.h: opensslconf-${MACHINE_ARCH}.h cp ${.ALLSRC} ${.TARGET} evp.h: ${LCRYPTO_SRC}/crypto/evp/evp.h -.if !defined(MAKE_IDEA) +.if ${MK_IDEA} == "no" sed '/^#ifndef OPENSSL_NO_IDEA$$/,/^#endif$$/d' ${.ALLSRC} > ${.TARGET} .else cp ${.ALLSRC} ${.TARGET} @@ -344,7 +346,7 @@ afterinstall: _bn_asmpath= ${LCRYPTO_SRC}/crypto/bn/asm .endif -.if defined(MAKE_IDEA) +.if ${MK_IDEA} != "no" _ideapath= ${LCRYPTO_SRC}/crypto/idea .endif diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 82ace34..5562062 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + LCRYPTO_SRC= ${.CURDIR}/../../../crypto/openssl LCRYPTO_DOC= ${.CURDIR}/../../../crypto/openssl/doc @@ -7,7 +9,7 @@ CFLAGS+= -DTERMIOS -DANSI_SOURCE CFLAGS+= -I${LCRYPTO_SRC} -I${LCRYPTO_SRC}/crypto -I${.OBJDIR} CFLAGS+= -DOPENSSL_THREADS -.if !defined(MAKE_IDEA) +.if ${MK_IDEA} == "no" CFLAGS+= -DOPENSSL_NO_IDEA .endif diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index ddd6b5c..6a4231d 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + LIB= ssh SHLIB_MAJOR= 3 SRCS= acss.c authfd.c authfile.c bufaux.c buffer.c \ @@ -30,7 +32,7 @@ CFLAGS+= -I${SSHDIR} DPADD= ${LIBZ} LDADD= -lz -.if !defined(NO_KERBEROS) +.if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN} LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile index b60b4ce..1c3ee01 100644 --- a/secure/libexec/Makefile +++ b/secure/libexec/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ +.include <bsd.own.mk> + SUBDIR= -.if !defined(NO_OPENSSL) -.if !defined(NO_OPENSSH) +.if ${MK_OPENSSH} != "no" SUBDIR+=sftp-server ssh-keysign .endif -.endif .include <bsd.subdir.mk> diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile index 4d78845..b10a43b 100644 --- a/secure/usr.bin/Makefile +++ b/secure/usr.bin/Makefile @@ -1,9 +1,11 @@ # $FreeBSD$ +.include <bsd.own.mk> + SUBDIR= -.if !defined(NO_OPENSSL) +.if ${MK_OPENSSL} != "no" SUBDIR+=bdes openssl -.if !defined(NO_OPENSSH) +.if ${MK_OPENSSH} != "no" SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan .endif .endif diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 9d1e0b5..43ade12 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -1,6 +1,8 @@ # $FreeBSD$ # +.include <bsd.own.mk> + PROG= ssh CFLAGS+=-I${SSHDIR} LINKS= ${BINDIR}/ssh ${BINDIR}/slogin @@ -14,7 +16,7 @@ SRCS= ssh.c readconf.c clientloop.c sshtty.c \ DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ} LDADD= -lssh -lutil -lz -.if !defined(NO_KERBEROS) +.if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL DPADD+= ${LIBGSSAPI} LDADD+= -lgssapi diff --git a/secure/usr.sbin/Makefile b/secure/usr.sbin/Makefile index b8636e5..e08025c 100644 --- a/secure/usr.sbin/Makefile +++ b/secure/usr.sbin/Makefile @@ -1,7 +1,9 @@ # $FreeBSD$ +.include <bsd.own.mk> + SUBDIR= -.if !defined(NO_OPENSSH) && !defined(NO_OPENSSL) +.if ${MK_OPENSSH} != "no" SUBDIR+=sshd .endif diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index 0e23288..7567505 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -1,6 +1,8 @@ # $FreeBSD$ # +.include <bsd.own.mk> + PROG= sshd SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ sshpty.c sshlogin.c servconf.c serverloop.c \ @@ -23,13 +25,13 @@ CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM} LDADD= -lssh -lutil -lz -lwrap ${MINUSLPAM} -.if !defined(NO_AUDIT) +.if ${MK_AUDIT} != "no" CFLAGS+= -DUSE_BSM_AUDIT DPADD+= ${LIBBSM} LDADD+= -lbsm .endif -.if !defined(NO_KERBEROS) +.if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lroken |