New release of the HPN patch that makes it mostly usable now. The multithreaded AES-CTR portion is disabled to avoid hangs however.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

2 files changed, 18 insertions, 5 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 3ccbf0a9fa6d..783a8103907b 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.350 2009/04/20 05:32:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.351 2009/05/18 06:29:48 robbat2 Exp $
+
+  18 May 2009; Robin H. Johnson <robbat2@gentoo.org>
+  openssh-5.2_p1-r2.ebuild:
+  New release of the HPN patch that makes it mostly usable now. The
+  multithreaded AES-CTR portion is disabled to avoid hangs however.
 
   20 Apr 2009; Mike Frysinger <vapier@gentoo.org> openssh-5.2_p1-r2.ebuild:
   Skip pkcs11/kerberos support when USE=static by Alon Bar-Lev #266404 by
diff --git a/net-misc/openssh/openssh-5.2_p1-r2.ebuild b/net-misc/openssh/openssh-5.2_p1-r2.ebuild
index 75ec9d6b10dd..311058173082 100644
--- a/net-misc/openssh/openssh-5.2_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-5.2_p1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild,v 1.8 2009/04/20 05:32:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild,v 1.9 2009/05/18 06:29:48 robbat2 Exp $
 
 inherit eutils flag-o-matic multilib autotools pam
 
@@ -8,21 +8,21 @@ inherit eutils flag-o-matic multilib autotools pam
 # and _p? releases.
 PARCH=${P/_/}
 
-#HPN_PATCH="${PARCH/2/1}-hpn13v5.diff.gz"
-HPN_PATCH="${PARCH}-hpn13v5-gentoo.diff.gz" # Unofficial Gentoo port of original patch
+HPN_PATCH="${PARCH}-hpn13v6.diff.gz"
 LDAP_PATCH="${PARCH/openssh/openssh-lpk}-0.3.11.patch.gz"
 PKCS11_PATCH="${PARCH/p1}pkcs11-0.26.tar.bz2"
 X509_VER="6.2" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="http://www.openssh.org/"
+# HPN appears twice as sometimes Gentoo has a custom version of it.
 SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 	http://www.sxw.org.uk/computing/patches/openssh-5.0p1-gsskex-20080404.patch
 	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
+	${HPN_PATCH:+hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )}
 	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
 	${PKCS11_PATCH:+pkcs11? ( http://alon.barlev.googlepages.com/${PKCS11_PATCH} )}
 	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}"
-#	${HPN_PATCH:+hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )}
 
 LICENSE="as-is"
 SLOT="0"
@@ -103,6 +103,14 @@ src_unpack() {
 	[[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH}
 	epatch "${FILESDIR}"/${PN}-4.7p1-selinux.diff #191665
 
+	# in 5.2p1, the AES-CTR multithreaded variant is temporarily broken, and
+	# causes random hangs when combined with the -f switch of ssh.
+	# To avoid this, we change the internal table to use the non-multithread
+	# version for the meantime.
+	sed -i \
+		-e '/aes...-ctr.*SSH_CIPHER_SSH2/s,evp_aes_ctr_mt,evp_aes_128_ctr,' \
+		cipher.c || die
+
 	sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die
 
 	# Disable PATH reset, trust what portage gives us. bug 254615