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

[Bryan Drewery]

Author: bdrewery
Date: Wed Apr 25 18:05:41 2018
New Revision: 468286
URL: https://svnweb.freebsd.org/changeset/ports/468286

Log:
  Update the KERB_GSSAPI patch from debian.
  
  https://sources.debian.org/data/main/o/openssh/1:7.7p1-2/debian/patches/gssapi.patch
  is mirrored due to not being filename-unique and not gzipped.
  
  PR:		226789
  Submitted by:	Rick Miller <vmiller at verisign.com> (based on)
  Tested by:	Rick Miller <vmiller at verisign.com>
  Reported by:	david at dcrosstech.com

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

Modified: head/security/openssh-portable/Makefile
==============================================================================
--- head/security/openssh-portable/Makefile	Wed Apr 25 17:57:30 2018	(r468285)
+++ head/security/openssh-portable/Makefile	Wed Apr 25 18:05:41 2018	(r468286)
@@ -89,9 +89,9 @@ EXTRA_PATCHES:=		${EXTRA_PATCHES:N${TCP_WRAPPERS_EXTRA
 
 # Must add this patch before HPN due to conflicts
 .if ${PORT_OPTIONS:MKERB_GSSAPI}
-BROKEN=	KERB_GSSAPI No patch for ${DISTVERSION} yet.
+#BROKEN=	KERB_GSSAPI No patch for ${DISTVERSION} yet.
 # Patch from:
-# http://sources.debian.net/data/main/o/openssh/1:7.4p1-5/debian/patches/gssapi.patch
+# https://sources.debian.org/data/main/o/openssh/1:7.7p1-2/debian/patches/gssapi.patch
 # which was originally based on 5.7 patch from
 # http://www.sxw.org.uk/computing/patches/
 # It is mirrored simply to apply gzip -9.
@@ -99,7 +99,7 @@ BROKEN=	KERB_GSSAPI No patch for ${DISTVERSION} yet.
 # Needed glue for applying HPN patch without conflict
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-hpn-gss-glue
 .  endif
-PATCHFILES+=	openssh-7.4p1-gsskex-all-20141021-debian-rh-20161228.patch.gz:-p1:gsskex
+PATCHFILES+=	openssh-7.7p1-gsskex-all-20141021-debian-rh-20171004.patch.gz:-p1:gsskex
 .endif
 
 # http://www.psc.edu/index.php/hpn-ssh https://github.com/rapier1/hpn-ssh https://github.com/rapier1/openssh-portable

Modified: head/security/openssh-portable/distinfo
==============================================================================
--- head/security/openssh-portable/distinfo	Wed Apr 25 17:57:30 2018	(r468285)
+++ head/security/openssh-portable/distinfo	Wed Apr 25 18:05:41 2018	(r468286)
@@ -1,5 +1,7 @@
-TIMESTAMP = 1522788732
+TIMESTAMP = 1524589531
 SHA256 (openssh-7.7p1.tar.gz) = d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f
 SIZE (openssh-7.7p1.tar.gz) = 1536900
 SHA256 (openssh-7.7p1+x509-11.3.diff.gz) = 57be0d0028863f1f690b8b4ccae7583c0f8dd8ed2c688a912b25832bf7f9b185
 SIZE (openssh-7.7p1+x509-11.3.diff.gz) = 488467
+SHA256 (openssh-7.7p1-gsskex-all-20141021-debian-rh-20171004.patch.gz) = c58f10ed5d9550e6e4ac09898a1aa131321e69c4d65a742ab95d357b35576ef4
+SIZE (openssh-7.7p1-gsskex-all-20141021-debian-rh-20171004.patch.gz) = 27251