From owner-svn-ports-all@freebsd.org Wed Apr 25 18:05:42 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 61D9AFABC72; Wed, 25 Apr 2018 18:05:42 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E9DDE80283; Wed, 25 Apr 2018 18:05:41 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DEF4C4BEA; Wed, 25 Apr 2018 18:05:41 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3PI5fsc088519; Wed, 25 Apr 2018 18:05:41 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3PI5fW3088517; Wed, 25 Apr 2018 18:05:41 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201804251805.w3PI5fW3088517@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 25 Apr 2018 18:05:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468286 - head/security/openssh-portable X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/security/openssh-portable X-SVN-Commit-Revision: 468286 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Apr 2018 18:05:42 -0000 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 (based on) Tested by: Rick Miller Reported by: david@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