Make libssh an INTERNALLIB like it is in {Net,Open}BSD.
This commit is contained in:
parent
463d4f5093
commit
32f80c77d0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=147056
@ -1,7 +1,7 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
|
INTERNALLIB=
|
||||||
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,11 +11,7 @@ SRCS= acss.c authfd.c authfile.c bufaux.c buffer.c \
|
|||||||
atomicio.c key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \
|
atomicio.c key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.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
|
||||||
|
|
||||||
# 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
|
||||||
|
@ -1,12 +1,14 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
|
LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a
|
||||||
|
|
||||||
PROG= sftp-server
|
PROG= sftp-server
|
||||||
SRCS= sftp-server.c sftp-common.c
|
SRCS= sftp-server.c sftp-common.c
|
||||||
MAN= sftp-server.8
|
MAN= sftp-server.8
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
||||||
LDADD= -lssh -lcrypt -lcrypto -lz
|
LDADD= ${LIBSSH} -lcrypt -lcrypto -lz
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
|
LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a
|
||||||
|
|
||||||
PROG= ssh-keysign
|
PROG= ssh-keysign
|
||||||
SRCS= ssh-keysign.c readconf.c
|
SRCS= ssh-keysign.c readconf.c
|
||||||
MAN= ssh-keysign.8
|
MAN= ssh-keysign.8
|
||||||
@ -9,7 +11,7 @@ BINMODE=4511
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
||||||
LDADD= -lssh -lcrypt -lcrypto -lz
|
LDADD= ${LIBSSH} -lcrypt -lcrypto -lz
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -1,10 +1,12 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
|
LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a
|
||||||
|
|
||||||
PROG= scp
|
PROG= scp
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
||||||
LDADD= -lssh -lcrypt -lcrypto -lz
|
LDADD= ${LIBSSH} -lcrypt -lcrypto -lz
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -1,11 +1,13 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
|
LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a
|
||||||
|
|
||||||
PROG= sftp
|
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} ${LIBEDIT}
|
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} ${LIBEDIT}
|
||||||
LDADD= -lssh -lcrypt -lcrypto -lz -ledit
|
LDADD= ${LIBSSH} -lcrypt -lcrypto -lz -ledit
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -1,10 +1,12 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
|
LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a
|
||||||
|
|
||||||
PROG= ssh-add
|
PROG= ssh-add
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
||||||
LDADD= -lssh -lcrypt -lcrypto -lz
|
LDADD= ${LIBSSH} -lcrypt -lcrypto -lz
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -1,10 +1,12 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
|
LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a
|
||||||
|
|
||||||
PROG= ssh-agent
|
PROG= ssh-agent
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
||||||
LDADD= -lssh -lcrypt -lcrypto -lz
|
LDADD= ${LIBSSH} -lcrypt -lcrypto -lz
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -1,10 +1,12 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
|
LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a
|
||||||
|
|
||||||
PROG= ssh-keygen
|
PROG= ssh-keygen
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
||||||
LDADD= -lssh -lcrypt -lcrypto -lz
|
LDADD= ${LIBSSH} -lcrypt -lcrypto -lz
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -1,10 +1,12 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
|
LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a
|
||||||
|
|
||||||
PROG= ssh-keyscan
|
PROG= ssh-keyscan
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
|
||||||
LDADD= -lssh -lcrypt -lcrypto -lz
|
LDADD= ${LIBSSH} -lcrypt -lcrypto -lz
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
#
|
|
||||||
|
LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a
|
||||||
|
|
||||||
PROG= ssh
|
PROG= ssh
|
||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
@ -8,11 +9,10 @@ MAN= ssh.1 ssh_config.5
|
|||||||
MLINKS= ssh.1 slogin.1
|
MLINKS= ssh.1 slogin.1
|
||||||
|
|
||||||
SRCS= ssh.c readconf.c clientloop.c sshtty.c \
|
SRCS= ssh.c readconf.c clientloop.c sshtty.c \
|
||||||
sshconnect.c sshconnect1.c sshconnect2.c \
|
sshconnect.c sshconnect1.c sshconnect2.c
|
||||||
gss-genr.c
|
|
||||||
|
|
||||||
DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ}
|
DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ}
|
||||||
LDADD= -lssh -lutil -lz
|
LDADD= ${LIBSSH} -lutil -lz
|
||||||
|
|
||||||
.if !defined(NO_KERBEROS)
|
.if !defined(NO_KERBEROS)
|
||||||
CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL
|
CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
#
|
|
||||||
|
LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a
|
||||||
|
|
||||||
PROG= sshd
|
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 auth-rsa.c auth-rh-rsa.c \
|
||||||
@ -12,16 +13,13 @@ 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 \
|
audit.c audit-bsm.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}
|
||||||
|
|
||||||
DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
|
DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
|
||||||
LDADD= -lssh -lutil -lz -lwrap ${MINUSLPAM}
|
LDADD= ${LIBSSH} -lutil -lz -lwrap ${MINUSLPAM}
|
||||||
|
|
||||||
.if !defined(NO_KERBEROS)
|
.if !defined(NO_KERBEROS)
|
||||||
CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL
|
CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL
|
||||||
|
Loading…
Reference in New Issue
Block a user