diff options
| author | des <des@FreeBSD.org> | 2016-03-14 13:05:13 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-03-14 13:05:13 +0000 |
| commit | 0f31b02d696704321e4e94e63dceff52599ab808 (patch) | |
| tree | 953c18ea1e163d5ebd4b0d153b6378646ff41808 /secure/usr.bin/scp | |
| parent | 5080a59fa0c3561940d69fe29dc75ac489f0183a (diff) | |
| download | FreeBSD-src-0f31b02d696704321e4e94e63dceff52599ab808.zip FreeBSD-src-0f31b02d696704321e4e94e63dceff52599ab808.tar.gz | |
MFS (r296781):
MFH (r296633): upgrade to 7.2p2 (fixes xauth command injection bug)
MFH (r296634): re-add aes-cbc to server-side default cipher list
MFH (r296651, r296657): fix gcc build of pam_ssh
PR: 207679
Security: CVE-2016-3115
Approved by: re (marius)
Diffstat (limited to 'secure/usr.bin/scp')
| -rw-r--r-- | secure/usr.bin/scp/Makefile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index 4ab5696..6495845 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -7,11 +7,6 @@ SRCS= scp.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h -.if !defined(NO_SHARED) -# required when linking with a dynamic libssh -SRCS+= roaming_dummy.c -.endif - DPADD= ${LIBSSH} LDADD= -lssh USEPRIVATELIB= ssh |
