From owner-svn-ports-all@FreeBSD.ORG Sun Mar 16 17:35:33 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DBD264D3; Sun, 16 Mar 2014 17:35:33 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BBB17F81; Sun, 16 Mar 2014 17:35:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2GHZXYS078555; Sun, 16 Mar 2014 17:35:33 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2GHZXRn078550; Sun, 16 Mar 2014 17:35:33 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201403161735.s2GHZXRn078550@svn.freebsd.org> From: Bryan Drewery Date: Sun, 16 Mar 2014 17:35:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348420 - in head/security/openssh-portable: . files X-SVN-Group: ports-head 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.17 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: Sun, 16 Mar 2014 17:35:33 -0000 Author: bdrewery Date: Sun Mar 16 17:35:32 2014 New Revision: 348420 URL: http://svnweb.freebsd.org/changeset/ports/348420 QAT: https://qat.redports.org/buildarchive/r348420/ Log: - Update to 6.6 - Capsicum patch no longer needed - Update X509 patch to 7.9 Changelog: http://www.openssh.org/txt/release-6.6 Deleted: head/security/openssh-portable/files/patch-sandbox-capsicum.c Modified: head/security/openssh-portable/Makefile head/security/openssh-portable/distinfo head/security/openssh-portable/files/extra-patch-hpn-build-options Modified: head/security/openssh-portable/Makefile ============================================================================== --- head/security/openssh-portable/Makefile Sun Mar 16 16:46:25 2014 (r348419) +++ head/security/openssh-portable/Makefile Sun Mar 16 17:35:32 2014 (r348420) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= openssh -DISTVERSION= 6.5p1 -PORTREVISION= 1 +DISTVERSION= 6.6p1 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= ${MASTER_SITE_OPENBSD} @@ -80,12 +79,12 @@ LPK_CONFIGURE_ON= --with-ldap=yes \ LPK_USE= OPENLDAP=yes # See http://www.roumenpetrov.info/openssh/ -X509_VERSION= 7.8 +X509_VERSION= 7.9 X509_PATCH_SITES= http://www.roumenpetrov.info/openssh/x509-${X509_VERSION}/:x509 -X509_PATCHFILES= ${PORTNAME}-6.5p1+x509-${X509_VERSION}.diff.gz:-p1:x509 +X509_PATCHFILES= ${PORTNAME}-6.6p1+x509-${X509_VERSION}.diff.gz:-p1:x509 # See https://bugzilla.mindrot.org/show_bug.cgi?id=2016 -SCTP_PATCHFILES= ${PORTNAME}-6.5p1-sctp-2329.patch.gz +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/ @@ -112,7 +111,7 @@ BROKEN= KERB_GSSAPI Patch is not update .if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MAES_THREADED} || ${PORT_OPTIONS:MNONECIPHER} PORTDOCS+= HPN-README HPN_VERSION= 14v2 -HPN_DISTVERSION= 6.5p1 +HPN_DISTVERSION= 6.6p1 PATCH_SITES+= ${MASTER_SITE_SOURCEFORGE:S/$/:hpn/} PATCH_SITE_SUBDIR+= hpnssh/HPN-SSH%20${HPN_VERSION}%20${HPN_DISTVERSION}/:hpn PATCHFILES+= ${PORTNAME}-${HPN_DISTVERSION}-hpnssh${HPN_VERSION}.diff.gz:-p1:hpn Modified: head/security/openssh-portable/distinfo ============================================================================== --- head/security/openssh-portable/distinfo Sun Mar 16 16:46:25 2014 (r348419) +++ head/security/openssh-portable/distinfo Sun Mar 16 17:35:32 2014 (r348420) @@ -1,12 +1,12 @@ -SHA256 (openssh-6.5p1.tar.gz) = a1195ed55db945252d5a1730d4a2a2a5c1c9a6aa01ef2e5af750a962623d9027 -SIZE (openssh-6.5p1.tar.gz) = 1293187 -SHA256 (openssh-6.5p1-hpnssh14v2.diff.gz) = be6915130f2b1aad00235e02d55b67114dbb517b13d04d52a8abac9343166efd -SIZE (openssh-6.5p1-hpnssh14v2.diff.gz) = 24534 -SHA256 (openssh-6.5p1+x509-7.8.diff.gz) = b096ff7569e9ea3601673383540a986ce87636a984cc605a60dc53574888b992 -SIZE (openssh-6.5p1+x509-7.8.diff.gz) = 225483 +SHA256 (openssh-6.6p1.tar.gz) = 48c1f0664b4534875038004cc4f3555b8329c2a81c1df48db5c517800de203bb +SIZE (openssh-6.6p1.tar.gz) = 1282502 +SHA256 (openssh-6.6p1-hpnssh14v2.diff.gz) = 2a1b34dc3bf922e12cbca687e57b1fad2a0b087e38022e6782e99b45fcc1a315 +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-lpk-6.3p1.patch.gz) = d2a8b7da7acebac2afc4d0a3dffe8fca2e49900cf733af2e7012f2449b3668e1 SIZE (openssh-lpk-6.3p1.patch.gz) = 17815 -SHA256 (openssh-6.5p1-sctp-2329.patch.gz) = 07acf0c6e6be493dbcf6fb166b846eef99256f6f60f0feb3451522147a1d9464 -SIZE (openssh-6.5p1-sctp-2329.patch.gz) = 8722 +SHA256 (openssh-6.6p1-sctp-2329.patch.gz) = e054529810815d63f7de5d1c6cc76fccb7766e1b2d1b62438ca83770afac9bfa +SIZE (openssh-6.6p1-sctp-2329.patch.gz) = 8695 Modified: head/security/openssh-portable/files/extra-patch-hpn-build-options ============================================================================== --- head/security/openssh-portable/files/extra-patch-hpn-build-options Sun Mar 16 16:46:25 2014 (r348419) +++ head/security/openssh-portable/files/extra-patch-hpn-build-options Sun Mar 16 17:35:32 2014 (r348420) @@ -76,10 +76,10 @@ /* if a user tries to set the size to 0 set it to 1KB */ --- servconf.c.orig 2013-10-11 09:24:44.734138483 -0500 +++ servconf.c 2013-10-11 09:25:50.777137928 -0500 -@@ -305,10 +305,16 @@ fill_default_server_options(ServerOption +@@ -303,10 +303,16 @@ + } + if (options->permit_tun == -1) options->permit_tun = SSH_TUNMODE_NO; - if (options->zero_knowledge_password_authentication == -1) - options->zero_knowledge_password_authentication = 0; +#ifdef NONECIPHER if (options->none_enabled == -1) +#endif