Update for OpenSSH 4.1p1.
This commit is contained in:
parent
19bccc89b4
commit
015bad3598
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=147007
@ -1,6 +1,7 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
LIB= ssh
|
LIB= ssh
|
||||||
|
SHLIB_MAJOR= 2
|
||||||
SRCS= acss.c authfd.c authfile.c bufaux.c buffer.c \
|
SRCS= acss.c authfd.c authfile.c bufaux.c buffer.c \
|
||||||
canohost.c channels.c cipher.c cipher-acss.c cipher-aes.c \
|
canohost.c channels.c cipher.c cipher-acss.c cipher-aes.c \
|
||||||
cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \
|
cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \
|
||||||
@ -11,6 +12,10 @@ SRCS= acss.c authfd.c authfile.c bufaux.c buffer.c \
|
|||||||
monitor_fdpass.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c \
|
monitor_fdpass.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c \
|
||||||
kexgex.c kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \
|
kexgex.c kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \
|
||||||
entropy.c scard-opensc.c
|
entropy.c scard-opensc.c
|
||||||
|
|
||||||
|
# gss-genr.c should be in $SRCS but causes linking problems, so it is
|
||||||
|
# compiled directly into sshd instead.
|
||||||
|
|
||||||
# Portability layer
|
# Portability layer
|
||||||
SRCS+= bsd-closefrom.c bsd-misc.c getrrsetbyname.c vis.c xcrypt.c xmmap.c
|
SRCS+= bsd-closefrom.c bsd-misc.c getrrsetbyname.c vis.c xcrypt.c xmmap.c
|
||||||
# FreeBSD additions
|
# FreeBSD additions
|
||||||
@ -25,7 +30,7 @@ DPADD= ${LIBZ}
|
|||||||
LDADD= -lz
|
LDADD= -lz
|
||||||
|
|
||||||
.if !defined(NO_KERBEROS)
|
.if !defined(NO_KERBEROS)
|
||||||
CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL
|
CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL
|
||||||
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
|
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
|
||||||
LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
|
LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
|
||||||
.endif
|
.endif
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
PROG= sftp-server
|
PROG= sftp-server
|
||||||
SRCS= sftp-common.c sftp-server.c
|
SRCS= sftp-server.c sftp-common.c
|
||||||
MAN= sftp-server.8
|
MAN= sftp-server.8
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
PROG= ssh-keysign
|
PROG= ssh-keysign
|
||||||
SRCS= ssh-keysign.c msg.c readconf.c
|
SRCS= ssh-keysign.c readconf.c
|
||||||
MAN= ssh-keysign.8
|
MAN= ssh-keysign.8
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
.if defined(ENABLE_SUID_SSH)
|
.if defined(ENABLE_SUID_SSH)
|
||||||
|
@ -4,8 +4,8 @@ PROG= sftp
|
|||||||
SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c
|
SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} ${LIBEDIT}
|
||||||
LDADD= -lssh -lcrypt -lcrypto -lz
|
LDADD= -lssh -lcrypt -lcrypto -lz -ledit
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ}
|
|||||||
LDADD= -lssh -lutil -lz
|
LDADD= -lssh -lutil -lz
|
||||||
|
|
||||||
.if !defined(NO_KERBEROS)
|
.if !defined(NO_KERBEROS)
|
||||||
CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL
|
CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL
|
||||||
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
|
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
|
||||||
LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
|
LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
|
||||||
.endif
|
.endif
|
||||||
|
@ -12,7 +12,11 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
|
|||||||
auth-krb5.c \
|
auth-krb5.c \
|
||||||
auth2-gss.c gss-serv.c gss-serv-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 \
|
loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \
|
||||||
|
audit.c audit-bsm.c \
|
||||||
gss-genr.c
|
gss-genr.c
|
||||||
|
|
||||||
|
# gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
|
||||||
|
|
||||||
MAN= sshd.8 sshd_config.5
|
MAN= sshd.8 sshd_config.5
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
@ -20,7 +24,7 @@ DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
|
|||||||
LDADD= -lssh -lutil -lz -lwrap ${MINUSLPAM}
|
LDADD= -lssh -lutil -lz -lwrap ${MINUSLPAM}
|
||||||
|
|
||||||
.if !defined(NO_KERBEROS)
|
.if !defined(NO_KERBEROS)
|
||||||
CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL
|
CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL
|
||||||
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
|
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
|
||||||
LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lroken
|
LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lroken
|
||||||
.endif
|
.endif
|
||||||
@ -32,17 +36,6 @@ CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
|
|||||||
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
|
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
|
||||||
LDADD+= -lcrypto -lcrypt
|
LDADD+= -lcrypto -lcrypt
|
||||||
|
|
||||||
.if defined(OPENSSH_USE_POSIX_THREADS)
|
|
||||||
.if ((${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
|
|
||||||
${MACHINE_ARCH} == "ia64") && !defined(NO_LIBPTHREAD)) || \
|
|
||||||
((${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64") && \
|
|
||||||
!defined(NO_LIBC_R))
|
|
||||||
CFLAGS+=-DUSE_POSIX_THREADS
|
|
||||||
DPADD+= ${LIBPTHREAD}
|
|
||||||
LDADD+= -lpthread
|
|
||||||
.endif
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
.PATH: ${SSHDIR}
|
.PATH: ${SSHDIR}
|
||||||
|
Loading…
Reference in New Issue
Block a user