diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile index 36d0616b86f0..c7e4c332d8b4 100644 --- a/lib/libpam/modules/pam_ssh/Makefile +++ b/lib/libpam/modules/pam_ssh/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ SSHSRC= ${.CURDIR}/../../../../crypto/openssh -LIBSSH= ${.OBJDIR}/../../../../secure/lib/libssh/libssh.a LIB= pam_ssh MAN= pam_ssh.8 @@ -12,6 +11,6 @@ WARNS?= 0 CFLAGS+= -I${SSHSRC} DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} -LDADD= ${LIBSSH} -lcrypto -lcrypt +LDADD= -lssh -lcrypto -lcrypt .include diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 947a43849aff..b290c86dc908 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -INTERNALLIB= LIB= ssh +SHLIB_MAJOR= 2 SRCS= acss.c authfd.c authfile.c bufaux.c buffer.c \ canohost.c channels.c cipher.c cipher-acss.c cipher-aes.c \ cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \ @@ -11,7 +11,11 @@ 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 \ 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 \ - entropy.c scard-opensc.c gss-genr.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 SRCS+= bsd-closefrom.c bsd-misc.c getrrsetbyname.c vis.c xcrypt.c xmmap.c # FreeBSD additions diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile index ff1d4b17d4b0..28cff683e037 100644 --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -1,14 +1,12 @@ # $FreeBSD$ -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a - PROG= sftp-server SRCS= sftp-server.c sftp-common.c MAN= sftp-server.8 CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= ${LIBSSH} -lcrypt -lcrypto -lz +LDADD= -lssh -lcrypt -lcrypto -lz .include diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile index 24bf29e021a7..3f2ed519dcb0 100644 --- a/secure/libexec/ssh-keysign/Makefile +++ b/secure/libexec/ssh-keysign/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a - PROG= ssh-keysign SRCS= ssh-keysign.c readconf.c MAN= ssh-keysign.8 @@ -11,7 +9,7 @@ BINMODE=4511 .endif DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= ${LIBSSH} -lcrypt -lcrypto -lz +LDADD= -lssh -lcrypt -lcrypto -lz .include diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index f0512e9782a2..d6d5abafc383 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -1,12 +1,10 @@ # $FreeBSD$ -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a - PROG= scp CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= ${LIBSSH} -lcrypt -lcrypto -lz +LDADD= -lssh -lcrypt -lcrypto -lz .include diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index 1af7d8264da8..08512e860457 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -1,13 +1,11 @@ # $FreeBSD$ -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a - PROG= sftp SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} ${LIBEDIT} -LDADD= ${LIBSSH} -lcrypt -lcrypto -lz -ledit +LDADD= -lssh -lcrypt -lcrypto -lz -ledit .include diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index 5d091c2abeb5..2716a62ed5b3 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -1,12 +1,10 @@ # $FreeBSD$ -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a - PROG= ssh-add CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= ${LIBSSH} -lcrypt -lcrypto -lz +LDADD= -lssh -lcrypt -lcrypto -lz .include diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 9aa20844d868..2f88a6d969c5 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -1,12 +1,10 @@ # $FreeBSD$ -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a - PROG= ssh-agent CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= ${LIBSSH} -lcrypt -lcrypto -lz +LDADD= -lssh -lcrypt -lcrypto -lz .include diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index b8a4cc170330..5dc86992ec96 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -1,12 +1,10 @@ # $FreeBSD$ -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a - PROG= ssh-keygen CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= ${LIBSSH} -lcrypt -lcrypto -lz +LDADD= -lssh -lcrypt -lcrypto -lz .include diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index f4f59ed80259..1c5ab3ed6b80 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -1,12 +1,10 @@ # $FreeBSD$ -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a - PROG= ssh-keyscan CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= ${LIBSSH} -lcrypt -lcrypto -lz +LDADD= -lssh -lcrypt -lcrypto -lz .include diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 403ee767133a..274e481e23f7 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ - -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a +# PROG= ssh CFLAGS+=-I${SSHDIR} @@ -9,10 +8,11 @@ MAN= ssh.1 ssh_config.5 MLINKS= ssh.1 slogin.1 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} -LDADD= ${LIBSSH} -lutil -lz +LDADD= -lssh -lutil -lz .if !defined(NO_KERBEROS) CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index fef808ba33b0..4e73571084a5 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ - -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a +# PROG= sshd SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ @@ -13,13 +12,16 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.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 \ - 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 CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM} -LDADD= ${LIBSSH} -lutil -lz -lwrap ${MINUSLPAM} +LDADD= -lssh -lutil -lz -lwrap ${MINUSLPAM} .if !defined(NO_KERBEROS) CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL