ports/138284: security/openssh-portable: OpenSSH GSSAPI Key Exchange patch updated
Alec Kloss
alec-keyword-freebsd.org.a6e2e4 at SetFilePointer.com
Sat Aug 29 14:20:04 UTC 2009
The following reply was made to PR ports/138284; it has been noted by GNATS.
From: Alec Kloss <alec-keyword-freebsd.org.a6e2e4 at SetFilePointer.com>
To: bug-followup at freebsd.org, wollman at khavrinen.csail.mit.edu
Cc:
Subject: Re: ports/138284: security/openssh-portable: OpenSSH GSSAPI Key
Exchange patch updated
Date: Sat, 29 Aug 2009 08:47:33 -0500
--qdStaANDtnP76DUZ
Content-Type: multipart/mixed; boundary="OKFp/nMBquCu/qa9"
Content-Disposition: inline
--OKFp/nMBquCu/qa9
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
The current patch in the PR is heimdal-unfriendly. Consider the
attached variation which checks for HEIMDAL_HOME and
defines a krb5_free_unparsed_name macro when using heimdal.
SHA1(patch-2.txt)=3D e5a97acaafca3124cd360504f11b067fee5b293c
--=20
Alec Kloss alec at SetFilePointer.com IM: daemonalec at gmail.com
PGP key at http://pgp.mit.edu:11371/pks/lookup?op=3Dget&search=3D0xA241980E
"No Bunny!" -- Simon, http://wiki.adultswim.com/xwiki/bin/Frisky+Dingo/Simon
--OKFp/nMBquCu/qa9
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-2.txt"
--- Makefile.orig 2009-08-29 13:23:34.000000000 +0000
+++ Makefile 2009-08-29 13:41:28.000000000 +0000
@@ -100,15 +100,19 @@
.if !defined(WITHOUT_KERBEROS)
.if defined(KRB5_HOME) && exists(${KRB5_HOME}) || defined(WITH_GSSAPI)
.if defined(WITH_KERB_GSSAPI)
-BROKEN= KERB_GSSAPI patch incompatible with ${PORTNAME}-5.2p1
PATCH_DIST_STRIP= -p0
-PATCH_SITES+= http://www.sxw.org.uk/computing/patches/
-PATCHFILES+= openssh-5.0p1-gsskex-20080404.patch
+PATCH_SITES+= http://setfilepointer.com/ajk/FreeBSD/patches/
+PATCHFILES+= openssh-5.2p1-gsskex-all-20090829.patch
.endif
PORTABLE_SUFFIX= # empty
GSSAPI_SUFFIX= -gssapi
CONFLICTS+= openssh-portable-*-[0-9]*
CONFIGURE_ARGS+= --with-kerberos5=${KRB5_HOME}
+.if ${HEIMDAL_HOME} == ${LOCALBASE}
+LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal
+.elif ${KRB5_HOME} == ${LOCALBASE}
+LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5
+.endif
.if ${OPENSSLBASE} == "/usr"
CONFIGURE_ARGS+= --without-rpath
LDFLAGS= # empty
--- distinfo.orig 2009-08-29 13:41:34.000000000 +0000
+++ distinfo 2009-08-29 13:41:38.000000000 +0000
@@ -1,6 +1,6 @@
MD5 (openssh-5.2p1.tar.gz) = ada79c7328a8551bdf55c95e631e7dad
SHA256 (openssh-5.2p1.tar.gz) = 4023710c37d0b3d79e6299cb79b6de2a31db7d581fe59e775a5351784034ecae
SIZE (openssh-5.2p1.tar.gz) = 1016612
-MD5 (openssh-5.2p1+x509-6.2.diff.gz) = 8dbbfb743226864f6bb49b56e77776d9
-SHA256 (openssh-5.2p1+x509-6.2.diff.gz) = 72cfb1e232b6ae0a9df6e8539a9f6b53db7c0a2141cf2e4dd65b407748fa9f34
-SIZE (openssh-5.2p1+x509-6.2.diff.gz) = 153010
+MD5 (openssh-5.2p1-gsskex-all-20090829.patch) = 571636f241132246e20fecfdccf93ddb
+SHA256 (openssh-5.2p1-gsskex-all-20090829.patch) = cf4cdbc075314027beaec2d8f05745d9e7b11345b5f2c00990d8c0461d077aee
+SIZE (openssh-5.2p1-gsskex-all-20090829.patch) = 91044
--OKFp/nMBquCu/qa9--
--qdStaANDtnP76DUZ
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (FreeBSD)
iD8DBQFKmTF1kQ6e6D/NCvIRAt7RAKCwr1YGbYdhGPjJ+vWroAri2mQcXQCfdPT7
8HtdKZYADuFm4JX3WSN8rHY=
=JOsx
-----END PGP SIGNATURE-----
--qdStaANDtnP76DUZ--
More information about the freebsd-ports-bugs
mailing list