diff options
author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-03-11 00:15:29 +0000 |
---|---|---|
committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-03-11 00:15:29 +0000 |
commit | acc1a9ef8333c798c210fa94be6af4d5fe2dd794 (patch) | |
tree | 755a41a3dcaa10393f1e0d17469bd517b8a0989a /secure | |
parent | 62ee4b69cd038bc55efbaeb27454ef07d39831b3 (diff) | |
parent | ff4b04e0d6105849f2b141c035ecd92a4ebc6d97 (diff) | |
download | src-acc1a9ef8333c798c210fa94be6af4d5fe2dd794.tar.gz src-acc1a9ef8333c798c210fa94be6af4d5fe2dd794.zip |
Upgrade to OpenSSH 7.2p2.
Notes
Notes:
svn path=/head/; revision=296633
Diffstat (limited to 'secure')
-rw-r--r-- | secure/lib/libssh/Makefile | 3 | ||||
-rw-r--r-- | secure/libexec/sftp-server/Makefile | 5 | ||||
-rw-r--r-- | secure/libexec/ssh-keysign/Makefile | 2 | ||||
-rw-r--r-- | secure/libexec/ssh-pkcs11-helper/Makefile | 5 | ||||
-rw-r--r-- | secure/usr.bin/scp/Makefile | 5 | ||||
-rw-r--r-- | secure/usr.bin/sftp/Makefile | 5 | ||||
-rw-r--r-- | secure/usr.bin/ssh-add/Makefile | 5 | ||||
-rw-r--r-- | secure/usr.bin/ssh-agent/Makefile | 5 | ||||
-rw-r--r-- | secure/usr.bin/ssh-keygen/Makefile | 5 | ||||
-rw-r--r-- | secure/usr.bin/ssh-keyscan/Makefile | 2 | ||||
-rw-r--r-- | secure/usr.bin/ssh/Makefile | 3 | ||||
-rw-r--r-- | secure/usr.sbin/sshd/Makefile | 4 |
12 files changed, 7 insertions, 42 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 2eae203cb83f..abb3cfb99704 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -22,7 +22,8 @@ SRCS+= authfd.c authfile.c bufaux.c bufbn.c bufec.c buffer.c \ sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c blocks.c \ kex.c kexdh.c kexgex.c kexecdh.c kexc25519.c \ kexdhc.c kexgexc.c kexecdhc.c kexc25519c.c \ - kexdhs.c kexgexs.c kexecdhs.c kexc25519s.c + kexdhs.c kexgexs.c kexecdhs.c kexc25519s.c \ + platform-pledge.c # gss-genr.c should be in $SRCS but causes linking problems, so it is # compiled directly into sshd instead. diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile index f0bedff797d7..24d675e0cf16 100644 --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -8,11 +8,6 @@ MAN= sftp-server.8 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 - LIBADD= ssh .if ${MK_LDNS} != "no" diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile index c546e835e4e6..c38b6dce8048 100644 --- a/secure/libexec/ssh-keysign/Makefile +++ b/secure/libexec/ssh-keysign/Makefile @@ -3,7 +3,7 @@ .include <src.opts.mk> PROG= ssh-keysign -SRCS= ssh-keysign.c roaming_dummy.c readconf.c +SRCS= ssh-keysign.c readconf.c MAN= ssh-keysign.8 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile index d8046d1994f6..19e114be935d 100644 --- a/secure/libexec/ssh-pkcs11-helper/Makefile +++ b/secure/libexec/ssh-pkcs11-helper/Makefile @@ -8,11 +8,6 @@ MAN= ssh-pkcs11-helper.8 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 - LIBADD= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index 18cfbaf38f54..d1c692760a31 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 - LIBADD= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index 9cea9fe3f08e..47d9bb19322a 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -7,11 +7,6 @@ SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.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 - LIBADD= ssh edit .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index 2f5d76e0d79c..cba7ac1963d6 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -7,11 +7,6 @@ SRCS+= ssh-add.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 - LIBADD= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index e79a02e1f6b5..92e545a8b1e7 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -7,11 +7,6 @@ SRCS= ssh-agent.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 - LIBADD= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index c3d6b2fd6b61..d3aff1b315b2 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -7,11 +7,6 @@ SRCS= ssh-keygen.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 - LIBADD= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index a2237a4fabf7..df00b6e0888b 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -3,7 +3,7 @@ .include <src.opts.mk> PROG= ssh-keyscan -SRCS= ssh-keyscan.c roaming_dummy.c +SRCS= ssh-keyscan.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index cad6b30335b6..623032a7dfa0 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -8,8 +8,7 @@ MAN= ssh.1 ssh_config.5 MLINKS= ssh.1 slogin.1 SRCS= ssh.c readconf.c clientloop.c sshtty.c \ - sshconnect.c sshconnect1.c sshconnect2.c mux.c \ - roaming_common.c roaming_client.c + sshconnect.c sshconnect1.c sshconnect2.c mux.c # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile SRCS+= gss-genr.c diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index debe2566bf47..7f9ee250ccb7 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -14,9 +14,9 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ auth2-gss.c gss-serv.c gss-serv-krb5.c \ loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \ sftp-server.c sftp-common.c \ - roaming_common.c roaming_serv.c \ sandbox-null.c sandbox-rlimit.c sandbox-systrace.c sandbox-darwin.c \ - sandbox-seccomp-filter.c sandbox-capsicum.c + sandbox-seccomp-filter.c sandbox-capsicum.c sandbox-pledge.c \ + sandbox-solaris.c # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile SRCS+= gss-genr.c |