From d78c11891694d603e264051b72f7bfd1374b67a1 Mon Sep 17 00:00:00 2001 From: des Date: Tue, 7 Jun 2005 09:31:28 +0000 Subject: Revert the commits that made libssh an INTERNALLIB; they caused too much trouble, especially on amd64. Requested by: ru --- secure/lib/libssh/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'secure/lib') diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 947a438..b290c86 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 -- cgit v1.1