massage hpn patch to apply with ldap and such #151305

Package-Manager: portage-2.1.2_pre2-r9

3 files changed, 24 insertions, 14 deletions

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index a215ab4efa53..83fba7a09e0e 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openssh-3.9_p1-chroot.patch 3026 RMD160 23b2a1c819580b0f2fcb927c13c63e4f16387333 SHA1 78f85bc81c0034e03d06dd3c7ab91b9210fc18fb SHA256 014158a32c707b2a79ac606aeefb6bc09f24c3f07ce5df353ddad96095518597
 MD5 c4edd6a7aa1418ce5bf74aeb46627dbf files/openssh-3.9_p1-chroot.patch 3026
 RMD160 23b2a1c819580b0f2fcb927c13c63e4f16387333 files/openssh-3.9_p1-chroot.patch 3026
@@ -170,7 +173,7 @@ DIST openssh-4.3p2+x509-5.5.diff.gz 136017 RMD160 21069550bbb05ea22870da853f68ee
 DIST openssh-4.3p2-hpn12-gentoo.patch.bz2 13642 RMD160 34fd5390d602a9ab99edb25756318cc0dd842360 SHA1 9110158ea6be921a936271eab00b45ea115b3567 SHA256 14d8ec5601bf1977f583a45353213a2dc4e8a453e3fc9c7a65499d0645cc9063
 DIST openssh-4.3p2.tar.gz 941455 RMD160 ccd5967e3296347e6dd2be43c3d6caacde2b6833 SHA1 2b5b0751fd578283ba7b106025c0ba391fd72f1f SHA256 4ba757d6c933e7d075b6424124d92d197eb5d91e4a58794596b67f5f0ca21d4f
 DIST openssh-4.4p1+x509-5.5.1.diff.gz 137417 RMD160 34cf39583e8c01bb055671a540c7463f45134960 SHA1 091e7499726fce527afeb66fffaf6ee48f4ac4bb SHA256 bb2936a0c5ffff2f5db41a7da83390a189dc4590f9a95325c252d81b9b693ded
-DIST openssh-4.4p1-hpn12v11.diff.gz 15786 RMD160 7f8c1def2bdd98f79cf26f1017a4ed19a627bf96 SHA1 d020aad90827bc4a61e5b5a77bd3e769ebb92387 SHA256 f42e6799de702281228691eadd5c983acadf81ceb31af82434607633c2cc4ada
+DIST openssh-4.4p1-hpn12v11-gentoo.patch.bz2 14675 RMD160 340aaed711bb58a39fe36ebbd47ba1f1e7e304c1 SHA1 f8fe308e338c186563cfce7aa7689a4c810ae6d5 SHA256 dfa55376bbd11f6688cc0f228f8dff1175ab985bf80267630bbe38f0c9be261d
 DIST openssh-4.4p1.tar.gz 1044334 RMD160 13eb79a54e95037fff1902b659319df1c5f79bbc SHA1 6a52b1dee1c2c9862923c0008d201d98a7fd9d6c SHA256 0252474af4009129cde6a2df2893fb1ac24316436758796f6adc043ac73b35ac
 DIST openssh-lpk-3.9p1-0.3.6.patch 60920 RMD160 0fdde5cf35e1fe59a428d330509f6964ff3402ed SHA1 cd0e8f4a9826e2883f5fc4cce41a761750657414 SHA256 f4732659ec8e222a8d80741a8e7975ffde089ab985fcad3c986d087732de7c33
 DIST openssh-lpk-4.0p1-0.3.6.patch 60557 RMD160 da57dcc8078c127abea0dc4017399cd5c3f8eee2 SHA1 f0fa0cfa6505b12da250a25115839210138defbc SHA256 61b244eb4c15db9c1a9b575be23afcbe6a30a248a2abbda0de18f0791842dbad
@@ -217,10 +220,10 @@ EBUILD openssh-4.3_p2-r5.ebuild 5957 RMD160 77b9c4c5c6aed23d5ab63596aa9fd76d40a2
 MD5 8b4bf9176c47593391f6a25cf40ee932 openssh-4.3_p2-r5.ebuild 5957
 RMD160 77b9c4c5c6aed23d5ab63596aa9fd76d40a2f65b openssh-4.3_p2-r5.ebuild 5957
 SHA256 beb5826bd7e1fc08ddfead5d5fa2114cf653fde315cc0264219373ea480e848c openssh-4.3_p2-r5.ebuild 5957
-EBUILD openssh-4.4_p1-r4.ebuild 5370 RMD160 38084f3c99eed96890bde772aa90bc2901e08265 SHA1 1e09a1e46e78d10297419c1a65c203b2eab1c036 SHA256 99b05731e432ee2fd1a7476afd9b7af21a670e7780aa56f51abd6d28dde9ddda
-MD5 f505b49dc0f3b35133698cf42367ece4 openssh-4.4_p1-r4.ebuild 5370
-RMD160 38084f3c99eed96890bde772aa90bc2901e08265 openssh-4.4_p1-r4.ebuild 5370
-SHA256 99b05731e432ee2fd1a7476afd9b7af21a670e7780aa56f51abd6d28dde9ddda openssh-4.4_p1-r4.ebuild 5370
+EBUILD openssh-4.4_p1-r4.ebuild 5408 RMD160 7ccf296edea7444f738bc7d7024ee19af43bd897 SHA1 0285c7b4666656adcb3b90b03c06d3ff5b483b20 SHA256 6004bee7c5cf853b2257a33b6df366f13e034079051221241a5f9c82d20663b8
+MD5 5400bdc44348a1a04f1734085893829b openssh-4.4_p1-r4.ebuild 5408
+RMD160 7ccf296edea7444f738bc7d7024ee19af43bd897 openssh-4.4_p1-r4.ebuild 5408
+SHA256 6004bee7c5cf853b2257a33b6df366f13e034079051221241a5f9c82d20663b8 openssh-4.4_p1-r4.ebuild 5408
 MISC ChangeLog 33556 RMD160 01574055a5844c559c2db5048f3ce4c7eb62b867 SHA1 b6a29b7d6120284ded2e3a17e54cf4113ad27f1b SHA256 d6ffaf95dd67f740db0708b01b08b7e225ccfb7ff8b834d3eee7aa64ae5d2ebf
 MD5 667026b50f34d71857c21c3642894b3f ChangeLog 33556
 RMD160 01574055a5844c559c2db5048f3ce4c7eb62b867 ChangeLog 33556
@@ -259,6 +262,13 @@ SHA256 a02a26ccb3fdf24c5b0a7196af3bb5273e61193f91fa383d479dc9e0e959630c files/di
 MD5 0d0254ed9210821ca64914bd75a158a0 files/digest-openssh-4.3_p2-r5 1343
 RMD160 956c689e98e6be7279d8cffab44e6182f20f6621 files/digest-openssh-4.3_p2-r5 1343
 SHA256 a02a26ccb3fdf24c5b0a7196af3bb5273e61193f91fa383d479dc9e0e959630c files/digest-openssh-4.3_p2-r5 1343
-MD5 056f45fb06ba68f12a5c3d17c358d11a files/digest-openssh-4.4_p1-r4 1054
-RMD160 b9c38e783576498b0a52efdd1d2a2fa1f7f1c5d8 files/digest-openssh-4.4_p1-r4 1054
-SHA256 9473c1a72dfbb64f75d675572c08d199d65c9a89af583d97217947cb09cb4135 files/digest-openssh-4.4_p1-r4 1054
+MD5 dfcb472e537d3fcb4a790e6b647de3a4 files/digest-openssh-4.4_p1-r4 1081
+RMD160 e8edb2a706a805fde3a17f52f85dd69243dbe65e files/digest-openssh-4.4_p1-r4 1081
+SHA256 278eef636448a10365ebbf07769be6801b8569738fe03748fb13731c0dc28f22 files/digest-openssh-4.4_p1-r4 1081
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFMTSCamhnQswr0vIRAgMyAJwICBaVIPiuM3/1/F7uHEzMb2QpAACaAk7p
+cSlwecKdqJ/+cAnO7agCndw=
+=Yd6G
+-----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/digest-openssh-4.4_p1-r4 b/net-misc/openssh/files/digest-openssh-4.4_p1-r4
index 951fce389440..a2f9e8f74e3b 100644
--- a/net-misc/openssh/files/digest-openssh-4.4_p1-r4
+++ b/net-misc/openssh/files/digest-openssh-4.4_p1-r4
@@ -1,9 +1,9 @@
 MD5 132f5ae282de4ff822a95591720da8fd openssh-4.4p1+x509-5.5.1.diff.gz 137417
 RMD160 34cf39583e8c01bb055671a540c7463f45134960 openssh-4.4p1+x509-5.5.1.diff.gz 137417
 SHA256 bb2936a0c5ffff2f5db41a7da83390a189dc4590f9a95325c252d81b9b693ded openssh-4.4p1+x509-5.5.1.diff.gz 137417
-MD5 ae271cb7f4e4ba8f6d34b9e289bd1123 openssh-4.4p1-hpn12v11.diff.gz 15786
-RMD160 7f8c1def2bdd98f79cf26f1017a4ed19a627bf96 openssh-4.4p1-hpn12v11.diff.gz 15786
-SHA256 f42e6799de702281228691eadd5c983acadf81ceb31af82434607633c2cc4ada openssh-4.4p1-hpn12v11.diff.gz 15786
+MD5 3a5545354e5c55eb1250b5be434032dd openssh-4.4p1-hpn12v11-gentoo.patch.bz2 14675
+RMD160 340aaed711bb58a39fe36ebbd47ba1f1e7e304c1 openssh-4.4p1-hpn12v11-gentoo.patch.bz2 14675
+SHA256 dfa55376bbd11f6688cc0f228f8dff1175ab985bf80267630bbe38f0c9be261d openssh-4.4p1-hpn12v11-gentoo.patch.bz2 14675
 MD5 793a709a8de695c22f523024d7e9bf07 openssh-4.4p1.tar.gz 1044334
 RMD160 13eb79a54e95037fff1902b659319df1c5f79bbc openssh-4.4p1.tar.gz 1044334
 SHA256 0252474af4009129cde6a2df2893fb1ac24316436758796f6adc043ac73b35ac openssh-4.4p1.tar.gz 1044334
diff --git a/net-misc/openssh/openssh-4.4_p1-r4.ebuild b/net-misc/openssh/openssh-4.4_p1-r4.ebuild
index fb58d71c9cb5..d6bee856dc61 100644
--- a/net-misc/openssh/openssh-4.4_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-4.4_p1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.4_p1-r4.ebuild,v 1.1 2006/10/13 22:41:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.4_p1-r4.ebuild,v 1.2 2006/10/14 19:03:21 vapier Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -14,14 +14,14 @@ PARCH=${P/_/}
 X509_PATCH="${PARCH}+x509-5.5.1.diff.gz"
 SECURID_PATCH="" #${PARCH}+SecurID_v1.3.2.patch"
 LDAP_PATCH="${PARCH/-4.4p1/-lpk-4.4p1}-0.3.7.patch"
-HPN_PATCH="${PARCH}-hpn12v11.diff.gz"
+HPN_PATCH="${PARCH}-hpn12v11-gentoo.patch.bz2"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="http://www.openssh.com/"
 SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 	X509? ( http://roumenpetrov.info/openssh/x509-5.5.1/${X509_PATCH} )
 	ldap? ( http://dev.inversepath.com/openssh-lpk/${LDAP_PATCH} )
-	hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )"
+	hpn? ( mirror://gentoo/${HPN_PATCH} http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )"
 #	smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )
 
 LICENSE="as-is"