Version bump.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

4 files changed, 19 insertions, 10 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index ad8245979b47..ee5859a1ee8f 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.503 2014/03/14 22:15:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.504 2014/03/19 23:40:40 vapier Exp $
+
+*openssh-6.6_p1 (19 Mar 2014)
+
+  19 Mar 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/openssh-6.6_p1-x509-glue.patch,
+  +files/openssh-6.6_p1-x509-hpn14v4-glue-p2.patch, +openssh-6.6_p1.ebuild,
+  -files/openssh-6.5_p1-x509-glue.patch,
+  -files/openssh-6.5_p1-x509-hpn14v4-glue-p2.patch, -openssh-6.5_p1-r1.ebuild:
+  Version bump.
 
   14 Mar 2014; Mike Frysinger <vapier@gentoo.org>
   files/openssh-6.5_p1-hpn-cipher-align.patch:
diff --git a/net-misc/openssh/files/openssh-6.5_p1-x509-glue.patch b/net-misc/openssh/files/openssh-6.6_p1-x509-glue.patch
index 83e873973501..0ba3e456f91f 100644
--- a/net-misc/openssh/files/openssh-6.5_p1-x509-glue.patch
+++ b/net-misc/openssh/files/openssh-6.6_p1-x509-glue.patch
@@ -1,7 +1,7 @@
 Make x509 apply after openssh-5.9_p1-sshd-gssapi-multihomed.patch.
 
---- openssh-6.5p1+x509-7.8.diff
-+++ openssh-6.5p1+x509-7.8.diff
+--- openssh-6.6p1+x509-7.9.diff
++++ openssh-6.6p1+x509-7.9.diff
 @@ -15473,10 +15473,9 @@
   .It Cm ChallengeResponseAuthentication
   Specifies whether challenge-response authentication is allowed (e.g. via
diff --git a/net-misc/openssh/files/openssh-6.5_p1-x509-hpn14v4-glue-p2.patch b/net-misc/openssh/files/openssh-6.6_p1-x509-hpn14v4-glue-p2.patch
index 95cf48d80fc0..de7e78f364fc 100644
--- a/net-misc/openssh/files/openssh-6.5_p1-x509-hpn14v4-glue-p2.patch
+++ b/net-misc/openssh/files/openssh-6.6_p1-x509-hpn14v4-glue-p2.patch
@@ -1,7 +1,7 @@
 make the hpn patch apply when the x509 patch has also been applied
 
---- openssh-6.5p1-hpnssh14v4.diff
-+++ openssh-6.5p1-hpnssh14v4.diff
+--- openssh-6.6p1-hpnssh14v4.diff
++++ openssh-6.6p1-hpnssh14v4.diff
 @@ -1790,18 +1790,14 @@
   	if (options->ip_qos_interactive == -1)
   		options->ip_qos_interactive = IPTOS_LOWDELAY;
diff --git a/net-misc/openssh/openssh-6.5_p1-r1.ebuild b/net-misc/openssh/openssh-6.6_p1.ebuild
index 082e94a5abc2..4d433ec3699a 100644
--- a/net-misc/openssh/openssh-6.5_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-6.6_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.5_p1-r1.ebuild,v 1.1 2014/03/14 12:12:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.6_p1.ebuild,v 1.1 2014/03/19 23:40:40 vapier Exp $
 
 EAPI="4"
 inherit eutils user flag-o-matic multilib autotools pam systemd versionator
@@ -9,9 +9,9 @@ inherit eutils user flag-o-matic multilib autotools pam systemd versionator
 # and _p? releases.
 PARCH=${P/_}
 
-HPN_PATCH="${PN}-6.5p1-hpnssh14v4.diff.gz"
+HPN_PATCH="${PN}-6.6p1-hpnssh14v4.diff.gz"
 LDAP_PATCH="${PN}-lpk-6.5p1-0.3.14.patch.gz"
-X509_VER="7.8" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+X509_VER="7.9" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="http://www.openssh.org/"
@@ -101,8 +101,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-5.9_p1-sshd-gssapi-multihomed.patch #378361
 	if use X509 ; then
 		pushd .. >/dev/null
-		epatch "${FILESDIR}"/${PN}-6.5_p1-x509-glue.patch
-		use hpn && epatch "${FILESDIR}"/${PN}-6.5_p1-x509-hpn14v4-glue-p2.patch
+		epatch "${FILESDIR}"/${PN}-6.6_p1-x509-glue.patch
+		use hpn && epatch "${FILESDIR}"/${PN}-6.6_p1-x509-hpn14v4-glue-p2.patch
 		popd >/dev/null
 		epatch "${WORKDIR}"/${X509_PATCH%.*}
 		epatch "${FILESDIR}"/${PN}-6.3_p1-x509-hpn14v2-glue.patch