diff options
| author | des <des@FreeBSD.org> | 2017-09-02 21:58:42 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2017-09-02 21:58:42 +0000 |
| commit | ca26403304720e30901aa6f7bde4883af9662d2d (patch) | |
| tree | 24e8f197b92c6ecd99617ac7584b6ba544a46aec /secure | |
| parent | ce0d6faba2a9fd27ff0fc0942a4e51f5203bb88f (diff) | |
| download | FreeBSD-src-ca26403304720e30901aa6f7bde4883af9662d2d.zip FreeBSD-src-ca26403304720e30901aa6f7bde4883af9662d2d.tar.gz | |
MFH (r314306,r314720): Upgrade OpenSSH to 7.4p1.
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/lib/libssh/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.sbin/sshd/Makefile | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index f67fcfb..562c169 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -32,7 +32,7 @@ PACKAGE= ssh # Portability layer SRCS+= bcrypt_pbkdf.c blowfish.c bsd-misc.c explicit_bzero.c fmt_scaled.c \ glob.c openssl-compat.c port-tun.c realpath.c strtonum.c \ - timingsafe_bcmp.c vis.c xcrypt.c xmmap.c + timingsafe_bcmp.c vis.c xcrypt.c .if ${MK_LDNS} == "no" SRCS+= getrrsetbyname.c diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index 5fb1e23..93832a9 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -3,14 +3,14 @@ .include <src.opts.mk> PROG= sshd -SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ +SRCS= sshd.c auth-rhosts.c auth-passwd.c \ audit.c audit-bsm.c audit-linux.c platform.c \ sshpty.c sshlogin.c servconf.c serverloop.c \ - auth.c auth1.c auth2.c auth-options.c session.c \ - auth-chall.c auth2-chall.c groupaccess.c \ + auth.c auth2.c auth-options.c session.c \ + auth2-chall.c groupaccess.c \ auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \ auth2-none.c auth2-passwd.c auth2-pubkey.c \ - monitor_mm.c monitor.c monitor_wrap.c auth-krb5.c \ + monitor.c monitor_wrap.c auth-krb5.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 \ @@ -36,12 +36,12 @@ CFLAGS+= -DHAVE_LDNS=1 .endif .if ${MK_AUDIT} != "no" -CFLAGS+= -DUSE_BSM_AUDIT -DHAVE_GETAUDIT_ADDR +CFLAGS+= -DUSE_BSM_AUDIT=1 -DHAVE_GETAUDIT_ADDR=1 LIBADD+= bsm .endif .if ${MK_BLACKLIST_SUPPORT} != "no" -CFLAGS+= -DUSE_BLACKLIST -I${SRCTOP}/contrib/blacklist/include +CFLAGS+= -DUSE_BLACKLIST=1 -I${SRCTOP}/contrib/blacklist/include SRCS+= blacklist.c LIBADD+= blacklist LDFLAGS+=-L${LIBBLACKLISTDIR} @@ -54,7 +54,7 @@ LIBADD+= gssapi_krb5 gssapi krb5 .endif .if ${MK_TCP_WRAPPERS} != "no" -CFLAGS+= -DLIBWRAP +CFLAGS+= -DLIBWRAP=1 LIBADD+= wrap .endif |
