diff options
| author | des <des@FreeBSD.org> | 2006-05-13 13:47:45 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-05-13 13:47:45 +0000 |
| commit | 148092431d1700e589fcbead33eda45aeb88731d (patch) | |
| tree | 74ec58d937814ef5ae4b74379961ddfd2a9fc64e /secure/usr.bin | |
| parent | 18f5285192dd391a2cc7a50f73bf1f90664fce6b (diff) | |
| download | FreeBSD-src-148092431d1700e589fcbead33eda45aeb88731d.zip FreeBSD-src-148092431d1700e589fcbead33eda45aeb88731d.tar.gz | |
Introduce a namespace munging hack inspired by NetBSD to avoid polluting
the namespace of applications which inadvertantly link in libssh (usually
through pam_ssh)
Suggested by: lukem@netbsd.org
MFC after: 6 weeks
Diffstat (limited to 'secure/usr.bin')
| -rw-r--r-- | secure/usr.bin/scp/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/sftp/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-add/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-agent/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-keygen/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-keyscan/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index d6d5aba..e6bb501 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= scp -CFLAGS+=-I${SSHDIR} +CFLAGS+=-I${SSHDIR} -include ssh_namespace.h DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD= -lssh -lcrypt -lcrypto -lz diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index 08512e8..4a42659 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -2,7 +2,7 @@ PROG= sftp SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c -CFLAGS+=-I${SSHDIR} +CFLAGS+=-I${SSHDIR} -include ssh_namespace.h DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} ${LIBEDIT} LDADD= -lssh -lcrypt -lcrypto -lz -ledit diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index 2716a62..7be6c0d 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= ssh-add -CFLAGS+=-I${SSHDIR} +CFLAGS+=-I${SSHDIR} -include ssh_namespace.h DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD= -lssh -lcrypt -lcrypto -lz diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 2f88a6d..49905a5 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= ssh-agent -CFLAGS+=-I${SSHDIR} +CFLAGS+=-I${SSHDIR} -include ssh_namespace.h DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD= -lssh -lcrypt -lcrypto -lz diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index 5dc8699..af39dec 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= ssh-keygen -CFLAGS+=-I${SSHDIR} +CFLAGS+=-I${SSHDIR} -include ssh_namespace.h DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD= -lssh -lcrypt -lcrypto -lz diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index 1c5ab3e..86afab8 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= ssh-keyscan -CFLAGS+=-I${SSHDIR} +CFLAGS+=-I${SSHDIR} -include ssh_namespace.h DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD= -lssh -lcrypt -lcrypto -lz diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 43ade12..213f035 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -4,7 +4,7 @@ .include <bsd.own.mk> PROG= ssh -CFLAGS+=-I${SSHDIR} +CFLAGS+=-I${SSHDIR} -include ssh_namespace.h LINKS= ${BINDIR}/ssh ${BINDIR}/slogin MAN= ssh.1 ssh_config.5 MLINKS= ssh.1 slogin.1 |
