| 1 |
robbat2 09/05/18 06:29:48 |
| 2 |
|
| 3 |
Modified: ChangeLog openssh-5.2_p1-r2.ebuild |
| 4 |
Log: |
| 5 |
New release of the HPN patch that makes it mostly usable now. The multithreaded AES-CTR portion is disabled to avoid hangs however. |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.351 net-misc/openssh/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/ChangeLog?rev=1.351&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/ChangeLog?rev=1.351&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/ChangeLog?r1=1.350&r2=1.351 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v |
| 18 |
retrieving revision 1.350 |
| 19 |
retrieving revision 1.351 |
| 20 |
diff -p -w -b -B -u -u -r1.350 -r1.351 |
| 21 |
--- ChangeLog 20 Apr 2009 05:32:10 -0000 1.350 |
| 22 |
+++ ChangeLog 18 May 2009 06:29:48 -0000 1.351 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for net-misc/openssh |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.350 2009/04/20 05:32:10 vapier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.351 2009/05/18 06:29:48 robbat2 Exp $ |
| 28 |
+ |
| 29 |
+ 18 May 2009; Robin H. Johnson <robbat2@g.o> |
| 30 |
+ openssh-5.2_p1-r2.ebuild: |
| 31 |
+ New release of the HPN patch that makes it mostly usable now. The |
| 32 |
+ multithreaded AES-CTR portion is disabled to avoid hangs however. |
| 33 |
|
| 34 |
20 Apr 2009; Mike Frysinger <vapier@g.o> openssh-5.2_p1-r2.ebuild: |
| 35 |
Skip pkcs11/kerberos support when USE=static by Alon Bar-Lev #266404 by |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.9 net-misc/openssh/openssh-5.2_p1-r2.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild?rev=1.9&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild?rev=1.9&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild?r1=1.8&r2=1.9 |
| 44 |
|
| 45 |
Index: openssh-5.2_p1-r2.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild,v |
| 48 |
retrieving revision 1.8 |
| 49 |
retrieving revision 1.9 |
| 50 |
diff -p -w -b -B -u -u -r1.8 -r1.9 |
| 51 |
--- openssh-5.2_p1-r2.ebuild 20 Apr 2009 05:32:10 -0000 1.8 |
| 52 |
+++ openssh-5.2_p1-r2.ebuild 18 May 2009 06:29:48 -0000 1.9 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2009 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $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 $ |
| 57 |
+# $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 $ |
| 58 |
|
| 59 |
inherit eutils flag-o-matic multilib autotools pam |
| 60 |
|
| 61 |
@@ -8,21 +8,21 @@ inherit eutils flag-o-matic multilib aut |
| 62 |
# and _p? releases. |
| 63 |
PARCH=${P/_/} |
| 64 |
|
| 65 |
-#HPN_PATCH="${PARCH/2/1}-hpn13v5.diff.gz" |
| 66 |
-HPN_PATCH="${PARCH}-hpn13v5-gentoo.diff.gz" # Unofficial Gentoo port of original patch |
| 67 |
+HPN_PATCH="${PARCH}-hpn13v6.diff.gz" |
| 68 |
LDAP_PATCH="${PARCH/openssh/openssh-lpk}-0.3.11.patch.gz" |
| 69 |
PKCS11_PATCH="${PARCH/p1}pkcs11-0.26.tar.bz2" |
| 70 |
X509_VER="6.2" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" |
| 71 |
|
| 72 |
DESCRIPTION="Port of OpenBSD's free SSH release" |
| 73 |
HOMEPAGE="http://www.openssh.org/" |
| 74 |
+# HPN appears twice as sometimes Gentoo has a custom version of it. |
| 75 |
SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz |
| 76 |
http://www.sxw.org.uk/computing/patches/openssh-5.0p1-gsskex-20080404.patch |
| 77 |
${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )} |
| 78 |
+ ${HPN_PATCH:+hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )} |
| 79 |
${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )} |
| 80 |
${PKCS11_PATCH:+pkcs11? ( http://alon.barlev.googlepages.com/${PKCS11_PATCH} )} |
| 81 |
${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}" |
| 82 |
-# ${HPN_PATCH:+hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )} |
| 83 |
|
| 84 |
LICENSE="as-is" |
| 85 |
SLOT="0" |
| 86 |
@@ -103,6 +103,14 @@ src_unpack() { |
| 87 |
[[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH} |
| 88 |
epatch "${FILESDIR}"/${PN}-4.7p1-selinux.diff #191665 |
| 89 |
|
| 90 |
+ # in 5.2p1, the AES-CTR multithreaded variant is temporarily broken, and |
| 91 |
+ # causes random hangs when combined with the -f switch of ssh. |
| 92 |
+ # To avoid this, we change the internal table to use the non-multithread |
| 93 |
+ # version for the meantime. |
| 94 |
+ sed -i \ |
| 95 |
+ -e '/aes...-ctr.*SSH_CIPHER_SSH2/s,evp_aes_ctr_mt,evp_aes_128_ctr,' \ |
| 96 |
+ cipher.c || die |
| 97 |
+ |
| 98 |
sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die |
| 99 |
|
| 100 |
# Disable PATH reset, trust what portage gives us. bug 254615 |
Archives