aboutsummaryrefslogtreecommitdiffstats
path: root/security/openssh-portable
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2013-11-08 20:41:44 +0800
committerbdrewery <bdrewery@FreeBSD.org>2013-11-08 20:41:44 +0800
commit9c6a94b9dd4fe48baddf8d1d854c3634ca5c39ee (patch)
tree1d39ac3b28da13f98e19a9c4ba1c2d81f060632d /security/openssh-portable
parentfb62cb601082a75f39d7319a3b89280721539bdd (diff)
downloadfreebsd-ports-gnome-9c6a94b9dd4fe48baddf8d1d854c3634ca5c39ee.tar.gz
freebsd-ports-gnome-9c6a94b9dd4fe48baddf8d1d854c3634ca5c39ee.tar.zst
freebsd-ports-gnome-9c6a94b9dd4fe48baddf8d1d854c3634ca5c39ee.zip
- Update to 6.4p1
This release fixes a security bug: * sshd(8): fix a memory corruption problem triggered during rekeying when an AES-GCM cipher is selected. Full details of the vulnerability are available at: http://www.openssh.com/txt/gcmrekey.adv Security: http://www.openssh.com/txt/gcmrekey.adv
Diffstat (limited to 'security/openssh-portable')
-rw-r--r--security/openssh-portable/Makefile10
-rw-r--r--security/openssh-portable/distinfo6
2 files changed, 10 insertions, 6 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index 3f69f7b0b228..8204280445c4 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= openssh
-DISTVERSION= 6.3p1
+DISTVERSION= 6.4p1
PORTEPOCH= 1
CATEGORIES= security ipv6
MASTER_SITES= ${MASTER_SITE_OPENBSD}
@@ -80,7 +80,8 @@ LPK_USE= OPENLDAP=yes
# See http://www.roumenpetrov.info/openssh/
X509_VERSION= 7.6
X509_PATCH_SITES= http://www.roumenpetrov.info/openssh/x509-${X509_VERSION}/:x509
-X509_PATCHFILES= ${PORTNAME}-6.3p1+x509-${X509_VERSION}.diff.gz:-p1:x509
+X509_PATCHFILES= openssh-6.4-x509-glue.patch \
+ ${PORTNAME}-6.3p1+x509-${X509_VERSION}.diff.gz:-p1:x509
# See https://bugzilla.mindrot.org/show_bug.cgi?id=2016
SCTP_PATCHFILES= ${PORTNAME}-sctp-2329.patch.gz
@@ -107,9 +108,10 @@ PORTDOCS= *
# http://www.psc.edu/index.php/hpn-ssh
.if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MAES_THREADED} || ${PORT_OPTIONS:MNONECIPHER}
HPN_VERSION= 14v2
+HPN_DISTVERSION= 6.3p1
PATCH_SITES+= ${MASTER_SITE_SOURCEFORGE:S/$/:hpn/}
-PATCH_SITE_SUBDIR+= hpnssh/HPN-SSH%20${HPN_VERSION}%20${DISTVERSION}/:hpn
-PATCHFILES+= ${PORTNAME}-${DISTVERSION}-hpnssh${HPN_VERSION}.diff.gz:-p1: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
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-hpn-build-options
# Remove HPN if only AES requested
. if !${PORT_OPTIONS:MHPN}
diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo
index e7cbd2ab7fda..e02e3181a283 100644
--- a/security/openssh-portable/distinfo
+++ b/security/openssh-portable/distinfo
@@ -1,9 +1,11 @@
-SHA256 (openssh-6.3p1.tar.gz) = aea575ededd3ebd45c05d42d0a87af22c79131a847ea440c54e3fdd223f5a420
-SIZE (openssh-6.3p1.tar.gz) = 1201101
+SHA256 (openssh-6.4p1.tar.gz) = 5530f616513b14aea3662c4c373bafd6a97a269938674c006377e381f68975d2
+SIZE (openssh-6.4p1.tar.gz) = 1201402
SHA256 (openssh-6.3p1-hpnssh14v2.diff.gz) = 23ae9307b58629ccf76a8ed5d9cf7215a45d6b7533d6b17eef17279fb9c48dca
SIZE (openssh-6.3p1-hpnssh14v2.diff.gz) = 24450
SHA256 (openssh-6.3p1+x509-7.6.diff.gz) = d9e5f37c1a7750c19895f71d9b54e35afb6e7a45511b828e9da51252d0946460
SIZE (openssh-6.3p1+x509-7.6.diff.gz) = 219962
+SHA256 (openssh-6.4-x509-glue.patch) = 8a199b3e6fe031775531c82e7a2d18fe468c1193c9d90ba17554ba9de2834876
+SIZE (openssh-6.4-x509-glue.patch) = 1219
SHA256 (openssh-6.3p1-gsskex-all-20110125.patch.gz) = 9dac542ed23f1ee330ddb03a34825f04abea726d227e9433f970e9a24325d767
SIZE (openssh-6.3p1-gsskex-all-20110125.patch.gz) = 23486
SHA256 (openssh-lpk-6.3p1.patch.gz) = d2a8b7da7acebac2afc4d0a3dffe8fca2e49900cf733af2e7012f2449b3668e1