ports/86384: openssh-portable GSSAPI key-exchange patch

[Garrett Wollman]

>Number:         86384
>Category:       ports
>Synopsis:       openssh-portable GSSAPI key-exchange patch
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 20 21:50:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Garrett Wollman
>Release:        FreeBSD 5.3-STABLE amd64
>Organization:
MIT CSAIL
>Environment:
System: FreeBSD khavrinen.csail.mit.edu 5.3-STABLE FreeBSD 5.3-STABLE #2: Thu Jan 27 16:21:39 EST 2005 wollman at wollman-random-testing.csail.mit.edu:/usr/src/sys/amd64/compile/KHAVRINEN amd64


>Description:

Someone who goes to the effort of installing openssh-portable with
GSSAPI enabled probably wants the GSSAPI key-exchange as well.  For
whatever reason, this still isn't integrated as of OpenSSH 4.2.

>How-To-Repeat:

Install openssh-portable with GSSAPI turned on.  Get annoying messages
about public keys.

>Fix:

Simon Wilkinson's patch for 4.0p1 still applies cleanly on 4.2p1.

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/openssh-portable/Makefile,v
retrieving revision 1.100
diff -u -r1.100 Makefile
--- Makefile	16 Sep 2005 17:58:31 -0000	1.100
+++ Makefile	20 Sep 2005 01:26:01 -0000
@@ -17,6 +17,7 @@
 MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR2}
 PKGNAMESUFFIX?=	${PORTABLE_SUFFIX}${GSSAPI_SUFFIX}${BASE_SUFFIX}${PKGNAMESUFFIX2}
 DISTNAME=	${DISTNAME2}
+PATCH_SITES=	http://www.sxw.org.uk/computing/patches/
 
 MAINTAINER=	mnag at FreeBSD.org
 COMMENT=	The portable version of OpenBSD's OpenSSH
@@ -52,6 +53,7 @@
 		ssh_host_dsa_key ssh_host_dsa_key.pub
 ETCOLD=		${PREFIX}/etc
 PORTABLE_SUFFIX=	-portable
+PATCH_DIST_STRIP=	-p1
 
 SUDO?=
 MAKE_ENV+=	SUDO="${SUDO}"
@@ -79,6 +81,7 @@
 GSSAPI_SUFFIX=	-gssapi
 CONFLICTS+=	openssh-portable-*
 CONFIGURE_ARGS+=	--with-kerberos5=${KRB5_HOME}
+PATCHFILES=	openssh-4.0p1-gssapikex.patch
 .if ${OPENSSLBASE} == "/usr"
 CONFIGURE_ARGS+=	--without-rpath
 LDFLAGS=
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/security/openssh-portable/distinfo,v
retrieving revision 1.28
diff -u -r1.28 distinfo
--- distinfo	1 Sep 2005 19:24:36 -0000	1.28
+++ distinfo	20 Sep 2005 01:17:45 -0000
@@ -1,2 +1,4 @@
 MD5 (openssh-4.2p1.tar.gz) = df899194a340c933944b193477c628fa
 SIZE (openssh-4.2p1.tar.gz) = 914165
+MD5 (openssh-4.0p1-gssapikex.patch) = 6841fa4b500d33d881743a85ede1f2fd
+SIZE (openssh-4.0p1-gssapikex.patch) = 37617



>Release-Note:
>Audit-Trail:
>Unformatted: