[gentoo-commits] gentoo-x86 commit in net-misc/openssh: openssh-5.8_p1.ebuild ChangeLog

["Robin H. Johnson (robbat2)" <robbat2@gentoo.org>]

robbat2     11/02/10 02:32:42

  Modified:             openssh-5.8_p1.ebuild ChangeLog
  Log:
  Also add AES-CTR fix to 5.8_p1 presently under stabilization. alpha/hppa/ppc64 are the only stable arches with the broken HPN version at present.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  net-misc/openssh/openssh-5.8_p1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/openssh-5.8_p1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/openssh-5.8_p1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/openssh-5.8_p1.ebuild?r1=1.4&r2=1.5

Index: openssh-5.8_p1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.8_p1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -p -w -b -B -u -u -r1.4 -r1.5
--- openssh-5.8_p1.ebuild	8 Feb 2011 21:39:12 -0000	1.4
+++ openssh-5.8_p1.ebuild	10 Feb 2011 02:32:42 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.8_p1.ebuild,v 1.4 2011/02/08 21:39:12 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.8_p1.ebuild,v 1.5 2011/02/10 02:32:42 robbat2 Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib autotools pam
@@ -97,6 +97,13 @@ src_prepare() {
 		# version.h patch conflict avoidence
 		mv version.h version.h.hpn
 		cp -f version.h.pristine version.h
+		# 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. Do NOT remove this in new versions.
+		sed -i \
+			-e '/aes...-ctr.*SSH_CIPHER_SSH2/s,evp_aes_ctr_mt,evp_aes_128_ctr,' \
+			cipher.c || die
 	fi
 
 	sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die



1.408                net-misc/openssh/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/ChangeLog?rev=1.408&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/ChangeLog?rev=1.408&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/ChangeLog?r1=1.407&r2=1.408

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v
retrieving revision 1.407
retrieving revision 1.408
diff -p -w -b -B -u -u -r1.407 -r1.408
--- ChangeLog	10 Feb 2011 02:30:27 -0000	1.407
+++ ChangeLog	10 Feb 2011 02:32:42 -0000	1.408
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.407 2011/02/10 02:30:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.408 2011/02/10 02:32:42 robbat2 Exp $
+
+  10 Feb 2011; Robin H. Johnson <robbat2@gentoo.org> openssh-5.8_p1.ebuild:
+  Also add AES-CTR fix to 5.8_p1 presently under stabilization.
+  alpha/hppa/ppc64 are the only stable arches with the broken HPN version at
+  present.
 
 *openssh-5.8_p1-r1 (10 Feb 2011)