From owner-svn-ports-head@FreeBSD.ORG Fri Apr 11 03:38:16 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B2FAD4FC; Fri, 11 Apr 2014 03:38:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9EB3A1A1B; Fri, 11 Apr 2014 03:38:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3B3cGIj002778; Fri, 11 Apr 2014 03:38:16 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3B3cGYX002776; Fri, 11 Apr 2014 03:38:16 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201404110338.s3B3cGYX002776@svn.freebsd.org> From: Bryan Drewery Date: Fri, 11 Apr 2014 03:38:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350880 - head/security/openssh-portable X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2014 03:38:16 -0000 Author: bdrewery Date: Fri Apr 11 03:38:15 2014 New Revision: 350880 URL: http://svnweb.freebsd.org/changeset/ports/350880 QAT: https://qat.redports.org/buildarchive/r350880/ Log: - Update GSS API Key Exchange patch with working version. PR: ports/183006 Submitted by: Garrett Wollman (via email) Tested by: Garrett Wollman Modified: head/security/openssh-portable/Makefile head/security/openssh-portable/distinfo Modified: head/security/openssh-portable/Makefile ============================================================================== --- head/security/openssh-portable/Makefile Fri Apr 11 02:59:07 2014 (r350879) +++ head/security/openssh-portable/Makefile Fri Apr 11 03:38:15 2014 (r350880) @@ -3,6 +3,7 @@ PORTNAME= openssh DISTVERSION= 6.6p1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= ${MASTER_SITE_OPENBSD} @@ -87,9 +88,10 @@ X509_PATCHFILES= ${PORTNAME}-6.6p1+x509- SCTP_PATCHFILES= ${PORTNAME}-6.6p1-sctp-2329.patch.gz SCTP_CONFIGURE_WITH= sctp -# Adapated from 5.7 patch at http://www.sxw.org.uk/computing/patches/ -KERB_GSSAPI_PATCHFILES= openssh-6.5p1-gsskex-all-20110125.patch.gz - +# 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 MIT_LIB_DEPENDS= libkrb5.so.3:${PORTSDIR}/security/krb5 HEIMDAL_LIB_DEPENDS= libkrb5.so.26:${PORTSDIR}/security/heimdal @@ -103,10 +105,6 @@ BSM_CONFIGURE_ON= --with-audit=bsm .include -.if ${PORT_OPTIONS:MKERB_GSSAPI} -BROKEN= KERB_GSSAPI Patch is not updated for 6.5 and upstream has not been active since 2001. -.endif - # http://www.psc.edu/index.php/hpn-ssh .if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MAES_THREADED} || ${PORT_OPTIONS:MNONECIPHER} PORTDOCS+= HPN-README @@ -122,7 +120,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch . endif .endif -PATCH_SITES+= http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn +PATCH_SITES+= http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn,gsskex .if ${OSVERSION} >= 900000 CONFIGURE_LIBS+= -lutil Modified: head/security/openssh-portable/distinfo ============================================================================== --- head/security/openssh-portable/distinfo Fri Apr 11 02:59:07 2014 (r350879) +++ head/security/openssh-portable/distinfo Fri Apr 11 03:38:15 2014 (r350880) @@ -4,8 +4,8 @@ SHA256 (openssh-6.6p1-hpnssh14v2.diff.gz SIZE (openssh-6.6p1-hpnssh14v2.diff.gz) = 24469 SHA256 (openssh-6.6p1+x509-7.9.diff.gz) = 463473f75c1dc250ea4eda21f2c79df6f0b479ea499d044cb51d73073881ca34 SIZE (openssh-6.6p1+x509-7.9.diff.gz) = 224691 -SHA256 (openssh-6.5p1-gsskex-all-20110125.patch.gz) = dd3b0f383a58e490f735646ae27f3dd05db96446e2e4ae8e753b64eee7f46582 -SIZE (openssh-6.5p1-gsskex-all-20110125.patch.gz) = 23516 +SHA256 (openssh-6.6p1-gsskex-all-20140318.patch.gz) = 9436c03ba46cdda8753f8957816a9832fd04e1244992ba8e729968c93682a236 +SIZE (openssh-6.6p1-gsskex-all-20140318.patch.gz) = 24299 SHA256 (openssh-lpk-6.3p1.patch.gz) = d2a8b7da7acebac2afc4d0a3dffe8fca2e49900cf733af2e7012f2449b3668e1 SIZE (openssh-lpk-6.3p1.patch.gz) = 17815 SHA256 (openssh-6.6p1-sctp-2329.patch.gz) = e054529810815d63f7de5d1c6cc76fccb7766e1b2d1b62438ca83770afac9bfa