diff options
author | gjb <gjb@FreeBSD.org> | 2016-03-14 18:54:29 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2016-03-14 18:54:29 +0000 |
commit | 086e6f562ffbb6de24f1e51c7df40f403dd1522b (patch) | |
tree | 7aa3dd8f24b6558f2ef57be4db6203ac91424ea3 /secure | |
parent | 1c7e318a9a31cae130bd5b2de01d93e7800f66ff (diff) | |
parent | aab6aadc586e30f7b3512d20c6a5f780bddc2de3 (diff) | |
download | FreeBSD-src-086e6f562ffbb6de24f1e51c7df40f403dd1522b.zip FreeBSD-src-086e6f562ffbb6de24f1e51c7df40f403dd1522b.tar.gz |
MFH
Sponsored by: The FreeBSD Foundation
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 35e291b..a352cbc 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 PACKAGE= ssh # gss-genr.c should be in $SRCS but causes linking problems, so it is diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile index f0bedff..24d675e 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 c546e83..c38b6dc 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 d8046d1..19e114b 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 ca00921..34469a4 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -8,11 +8,6 @@ PACKAGE= ssh 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 4b1f24e..249fef2 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -8,11 +8,6 @@ PACKAGE= ssh 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 70feb8b..acce73d 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -8,11 +8,6 @@ PACKAGE= ssh 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 1e77d96..50eafa6 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -8,11 +8,6 @@ PACKAGE= ssh 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 5cd6e2f..d6b5616 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -8,11 +8,6 @@ PACKAGE= ssh 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 95b85e4..ade1e42 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 PACKAGE= ssh 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 38eab11..8d82148 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -9,8 +9,7 @@ MLINKS= ssh.1 slogin.1 PACKAGE= ssh 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 c9fd159..f9589a3 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 PACKAGE= ssh # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile |