diff options
author | ru <ru@FreeBSD.org> | 2001-03-26 14:53:33 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2001-03-26 14:53:33 +0000 |
commit | ffbd5f978d5e034c5c1c8c018f77afcc43eba8d4 (patch) | |
tree | 0db60fb94584b564904c50e18e3ff4f05eb4cdcb /secure/usr.bin | |
parent | 0c5874752b9906c2928c57de2a78a6a5fb277673 (diff) | |
download | FreeBSD-src-ffbd5f978d5e034c5c1c8c018f77afcc43eba8d4.zip FreeBSD-src-ffbd5f978d5e034c5c1c8c018f77afcc43eba8d4.tar.gz |
secure/ build fixes:
- TELNETOBJDIR is gone. `buildworld' already installs libtelnet.a
in ${WORLDTMP}/usr/lib, and we have LIBRARY_PATH pointing there.
- SSHDIR (formerly SSHSRC) is now shared between all SSH modules.
New LIBSSH is introduced for libssh.a (an internal static lib).
Previously, build without prior `obj' was broken; SSH modules
always looked for libssh.a in ${.OBJDIR}. Also, the dependancies
on the libssh.a were missing.
- libtelnet/ did not install the crypto version of telnet.h into
/usr/include/arpa.
- Removed BINOWN, BINMODE, BINDIR and SRCS with default values.
Reviewed by: markm
- MAN[1-9] -> MAN.
Diffstat (limited to 'secure/usr.bin')
-rw-r--r-- | secure/usr.bin/Makefile.inc | 3 | ||||
-rw-r--r-- | secure/usr.bin/openssl/Makefile | 1 | ||||
-rw-r--r-- | secure/usr.bin/scp/Makefile | 13 | ||||
-rw-r--r-- | secure/usr.bin/ssh-add/Makefile | 14 | ||||
-rw-r--r-- | secure/usr.bin/ssh-agent/Makefile | 14 | ||||
-rw-r--r-- | secure/usr.bin/ssh-keygen/Makefile | 14 | ||||
-rw-r--r-- | secure/usr.bin/ssh/Makefile | 15 | ||||
-rw-r--r-- | secure/usr.bin/telnet/Makefile | 2 |
8 files changed, 22 insertions, 54 deletions
diff --git a/secure/usr.bin/Makefile.inc b/secure/usr.bin/Makefile.inc index c4fd273..de35b78 100644 --- a/secure/usr.bin/Makefile.inc +++ b/secure/usr.bin/Makefile.inc @@ -1,4 +1,5 @@ # $FreeBSD$ -BINDIR= /usr/bin +BINDIR?= /usr/bin + .include "${.CURDIR}/../../Makefile.inc" diff --git a/secure/usr.bin/openssl/Makefile b/secure/usr.bin/openssl/Makefile index a97daf4..efe3c302 100644 --- a/secure/usr.bin/openssl/Makefile +++ b/secure/usr.bin/openssl/Makefile @@ -10,7 +10,6 @@ PROG= openssl MAINTAINER= kris LDADD= -lssl -lcrypto -MAN1= openssl.1 MLINKS= openssl.1 ssl.8 CFLAGS+= -DMONOLITH -I${.CURDIR} diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index 80ad088..c4cfac2 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -1,18 +1,11 @@ # $FreeBSD$ # -SSHSRC= ${.CURDIR}/../../../crypto/openssh - PROG= scp -BINOWN= root -BINMODE=555 -MAN1= scp.1 -SRCS= scp.c +LDADD+= ${LIBSSH} -lcrypto -lutil -lz +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} .include <bsd.prog.mk> -.PATH: ${SSHSRC} - -LDADD+= -lcrypto -lutil -lz -L${.OBJDIR}/../../lib/libssh -lssh -DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} +.PATH: ${SSHDIR} diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index 5e8dbf2..fb657da 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -1,18 +1,12 @@ # $FreeBSD$ # -SSHSRC= ${.CURDIR}/../../../crypto/openssh - PROG= ssh-add -BINOWN= root -BINMODE=555 -MAN1= ssh-add.1 - SRCS= ssh-add.c log-client.c -.include <bsd.prog.mk> +LDADD+= ${LIBSSH} -lcrypto -lcrypt -lutil -lz +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ} -.PATH: ${SSHSRC} +.include <bsd.prog.mk> -LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz -DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ} +.PATH: ${SSHDIR} diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 901f09e..bf9cfd6 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -1,18 +1,12 @@ # $FreeBSD$ # -SSHSRC= ${.CURDIR}/../../../crypto/openssh - PROG= ssh-agent -BINOWN= root -BINMODE=555 -MAN= ssh-agent.1 - SRCS= ssh-agent.c log-client.c -.include <bsd.prog.mk> +LDADD+= ${LIBSSH} -lcrypto -lcrypt -lutil -lz +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ} -.PATH: ${SSHSRC} +.include <bsd.prog.mk> -LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz -DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ} +.PATH: ${SSHDIR} diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index b34e0f7..b53e164 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -1,18 +1,12 @@ # $FreeBSD$ # -SSHSRC= ${.CURDIR}/../../../crypto/openssh - PROG= ssh-keygen -BINOWN= root -BINMODE=555 -MAN= ssh-keygen.1 - SRCS= key.c log-client.c ssh-keygen.c -.include <bsd.prog.mk> +LDADD+= ${LIBSSH} -lcrypto -lcrypt -lutil -lz +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ} -.PATH: ${SSHSRC} +.include <bsd.prog.mk> -LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz -DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ} +.PATH: ${SSHDIR} diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 0b99611..fcb95d9 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -1,25 +1,16 @@ # $FreeBSD$ # -SSHSRC= ${.CURDIR}/../../../crypto/openssh - PROG= ssh -BINOWN= root .if defined(ENABLE_SUID_SSH) BINMODE=4555 .endif -MAN1= ssh.1 LINKS= ${BINDIR}/ssh ${BINDIR}/slogin MLINKS= ssh.1 slogin.1 SRCS= ssh.c log-client.c readconf.c clientloop.c sshconnect.c \ sshconnect1.c sshconnect2.c -.include <bsd.own.mk> - -.PATH: ${SSHSRC} -.PATH: ${SSHSRC}/lib - .if defined(MAKE_KERBEROS4) && \ ((${MAKE_KERBEROS4} == "yes") || (${MAKE_KERBEROS4} == "YES")) DISTRIBUTION=krb4 @@ -40,7 +31,9 @@ DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT} CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\" .endif -LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lutil -lz -DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} +LDADD+= ${LIBSSH} -lcrypto -lutil -lz +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} .include <bsd.prog.mk> + +.PATH: ${SSHDIR} diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile index b59da7a..0e9db53 100644 --- a/secure/usr.bin/telnet/Makefile +++ b/secure/usr.bin/telnet/Makefile @@ -11,7 +11,7 @@ SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \ DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMP} DPADD+= ${LIBIPSEC} -LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto -lcrypt -lmp +LDADD= -ltermcap -ltelnet -lcrypto -lcrypt -lmp LDADD+= -lipsec .include <bsd.prog.mk> |