diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2011-02-10 02:32:42 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2011-02-10 02:32:42 +0000 |
| commit | 425b70f7431ce63beddaa364fed6bcbffdada531 (patch) | |
| tree | 90d24e0b0dfcf651f0886b475983d52e026c6833 /net-misc | |
| parent | Bug #354113: AES-CTR workaround was dropped from 5.7 and 5.8 when it is still... (diff) | |
| download | historical-425b70f7431ce63beddaa364fed6bcbffdada531.tar.gz historical-425b70f7431ce63beddaa364fed6bcbffdada531.tar.bz2 historical-425b70f7431ce63beddaa364fed6bcbffdada531.zip | |
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.
Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/openssh/Manifest | 4 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-5.8_p1.ebuild | 9 |
3 files changed, 16 insertions, 4 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 8eccc4620a57..b2d0da300386 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -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) diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 79c248c3dccc..a591cabf3a12 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -34,6 +34,6 @@ EBUILD openssh-5.5_p1-r2.ebuild 8180 RMD160 e2bcad59293157b59d2b92fbb841fd8c4e2e EBUILD openssh-5.6_p1-r2.ebuild 7962 RMD160 e8c3f7abd744ab2002078b0b94d1b9d2ab89148e SHA1 f1214a171e3ee5d7f19cf8392a469c0958b44fd2 SHA256 7edfebdd8a012778448a86b4903fc4ca773a485a4d7623aa9b92e26dfb767eed EBUILD openssh-5.7_p1-r1.ebuild 7812 RMD160 23fd5722804982568ab00f7b854c011922fbccac SHA1 b1707a680317cc6c38810682fc4691b7fbbadeaf SHA256 b99f981d423755aa974b389c056c2f79375ed63b77d9c00dd25981cd229b93dc EBUILD openssh-5.8_p1-r1.ebuild 7792 RMD160 9fda7a198b3380ad563a6a4923bf5df48858419a SHA1 d86b45cbd3598db330e3a22f0f85ac703aeff4c5 SHA256 71d06bb7a9cc4bb2ae214314ad4c6f953a56def9db26a3dd46326aa0d69d821d -EBUILD openssh-5.8_p1.ebuild 7415 RMD160 f27705b03cdbba58fd99867368ac80cd5220ae91 SHA1 30ed380d585890f1122ce47a8d09b11f387197ff SHA256 714c26a0f5783741df23621641441c748ce1544ef4f50363887552cc4dd16097 -MISC ChangeLog 63780 RMD160 0aa6054da2058d0630212330a9e0b3ffca99a743 SHA1 ad208e45f24fa21b178e9f707b8928b1f0cacbd9 SHA256 5ca3f195b9743dff97ae6ae670691f3ad758698e88e8472a30ecd67b6a8cf74a +EBUILD openssh-5.8_p1.ebuild 7786 RMD160 cbcbc8930045986fb7b449cb9641ecf0c0ad724e SHA1 1d457b48b37844afb698daa7b873ca95480a0177 SHA256 b9f79f57d3b15c3a3a1425ea3c312ca18d432183dd266815d4173c128390bbac +MISC ChangeLog 64009 RMD160 edd8dc5272e074054e58b6ecb2ce73e54d311a5c SHA1 3be7ba7e6cc6dc7321cf5e75c45983dfea64ac4b SHA256 18be8179de18e6a70456972c08484f246772382a9053320aaa81f94dbda4dbed MISC metadata.xml 1599 RMD160 31fdd1531a4111aa437882680029451b29ddf4aa SHA1 af53a6887ebf563150184ab40b4cc018ab4e4d3f SHA256 fddc51b98b6831f5bc0f1f5fdeb78c064f9c40fc5c9a9f31ec816890e6aade86 diff --git a/net-misc/openssh/openssh-5.8_p1.ebuild b/net-misc/openssh/openssh-5.8_p1.ebuild index d9b7cf29eae2..7b83cc149d2f 100644 --- a/net-misc/openssh/openssh-5.8_p1.ebuild +++ b/net-misc/openssh/openssh-5.8_p1.ebuild @@ -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 |