Add support for the High Performance patch #96717 by Frank Benkstein.

(Portage version: 2.0.51.22-r1)

7 files changed, 26 insertions, 9 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index fe62ca42f229..e78f58283a30 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.123 2005/05/29 22:29:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.124 2005/06/26 07:54:20 vapier Exp $
+
+  26 Jun 2005; Mike Frysinger <vapier@gentoo.org> openssh-3.9_p1-r2.ebuild,
+  openssh-4.0_p1-r1.ebuild, openssh-4.1_p1.ebuild:
+  Add support for the High Performance patch #96717 by Frank Benkstein.
 
   29 May 2005; Mike Frysinger <vapier@gentoo.org> openssh-4.0_p1-r1.ebuild,
   openssh-4.1_p1.ebuild:
diff --git a/net-misc/openssh/files/digest-openssh-3.9_p1-r2 b/net-misc/openssh/files/digest-openssh-3.9_p1-r2
index fb43f8fc4a91..9f7213b5b5f5 100644
--- a/net-misc/openssh/files/digest-openssh-3.9_p1-r2
+++ b/net-misc/openssh/files/digest-openssh-3.9_p1-r2
@@ -1,3 +1,4 @@
 MD5 8e1774d0b52aff08f817f3987442a16e openssh-3.9p1.tar.gz 854027
 MD5 e1be73c425cc6893df83ced51ee1df10 openssh-lpk-3.9p1-0.3.4.patch 44563
 MD5 eedb263c96a1d7bf208eb2ba70c2e238 openssh-3.9p1+x509h.diff.gz 98011
+MD5 b91d73e58e2b72aecb3025ee550411fb openssh-3.9p1-hpn11.diff 13237
diff --git a/net-misc/openssh/files/digest-openssh-4.0_p1-r1 b/net-misc/openssh/files/digest-openssh-4.0_p1-r1
index 9b11ec5a3683..6c71ca134618 100644
--- a/net-misc/openssh/files/digest-openssh-4.0_p1-r1
+++ b/net-misc/openssh/files/digest-openssh-4.0_p1-r1
@@ -1,4 +1,5 @@
 MD5 7b36f28fc16e1b7f4ba3c1dca191ac92 openssh-4.0p1.tar.gz 889880
 MD5 576d620efda55ded77c973de54803246 openssh-lpk-4.0p1-0.3.4.patch 44122
 MD5 a47391f0b77ad10264950c56363d4317 openssh-4.0p1+x509-5.1.diff.gz 117420
+MD5 997c4f320c171d7dce1e00fba481ccf2 openssh-4.0p1-hpn11.diff 14225
 MD5 79f5648305c8b8a1bc1414e8f6c6134c openssh-4.0p1+SecurID_v1.3.1.patch 610662
diff --git a/net-misc/openssh/files/digest-openssh-4.1_p1 b/net-misc/openssh/files/digest-openssh-4.1_p1
index 4106d4a7dba2..65e6798d4cc1 100644
--- a/net-misc/openssh/files/digest-openssh-4.1_p1
+++ b/net-misc/openssh/files/digest-openssh-4.1_p1
@@ -1,3 +1,4 @@
 MD5 959c663e709c981f07a3315bfd64f3d0 openssh-4.1p1.tar.gz 894234
 MD5 576d620efda55ded77c973de54803246 openssh-lpk-4.0p1-0.3.4.patch 44122
 MD5 8d4ef926ec329c8ae551fd0133ba91e6 openssh-4.1p1+x509-5.1.diff.gz 117293
+MD5 7a9abefaf7078da86ac2e70bf154127f openssh-4.1p1-hpn11.diff 14223
diff --git a/net-misc/openssh/openssh-3.9_p1-r2.ebuild b/net-misc/openssh/openssh-3.9_p1-r2.ebuild
index 4cc774343555..0168c6edcd84 100644
--- a/net-misc/openssh/openssh-3.9_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-3.9_p1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1-r2.ebuild,v 1.8 2005/05/31 03:23:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1-r2.ebuild,v 1.9 2005/06/26 07:54:20 vapier Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -12,17 +12,19 @@ SFTPLOG_PATCH_VER="1.2"
 X509_PATCH="${PARCH}+x509h.diff.gz"
 SELINUX_PATCH="openssh-3.9_p1-selinux.diff"
 LDAP_PATCH="${PARCH/-/-lpk-}-0.3.4.patch"
+HPN_PATCH="${PARCH}-hpn11.diff"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="http://www.openssh.com/"
 SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 	ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} )
-	X509? ( http://roumenpetrov.info/openssh/x509h/${X509_PATCH} )"
+	X509? ( http://roumenpetrov.info/openssh/x509h/${X509_PATCH} )
+	hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard nocxx sftplogging"
+IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard nocxx sftplogging hpn"
 
 RDEPEND="pam? ( >=sys-libs/pam-0.73 >=sys-apps/shadow-4.0.2-r2 )
 	kerberos? ( virtual/krb5 )
@@ -67,6 +69,7 @@ src_unpack() {
 			epatch ${DISTDIR}/${LDAP_PATCH}
 		fi
 	fi
+	use hpn && epatch ${DISTDIR}/${HPN_PATCH}
 
 	autoconf || die "autoconf failed"
 }
diff --git a/net-misc/openssh/openssh-4.0_p1-r1.ebuild b/net-misc/openssh/openssh-4.0_p1-r1.ebuild
index 89db9553df88..68c577fce03a 100644
--- a/net-misc/openssh/openssh-4.0_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-4.0_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.0_p1-r1.ebuild,v 1.10 2005/05/31 03:23:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.0_p1-r1.ebuild,v 1.11 2005/06/26 07:54:20 vapier Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -13,18 +13,21 @@ X509_PATCH="${PARCH}+x509-5.1.diff.gz"
 SELINUX_PATCH="openssh-3.9_p1-selinux.diff"
 SECURID_PATCH="${PARCH}+SecurID_v1.3.1.patch"
 LDAP_PATCH="${PARCH/-/-lpk-}-0.3.4.patch"
+HPN_PATCH="${PARCH}-hpn11.diff"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="http://www.openssh.com/"
 SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 	ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} )
 	X509? ( http://roumenpetrov.info/openssh/x509-5.1/${X509_PATCH} )
+	hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )
 	smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )"
 
+
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard nocxx sftplogging libedit"
+IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard nocxx sftplogging hpn libedit"
 
 RDEPEND="pam? ( virtual/pam )
 	kerberos? ( virtual/krb5 )
@@ -69,6 +72,7 @@ src_unpack() {
 	elif use smartcard || use ldap ; then
 		ewarn "Sorry, x509 and smartcard/ldap don't get along"
 	fi
+	use hpn && epatch ${DISTDIR}/${HPN_PATCH}
 
 	sed -i '/LD.*ssh-keysign/s:$: -Wl,-z,now:' Makefile.in || die "setuid"
 
diff --git a/net-misc/openssh/openssh-4.1_p1.ebuild b/net-misc/openssh/openssh-4.1_p1.ebuild
index 7b7679e8d01a..fd7d2cda07fa 100644
--- a/net-misc/openssh/openssh-4.1_p1.ebuild
+++ b/net-misc/openssh/openssh-4.1_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.1_p1.ebuild,v 1.4 2005/05/31 03:23:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.1_p1.ebuild,v 1.5 2005/06/26 07:54:20 vapier Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -13,18 +13,20 @@ X509_PATCH="${PARCH}+x509-5.1.diff.gz"
 SELINUX_PATCH="openssh-3.9_p1-selinux.diff"
 SECURID_PATCH="" #${PARCH}+SecurID_v1.3.1.patch
 LDAP_PATCH="openssh-lpk-4.0p1-0.3.4.patch" #${PARCH/-/-lpk-}-0.3.4.patch
+HPN_PATCH="${PARCH}-hpn11.diff"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="http://www.openssh.com/"
 SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 	ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} )
-	X509? ( http://roumenpetrov.info/openssh/x509-5.1/${X509_PATCH} )"
+	X509? ( http://roumenpetrov.info/openssh/x509-5.1/${X509_PATCH} )
+	hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )"
 #	smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard nocxx sftplogging libedit"
+IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard nocxx sftplogging hpn libedit"
 
 RDEPEND="pam? ( virtual/pam )
 	kerberos? ( virtual/krb5 )
@@ -70,6 +72,7 @@ src_unpack() {
 	elif use smartcard || use ldap ; then
 		ewarn "Sorry, x509 and smartcard/ldap don't get along"
 	fi
+	use hpn && epatch ${DISTDIR}/${HPN_PATCH}
 
 	sed -i '/LD.*ssh-keysign/s:$: -Wl,-z,now:' Makefile.in || die "setuid"