From 189d70072d315be1a291e121b4a8fed8eaef8d11 Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Sun, 5 Jun 2005 15:47:07 +0000
Subject: Update for OpenSSH 4.1p1.

---
 secure/lib/libssh/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'secure/lib')

diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 8827f05..b290c86 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 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,6 +12,10 @@ SRCS=	acss.c authfd.c authfile.c bufaux.c buffer.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 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
@@ -25,7 +30,7 @@ DPADD=	${LIBZ}
 LDADD=	-lz
 
 .if !defined(NO_KERBEROS)
-CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL
+CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL
 DPADD+=	${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
 LDADD+=	-lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
 .endif
-- 
cgit v1.1