restored ldap patch

(Portage version: 2.0.54)

8 files changed, 26 insertions, 163 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index e118c3f83123..9fae037e4038 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.158 2006/03/05 00:20:01 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.159 2006/03/05 14:54:55 lcars Exp $
+
+  05 Mar 2006; Andrea Barisani <lcars@gentoo.org> openssh-4.3_p1.ebuild,
+  openssh-4.3_p2.ebuild, openssh-4.3_p2-r1.ebuild:
+  Restored ldap support in 4.3 versions.
 
 *openssh-4.3_p2-r1 (05 Mar 2006)
 
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 75791cddc4eb..2ca19b420aca 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,142 +1,44 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 195a5e8a40f460d744bfc6c78eee7b52 ChangeLog 25950
-RMD160 afef862c2a0aed670b87a1fdff93d862fd5fff9f ChangeLog 25950
-SHA256 593003c3ea0f25cd547811364f9226712c6ecfe54432298260416e722aff150c ChangeLog 25950
 MD5 239a562c31f4486b3665948b60831839 files/digest-openssh-3.9_p1-r3 835
-RMD160 4caa67826d1847f62d6899f70be04ccb1234a260 files/digest-openssh-3.9_p1-r3 835
-SHA256 cff18a611c7cacebde002a7b0fea2f2e7e267566bcf456d4ed24da6693003848 files/digest-openssh-3.9_p1-r3 835
 MD5 c92c33beb73a2d008cb3744ebd7e4f88 files/digest-openssh-4.0_p1-r2 360
-RMD160 7e7eb70da6f2f60339a1b0c2057dc96e619eb6af files/digest-openssh-4.0_p1-r2 360
-SHA256 9e4b3809079f00669bacfc5008b2a4b202cceb109f8637289341a6f8c1a1eb38 files/digest-openssh-4.0_p1-r2 360
 MD5 9da4e1a777f8baaa5caffb5084a68ed4 files/digest-openssh-4.1_p1-r1 360
-RMD160 a3054e3e2288050a7cbbfbd8ef5c89d46acfc646 files/digest-openssh-4.1_p1-r1 360
-SHA256 e41a62b5c48fd3b561dc03f2e4d0ef782ec2f70d3eaa71866292ec7f4fac3070 files/digest-openssh-4.1_p1-r1 360
 MD5 2c543bcea78a9b958429a3d5b64729e5 files/digest-openssh-4.2_p1 1310
-RMD160 b1518ca5306f376c35ffff7c9ade799ba32e83be files/digest-openssh-4.2_p1 1310
-SHA256 0f2f32fc675c159248a12086122b8c04d4ca3925b1ea1c88442573b968a5a434 files/digest-openssh-4.2_p1 1310
 MD5 594aa58909853e6c3f0be598f8928ae5 files/digest-openssh-4.2_p1-r1 360
-RMD160 e3ff0fde2596b692959dcefb62650d60aa8266e6 files/digest-openssh-4.2_p1-r1 360
-SHA256 627d1524ba20e4714611168bb567b29afd621e7b1fe7c8b4f2f29ad73adef6dc files/digest-openssh-4.2_p1-r1 360
-MD5 d5790cd27e71adf24c06f1003712668a files/digest-openssh-4.3_p1 762
-RMD160 87f65cf548ff83baf53983c678327af07f8d58d7 files/digest-openssh-4.3_p1 762
-SHA256 6d29cb665247fb9bfd35bb4d6dd092433f5c38d7ad0adb5ab60ff2666246ea88 files/digest-openssh-4.3_p1 762
-MD5 ae5453ce00228584c7f60002ee0b2c4d files/digest-openssh-4.3_p2 1042
-RMD160 3e3baeaf0792353265c3e8d2c5414815cb2c3e7a files/digest-openssh-4.3_p2 1042
-SHA256 74fac47e5281569f157448d2c60ee1b8be7732392c080d87db6b225a33e57b21 files/digest-openssh-4.3_p2 1042
-MD5 ae5453ce00228584c7f60002ee0b2c4d files/digest-openssh-4.3_p2-r1 1042
-RMD160 3e3baeaf0792353265c3e8d2c5414815cb2c3e7a files/digest-openssh-4.3_p2-r1 1042
-SHA256 74fac47e5281569f157448d2c60ee1b8be7732392c080d87db6b225a33e57b21 files/digest-openssh-4.3_p2-r1 1042
+MD5 4dc2c4e3aea10bc17bee5eacdc1009a8 files/digest-openssh-4.3_p1 281
+MD5 d8bcee45204677e9c9180e209a021067 files/digest-openssh-4.3_p2 359
+MD5 d8bcee45204677e9c9180e209a021067 files/digest-openssh-4.3_p2-r1 359
 MD5 87593c73e26e1a3825fcb51f2270b694 files/openssh-3.9_p1-chroot.patch 3027
-RMD160 bdbdcadc59c1eda5cb516f8a601d1c8912b36ebb files/openssh-3.9_p1-chroot.patch 3027
-SHA256 14653a7eb8d0458f5a74baa4bbc6ba026d141432af745c5d52f3728328badc04 files/openssh-3.9_p1-chroot.patch 3027
 MD5 7937a17eb31fc6139ef42fa04521de27 files/openssh-3.9_p1-configure-openct.patch 995
-RMD160 311073097835d8fdd4b2127df6c6d9a8e063272c files/openssh-3.9_p1-configure-openct.patch 995
-SHA256 663a0d7978861bed2ba41cbbd9c5344e5d898623cd5adcb699d1c5fca06b6b34 files/openssh-3.9_p1-configure-openct.patch 995
 MD5 5c73d0ef570e6326839011abc8045626 files/openssh-3.9_p1-fix_suid-x509.patch 579
-RMD160 735b48130cbad119c8fe45cb1eaeff4242c190c8 files/openssh-3.9_p1-fix_suid-x509.patch 579
-SHA256 eb04cd466b69f0320476c181759ec5172772022b295b080d072fb15694417b00 files/openssh-3.9_p1-fix_suid-x509.patch 579
 MD5 86dbc28431f831a22b51c2ae8637a611 files/openssh-3.9_p1-fix_suid.patch 492
-RMD160 d87a1d376f99b129f745f077cdf8824ba0e3e4b0 files/openssh-3.9_p1-fix_suid.patch 492
-SHA256 6366f9fb4702833f148b931f9d8ed91bb0685b8ee5d2742bfe3e89db45ecb42c files/openssh-3.9_p1-fix_suid.patch 492
 MD5 ba87dbfc3be0ab9d70fe24278d9deb02 files/openssh-3.9_p1-infoleak.patch 2496
-RMD160 a62ef20bc9c54d55ae9e27b42d6c8081fb2b2a1b files/openssh-3.9_p1-infoleak.patch 2496
-SHA256 0618ee562152cb097d58c97a9474ab43a658bcf285a9708f9bd1727767c1a5bf files/openssh-3.9_p1-infoleak.patch 2496
 MD5 c326cd447fb5f86124295ef943d3bf35 files/openssh-3.9_p1-kerberos-detection.patch 593
-RMD160 fccc8d29b397ec3347a13fcd6ab223bf652c820a files/openssh-3.9_p1-kerberos-detection.patch 593
-SHA256 b44d4d6d65f91a6d0f3ff8bf644dbce7bb54b47c8adb99eb542fc8bf63bfbeb9 files/openssh-3.9_p1-kerberos-detection.patch 593
 MD5 e072ca9db3ff5a7616b04f055c976d35 files/openssh-3.9_p1-opensc.patch 3164
-RMD160 e3a17a0823e1c0767d72d8131a8d719a7ed7c444 files/openssh-3.9_p1-opensc.patch 3164
-SHA256 b2619bf9c7589e69e126750a8ab6e6f19ef2f51842d53cda199245464e7afe10 files/openssh-3.9_p1-opensc.patch 3164
 MD5 6ff556bce509be91ea2b0317bbbe6c8d files/openssh-3.9_p1-pamfix.patch 2421
-RMD160 716f31a1ac18eaf0c899550450a03389ec225929 files/openssh-3.9_p1-pamfix.patch 2421
-SHA256 f04926c0a31f899ce80e7c61038a582a4c4d114147091653a8ba16212a21fc6d files/openssh-3.9_p1-pamfix.patch 2421
 MD5 87a36ab7287f844cf5cf5998be90d08e files/openssh-3.9_p1-selinux.diff 2844
-RMD160 7d40faf638877f48cbeb9804a14b0090d6ae7891 files/openssh-3.9_p1-selinux.diff 2844
-SHA256 41db21c0d3804bbcefb731efe92a15f52a4a3bdf30e640255bb5f4a1a5a20525 files/openssh-3.9_p1-selinux.diff 2844
 MD5 1cb38b00876090a79d11989acb60522c files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch.bz2 5775
-RMD160 cc96abe954d9e76e39cfcee87c13ce57e221cc98 files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch.bz2 5775
-SHA256 2a80ec6d5b0e27d5997976efa98d84a93859429027404a2eb32b898b2a9d6ad7 files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch.bz2 5775
 MD5 a31d6c7233744b4333a2ea12d85a29c7 files/openssh-3.9_p1-skey.patch 254
-RMD160 8e98d26d75bba3c6e35fb6e2e9503918bfd25103 files/openssh-3.9_p1-skey.patch 254
-SHA256 422e5c8c42b123120e428f8673e72c91fbe01914c8b005020d2144e79c4ada96 files/openssh-3.9_p1-skey.patch 254
 MD5 6e6d18f8f0988cfd5233f475d5c36f0d files/openssh-3.9_p1-terminal_restore.patch 404
-RMD160 476d865f3fb9eb6a89f48745ef96526209cb9d4e files/openssh-3.9_p1-terminal_restore.patch 404
-SHA256 6912c298215057eb301ad1b31b2e3d2c83d23aa131fa54ec55a2f078fe7589a7 files/openssh-3.9_p1-terminal_restore.patch 404
 MD5 d235f6e0c273e8a968b6759b12a8fd11 files/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2 5770
-RMD160 4b317fa8c10f58ea506b9c0159d5216a71a8eaf1 files/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2 5770
-SHA256 07f684954f8d53c547e125861a4a2ccbbffd8fdeb0bc18d310a3274b06cb99a4 files/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2 5770
 MD5 4bee5c8ce11f30487154c3742e004f7d files/openssh-4.0_p1-smartcard-ldap-happy.patch 545
-RMD160 2287950de3385bdffaf6af8eec8b355358891ef1 files/openssh-4.0_p1-smartcard-ldap-happy.patch 545
-SHA256 c6a6f82dd9d5fe34310e2a2bd82558809d28b29cad6e8f0b4a1c3f232ded67be files/openssh-4.0_p1-smartcard-ldap-happy.patch 545
 MD5 4044a10674964d7c34cad8a45cd2264d files/openssh-4.2_p1-CVE-2006-0225.patch 8962
-RMD160 a5c56985d97b32e4624693b27a884c32f0f9de77 files/openssh-4.2_p1-CVE-2006-0225.patch 8962
-SHA256 f11e9d62cb6b33ad38258f4d82446f101b5f4a9ce21b56a4d71377b7850a8734 files/openssh-4.2_p1-CVE-2006-0225.patch 8962
 MD5 8155bbbeb16c552ccb793f05904074b5 files/openssh-4.2_p1-cross-compile.patch 1028
-RMD160 cee147bcb5792d0cc16c6c9c9096b73e4dbcb07d files/openssh-4.2_p1-cross-compile.patch 1028
-SHA256 dc3e7c74189ffa921cb64767e9876e4a7477c15103a4454cd7ddb68edad7943d files/openssh-4.2_p1-cross-compile.patch 1028
 MD5 21a3d3ba5d33cb010404c562ef1078b1 files/openssh-4.2_p1-kerberos-detection.patch 359
-RMD160 70efd444ce542f931121ccd7d776e3c14aa3ffc8 files/openssh-4.2_p1-kerberos-detection.patch 359
-SHA256 12e8d230bf4743ed2f11f84151235a3f4756dae08dfcdc2ca7be43f616c4381e files/openssh-4.2_p1-kerberos-detection.patch 359
 MD5 551a19fc1be4d7792633865816bc9426 files/openssh-4.2_p1-selinux.patch 2355
-RMD160 355bc9b563ef812184abf0ab586a4e5f47ce4b64 files/openssh-4.2_p1-selinux.patch 2355
-SHA256 6cda5262746d8433a71a5f858baf9ae42662d429d03959d0c7e5d187c676f417 files/openssh-4.2_p1-selinux.patch 2355
 MD5 9cf3a0fb4e8709dde06bd4a3c61eeaff files/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 5718
-RMD160 da03df4ed3fb19c244efbc06474cd4e0dc20b20f files/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 5718
-SHA256 0be50a8ee5e7d2faf4961cc7eae96b22557e1b8e6b39f9da7d74b6c2c13fbc3b files/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 5718
 MD5 50f8706c29e6d5c509c64cfba22a78b1 files/openssh-4.3_p1-krb5-typos.patch 301
-RMD160 3b1a82e230c870269f9aa25cd73e9c5be03db3f6 files/openssh-4.3_p1-krb5-typos.patch 301
-SHA256 98310c487625b5dbd86f4a2c1acd00c223911b6a7e505455bc4196063fa38b9c files/openssh-4.3_p1-krb5-typos.patch 301
 MD5 09e5245f22949581185b0bf197066b09 files/openssh-4.3_p2-selinux.patch 12576
-RMD160 7b69b64260951761a28b1278e25a0c248a73157f files/openssh-4.3_p2-selinux.patch 12576
-SHA256 be219ea2d309b851d14dcfc4d402adb1a7d01648218d46c865038eaa84398b27 files/openssh-4.3_p2-selinux.patch 12576
 MD5 eca7ba0b23754a710b42a79c1fb5e248 files/openssh-securid-1.3.1-updates.patch 445
-RMD160 b1db3dfa75f7e03d0dff41e85e285f8b749f27f0 files/openssh-securid-1.3.1-updates.patch 445
-SHA256 11c95cc508d20c8eb1e8faa0d2b5e68346cbb93db8fb560cfa8b4d2c0d1104b3 files/openssh-securid-1.3.1-updates.patch 445
 MD5 f63b0b7359fba745965a6d302a33762c files/sshd.confd 223
-RMD160 8705077fa2f09d42db286008cda2a65becc1a307 files/sshd.confd 223
-SHA256 b855256383de617696445f39f39cb96a579a3311d93acbf9d37437dc0bf14efb files/sshd.confd 223
 MD5 b86ae0c43a704c4ee2abd2ce5c955f8f files/sshd.pam 294
-RMD160 1d4499a7de54188e51e87a240ec7a1b3b1af583d files/sshd.pam 294
-SHA256 f01cc51c624b21a815fb6c0be35edc590e2e6f8a5ffbdcabc220a9630517972f files/sshd.pam 294
 MD5 2b66f75047edfac5d5e6cdbffa35383e files/sshd.pam_include 205
-RMD160 6b20ea83c69ef613d75daf43515aaec88d4cd815 files/sshd.pam_include 205
-SHA256 8d59135e96f4eff6b80c143b82cced7beb0bbca19ff91b479f1ba92916243d5e files/sshd.pam_include 205
 MD5 040058236238ec4a94d3abb8a4e532e9 files/sshd.rc6 1797
-RMD160 896e47a5df3a7b7d6602e8a2853b8deddc00f77b files/sshd.rc6 1797
-SHA256 988140af34ec5f4943e50f07e3c7933ae2aa2dc5e692c097cf769420d436d6fe files/sshd.rc6 1797
 MD5 02a1e50ab3fa841edec86694bd71c8d1 metadata.xml 1251
-RMD160 6cc73434a9ddba10013961600493ede02841b514 metadata.xml 1251
-SHA256 bc756cbd9737146f4aef4b1cf329f9c6fb2dc580fe4230b866c1101d9637c63b metadata.xml 1251
 MD5 4bf2ed1ba4e71ff7a799b27f958b8214 openssh-3.9_p1-r3.ebuild 4984
-RMD160 fc6e960460f5ed80f38de0ad62844786906a40dc openssh-3.9_p1-r3.ebuild 4984
-SHA256 243071563d56d49415ecdd850291e0ba005db6dd6c3a90f3b33b727de3990686 openssh-3.9_p1-r3.ebuild 4984
 MD5 f348bd329ca422946f501cc5ed1cbfb8 openssh-4.0_p1-r2.ebuild 5420
-RMD160 016f5a9ba4af8afdec47f42c3a90f71ffe5da765 openssh-4.0_p1-r2.ebuild 5420
-SHA256 c9257e969c7bdffa69134c198fd5c7d77118daba6bc687c73f0bed463ab24d8e openssh-4.0_p1-r2.ebuild 5420
 MD5 2c888cf3a4cf4a20bf8b399f0e41dd0b openssh-4.1_p1-r1.ebuild 5381
-RMD160 fe412d4d8fc9640b59446a80291fce64e5dd5d95 openssh-4.1_p1-r1.ebuild 5381
-SHA256 b2d45cf55c08e2030ef74b28f8439d3e4e5aae749e1a12e862a4c86e90f46315 openssh-4.1_p1-r1.ebuild 5381
 MD5 a9d7923f3909976222c24efd31c147f5 openssh-4.2_p1-r1.ebuild 5416
-RMD160 bf795a39a239ed3bb00deed091a4ab1fbe383c81 openssh-4.2_p1-r1.ebuild 5416
-SHA256 36869f415923667f3f0d68c708ed0a8b6f65ee8e1a8520630bc8e018c31883c2 openssh-4.2_p1-r1.ebuild 5416
 MD5 0123e9e036a3a2a83d279f4edb18f2bd openssh-4.2_p1.ebuild 5349
-RMD160 845d8635b7065e51097b7b8ca2d3170ab33d3cf0 openssh-4.2_p1.ebuild 5349
-SHA256 27defefc8b7f32748b4cb44b346eeca9497f5c226d95401a2febba663eb0b9b2 openssh-4.2_p1.ebuild 5349
-MD5 d9d5ef9d6626f46949671061c8fe71a8 openssh-4.3_p1.ebuild 5519
-RMD160 9e7b7b75accf88848bf9f1ed32949420780690cf openssh-4.3_p1.ebuild 5519
-SHA256 4627282f3cbfef247eddbe0b7728345b86df1a74b78ce1bf6e668272c7a137d0 openssh-4.3_p1.ebuild 5519
-MD5 4e84c41e9b056cc7f64f09421462a647 openssh-4.3_p2-r1.ebuild 5568
-RMD160 3b61c1ac0a71bbd0e8ce00779850073fa906b6cb openssh-4.3_p2-r1.ebuild 5568
-SHA256 706c053f4ad3cebf5ad15fd5a28d636ee326038330ba3c5acebab47ecef1de38 openssh-4.3_p2-r1.ebuild 5568
-MD5 2393449a462c67073f67179bf182977a openssh-4.3_p2.ebuild 5556
-RMD160 6ecd68a5cd3d0f0f52947c6f1dcb164597644690 openssh-4.3_p2.ebuild 5556
-SHA256 47b1a279831fcab420063bb100eb5428490eeec1c54f759ef2c99964d9caf49b openssh-4.3_p2.ebuild 5556
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFECi6/J+ChZlpDtAoRAvFNAJ9He+kOJhsuiZzI6U8C31Q7miKFdwCghYsq
-8Fuy0p7hfHPTYmLP5+yDZYU=
-=8o0u
------END PGP SIGNATURE-----
+MD5 9b0c5a8e459b30c960781f24a1014a9f openssh-4.3_p1.ebuild 5230
+MD5 0e9a33f34c0dd07d43f7ef4dbf47d657 openssh-4.3_p2-r1.ebuild 5310
+MD5 9308ad1e9b2f79fba48c1fc10b44b6cb openssh-4.3_p2.ebuild 5298
diff --git a/net-misc/openssh/files/digest-openssh-4.3_p1 b/net-misc/openssh/files/digest-openssh-4.3_p1
index 2336a2e0c00d..5c9f108447e5 100644
--- a/net-misc/openssh/files/digest-openssh-4.3_p1
+++ b/net-misc/openssh/files/digest-openssh-4.3_p1
@@ -1,9 +1,4 @@
 MD5 097e7e8db2970e69e074454173f2215b openssh-4.3p1+x509-5.3.diff.gz 131152
-RMD160 48caf99a07cf6b1be1915d6dbec9d1ef015ba24c openssh-4.3p1+x509-5.3.diff.gz 131152
-SHA256 501b3b704081ee26295964d69d120f9825e93d9b33ab5abb1b417c40815e5642 openssh-4.3p1+x509-5.3.diff.gz 131152
 MD5 7dd2a6716b81da33af4ca960185fdd1b openssh-4.3p1-hpn11.diff 11024
-RMD160 c3b807437fd9f40f2ab73c52586de194b84cce6e openssh-4.3p1-hpn11.diff 11024
-SHA256 0a0b0e07bd845fdbf2112769c426a3b47b795076c8459f6dbc3e7c9060abb740 openssh-4.3p1-hpn11.diff 11024
 MD5 eaeb880b1b6c63b9a4d7c5b1e74727c4 openssh-4.3p1.tar.gz 940777
-RMD160 c1d69873ecc453b40d825a2f1b3a0909da815f5e openssh-4.3p1.tar.gz 940777
-SHA256 7a4e356742190901e458b7526f91dfa24c66babbcd24d55cf7eac282266f5254 openssh-4.3p1.tar.gz 940777
+MD5 f01af3895c2399c9fd12bfd8e3119732 openssh-lpk-4.3p1-0.3.7.patch 60597
diff --git a/net-misc/openssh/files/digest-openssh-4.3_p2 b/net-misc/openssh/files/digest-openssh-4.3_p2
index 30255f76e935..46d6491e42fd 100644
--- a/net-misc/openssh/files/digest-openssh-4.3_p2
+++ b/net-misc/openssh/files/digest-openssh-4.3_p2
@@ -1,12 +1,5 @@
 MD5 7dd2a6716b81da33af4ca960185fdd1b openssh-4.3p1-hpn11.diff 11024
-RMD160 c3b807437fd9f40f2ab73c52586de194b84cce6e openssh-4.3p1-hpn11.diff 11024
-SHA256 0a0b0e07bd845fdbf2112769c426a3b47b795076c8459f6dbc3e7c9060abb740 openssh-4.3p1-hpn11.diff 11024
 MD5 3611a21a0098c32416d4b8f75232c796 openssh-4.3p2+SecurID_v1.3.2.patch 47650
-RMD160 90c719e8b7576d06bda5fdfb86287bfa577c5e1a openssh-4.3p2+SecurID_v1.3.2.patch 47650
-SHA256 d6fc92a11c23f3fa0c77f50e6d76cb6c6635ae4907df724a12e460b90c90e988 openssh-4.3p2+SecurID_v1.3.2.patch 47650
 MD5 c60e16b0bdf3a825f2a2b501b34cdef4 openssh-4.3p2+x509-5.3.diff.gz 131147
-RMD160 d42a7e14b72bf850b9898e3707582b4b345ca27b openssh-4.3p2+x509-5.3.diff.gz 131147
-SHA256 768c44ae60b57e7571843996255204c1678736fb16616e965844bda982ebd44d openssh-4.3p2+x509-5.3.diff.gz 131147
 MD5 7e9880ac20a9b9db0d3fea30a9ff3d46 openssh-4.3p2.tar.gz 941455
-RMD160 ccd5967e3296347e6dd2be43c3d6caacde2b6833 openssh-4.3p2.tar.gz 941455
-SHA256 4ba757d6c933e7d075b6424124d92d197eb5d91e4a58794596b67f5f0ca21d4f openssh-4.3p2.tar.gz 941455
+MD5 f01af3895c2399c9fd12bfd8e3119732 openssh-lpk-4.3p1-0.3.7.patch 60597
diff --git a/net-misc/openssh/files/digest-openssh-4.3_p2-r1 b/net-misc/openssh/files/digest-openssh-4.3_p2-r1
index 30255f76e935..46d6491e42fd 100644
--- a/net-misc/openssh/files/digest-openssh-4.3_p2-r1
+++ b/net-misc/openssh/files/digest-openssh-4.3_p2-r1
@@ -1,12 +1,5 @@
 MD5 7dd2a6716b81da33af4ca960185fdd1b openssh-4.3p1-hpn11.diff 11024
-RMD160 c3b807437fd9f40f2ab73c52586de194b84cce6e openssh-4.3p1-hpn11.diff 11024
-SHA256 0a0b0e07bd845fdbf2112769c426a3b47b795076c8459f6dbc3e7c9060abb740 openssh-4.3p1-hpn11.diff 11024
 MD5 3611a21a0098c32416d4b8f75232c796 openssh-4.3p2+SecurID_v1.3.2.patch 47650
-RMD160 90c719e8b7576d06bda5fdfb86287bfa577c5e1a openssh-4.3p2+SecurID_v1.3.2.patch 47650
-SHA256 d6fc92a11c23f3fa0c77f50e6d76cb6c6635ae4907df724a12e460b90c90e988 openssh-4.3p2+SecurID_v1.3.2.patch 47650
 MD5 c60e16b0bdf3a825f2a2b501b34cdef4 openssh-4.3p2+x509-5.3.diff.gz 131147
-RMD160 d42a7e14b72bf850b9898e3707582b4b345ca27b openssh-4.3p2+x509-5.3.diff.gz 131147
-SHA256 768c44ae60b57e7571843996255204c1678736fb16616e965844bda982ebd44d openssh-4.3p2+x509-5.3.diff.gz 131147
 MD5 7e9880ac20a9b9db0d3fea30a9ff3d46 openssh-4.3p2.tar.gz 941455
-RMD160 ccd5967e3296347e6dd2be43c3d6caacde2b6833 openssh-4.3p2.tar.gz 941455
-SHA256 4ba757d6c933e7d075b6424124d92d197eb5d91e4a58794596b67f5f0ca21d4f openssh-4.3p2.tar.gz 941455
+MD5 f01af3895c2399c9fd12bfd8e3119732 openssh-lpk-4.3p1-0.3.7.patch 60597
diff --git a/net-misc/openssh/openssh-4.3_p1.ebuild b/net-misc/openssh/openssh-4.3_p1.ebuild
index e080c5fec1bb..b2954341740e 100644
--- a/net-misc/openssh/openssh-4.3_p1.ebuild
+++ b/net-misc/openssh/openssh-4.3_p1.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.3_p1.ebuild,v 1.2 2006/02/10 01:33:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p1.ebuild,v 1.3 2006/03/05 14:54:55 lcars Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -10,15 +10,15 @@ PARCH=${P/_/}
 
 X509_PATCH="${PARCH}+x509-5.3.diff.gz"
 SECURID_PATCH="" #${PARCH}+SecurID_v1.3.2.patch"
-LDAP_PATCH="" #${PARCH/-4.3/-lpk-4.1}-0.3.6.patch"
+LDAP_PATCH="${PARCH/-4.3/-lpk-4.3}-0.3.7.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
 	hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )
-	X509? ( http://roumenpetrov.info/openssh/x509-5.3/${X509_PATCH} )"
-#	ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} )
+	X509? ( http://roumenpetrov.info/openssh/x509-5.3/${X509_PATCH} )
+	ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} )"
 #	smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )
 
 LICENSE="as-is"
@@ -47,14 +47,6 @@ src_unpack() {
 	unpack ${PARCH}.tar.gz
 	cd "${S}"
 
-	if use ldap || use smartcard ; then
-		eerror "Sorry, but this version does not yet support"
-		eerror "ldap/smartcard.  Please mask 4.3_p1 for"
-		eerror "now and check back later:"
-		eerror " # echo '=net-misc/openssh-4.3_p1' >> /etc/portage/package.mask"
-		die "boooooooooooooo"
-	fi
-
 	sed -i \
 		-e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
 		pathnames.h || die
diff --git a/net-misc/openssh/openssh-4.3_p2-r1.ebuild b/net-misc/openssh/openssh-4.3_p2-r1.ebuild
index 9e2440177789..f199feea8082 100644
--- a/net-misc/openssh/openssh-4.3_p2-r1.ebuild
+++ b/net-misc/openssh/openssh-4.3_p2-r1.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.3_p2-r1.ebuild,v 1.1 2006/03/05 00:20:01 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p2-r1.ebuild,v 1.2 2006/03/05 14:54:55 lcars Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -10,7 +10,7 @@ PARCH=${P/_/}
 
 X509_PATCH="${PARCH}+x509-5.3.diff.gz"
 SECURID_PATCH="${PARCH}+SecurID_v1.3.2.patch"
-LDAP_PATCH="" #${PARCH/-4.3/-lpk-4.1}-0.3.6.patch"
+LDAP_PATCH="${PARCH/-4.3p2/-lpk-4.3p1}-0.3.7.patch"
 HPN_PATCH="${PARCH/p2/p1}-hpn11.diff"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
@@ -18,8 +18,8 @@ HOMEPAGE="http://www.openssh.com/"
 SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 	hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )
 	X509? ( http://roumenpetrov.info/openssh/x509-5.3/${X509_PATCH} )
-	smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )"
-#	ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} )
+	smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )
+	ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} )"
 
 LICENSE="as-is"
 SLOT="0"
@@ -47,14 +47,6 @@ src_unpack() {
 	unpack ${PARCH}.tar.gz
 	cd "${S}"
 
-	if use ldap ; then
-		eerror "Sorry, but this version does not yet support"
-		eerror "ldap.  Please mask 4.3_p2 for"
-		eerror "now and check back later:"
-		eerror " # echo '=net-misc/openssh-4.3_p2' >> /etc/portage/package.mask"
-		die "boooooooooooooo"
-	fi
-
 	sed -i \
 		-e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
 		pathnames.h || die
diff --git a/net-misc/openssh/openssh-4.3_p2.ebuild b/net-misc/openssh/openssh-4.3_p2.ebuild
index ae9885dd821a..8b350ccd8a6e 100644
--- a/net-misc/openssh/openssh-4.3_p2.ebuild
+++ b/net-misc/openssh/openssh-4.3_p2.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.3_p2.ebuild,v 1.1 2006/03/04 01:48:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p2.ebuild,v 1.2 2006/03/05 14:54:55 lcars Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -10,7 +10,7 @@ PARCH=${P/_/}
 
 X509_PATCH="${PARCH}+x509-5.3.diff.gz"
 SECURID_PATCH="${PARCH}+SecurID_v1.3.2.patch"
-LDAP_PATCH="" #${PARCH/-4.3/-lpk-4.1}-0.3.6.patch"
+LDAP_PATCH="${PARCH/-4.3p2/-lpk-4.3p1}-0.3.7.patch"
 HPN_PATCH="${PARCH/p2/p1}-hpn11.diff"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
@@ -18,8 +18,8 @@ HOMEPAGE="http://www.openssh.com/"
 SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 	hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )
 	X509? ( http://roumenpetrov.info/openssh/x509-5.3/${X509_PATCH} )
-	smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )"
-#	ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} )
+	smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )
+	ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} )"
 
 LICENSE="as-is"
 SLOT="0"
@@ -47,14 +47,6 @@ src_unpack() {
 	unpack ${PARCH}.tar.gz
 	cd "${S}"
 
-	if use ldap ; then
-		eerror "Sorry, but this version does not yet support"
-		eerror "ldap.  Please mask 4.3_p2 for"
-		eerror "now and check back later:"
-		eerror " # echo '=net-misc/openssh-4.3_p2' >> /etc/portage/package.mask"
-		die "boooooooooooooo"
-	fi
-
 	sed -i \
 		-e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
 		pathnames.h || die