Update Makefiles for OpenSSH 3.7.1p2.
This commit is contained in:
parent
cf2b5f3b6d
commit
a04e3d6c30
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=124212
@ -2,15 +2,16 @@
|
|||||||
|
|
||||||
LIB= ssh
|
LIB= ssh
|
||||||
SRCS= authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
|
SRCS= authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
|
||||||
cipher.c compat.c compress.c crc32.c deattack.c fatal.c \
|
cipher.c cipher-aes.o cipher-bf1.o cipher-ctr.o cipher-3des1.o \
|
||||||
hostfile.c log.c match.c mpaux.c nchan.c packet.c readpass.c \
|
compat.c compress.c crc32.c deattack.c fatal.c \
|
||||||
rsa.c tildexpand.c ttymodes.c xmalloc.c atomicio.c \
|
hostfile.c log.c match.c moduli.c mpaux.c nchan.c packet.c \
|
||||||
|
readpass.c rsa.c tildexpand.c ttymodes.c xmalloc.c atomicio.c \
|
||||||
key.c dispatch.c kex.c mac.c uuencode.c misc.c \
|
key.c dispatch.c kex.c mac.c uuencode.c misc.c \
|
||||||
rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.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 \
|
kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \
|
||||||
entropy.c
|
entropy.c scard-opensc.c gss-genr.c
|
||||||
# Portability layer
|
# Portability layer
|
||||||
SRCS+= bsd-misc.c vis.c xmmap.c
|
SRCS+= bsd-misc.c vis.c xcrypt.c xmmap.c
|
||||||
# FreeBSD additions
|
# FreeBSD additions
|
||||||
SRCS+= version.c
|
SRCS+= version.c
|
||||||
|
|
||||||
@ -25,8 +26,8 @@ CFLAGS+= -DKRB5 -DHEIMDAL
|
|||||||
|
|
||||||
NOLINT= true
|
NOLINT= true
|
||||||
|
|
||||||
DPADD= ${LIBCRYPTO} ${LIBZ}
|
DPADD= ${LIBCRYPTO} ${LIBCRYPT} ${LIBZ}
|
||||||
LDADD= -lcrypto -lz
|
LDADD= -lcrypto -lcrypt -lz
|
||||||
|
|
||||||
.include <bsd.lib.mk>
|
.include <bsd.lib.mk>
|
||||||
|
|
||||||
|
@ -5,8 +5,8 @@ SRCS= sftp-common.c sftp-server.c
|
|||||||
MAN= sftp-server.8
|
MAN= sftp-server.8
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
DPADD+= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
||||||
LDADD+= -lssh -lcrypto -lz
|
LDADD+= -lssh -lcrypt -lcrypto -lz
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -8,8 +8,8 @@ CFLAGS+=-I${SSHDIR}
|
|||||||
BINMODE=4511
|
BINMODE=4511
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
||||||
LDADD= -lssh -lcrypto -lz
|
LDADD= -lssh -lcrypt -lcrypto -lz
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
PROG= scp
|
PROG= scp
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
||||||
LDADD= -lssh -lcrypto -lz
|
LDADD= -lssh -lcrypt -lcrypto -lz
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -4,8 +4,8 @@ PROG= sftp
|
|||||||
SRCS= sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c
|
SRCS= sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
||||||
LDADD= -lssh -lcrypto -lz
|
LDADD= -lssh -lcrypt -lcrypto -lz
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
PROG= ssh-add
|
PROG= ssh-add
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
||||||
LDADD= -lssh -lcrypto -lz
|
LDADD= -lssh -lcrypt -lcrypto -lz
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
PROG= ssh-agent
|
PROG= ssh-agent
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
||||||
LDADD= -lssh -lcrypto -lz
|
LDADD= -lssh -lcrypt -lcrypto -lz
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
PROG= ssh-keygen
|
PROG= ssh-keygen
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
||||||
LDADD= -lssh -lcrypto -lz
|
LDADD= -lssh -lcrypt -lcrypto -lz
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
PROG= ssh-keyscan
|
PROG= ssh-keyscan
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
||||||
LDADD= -lssh -lcrypto -lz
|
LDADD= -lssh -lcrypt -lcrypto -lz
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -20,8 +20,8 @@ DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN} ${LIBCRYPT}
|
|||||||
CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
|
CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
LDADD+= -lssh -lcrypto -lutil -lz
|
DPADD+= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
|
||||||
DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
|
LDADD+= -lssh -lcrypt -lcrypto -lutil -lz
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -6,37 +6,36 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
|
|||||||
sshpty.c sshlogin.c servconf.c serverloop.c uidswap.c \
|
sshpty.c sshlogin.c servconf.c serverloop.c uidswap.c \
|
||||||
auth.c auth1.c auth2.c auth-options.c session.c \
|
auth.c auth1.c auth2.c auth-options.c session.c \
|
||||||
auth-chall.c auth2-chall.c groupaccess.c \
|
auth-chall.c auth2-chall.c groupaccess.c \
|
||||||
auth-skey.c auth-bsdauth.c monitor_mm.c monitor.c \
|
auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \
|
||||||
auth2-none.c auth2-passwd.c auth2-pubkey.c \
|
auth2-none.c auth2-passwd.c auth2-pubkey.c \
|
||||||
auth2-hostbased.c auth2-kbdint.c \
|
monitor_mm.c monitor.c monitor_wrap.c monitor_fdpass.c \
|
||||||
auth2-pam-freebsd.c monitor_wrap.c monitor_fdpass.c \
|
kexdhs.c kexgexs.c \
|
||||||
kexdhs.c kexgexs.c
|
auth-krb5.c \
|
||||||
# Portability layer
|
auth2-gss.c gss-serv.c gss-serv-krb5.c \
|
||||||
SRCS+= loginrec.c
|
loginrec.c auth-pam.c auth-sia.c md5crypt.c
|
||||||
MAN= sshd.8 sshd_config.5
|
MAN= sshd.8 sshd_config.5
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
.if !defined(NO_KERBEROS)
|
.if !defined(NO_KERBEROS)
|
||||||
CFLAGS+= -DKRB5 -DHEIMDAL
|
CFLAGS+= -DKRB5 -DHEIMDAL
|
||||||
SRCS+= auth-krb5.c
|
|
||||||
LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -lroken
|
|
||||||
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
|
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
|
||||||
|
LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -lroken
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
LDADD+= -lopie -lmd
|
|
||||||
DPADD+= ${LIBOPIE} ${LIBMD}
|
DPADD+= ${LIBOPIE} ${LIBMD}
|
||||||
|
LDADD+= -lopie -lmd
|
||||||
|
|
||||||
.if defined(X11BASE)
|
.if defined(X11BASE)
|
||||||
CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
|
CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
LDADD+= -lssh -lcrypt -lcrypto -lutil -lz -lwrap ${MINUSLPAM}
|
|
||||||
DPADD+= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
|
DPADD+= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
|
||||||
|
LDADD+= -lssh -lcrypt -lcrypto -lutil -lz -lwrap ${MINUSLPAM}
|
||||||
|
|
||||||
.if defined(OPENSSH_USE_POSIX_THREADS) && !defined(NOLIBC_R)
|
.if defined(OPENSSH_USE_POSIX_THREADS) && !defined(NOLIBC_R)
|
||||||
CFLAGS+=-DUSE_POSIX_THREADS
|
CFLAGS+=-DUSE_POSIX_THREADS
|
||||||
LDADD+= -lc_r
|
|
||||||
DPADD+= ${LIBC_R}
|
DPADD+= ${LIBC_R}
|
||||||
|
LDADD+= -lc_r
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
Loading…
Reference in New Issue
Block a user