d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert the commits that made libssh an INTERNALLIB; they caused too much

Browse Source 
trouble, especially on amd64.

Requested by:	ru
This commit is contained in:
Dag-Erling Smørgrav 2005-06-07 09:31:28 +00:00
parent f395d8386a
commit 40e0db94af
12 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libpam/modules/pam_ssh/Makefile
View File

@ -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 <bsd.lib.mk>

8
secure/lib/libssh/Makefile
View File

@ -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

4
secure/libexec/sftp-server/Makefile
View File

@ -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 <bsd.prog.mk>

4
secure/libexec/ssh-keysign/Makefile
View File

@ -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 <bsd.prog.mk>

4
secure/usr.bin/scp/Makefile
View File

@ -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 <bsd.prog.mk>

4
secure/usr.bin/sftp/Makefile
View File

@ -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 <bsd.prog.mk>

4
secure/usr.bin/ssh-add/Makefile
View File

@ -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 <bsd.prog.mk>

4
secure/usr.bin/ssh-agent/Makefile
View File

@ -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 <bsd.prog.mk>

4
secure/usr.bin/ssh-keygen/Makefile
View File

@ -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 <bsd.prog.mk>

4
secure/usr.bin/ssh-keyscan/Makefile
View File

@ -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 <bsd.prog.mk>

8
secure/usr.bin/ssh/Makefile
View File

@ -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

10
secure/usr.sbin/sshd/Makefile
View File

@ -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