Fixed hpn patch to not add a false patch level to ssh's version string (6.6p2). Committed straight to stable where -r0 was stable

(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x981CA6FC)

3 files changed, 18 insertions, 9 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 52ccc03d55a8..b15529758621 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,13 @@
 # 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.508 2014/03/20 18:17:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.509 2014/03/20 20:42:44 polynomial-c Exp $
+
+*openssh-6.6_p1-r1 (20 Mar 2014)
+
+  20 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> -openssh-6.6_p1.ebuild,
+  +openssh-6.6_p1-r1.ebuild:
+  Fixed hpn patch to not add a false patch level to ssh's version string
+  (6.6p2). Committed straight to stable where -r0 was stable.
 
   20 Mar 2014; Agostino Sarubbo <ago@gentoo.org> openssh-6.6_p1.ebuild:
   Stable for x86, wrt bug #505066
diff --git a/net-misc/openssh/files/openssh-6.6_p1-x509-hpn14v4-glue-p2.patch b/net-misc/openssh/files/openssh-6.6_p1-x509-hpn14v4-glue-p2.patch
index de7e78f364fc..a69830e08968 100644
--- a/net-misc/openssh/files/openssh-6.6_p1-x509-hpn14v4-glue-p2.patch
+++ b/net-misc/openssh/files/openssh-6.6_p1-x509-hpn14v4-glue-p2.patch
@@ -2,14 +2,14 @@ make the hpn patch apply when the x509 patch has also been applied
 
 --- openssh-6.6p1-hpnssh14v4.diff
 +++ openssh-6.6p1-hpnssh14v4.diff
-@@ -1790,18 +1790,14 @@
+@@ -1742,18 +1742,14 @@
   	if (options->ip_qos_interactive == -1)
   		options->ip_qos_interactive = IPTOS_LOWDELAY;
   	if (options->ip_qos_bulk == -1)
--@@ -348,9 +396,10 @@ typedef enum {
-+@@ -348,6 +396,7 @@ typedef enum {
+-@@ -345,9 +393,10 @@
++@@ -345,6 +393,7 @@
   	sUsePrivilegeSeparation, sAllowAgentForwarding,
-  	sZeroKnowledgePasswordAuthentication, sHostCertificate,
+  	sHostCertificate,
   	sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile,
 -+	sTcpRcvBufPoll, sHPNDisabled, sHPNBufferSize,
 ++	sTcpRcvBufPoll, sHPNDisabled, sHPNBufferSize, sNoneEnabled,
@@ -21,6 +21,6 @@ make the hpn patch apply when the x509 patch has also been applied
 - } ServerOpCodes;
 - 
 + 	sAuthenticationMethods, sHostKeyAgent,
- @@ -476,6 +525,10 @@ static struct {
+ @@ -468,6 +517,10 @@
   	{ "revokedkeys", sRevokedKeys, SSHCFG_ALL },
   	{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
diff --git a/net-misc/openssh/openssh-6.6_p1.ebuild b/net-misc/openssh/openssh-6.6_p1-r1.ebuild
index 5e0e528b1496..445b5d0f932b 100644
--- a/net-misc/openssh/openssh-6.6_p1.ebuild
+++ b/net-misc/openssh/openssh-6.6_p1-r1.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.6_p1.ebuild,v 1.4 2014/03/20 18:17:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.6_p1-r1.ebuild,v 1.1 2014/03/20 20:42:44 polynomial-c Exp $
 
 EAPI="4"
 inherit eutils user flag-o-matic multilib autotools pam systemd versionator
@@ -9,17 +9,19 @@ inherit eutils user flag-o-matic multilib autotools pam systemd versionator
 # and _p? releases.
 PARCH=${P/_}
 
-HPN_PATCH="${PN}-6.6p1-hpnssh14v4.diff.gz"
+#HPN_PATCH="${PN}-6.6p1-hpnssh14v4.diff.gz"
+HPN_PATCH="${PN}-6.6p1-hpnssh14v4.diff.xz"
 LDAP_PATCH="${PN}-lpk-6.5p1-0.3.14.patch.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/"
 SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	${HPN_PATCH:+hpn? ( mirror://sourceforge/hpnssh/${HPN_PATCH} )}
+	${HPN_PATCH:+hpn? ( http://dev.gentoo.org/~polynomial-c/${HPN_PATCH} )}
 	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
 	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
 	"
+	#${HPN_PATCH:+hpn? ( mirror://sourceforge/hpnssh/${HPN_PATCH} )}
 
 LICENSE="BSD GPL-2"
 SLOT="0"