svn commit: r374825 - head/security/openssh-portable

[Bryan Drewery]

Author: bdrewery
Date: Tue Dec 16 21:44:11 2014
New Revision: 374825
URL: https://svnweb.freebsd.org/changeset/ports/374825
QAT: https://qat.redports.org/buildarchive/r374825/

Log:
  - Unbreak KERB_GSSAPI option by using Debian's patch.
  
    I am serving the patch exactly as-is from their site. Obtained from:
    http://sources.debian.net/data/main/o/openssh/1:6.7p1-3/debian/patches/gssapi.patch

Modified:
  head/security/openssh-portable/Makefile
  head/security/openssh-portable/distinfo

Modified: head/security/openssh-portable/Makefile
==============================================================================
--- head/security/openssh-portable/Makefile	Tue Dec 16 21:37:30 2014	(r374824)
+++ head/security/openssh-portable/Makefile	Tue Dec 16 21:44:11 2014	(r374825)
@@ -41,7 +41,7 @@ OPTIONS_RADIO=		KERBEROS
 OPTIONS_RADIO_KERBEROS=	MIT HEIMDAL HEIMDAL_BASE
 TCP_WRAPPERS_DESC=	tcp_wrappers support
 BSM_DESC=		OpenBSM Auditing
-KERB_GSSAPI_DESC=	Kerberos/GSSAPI patch (req: GSSAPI) [BROKEN]
+KERB_GSSAPI_DESC=	Kerberos/GSSAPI patch (req: GSSAPI)
 HPN_DESC=		HPN-SSH patch [BROKEN]
 LDNS_DESC=		SSHFP/LDNS support
 X509_DESC=		x509 certificate patch
@@ -79,10 +79,11 @@ X509_PATCHFILES=	${PORTNAME}-6.7p1+x509-
 SCTP_PATCHFILES=	${PORTNAME}-6.7p1-sctp-2496.patch.gz:-p1
 SCTP_CONFIGURE_WITH=	sctp
 
-# 6.6 patch taken from http://www.stacken.kth.se/~haba/ which was originally
-# based on 5.7 patch at http://www.sxw.org.uk/computing/patches/
-KERB_GSSAPI_PATCHFILES=	openssh-6.6p1-gsskex-all-20140318.patch.gz:-p1:gsskex
-#KERB_GSSAPI_PATCH_SITES=http://www.stacken.kth.se/~haba/:gsskex
+# 6.7 patch taken from
+# http://sources.debian.net/data/main/o/openssh/1:6.7p1-3/debian/patches/gssapi.patch
+# which was originally based on 5.7 patch from
+# http://www.sxw.org.uk/computing/patches/
+KERB_GSSAPI_PATCHFILES=	openssh-6.7p1-gsskex-all-20141021-284f364.patch.gz:-p1:gsskex
 
 MIT_LIB_DEPENDS=		libkrb5.so.3:${PORTSDIR}/security/krb5
 HEIMDAL_LIB_DEPENDS=		libkrb5.so.26:${PORTSDIR}/security/heimdal
@@ -131,9 +132,6 @@ EXTRA_PATCHES+=		${FILESDIR}/extra-patch
 .if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MAES_THREADED} || ${PORT_OPTIONS:MNONECIPHER}
 BROKEN=		HPN does not apply yet. Use security/openssh-portable66
 .endif
-.if ${PORT_OPTIONS:MKERB_GSSAPI}
-BROKEN=		KERB_GSSAPI does not apply yet. Use security/openssh-portable66
-.endif
 
 .if ${PORT_OPTIONS:MX509}
 .  if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MAES_THREADED} || ${PORT_OPTIONS:MNONECIPHER}

Modified: head/security/openssh-portable/distinfo
==============================================================================
--- head/security/openssh-portable/distinfo	Tue Dec 16 21:37:30 2014	(r374824)
+++ head/security/openssh-portable/distinfo	Tue Dec 16 21:44:11 2014	(r374825)
@@ -4,8 +4,8 @@ SHA256 (openssh-6.6.1p1-hpnssh14v2.diff.
 SIZE (openssh-6.6.1p1-hpnssh14v2.diff.gz) = 24473
 SHA256 (openssh-6.7p1+x509-8.2.diff.gz) = 85acfcd560b40d4533b82a4e3f443b7137b377868bab424dacdf00581c83240f
 SIZE (openssh-6.7p1+x509-8.2.diff.gz) = 241798
-SHA256 (openssh-6.6p1-gsskex-all-20140318.patch.gz) = 9436c03ba46cdda8753f8957816a9832fd04e1244992ba8e729968c93682a236
-SIZE (openssh-6.6p1-gsskex-all-20140318.patch.gz) = 24299
+SHA256 (openssh-6.7p1-gsskex-all-20141021-284f364.patch.gz) = 9a361408269a542d28dae77320f30e94a44098acdbbbc552efb0bdeac6270dc8
+SIZE (openssh-6.7p1-gsskex-all-20141021-284f364.patch.gz) = 25825
 SHA256 (openssh-lpk-6.3p1.patch.gz) = d2a8b7da7acebac2afc4d0a3dffe8fca2e49900cf733af2e7012f2449b3668e1
 SIZE (openssh-lpk-6.3p1.patch.gz) = 17815
 SHA256 (openssh-6.7p1-sctp-2496.patch.gz) = ec2b6aa8a6d65a2c11d4453a25294ae5082e7ed7c9f418ec081f750bfba022db