As older versions have a constant patchset, move that out to mirrors

(Portage version: 2.1.2_rc4-r8)
 (Signed Manifest commit)

20 files changed, 30 insertions, 1250 deletions

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 31db78b177b0..3ef4fbef63f1 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -5,82 +5,10 @@ AUX DB_CONFIG.fast.example 746 RMD160 03d179d1c58d695c442eb5e3e69c245f3c2f2358 S
 MD5 d00ccd5b4b44ac1df463da80d5ebb8a1 files/DB_CONFIG.fast.example 746
 RMD160 03d179d1c58d695c442eb5e3e69c245f3c2f2358 files/DB_CONFIG.fast.example 746
 SHA256 69fc9aa6e4f0b888bc02d3f75642fe1ebf9345c685257a5c1236b2e79ed56e0b files/DB_CONFIG.fast.example 746
-AUX openldap-2.1.27-db40.patch 718 RMD160 89803b72228deb5772a57fa7e70b35530c7353b6 SHA1 9a6a9fb9608a1abfbafa3a4e4915d67e8e36ec4c SHA256 c312198115be7f9e63d073de9429b0253bb73e4d9c39aa03cbe5ab30c6309d53
-MD5 b10517f0e7be829d47bb8096d86fb519 files/openldap-2.1.27-db40.patch 718
-RMD160 89803b72228deb5772a57fa7e70b35530c7353b6 files/openldap-2.1.27-db40.patch 718
-SHA256 c312198115be7f9e63d073de9429b0253bb73e4d9c39aa03cbe5ab30c6309d53 files/openldap-2.1.27-db40.patch 718
-AUX openldap-2.1.27-perlthreadsfix.patch 967 RMD160 560fff078d5a446519164881bd25e8dfaaf39f69 SHA1 e4be7942cd2f54c83ba5cbe92d1e35e540b29dfb SHA256 4798278284ab6ccd768594db18a56525a34f7d8c890a5f2198b2542573173fcf
-MD5 ca2c43219df88502aafeab9db9eda4d5 files/openldap-2.1.27-perlthreadsfix.patch 967
-RMD160 560fff078d5a446519164881bd25e8dfaaf39f69 files/openldap-2.1.27-perlthreadsfix.patch 967
-SHA256 4798278284ab6ccd768594db18a56525a34f7d8c890a5f2198b2542573173fcf files/openldap-2.1.27-perlthreadsfix.patch 967
-AUX openldap-2.1.30-autoconf-archived-fix.patch 1912 RMD160 e2ecd27a8dac980903804cc0cbc9210fb0cabe18 SHA1 0522ce713b8153f42550eb90d71cb1927d0e97da SHA256 52e82990d4c93499e1a53d533921732979cd1dfc3119db48eedd525a4ea79e2f
-MD5 b51f63396bab5123f8b24674ed4481b2 files/openldap-2.1.30-autoconf-archived-fix.patch 1912
-RMD160 e2ecd27a8dac980903804cc0cbc9210fb0cabe18 files/openldap-2.1.30-autoconf-archived-fix.patch 1912
-SHA256 52e82990d4c93499e1a53d533921732979cd1dfc3119db48eedd525a4ea79e2f files/openldap-2.1.30-autoconf-archived-fix.patch 1912
-AUX openldap-2.1.30-autoconf25.patch 382 RMD160 1c2dbcd122e86487098ac8d563896aa1002b9238 SHA1 c9ea3892c092afde74cfed622b54ce6ac5e69a3a SHA256 aa43c6d8fa15e31b75243580ebc0d10e41975ba658c0b8bb534df15e11503df5
-MD5 14cfcdbe422004e2e42bfb14cea16a5e files/openldap-2.1.30-autoconf25.patch 382
-RMD160 1c2dbcd122e86487098ac8d563896aa1002b9238 files/openldap-2.1.30-autoconf25.patch 382
-SHA256 aa43c6d8fa15e31b75243580ebc0d10e41975ba658c0b8bb534df15e11503df5 files/openldap-2.1.30-autoconf25.patch 382
-AUX openldap-2.1.30-db40.patch 718 RMD160 13d21287d7ad881ba28d42deea507dbe973a0d5b SHA1 628624f9c3f6980759fda65676438d35acfb2620 SHA256 4c68a8b052968dd9b7fc823144fd3f2b0b1d686ce5d8899d27ad3e8d99301cc2
-MD5 c58db81c8d7084a9abf48747134da0a8 files/openldap-2.1.30-db40.patch 718
-RMD160 13d21287d7ad881ba28d42deea507dbe973a0d5b files/openldap-2.1.30-db40.patch 718
-SHA256 4c68a8b052968dd9b7fc823144fd3f2b0b1d686ce5d8899d27ad3e8d99301cc2 files/openldap-2.1.30-db40.patch 718
-AUX openldap-2.1.30-glibc24.patch 376 RMD160 eccf72b0d4eb6fff0de91889e735bf5ff3bc07f4 SHA1 2199dc3138a3d6877d43360fc89ccf99913f494a SHA256 8310792c201d98e2b2a55d62882098726633bfbc8ddef6af1cf3a5a1485612d1
-MD5 624d84051bd96193e20f66bbb112b85f files/openldap-2.1.30-glibc24.patch 376
-RMD160 eccf72b0d4eb6fff0de91889e735bf5ff3bc07f4 files/openldap-2.1.30-glibc24.patch 376
-SHA256 8310792c201d98e2b2a55d62882098726633bfbc8ddef6af1cf3a5a1485612d1 files/openldap-2.1.30-glibc24.patch 376
-AUX openldap-2.1.30-m4_underquoted.patch 3916 RMD160 8190e85d91c3f6e64ceed786581615c765176a4d SHA1 0b63f3b5f082dddf56841513802d97c0e0edbab0 SHA256 b48f5a56ce2f26d117d8ca491bb22229fc25d05808bef1c1fabc98b5164d87d0
-MD5 a240004c097944335b15bcb489661c2c files/openldap-2.1.30-m4_underquoted.patch 3916
-RMD160 8190e85d91c3f6e64ceed786581615c765176a4d files/openldap-2.1.30-m4_underquoted.patch 3916
-SHA256 b48f5a56ce2f26d117d8ca491bb22229fc25d05808bef1c1fabc98b5164d87d0 files/openldap-2.1.30-m4_underquoted.patch 3916
-AUX openldap-2.1.30-rpath.patch 13131 RMD160 e2e2e2e0a244a1265e5af821499762c7bf7194a8 SHA1 329d550198818b578f29c80f8bd98e9be9164398 SHA256 7f0f65f5837c67613953e06793a23b1580481b7ee5bb56020f31061a4d46cbd6
-MD5 07a689148742f0fd74dcedf572a8f092 files/openldap-2.1.30-rpath.patch 13131
-RMD160 e2e2e2e0a244a1265e5af821499762c7bf7194a8 files/openldap-2.1.30-rpath.patch 13131
-SHA256 7f0f65f5837c67613953e06793a23b1580481b7ee5bb56020f31061a4d46cbd6 files/openldap-2.1.30-rpath.patch 13131
-AUX openldap-2.1.30-tests.patch 378 RMD160 c3a64faa592be085166a44b7acd3095f7f5dcb2d SHA1 28d673c2162695adc2c363c19069fcaf4e92dc9d SHA256 bace9ce39bba49d55b2b9aa52518acb193ff507ebe4f9cdb39c5d713daa755c9
-MD5 c3c348e2e475de1b8f04c674aa15d27e files/openldap-2.1.30-tests.patch 378
-RMD160 c3a64faa592be085166a44b7acd3095f7f5dcb2d files/openldap-2.1.30-tests.patch 378
-SHA256 bace9ce39bba49d55b2b9aa52518acb193ff507ebe4f9cdb39c5d713daa755c9 files/openldap-2.1.30-tests.patch 378
-AUX openldap-2.1.30-tls-activedirectory-hang-fix.patch 1122 RMD160 1c39aa073ffb1616d2542e8a949f50d54f765635 SHA1 dbbf04d7d0646be5e0e31ef5bf908bf5e38cf500 SHA256 9daf88287cc0a0a62817b3d765fdc0eb64abf931b46b11c03f6f91b0ccc5172f
-MD5 1afdae6ce6fa709abed41ce45f41f5e8 files/openldap-2.1.30-tls-activedirectory-hang-fix.patch 1122
-RMD160 1c39aa073ffb1616d2542e8a949f50d54f765635 files/openldap-2.1.30-tls-activedirectory-hang-fix.patch 1122
-SHA256 9daf88287cc0a0a62817b3d765fdc0eb64abf931b46b11c03f6f91b0ccc5172f files/openldap-2.1.30-tls-activedirectory-hang-fix.patch 1122
-AUX openldap-2.1.30-ximian_connector.patch 6435 RMD160 5e33c988ad0d26596d6ed6f130edcace9c8dec77 SHA1 73b6363cb1022785f5911e07222ff570f71a8c27 SHA256 fed7526974d1d17df5bdfc69cbc23191e519041840b8c914a79a09e7804b6e94
-MD5 2e6d3f7cf49a1d85468befdff2bfc1d8 files/openldap-2.1.30-ximian_connector.patch 6435
-RMD160 5e33c988ad0d26596d6ed6f130edcace9c8dec77 files/openldap-2.1.30-ximian_connector.patch 6435
-SHA256 fed7526974d1d17df5bdfc69cbc23191e519041840b8c914a79a09e7804b6e94 files/openldap-2.1.30-ximian_connector.patch 6435
-AUX openldap-2.2.14-db40.patch 773 RMD160 de210089942e6effeb0fa272296cc72c64480418 SHA1 5db78bfdded7cc0f7ae0e9831e0fedd68b66aae4 SHA256 8cd763aecaa0c81fe510b20bad348a9541bd6e85e2cd131239d27968c3110dec
-MD5 4c6ef684996786b3a7cc2dc15c4ae7a4 files/openldap-2.2.14-db40.patch 773
-RMD160 de210089942e6effeb0fa272296cc72c64480418 files/openldap-2.2.14-db40.patch 773
-SHA256 8cd763aecaa0c81fe510b20bad348a9541bd6e85e2cd131239d27968c3110dec files/openldap-2.2.14-db40.patch 773
 AUX openldap-2.2.14-perlthreadsfix.patch 614 RMD160 6e868aa5a5cc4e80c0340af25d18d010b342ed15 SHA1 3bb05c7ed511e8464331619ce23064d236a5fe82 SHA256 bb719cc1fed47ff0f111c960f3295781ae6f0d9e98b4266a87751044b4bb3175
 MD5 95a998755d69f0f30cb64b9cb8eeab15 files/openldap-2.2.14-perlthreadsfix.patch 614
 RMD160 6e868aa5a5cc4e80c0340af25d18d010b342ed15 files/openldap-2.2.14-perlthreadsfix.patch 614
 SHA256 bb719cc1fed47ff0f111c960f3295781ae6f0d9e98b4266a87751044b4bb3175 files/openldap-2.2.14-perlthreadsfix.patch 614
-AUX openldap-2.2.26-tls-fix-connection-test.patch 663 RMD160 8a076e406e95dd6a9e64aafd2ce32b40e63f5389 SHA1 243a9b32d085beec8f63ed5c8b85177f2b5e8946 SHA256 9a0995a0075c0067cc20fefeb1080a9c2767f16d8efe1ca73ec072649f297a76
-MD5 4591bdcf0bd459c6fdbcabc93f5b6b55 files/openldap-2.2.26-tls-fix-connection-test.patch 663
-RMD160 8a076e406e95dd6a9e64aafd2ce32b40e63f5389 files/openldap-2.2.26-tls-fix-connection-test.patch 663
-SHA256 9a0995a0075c0067cc20fefeb1080a9c2767f16d8efe1ca73ec072649f297a76 files/openldap-2.2.26-tls-fix-connection-test.patch 663
-AUX openldap-2.2.28-autoconf-archived-fix.patch 2001 RMD160 183e1d364f98e906d643ecbf81a3049ab3590844 SHA1 392b709e92e61e60b32ed013f1362df814667c6e SHA256 8bf925033a625842c31f69ba66a2a62d5c7eb09478951e574496c0bd43a8d1db
-MD5 f92be2e2c3b130cc9ff6ff738165e40e files/openldap-2.2.28-autoconf-archived-fix.patch 2001
-RMD160 183e1d364f98e906d643ecbf81a3049ab3590844 files/openldap-2.2.28-autoconf-archived-fix.patch 2001
-SHA256 8bf925033a625842c31f69ba66a2a62d5c7eb09478951e574496c0bd43a8d1db files/openldap-2.2.28-autoconf-archived-fix.patch 2001
-AUX openldap-2.2.28-cleartext-passwords.patch 1497 RMD160 49bbb0364b349d84e9d60eca8957bad7a7fbef61 SHA1 cac15b91305b79cdb6e83d771386d642c71d18b5 SHA256 46feb1eec1c92c9b45082f594526a9e67f72a62980153d6c03616e020db29b5c
-MD5 c0b486ddc5a55fa4879cec74e9a11748 files/openldap-2.2.28-cleartext-passwords.patch 1497
-RMD160 49bbb0364b349d84e9d60eca8957bad7a7fbef61 files/openldap-2.2.28-cleartext-passwords.patch 1497
-SHA256 46feb1eec1c92c9b45082f594526a9e67f72a62980153d6c03616e020db29b5c files/openldap-2.2.28-cleartext-passwords.patch 1497
-AUX openldap-2.2.28-r1-configure.in-rpath.patch 382 RMD160 1c2dbcd122e86487098ac8d563896aa1002b9238 SHA1 c9ea3892c092afde74cfed622b54ce6ac5e69a3a SHA256 aa43c6d8fa15e31b75243580ebc0d10e41975ba658c0b8bb534df15e11503df5
-MD5 14cfcdbe422004e2e42bfb14cea16a5e files/openldap-2.2.28-r1-configure.in-rpath.patch 382
-RMD160 1c2dbcd122e86487098ac8d563896aa1002b9238 files/openldap-2.2.28-r1-configure.in-rpath.patch 382
-SHA256 aa43c6d8fa15e31b75243580ebc0d10e41975ba658c0b8bb534df15e11503df5 files/openldap-2.2.28-r1-configure.in-rpath.patch 382
-AUX openldap-2.2.28-tests.patch 385 RMD160 a37869af6204e294d58b613f80300c8b57c4a934 SHA1 13f5cff50c21e994d478eecb2d493d0d411a4769 SHA256 d493bfce2cbb9958416b8c90053f56183de46dc1965c5c16cb3586aabef6beb6
-MD5 91f97e6962d63d9a7f12697ff34772f7 files/openldap-2.2.28-tests.patch 385
-RMD160 a37869af6204e294d58b613f80300c8b57c4a934 files/openldap-2.2.28-tests.patch 385
-SHA256 d493bfce2cbb9958416b8c90053f56183de46dc1965c5c16cb3586aabef6beb6 files/openldap-2.2.28-tests.patch 385
-AUX openldap-2.2.28-ximian_connector.patch 5669 RMD160 a099ae0fbcd52b3b5ddf6450374ffaaff1c0d4b9 SHA1 c526fa88e45e7f9b9dc51f7bace5ff086a13b5b8 SHA256 6ac33c6ca0da7b24070402dfa6bafbe6ad44561141fbba9f22f842fce1636968
-MD5 f940f4e9ac544ed0a0f28b87df5cd2c8 files/openldap-2.2.28-ximian_connector.patch 5669
-RMD160 a099ae0fbcd52b3b5ddf6450374ffaaff1c0d4b9 files/openldap-2.2.28-ximian_connector.patch 5669
-SHA256 6ac33c6ca0da7b24070402dfa6bafbe6ad44561141fbba9f22f842fce1636968 files/openldap-2.2.28-ximian_connector.patch 5669
 AUX openldap-2.2.6-ntlm.patch 5011 RMD160 317f4b6dc9589826739a14a8ad7200ed287c87be SHA1 29b8e9c4835235c976f026cd5883228b77581083 SHA256 1f7e766bcafb412ec336aad7e07295d6d62d2e2a62b6804b07b06a5056102243
 MD5 7d80c3708d5940a3b7a428740af863d0 files/openldap-2.2.6-ntlm.patch 5011
 RMD160 317f4b6dc9589826739a14a8ad7200ed287c87be files/openldap-2.2.6-ntlm.patch 5011
@@ -93,10 +21,6 @@ AUX openldap-2.3.24-contrib-smbk5pwd.patch 1631 RMD160 01e394da82c2ca8493d0dc15c
 MD5 c3eaf17d4936f6793f9c6486c51ef677 files/openldap-2.3.24-contrib-smbk5pwd.patch 1631
 RMD160 01e394da82c2ca8493d0dc15c400675545f463bb files/openldap-2.3.24-contrib-smbk5pwd.patch 1631
 SHA256 277990c6bc9e00c29bc5123d5074e1a741a224e884f92651b301375b02edc70e files/openldap-2.3.24-contrib-smbk5pwd.patch 1631
-AUX openldap-2.3.27-CVE-2006-5779.patch 1197 RMD160 9f97d7022eb74b0cb659a80153c022c7286102f9 SHA1 dd8da7102f77ace7add69fc3ab62880ebbd2cdcf SHA256 be408486602937511326edcdc8dad7a4e4de052ff1cac8b7d23bcf58bb5c41b6
-MD5 9aca314fefd4479767946b6c2b5ca38c files/openldap-2.3.27-CVE-2006-5779.patch 1197
-RMD160 9f97d7022eb74b0cb659a80153c022c7286102f9 files/openldap-2.3.27-CVE-2006-5779.patch 1197
-SHA256 be408486602937511326edcdc8dad7a4e4de052ff1cac8b7d23bcf58bb5c41b6 files/openldap-2.3.27-CVE-2006-5779.patch 1197
 AUX slapd-confd 436 RMD160 764d5e2915d9af33fd1db2489ceac6d953750984 SHA1 a16b4674b45ac1e1c8a8f9e84ad0de519c81aa11 SHA256 1ccb8a3b78b65b125b24779dd065cf8000e2d5e4da267bb0a892e730edd2055d
 MD5 b672311fca605c398240cd37a2ae080a files/slapd-confd 436
 RMD160 764d5e2915d9af33fd1db2489ceac6d953750984 files/slapd-confd 436
@@ -114,40 +38,41 @@ DIST openldap-2.2.28.tgz 2630427 RMD160 ca3f5aff42e6afc6b7c0a62beb8c13d4ff43d44c
 DIST openldap-2.3.27.tgz 3757519 RMD160 8c25c39689daa515f14e88611490ae6d8df0911c SHA1 c2b6ac3ec89d0f58d079592946d045dba45edafe SHA256 6ddf211d65aa62bb2165a612f96545d5dc8baf01d269e0f7945ebe066c282ed7
 DIST openldap-2.3.30.tgz 3763533 RMD160 4cafe33efcc1cf3baedc73a89f115a659407a710 SHA1 99dd73df2bdf3ac303b2a81ee2c689a2ee09e13a SHA256 3b27a5666dbe4584612be443bfa636238a48f3c16a4dc8f43d59171e8697687b
 DIST openldap-2.3.32.tgz 3763696 RMD160 de0d076868cbef4e3b9eb393ef45683cf990d3d2 SHA1 ccf008c3d41206e2e29870b7786aaf00d7c2bc70 SHA256 4882c9fcb5036747555166972fd16a4e3376264f772cce580da95af4149286df
-EBUILD openldap-2.1.30-r10.ebuild 7834 RMD160 5040cea9e7a2db3823618af602e9269e11bbdf21 SHA1 2bc9c5ee00fc201fabe481aecbcfa48e5b35abd0 SHA256 668797b9db0c7cef19d9f516a7d995f60a00c9cbddc0cc9ad19dd89926990654
-MD5 eaafc79466b4ddb10557f3e778415ac9 openldap-2.1.30-r10.ebuild 7834
-RMD160 5040cea9e7a2db3823618af602e9269e11bbdf21 openldap-2.1.30-r10.ebuild 7834
-SHA256 668797b9db0c7cef19d9f516a7d995f60a00c9cbddc0cc9ad19dd89926990654 openldap-2.1.30-r10.ebuild 7834
-EBUILD openldap-2.2.28-r7.ebuild 11691 RMD160 a3370167469fc1f8fd236a7c58c8d8cd88721d21 SHA1 6dd619b97901617461981ab30fca601e2c63bce5 SHA256 002ac050df2be60644f5802d2ea385f49377bfa989a6b7dc16b0b3badaf46ae2
-MD5 325b0b03bf90820f09cbeb92c811479a openldap-2.2.28-r7.ebuild 11691
-RMD160 a3370167469fc1f8fd236a7c58c8d8cd88721d21 openldap-2.2.28-r7.ebuild 11691
-SHA256 002ac050df2be60644f5802d2ea385f49377bfa989a6b7dc16b0b3badaf46ae2 openldap-2.2.28-r7.ebuild 11691
+DIST openldap-compatversions-patchset-1.0.tar.bz2 10547 RMD160 7d6200e26fe8818934a94b4cf192f8e53df5dc2c SHA1 eb6dfb169023e88f08ee93baabcf9293bc29e5f5 SHA256 8b0a7b0c16601405a623012f84f9edba698cb708aea953da3d2f51da26d35c26
+EBUILD openldap-2.1.30-r10.ebuild 7959 RMD160 f45775b295eca0285313f97bd821966341cfcaf8 SHA1 8cb6ec5e176175fcd04a477991aed277d2c87671 SHA256 18c66f4585d49ed5324fb31631d24e27b5e1ed1c71e74f05568896604383aee3
+MD5 6d0caddc4b681d687484b002c6cf502a openldap-2.1.30-r10.ebuild 7959
+RMD160 f45775b295eca0285313f97bd821966341cfcaf8 openldap-2.1.30-r10.ebuild 7959
+SHA256 18c66f4585d49ed5324fb31631d24e27b5e1ed1c71e74f05568896604383aee3 openldap-2.1.30-r10.ebuild 7959
+EBUILD openldap-2.2.28-r7.ebuild 11816 RMD160 0f8268292e6291f8cad4c04e0d033f737ba887c7 SHA1 e09a9ffa6ff61c06e0ce3f43b4723acf70e5255c SHA256 88b353db74dd6bb09262e5347d44a52bb1b5243059f95e9b2d4632f91ec6d705
+MD5 745aa78f028ee9876eff575b9a4c57fd openldap-2.2.28-r7.ebuild 11816
+RMD160 0f8268292e6291f8cad4c04e0d033f737ba887c7 openldap-2.2.28-r7.ebuild 11816
+SHA256 88b353db74dd6bb09262e5347d44a52bb1b5243059f95e9b2d4632f91ec6d705 openldap-2.2.28-r7.ebuild 11816
 EBUILD openldap-2.3.27-r3.ebuild 17913 RMD160 4ef009d1299514bdda6667694e176632f084f51a SHA1 793d6fe1bf3f185cff1bfd40157e02231733cc73 SHA256 5939ae06f7bcbcb692d25d06cc0ecab477ae9f5ad031b447e36bc5146341c1b2
 MD5 e85cfe3479b0b0f669d58e42c3887d99 openldap-2.3.27-r3.ebuild 17913
 RMD160 4ef009d1299514bdda6667694e176632f084f51a openldap-2.3.27-r3.ebuild 17913
 SHA256 5939ae06f7bcbcb692d25d06cc0ecab477ae9f5ad031b447e36bc5146341c1b2 openldap-2.3.27-r3.ebuild 17913
-EBUILD openldap-2.3.30-r2.ebuild 16347 RMD160 5b53d62e69bf8cc56803e3d9e5694120586c4a00 SHA1 d96d0a239e428ddd07642c6ebe2a198e7b7e9e65 SHA256 799456a960af6f5a7b9b2a636d51d2146ca712311a9e92c1a6b2f6ee42cac73f
-MD5 0ff56e8f27eb948d5b8670db05ce7680 openldap-2.3.30-r2.ebuild 16347
-RMD160 5b53d62e69bf8cc56803e3d9e5694120586c4a00 openldap-2.3.30-r2.ebuild 16347
-SHA256 799456a960af6f5a7b9b2a636d51d2146ca712311a9e92c1a6b2f6ee42cac73f openldap-2.3.30-r2.ebuild 16347
-EBUILD openldap-2.3.32.ebuild 16346 RMD160 39f321921cc41b5faf1a304f82378313abfb726a SHA1 a36259f8baa7d7262e0425ca38c6e3561a935a92 SHA256 3d07b3b7e26d83384c6ae84aeb75ff22f2805873adcc91781630763a2e5b3189
-MD5 7098e5b7acfd48da5098c351d2a11bb3 openldap-2.3.32.ebuild 16346
-RMD160 39f321921cc41b5faf1a304f82378313abfb726a openldap-2.3.32.ebuild 16346
-SHA256 3d07b3b7e26d83384c6ae84aeb75ff22f2805873adcc91781630763a2e5b3189 openldap-2.3.32.ebuild 16346
-MISC ChangeLog 44437 RMD160 dc5bd270e237905fc5f13bd34a838e9aad9ae1fc SHA1 6a18c78d45eb7a38511194c1b47ec16084591cd1 SHA256 65c9c4a2bab58100e0214ea961e7791c0f1f4273f7fe30accf472ea32f76eaeb
-MD5 34a46f7f5dd1f19b1f27a07761af0e8f ChangeLog 44437
-RMD160 dc5bd270e237905fc5f13bd34a838e9aad9ae1fc ChangeLog 44437
-SHA256 65c9c4a2bab58100e0214ea961e7791c0f1f4273f7fe30accf472ea32f76eaeb ChangeLog 44437
+EBUILD openldap-2.3.30-r2.ebuild 16349 RMD160 a4950514eca668567861f7b73ea79dc0a90175e3 SHA1 bc46981126380c8352acf2ef5c662b5b4ad04cb7 SHA256 2fbac07ac4630f81f574daf95c8e917e8c7ec5d4bd2794b9e8b7ffb3e32b3e34
+MD5 1456ee2c2ff41d9058d90b5cb605de6b openldap-2.3.30-r2.ebuild 16349
+RMD160 a4950514eca668567861f7b73ea79dc0a90175e3 openldap-2.3.30-r2.ebuild 16349
+SHA256 2fbac07ac4630f81f574daf95c8e917e8c7ec5d4bd2794b9e8b7ffb3e32b3e34 openldap-2.3.30-r2.ebuild 16349
+EBUILD openldap-2.3.32.ebuild 16348 RMD160 9f65c09973672b38cbe5131af5b29e8c4e158f6f SHA1 fdb52c2ec527d30c74e1a74fefc426794c581268 SHA256 573000402d763d74121d83904b965c77f891e9f6a981aec23b4730c4e325c68c
+MD5 19af3d372ca80c43f56d47d3224f8255 openldap-2.3.32.ebuild 16348
+RMD160 9f65c09973672b38cbe5131af5b29e8c4e158f6f openldap-2.3.32.ebuild 16348
+SHA256 573000402d763d74121d83904b965c77f891e9f6a981aec23b4730c4e325c68c openldap-2.3.32.ebuild 16348
+MISC ChangeLog 45488 RMD160 748fefc95dd8ae0539202cf6386213647869ae8a SHA1 099db26a0a1e2a402827a6e8e58d53779631aac4 SHA256 4538f796218070b95d1912a3092000e12d931123b9e5d8ecb245bd191c393136
+MD5 ffb850ef02c3d5182ee46e91cc5aaedc ChangeLog 45488
+RMD160 748fefc95dd8ae0539202cf6386213647869ae8a ChangeLog 45488
+SHA256 4538f796218070b95d1912a3092000e12d931123b9e5d8ecb245bd191c393136 ChangeLog 45488
 MISC metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf SHA1 21c64f9ef102b6649bccfca61f06d7b328ef1727 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6
 MD5 9a8efd7efb44b06913bf1d906d493407 metadata.xml 240
 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf metadata.xml 240
 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6 metadata.xml 240
-MD5 c9e269ba9c43c4aefb19e6cce36405a6 files/digest-openldap-2.1.30-r10 241
-RMD160 41352ebe2a161b8683f2706cb6c460c4ba4e1fee files/digest-openldap-2.1.30-r10 241
-SHA256 93bf80b5f142956ebcafc98f71500106ffddbf3e1bfd5986c3573a6567e61b54 files/digest-openldap-2.1.30-r10 241
-MD5 7c24277a9daf03437d0d2266c2379a60 files/digest-openldap-2.2.28-r7 241
-RMD160 68c8f1b251970b4272d34661de70d260efe8f90c files/digest-openldap-2.2.28-r7 241
-SHA256 51c7035bfbf95337f8b29fb76a53ed35b35d31d1e194d72fd430126279074adf files/digest-openldap-2.2.28-r7 241
+MD5 803c2e34467ceb981caa2c3854af60fd files/digest-openldap-2.1.30-r10 551
+RMD160 0f627c173b06f566a6d5efbfb28f682cab641fe9 files/digest-openldap-2.1.30-r10 551
+SHA256 22157a2b77e4b40a650a1faee88db3b59f58ea060115487496746bb915cb7dfa files/digest-openldap-2.1.30-r10 551
+MD5 fc44e4ed11cbd528c735267ab7adcee7 files/digest-openldap-2.2.28-r7 551
+RMD160 eb854940e823e0f9f0040834856f7a40db575312 files/digest-openldap-2.2.28-r7 551
+SHA256 61bde84c81976ceb65369263a2ed306e0ce296f57b832a15dad2d5f57fd5fc22 files/digest-openldap-2.2.28-r7 551
 MD5 11da1511848af420c24e05af22af0d36 files/digest-openldap-2.3.27-r3 241
 RMD160 6d2cb0114f4d36e4ab6901507bc8d2c075392344 files/digest-openldap-2.3.27-r3 241
 SHA256 5647879ba591b3ec35a04e87326cf4526f35239aa4c30434e4dc4b055fba7154 files/digest-openldap-2.3.27-r3 241
@@ -160,7 +85,7 @@ SHA256 cd8ea4e7921df759b93458eb8fdeb7a7df5f3a46ae3a2dce184d19c27f8bea30 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFrV38z974XjDVpbkRAuIPAKDFpXByFrrrSvA9D0ze9U5gpv+4ogCfUMNc
-7YY9l3Mi0eDNN3RT5sHcCM4=
-=ysAu
+iD8DBQFFrWbfz974XjDVpbkRAutPAKCI7P3M3vv/ms0w4Ae1uEauwvJboACgoFwK
+nuKdvYz0Z0iR23EcIqDxspw=
+=Jwz/
 -----END PGP SIGNATURE-----
diff --git a/net-nds/openldap/files/openldap-2.1.27-db40.patch b/net-nds/openldap/files/openldap-2.1.27-db40.patch
deleted file mode 100644
index dcebdb4a5bb1..000000000000
--- a/net-nds/openldap/files/openldap-2.1.27-db40.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur openldap-2.1.27.orig/build/openldap.m4 openldap-2.1.27/build/openldap.m4
---- openldap-2.1.27.orig/build/openldap.m4	2003-12-02 10:05:49.000000000 -0800
-+++ openldap-2.1.27/build/openldap.m4	2004-03-28 20:46:04.000000000 -0800
-@@ -320,6 +320,10 @@
- OL_BERKELEY_DB_TRY(ol_cv_db_db_41,[-ldb-41])
- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_1,[-ldb-4.1])
- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_1,[-ldb-4-1])
-+OL_BERKELEY_DB_TRY(ol_cv_db_db40,[-ldb40])
-+OL_BERKELEY_DB_TRY(ol_cv_db_db_40,[-ldb-40])
-+OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_0,[-ldb-4.0])
-+OL_BERKELEY_DB_TRY(ol_cv_db_db_4_0,[-ldb-4-0])
- OL_BERKELEY_DB_TRY(ol_cv_db_db_4,[-ldb-4])
- OL_BERKELEY_DB_TRY(ol_cv_db_db4,[-ldb4])
- OL_BERKELEY_DB_TRY(ol_cv_db_db,[-ldb])
diff --git a/net-nds/openldap/files/openldap-2.1.27-perlthreadsfix.patch b/net-nds/openldap/files/openldap-2.1.27-perlthreadsfix.patch
deleted file mode 100644
index 978ebb3ff0fe..000000000000
--- a/net-nds/openldap/files/openldap-2.1.27-perlthreadsfix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- servers/slapd/back-perl.orig/Makefile.in	2002-06-20 18:15:09.000000000 -0700
-+++ servers/slapd/back-perl/Makefile.in	2004-03-08 16:38:51.000000000 -0800
-@@ -28,7 +28,7 @@
- 
- shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
- NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
--UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
-+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) `perl -MExtUtils::Embed -e ldopts`
- 
- LIBBASE = back_perl
- 
---- servers/slapd/back-perl.orig/perl_back.h	2003-03-12 17:09:09.000000000 -0800
-+++ servers/slapd/back-perl/perl_back.h	2004-03-08 16:39:35.000000000 -0800
-@@ -2,6 +2,8 @@
- #ifndef PERL_BACK_H
- #define PERL_BACK_H 1
- 
-+#include <perl.h>
-+
- LDAP_BEGIN_DECL
- 
- /*
-@@ -23,7 +25,7 @@
- # define na	PL_na
- #endif
- 
--#ifdef HAVE_WIN32_ASPERL
-+#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
- /* pTHX is needed often now */
- # define PERL_INTERPRETER			my_perl
- # define PERL_BACK_XS_INIT_PARAMS		pTHX
diff --git a/net-nds/openldap/files/openldap-2.1.30-autoconf-archived-fix.patch b/net-nds/openldap/files/openldap-2.1.30-autoconf-archived-fix.patch
deleted file mode 100644
index 19a1f710eb17..000000000000
--- a/net-nds/openldap/files/openldap-2.1.30-autoconf-archived-fix.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- ./configure.in.orig	2005-12-18 15:52:54.000000000 +0100
-+++ ./configure.in	2005-12-18 15:54:24.000000000 +0100
-@@ -683,8 +683,8 @@
- 
- dnl ----------------------------------------------------------------
- dnl Checks for system services
--AC_CYGWIN
--AC_MINGW32
-+dnl AC_CYGWIN
-+dnl AC_MINGW32
- AC_EXEEXT
- AC_OBJEXT
- 
-@@ -2308,7 +2308,7 @@
- AC_TYPE_MODE_T
- AC_TYPE_OFF_T
- AC_TYPE_PID_T
--AM_TYPE_PTRDIFF_T
-+AC_CHECK_TYPES([ptrdiff_t])
- AC_TYPE_SIGNAL
- AC_TYPE_SIZE_T
- 
-@@ -2337,7 +2337,7 @@
- 	AC_C_BIGENDIAN
- fi
- 
--AC_COMPILE_CHECK_SIZEOF(short) 
-+OL_AC_COMPILE_CHECK_SIZEOF(short) 
--AC_COMPILE_CHECK_SIZEOF(int) 
-+OL_AC_COMPILE_CHECK_SIZEOF(int) 
--AC_COMPILE_CHECK_SIZEOF(long)
-+OL_AC_COMPILE_CHECK_SIZEOF(long)
- 
- if test "$ac_cv_sizeof_int" -lt 4 ; then
-         AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.])
---- ./build/openldap.m4.orig	2005-12-19 01:20:14.000000000 +0100
-+++ ./build/openldap.m4	2005-12-19 01:24:11.000000000 +0100
-@@ -1237,3 +1237,29 @@
- 		[define if struct msghdr has msg_accrights])
-   fi
- ])dnl
-+
-+AC_DEFUN([OL_AC_COMPILE_CHECK_SIZEOF],
-+[changequote(<<, >>)dnl
-+dnl The name to #define.
-+define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
-+dnl The cache variable name.
-+define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl
-+changequote([, ])dnl
-+AC_MSG_CHECKING(size of $1)
-+AC_CACHE_VAL(AC_CV_NAME,
-+[for ac_size in 4 8 1 2 16 $2 ; do # List sizes in rough order of prevalence.
-+  AC_TRY_COMPILE([#include "confdefs.h"
-+#include <sys/types.h>
-+$2
-+], [switch (0) case 0: case (sizeof ($1) == $ac_size):;], AC_CV_NAME=$ac_size)
-+  if test x$AC_CV_NAME != x ; then break; fi
-+done
-+])
-+if test x$AC_CV_NAME = x ; then
-+  AC_MSG_ERROR([cannot determine a size for $1])
-+fi
-+AC_MSG_RESULT($AC_CV_NAME)
-+AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in type $1])
-+undefine([AC_TYPE_NAME])dnl
-+undefine([AC_CV_NAME])dnl
-+])
diff --git a/net-nds/openldap/files/openldap-2.1.30-autoconf25.patch b/net-nds/openldap/files/openldap-2.1.30-autoconf25.patch
deleted file mode 100644
index 45d94fc6c9b1..000000000000
--- a/net-nds/openldap/files/openldap-2.1.30-autoconf25.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.in.orig	2005-03-14 18:06:26.000000000 +0100
-+++ ./configure.in	2005-12-03 01:46:39.607707750 +0100
-@@ -2133,7 +2133,7 @@
- 			[have_setproctitle=yes
- 			LUTIL_LIBS="$LUTIL_LIBS -lutil"],
- 			[have_setproctitle=no
--			LIBOBJS="$LIBOBJS setproctitle.o"
-+			AC_LIBOBJ([setproctitle])
- 			LIBSRCS="$LIBSRCS setproctitle.c"])])
- 
- 	if test $have_setproctitle = yes ; then
diff --git a/net-nds/openldap/files/openldap-2.1.30-db40.patch b/net-nds/openldap/files/openldap-2.1.30-db40.patch
deleted file mode 100644
index 0411cecca789..000000000000
--- a/net-nds/openldap/files/openldap-2.1.30-db40.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur openldap-2.1.30.orig/build/openldap.m4 openldap-2.1.30/build/openldap.m4
---- openldap-2.1.30.orig/build/openldap.m4	2003-12-02 10:05:49.000000000 -0800
-+++ openldap-2.1.30/build/openldap.m4	2004-03-28 20:46:04.000000000 -0800
-@@ -320,6 +320,10 @@
- OL_BERKELEY_DB_TRY(ol_cv_db_db_41,[-ldb-41])
- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_1,[-ldb-4.1])
- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_1,[-ldb-4-1])
-+OL_BERKELEY_DB_TRY(ol_cv_db_db40,[-ldb40])
-+OL_BERKELEY_DB_TRY(ol_cv_db_db_40,[-ldb-40])
-+OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_0,[-ldb-4.0])
-+OL_BERKELEY_DB_TRY(ol_cv_db_db_4_0,[-ldb-4-0])
- OL_BERKELEY_DB_TRY(ol_cv_db_db_4,[-ldb-4])
- OL_BERKELEY_DB_TRY(ol_cv_db_db4,[-ldb4])
- OL_BERKELEY_DB_TRY(ol_cv_db_db,[-ldb])
diff --git a/net-nds/openldap/files/openldap-2.1.30-glibc24.patch b/net-nds/openldap/files/openldap-2.1.30-glibc24.patch
deleted file mode 100644
index 6e0d8d107c91..000000000000
--- a/net-nds/openldap/files/openldap-2.1.30-glibc24.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- openldap-2.2.28/libraries/libldap/init.c	2005-01-20 18:01:01.000000000 +0100
-+++ openldap-2.2.28-patch/libraries/libldap/init.c	2006-03-14 17:17:13.000000000 +0100
-@@ -553,7 +553,7 @@
- 		if( user == NULL ) user = getenv("LOGNAME");
- 
- 		if( user != NULL ) {
--			gopts->ldo_def_sasl_authcid = user;
-+			gopts->ldo_def_sasl_authcid = LDAP_STRDUP(user);
- 		}
-     }
- #endif
-
diff --git a/net-nds/openldap/files/openldap-2.1.30-m4_underquoted.patch b/net-nds/openldap/files/openldap-2.1.30-m4_underquoted.patch
deleted file mode 100644
index 84bb7c014f08..000000000000
--- a/net-nds/openldap/files/openldap-2.1.30-m4_underquoted.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- openldap.m4.orig	2005-03-12 22:03:12.000000000 -0500
-+++ openldap.m4	2005-12-06 17:09:19.000000000 -0500
-@@ -65,7 +65,7 @@
- dnl
- dnl ====================================================================
- dnl
--AC_DEFUN(AC_COMPILE_CHECK_SIZEOF,
-+AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],
- [changequote(<<, >>)dnl 
- dnl The name to #define. 
- define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl 
-@@ -173,7 +173,7 @@
- dnl
- dnl --------------------------------------------------------------------
- dnl OpenLDAP version of STDC header check w/ EBCDIC support
--AC_DEFUN(OL_HEADER_STDC,
-+AC_DEFUN([OL_HEADER_STDC],
- [AC_REQUIRE_CPP()dnl
- AC_REQUIRE([OL_CPP_EBCDIC])dnl
- AC_CACHE_CHECK([for ANSI C header files], ol_cv_header_stdc,
-@@ -1016,7 +1020,7 @@
- dnl Early MIPS compilers (used in Ultrix 4.2) don't like
- dnl "int x; int *volatile a = &x; *a = 0;"
- dnl 	-- borrowed from PDKSH
--AC_DEFUN(OL_C_VOLATILE,
-+AC_DEFUN([OL_C_VOLATILE],
-  [AC_CACHE_CHECK(if compiler understands volatile, ol_cv_c_volatile,
-     [AC_TRY_COMPILE([int x, y, z;],
-       [volatile int a; int * volatile b = x ? &y : &z;
-@@ -1052,7 +1056,7 @@
- dnl
- dnl ====================================================================
- dnl Define sig_atomic_t if not defined in signal.h
--AC_DEFUN(OL_TYPE_SIG_ATOMIC_T,
-+AC_DEFUN([OL_TYPE_SIG_ATOMIC_T],
-  [AC_CACHE_CHECK(for sig_atomic_t, ol_cv_type_sig_atomic_t,
-     [AC_TRY_COMPILE([#include <signal.h>], [sig_atomic_t atomic;],
- 		ol_cv_type_sig_atomic_t=yes, ol_cv_type_sig_atomic_t=no)])
-@@ -1064,7 +1068,7 @@
- dnl
- dnl ====================================================================
- dnl Define socklen_t if not defined in sys/types.h or sys/socket.h
--AC_DEFUN(OL_TYPE_SOCKLEN_T,
-+AC_DEFUN([OL_TYPE_SOCKLEN_T],
-  [AC_CACHE_CHECK(for socklen_t, ol_cv_type_socklen_t,
-     [AC_TRY_COMPILE([
- #ifdef HAVE_SYS_TYPES_H
-@@ -1083,7 +1087,7 @@
- dnl
- dnl ====================================================================
- dnl Define inet_aton is available
--AC_DEFUN(OL_FUNC_INET_ATON,
-+AC_DEFUN([OL_FUNC_INET_ATON],
-  [AC_CACHE_CHECK([for inet_aton()], ol_cv_func_inet_aton,
-     [AC_TRY_LINK([
- #ifdef HAVE_SYS_TYPES_H
-@@ -1110,7 +1114,7 @@
- dnl
- dnl ====================================================================
- dnl check no of arguments for ctime_r
--AC_DEFUN(OL_FUNC_CTIME_R_NARGS,
-+AC_DEFUN([OL_FUNC_CTIME_R_NARGS],
-  [AC_CACHE_CHECK(number of arguments of ctime_r, ol_cv_func_ctime_r_nargs,
-    [AC_TRY_COMPILE([#include <time.h>],
- 		[time_t ti; char *buffer; ctime_r(&ti,buffer,32);],
-@@ -1145,7 +1149,7 @@
- dnl
- dnl --------------------------------------------------------------------
- dnl check return type of ctime_r()
--AC_DEFUN(OL_FUNC_CTIME_R_TYPE,
-+AC_DEFUN([OL_FUNC_CTIME_R_TYPE],
-  [AC_CACHE_CHECK(return type of ctime_r, ol_cv_func_ctime_r_type,
-    [AC_TRY_COMPILE([#include <time.h>],
- 		[extern int (ctime_r)();],
-@@ -1157,7 +1161,7 @@
- ])dnl
- dnl ====================================================================
- dnl check no of arguments for gethostbyname_r
--AC_DEFUN(OL_FUNC_GETHOSTBYNAME_R_NARGS,
-+AC_DEFUN([OL_FUNC_GETHOSTBYNAME_R_NARGS],
-  [AC_CACHE_CHECK(number of arguments of gethostbyname_r,
- 	ol_cv_func_gethostbyname_r_nargs,
- 	[AC_TRY_COMPILE([#include <sys/types.h>
-@@ -1207,7 +1211,7 @@
- ])dnl
- dnl
- dnl check no of arguments for gethostbyaddr_r
--AC_DEFUN(OL_FUNC_GETHOSTBYADDR_R_NARGS,
-+AC_DEFUN([OL_FUNC_GETHOSTBYADDR_R_NARGS],
-  [AC_CACHE_CHECK(number of arguments of gethostbyaddr_r,
- 	[ol_cv_func_gethostbyaddr_r_nargs],
- 	[AC_TRY_COMPILE([#include <sys/types.h>
-@@ -1283,7 +1287,7 @@
- ])
- dnl ====================================================================
- dnl check for msg_accrights in msghdr
--AC_DEFUN(OL_MSGHDR_MSG_ACCRIGHTS,
-+AC_DEFUN([OL_MSGHDR_MSG_ACCRIGHTS],
-  [AC_CACHE_CHECK(for msg_accrights in msghdr, ol_cv_msghdr_msg_accrights,
-    [AC_TRY_COMPILE([#include <sys/socket.h>],
- 		[struct msghdr m; m.msg_accrightslen=0],
diff --git a/net-nds/openldap/files/openldap-2.1.30-rpath.patch b/net-nds/openldap/files/openldap-2.1.30-rpath.patch
deleted file mode 100644
index 31016e8ce876..000000000000
--- a/net-nds/openldap/files/openldap-2.1.30-rpath.patch
+++ /dev/null
@@ -1,205 +0,0 @@
---- ./aclocal.m4.orig   2005-12-04 00:06:26.000000000 +0100
-+++ ./aclocal.m4        2005-12-04 00:06:51.585142250 +0100
-@@ -2884,7 +2884,7 @@
-     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-     _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- 
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
-     _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- 
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-@@ -3311,7 +3311,7 @@
- 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 	;;
-     esac
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
-     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-     ;;
-   linux*)
-@@ -3334,7 +3334,7 @@
- 	# dependencies.
- 	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- 
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
- 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- 
- 	# Archives containing C++ object files must be created using
-@@ -3362,7 +3362,7 @@
- 	  ;;
- 	esac
- 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
- 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- 	;;
-@@ -3371,7 +3371,7 @@
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-   	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
- 
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
- 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-         ;;
-@@ -3381,7 +3381,7 @@
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
- 
- 	runpath_var=LD_RUN_PATH
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
- 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- 
- 	# Commands to make compiler produce verbose output that lists
-@@ -3435,7 +3435,7 @@
-     _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
-     if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -3453,7 +3453,7 @@
- 	# to its proper name (with version) after linking.
- 	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- 
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
- 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- 
- 	# Archives containing C++ object files must be created using
-@@ -3470,7 +3470,7 @@
- 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
- 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- 
- 	# Commands to make compiler produce verbose output that lists
-@@ -3488,7 +3488,7 @@
- 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
- 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- 
- 	  # Commands to make compiler produce verbose output that lists
-@@ -3513,7 +3513,7 @@
- 	# to its proper name (with version) after linking.
- 	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- 
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
- 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- 
- 	# Archives containing C++ object files must be created using
-@@ -3533,7 +3533,7 @@
- 	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
- 	  $rm $lib.exp'
- 
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- 
- 	# Commands to make compiler produce verbose output that lists
-@@ -3551,7 +3551,7 @@
- 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- 	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
- 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- 
- 	  # Commands to make compiler produce verbose output that lists
-@@ -5385,7 +5385,7 @@
-     # are reset later if shared libraries are not supported. Putting them
-     # here allows them to be overridden if necessary.
-     runpath_var=LD_RUN_PATH
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
-     _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-     # ancient GNU ld didn't support --whole-archive et. al.
-     if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-@@ -5884,9 +5884,9 @@
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       else
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-L$libdir'
-       fi
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
-@@ -5905,7 +5905,7 @@
-     newsos6)
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       ;;
-@@ -5916,7 +5916,7 @@
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
- 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-       else
-        case $host_os in
-@@ -5926,7 +5926,7 @@
- 	   ;;
- 	 *)
- 	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
- 	   ;;
-        esac
-       fi
-@@ -5948,7 +5948,7 @@
- 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-       fi
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-       ;;
- 
-@@ -5956,7 +5956,7 @@
-       if test "$GCC" = yes; then
- 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-L$libdir'
-       else
- 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -5964,7 +5964,7 @@
- 	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-       fi
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-       ;;
---- ./libraries/liblunicode/Makefile.in.orig	2005-01-20 18:01:03.000000000 +0100
-+++ ./libraries/liblunicode/Makefile.in		2005-12-04 01:40:59.000000000 +0100
-@@ -31,7 +31,7 @@
- 
- ucgendat: $(XLIBS) ucgendat.o
- 	$(LTLINK) -o $@ ucgendat.o $(LIBS)
--	./ucgendat $(srcdir)/UnicodeData.txt -x $(srcdir)/CompositionExclusions.txt
-+	LD_LIBRARY_PATH=../liblber/.libs:$LD_LIBRARY_PATH ./ucgendat $(srcdir)/UnicodeData.txt -x $(srcdir)/CompositionExclusions.txt
- 
- DATFILES = case.dat cmbcl.dat comp.dat ctype.dat decomp.dat num.dat kdecomp.dat
- 
diff --git a/net-nds/openldap/files/openldap-2.1.30-tests.patch b/net-nds/openldap/files/openldap-2.1.30-tests.patch
deleted file mode 100644
index 5cde2ba073c4..000000000000
--- a/net-nds/openldap/files/openldap-2.1.30-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./Makefile.in.orig	2003-03-03 18:10:11.000000000 +0100
-+++ ./Makefile.in	2005-12-18 15:45:08.000000000 +0100
-@@ -8,6 +8,9 @@
- BUILD_BDB=@BUILD_BDB@
- BUILD_MONITOR=@BUILD_MONITOR@
- 
-+LD_LIBRARY_PATH=${pwd}../libraries/libldap_r/.libs:${pwd}../libraries/liblber/.libs:${pwd}../libraries/libldap/.libs:$LD_LIBRARY_PATH
-+export LD_LIBRARY_PATH
-+
- test: tests
- tests: bdb ldbm
- 
diff --git a/net-nds/openldap/files/openldap-2.1.30-tls-activedirectory-hang-fix.patch b/net-nds/openldap/files/openldap-2.1.30-tls-activedirectory-hang-fix.patch
deleted file mode 100644
index 57f6f08d465c..000000000000
--- a/net-nds/openldap/files/openldap-2.1.30-tls-activedirectory-hang-fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --recursive --context=3 openldap-2.1.30/libraries/libldap/result.c openldap-2.1.30.patched/libraries/libldap/result.c
-*** openldap-2.1.30/libraries/libldap/result.c	Fri Mar 26 22:34:27 2004
---- openldap-2.1.30.patched/libraries/libldap/result.c	Mon Oct 11 12:32:02 2004
-***************
-*** 297,302 ****
---- 297,303 ----
-          if( (*result = chkResponseList(ld, msgid, all)) != NULL ) {
-              rc = (*result)->lm_msgtype;
-          } else {
-+ 			int found_msg = 0;
-  
-  			for ( lc = ld->ld_conns; lc != NULL; lc = nextlc ) {
-  				nextlc = lc->lconn_next;
-***************
-*** 304,314 ****
-  						LBER_SB_OPT_DATA_READY, NULL ) ) {
-  					rc = try_read1msg( ld, msgid, all, lc->lconn_sb,
-  						&lc, result );
-  				    break;
-  				}
-  	        }
-  
-! 		    if ( lc == NULL ) {
-  			    rc = ldap_int_select( ld, tvp );
-  
-  
---- 305,316 ----
-  						LBER_SB_OPT_DATA_READY, NULL ) ) {
-  					rc = try_read1msg( ld, msgid, all, lc->lconn_sb,
-  						&lc, result );
-+ 					found_msg = 1;
-  				    break;
-  				}
-  	        }
-  
-! 		    if ( !found_msg ) {
-  			    rc = ldap_int_select( ld, tvp );
-  
-  
diff --git a/net-nds/openldap/files/openldap-2.1.30-ximian_connector.patch b/net-nds/openldap/files/openldap-2.1.30-ximian_connector.patch
deleted file mode 100644
index aa6e7133ab5d..000000000000
--- a/net-nds/openldap/files/openldap-2.1.30-ximian_connector.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-(Note that this patch is not useful on its own... it just adds some
-hooks to work with the LDAP authentication process at a lower level
-than the API otherwise allows. The code that calls these hooks and
-actually drives the NTLM authentication process is in
-lib/e2k-global-catalog.c, and the code that actually implements the
-NTLM algorithms is in xntlm/.)
-
-diff -Nrc -x '*~' -x '*.o' openldap-2.1.23.orig/include/ldap.h openldap-2.1.23/include/ldap.h
-*** openldap-2.1.23.orig/include/ldap.h	Wed Mar  5 18:48:31 2003
---- openldap-2.1.23/include/ldap.h	Mon Nov 17 13:46:23 2003
-***************
-*** 1645,1649 ****
---- 1645,1670 ----
-  	LDAPControl **sctrls,
-  	LDAPControl **cctrls ));
-  
-+ /*
-+  * hacks for NTLM
-+  */
-+ #define LDAP_AUTH_NTLM_REQUEST	((ber_tag_t) 0x8aU)
-+ #define LDAP_AUTH_NTLM_RESPONSE	((ber_tag_t) 0x8bU)
-+ LDAP_F( int )
-+ ldap_ntlm_bind LDAP_P((
-+ 	LDAP		*ld,
-+ 	LDAP_CONST char	*dn,
-+ 	ber_tag_t	tag,
-+ 	struct berval	*cred,
-+ 	LDAPControl	**sctrls,
-+ 	LDAPControl	**cctrls,
-+ 	int		*msgidp ));
-+ LDAP_F( int )
-+ ldap_parse_ntlm_bind_result LDAP_P((
-+ 	LDAP		*ld,
-+ 	LDAPMessage	*res,
-+ 	struct berval	*challenge));
-+ 
-+ 
-  LDAP_END_DECL
-  #endif /* _LDAP_H */
-diff -Nrc -x '*~' -x '*.o' openldap-2.1.23.orig/libraries/libldap/Makefile.in openldap-2.1.23/libraries/libldap/Makefile.in
-*** openldap-2.1.23.orig/libraries/libldap/Makefile.in	Sun Mar 30 09:47:09 2003
---- openldap-2.1.23/libraries/libldap/Makefile.in	Mon Nov 17 13:48:02 2003
-***************
-*** 11,17 ****
-  SRCS	= bind.c open.c result.c error.c compare.c search.c \
-  	controls.c messages.c references.c extended.c cyrus.c \
-  	modify.c add.c modrdn.c delete.c abandon.c \
-! 	sasl.c sbind.c kbind.c unbind.c cancel.c cache.c \
-  	filter.c free.c sort.c passwd.c whoami.c \
-  	getdn.c getentry.c getattr.c getvalues.c addentry.c \
-  	request.c os-ip.c url.c sortctrl.c vlvctrl.c \
---- 11,17 ----
-  SRCS	= bind.c open.c result.c error.c compare.c search.c \
-  	controls.c messages.c references.c extended.c cyrus.c \
-  	modify.c add.c modrdn.c delete.c abandon.c \
-! 	sasl.c sbind.c kbind.c ntlm.c unbind.c cancel.c cache.c \
-  	filter.c free.c sort.c passwd.c whoami.c \
-  	getdn.c getentry.c getattr.c getvalues.c addentry.c \
-  	request.c os-ip.c url.c sortctrl.c vlvctrl.c \
-***************
-*** 20,26 ****
-  OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
-  	controls.lo messages.lo references.lo extended.lo cyrus.lo \
-  	modify.lo add.lo modrdn.lo delete.lo abandon.lo \
-! 	sasl.lo sbind.lo kbind.lo unbind.lo cancel.lo cache.lo \
-  	filter.lo free.lo sort.lo passwd.lo whoami.lo \
-  	getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
-  	request.lo os-ip.lo url.lo sortctrl.lo vlvctrl.lo \
---- 20,26 ----
-  OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
-  	controls.lo messages.lo references.lo extended.lo cyrus.lo \
-  	modify.lo add.lo modrdn.lo delete.lo abandon.lo \
-! 	sasl.lo sbind.lo kbind.lo ntlm.lo unbind.lo cancel.lo cache.lo \
-  	filter.lo free.lo sort.lo passwd.lo whoami.lo \
-  	getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
-  	request.lo os-ip.lo url.lo sortctrl.lo vlvctrl.lo \
-diff -Nrc -x '*~' -x '*.o' openldap-2.1.23.orig/libraries/libldap/ntlm.c openldap-2.1.23/libraries/libldap/ntlm.c
-*** openldap-2.1.23.orig/libraries/libldap/ntlm.c	Wed Dec 31 19:00:00 1969
---- openldap-2.1.23/libraries/libldap/ntlm.c	Mon Nov 17 13:46:23 2003
-***************
-*** 0 ****
---- 1,141 ----
-+ /* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
-+ /*
-+  * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-+  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-+  */
-+ 
-+ /* Mostly copied from sasl.c */
-+ 
-+ #include "portable.h"
-+ 
-+ #include <stdlib.h>
-+ #include <stdio.h>
-+ 
-+ #include <ac/socket.h>
-+ #include <ac/string.h>
-+ #include <ac/time.h>
-+ #include <ac/errno.h>
-+ 
-+ #include "ldap-int.h"
-+ 
-+ int
-+ ldap_ntlm_bind(
-+ 	LDAP		*ld,
-+ 	LDAP_CONST char	*dn,
-+ 	ber_tag_t	tag,
-+ 	struct berval	*cred,
-+ 	LDAPControl	**sctrls,
-+ 	LDAPControl	**cctrls,
-+ 	int		*msgidp )
-+ {
-+ 	BerElement	*ber;
-+ 	int rc;
-+ 
-+ 	Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
-+ 
-+ 	assert( ld != NULL );
-+ 	assert( LDAP_VALID( ld ) );
-+ 	assert( msgidp != NULL );
-+ 
-+ 	if( msgidp == NULL ) {
-+ 		ld->ld_errno = LDAP_PARAM_ERROR;
-+ 		return ld->ld_errno;
-+ 	}
-+ 
-+ 	/* create a message to send */
-+ 	if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-+ 		ld->ld_errno = LDAP_NO_MEMORY;
-+ 		return ld->ld_errno;
-+ 	}
-+ 
-+ 	assert( LBER_VALID( ber ) );
-+ 
-+ 	rc = ber_printf( ber, "{it{istON}" /*}*/,
-+ 			 ++ld->ld_msgid, LDAP_REQ_BIND,
-+ 			 ld->ld_version, dn, tag,
-+ 			 cred );
-+ 
-+ 	/* Put Server Controls */
-+ 	if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
-+ 		ber_free( ber, 1 );
-+ 		return ld->ld_errno;
-+ 	}
-+ 
-+ 	if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
-+ 		ld->ld_errno = LDAP_ENCODING_ERROR;
-+ 		ber_free( ber, 1 );
-+ 		return ld->ld_errno;
-+ 	}
-+ 
-+ #ifndef LDAP_NOCACHE
-+ 	if ( ld->ld_cache != NULL ) {
-+ 		ldap_flush_cache( ld );
-+ 	}
-+ #endif /* !LDAP_NOCACHE */
-+ 
-+ 	/* send the message */
-+ 	*msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber );
-+ 
-+ 	if(*msgidp < 0)
-+ 		return ld->ld_errno;
-+ 
-+ 	return LDAP_SUCCESS;
-+ }
-+ 
-+ int
-+ ldap_parse_ntlm_bind_result(
-+ 	LDAP		*ld,
-+ 	LDAPMessage	*res,
-+ 	struct berval	*challenge)
-+ {
-+ 	ber_int_t	errcode;
-+ 	ber_tag_t	tag;
-+ 	BerElement	*ber;
-+ 	ber_len_t	len;
-+ 
-+ 	Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
-+ 
-+ 	assert( ld != NULL );
-+ 	assert( LDAP_VALID( ld ) );
-+ 	assert( res != NULL );
-+ 
-+ 	if ( ld == NULL || res == NULL ) {
-+ 		return LDAP_PARAM_ERROR;
-+ 	}
-+ 
-+ 	if( res->lm_msgtype != LDAP_RES_BIND ) {
-+ 		ld->ld_errno = LDAP_PARAM_ERROR;
-+ 		return ld->ld_errno;
-+ 	}
-+ 
-+ 	if ( ld->ld_error ) {
-+ 		LDAP_FREE( ld->ld_error );
-+ 		ld->ld_error = NULL;
-+ 	}
-+ 	if ( ld->ld_matched ) {
-+ 		LDAP_FREE( ld->ld_matched );
-+ 		ld->ld_matched = NULL;
-+ 	}
-+ 
-+ 	/* parse results */
-+ 
-+ 	ber = ber_dup( res->lm_ber );
-+ 
-+ 	if( ber == NULL ) {
-+ 		ld->ld_errno = LDAP_NO_MEMORY;
-+ 		return ld->ld_errno;
-+ 	}
-+ 
-+ 	tag = ber_scanf( ber, "{ioa" /*}*/,
-+ 			 &errcode, challenge, &ld->ld_error );
-+ 	ber_free( ber, 0 );
-+ 
-+ 	if( tag == LBER_ERROR ) {
-+ 		ld->ld_errno = LDAP_DECODING_ERROR;
-+ 		return ld->ld_errno;
-+ 	}
-+ 
-+ 	ld->ld_errno = errcode;
-+ 
-+ 	return( ld->ld_errno );
-+ }
diff --git a/net-nds/openldap/files/openldap-2.2.14-db40.patch b/net-nds/openldap/files/openldap-2.2.14-db40.patch
deleted file mode 100644
index 09e066d5482f..000000000000
--- a/net-nds/openldap/files/openldap-2.2.14-db40.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Only in openldap-2.2.14.orig/build: .openldap.m4.swp
-diff -ur openldap-2.2.14.orig/build/openldap.m4 openldap-2.2.14/build/openldap.m4
---- openldap-2.2.14.orig/build/openldap.m4	2004-06-20 18:39:39.000000000 -0700
-+++ openldap-2.2.14/build/openldap.m4	2004-06-20 18:40:23.000000000 -0700
-@@ -326,6 +326,10 @@
- OL_BERKELEY_DB_TRY(ol_cv_db_db_41,[-ldb-41])
- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_1,[-ldb-4.1])
- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_1,[-ldb-4-1])
-+OL_BERKELEY_DB_TRY(ol_cv_db_db40,[-ldb40])
-+OL_BERKELEY_DB_TRY(ol_cv_db_db_40,[-ldb-40])
-+OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_0,[-ldb-4.0])
-+OL_BERKELEY_DB_TRY(ol_cv_db_db_4_0,[-ldb-4-0])
- OL_BERKELEY_DB_TRY(ol_cv_db_db3,[-ldb3])
- OL_BERKELEY_DB_TRY(ol_cv_db_db_3,[-ldb-3])
- OL_BERKELEY_DB_TRY(ol_cv_db_db2,[-ldb2])
diff --git a/net-nds/openldap/files/openldap-2.2.26-tls-fix-connection-test.patch b/net-nds/openldap/files/openldap-2.2.26-tls-fix-connection-test.patch
deleted file mode 100644
index dce56a0093bb..000000000000
--- a/net-nds/openldap/files/openldap-2.2.26-tls-fix-connection-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN openldap-2.2.26.orig/libraries/libldap/tls.c openldap-2.2.26/libraries/libldap/tls.c
---- openldap-2.2.26.orig/libraries/libldap/tls.c	2005-01-20 17:01:02.000000000 +0000
-+++ openldap-2.2.26/libraries/libldap/tls.c	2005-06-22 01:34:22.000000000 +0100
-@@ -1738,7 +1738,8 @@
- 
- 	/* XXYYZ: this initiates operation only on default connection! */
- 
--	if ( ld->ld_sb != NULL && ldap_pvt_tls_inplace( ld->ld_sb ) != 0 ) {
-+	if ( ( ld->ld_defconn != NULL ) ? ( ld->ld_defconn->lconn_sb != NULL && ldap_pvt_tls_inplace( ld->ld_defconn->lconn_sb ) != 0 )
-+			: ( ld->ld_sb != NULL && ldap_pvt_tls_inplace( ld->ld_sb ) != 0 ) ) {
- 		return LDAP_LOCAL_ERROR;
- 	}
- 
diff --git a/net-nds/openldap/files/openldap-2.2.28-autoconf-archived-fix.patch b/net-nds/openldap/files/openldap-2.2.28-autoconf-archived-fix.patch
deleted file mode 100644
index 2a0aae9c00d3..000000000000
--- a/net-nds/openldap/files/openldap-2.2.28-autoconf-archived-fix.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- build/openldap.m4.orig	2005-12-19 01:43:17.000000000 +0100
-+++ build/openldap.m4	2005-12-19 01:44:05.000000000 +0100
-@@ -1298,3 +1298,30 @@
- 		[define if struct msghdr has msg_accrights])
-   fi
- ])dnl
-+
-+AC_DEFUN([OL_AC_COMPILE_CHECK_SIZEOF],
-+[changequote(<<, >>)dnl
-+dnl The name to #define.
-+define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
-+dnl The cache variable name.
-+define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl
-+changequote([, ])dnl
-+AC_MSG_CHECKING(size of $1)
-+AC_CACHE_VAL(AC_CV_NAME,
-+[for ac_size in 4 8 1 2 16 32 64 $2 ; do # List sizes in rough order of prevalence.
-+  AC_TRY_COMPILE([#include "confdefs.h"
-+#include <sys/types.h>
-+#include <stddef.h>
-+$2
-+], [switch (0) case 0: case (sizeof ($1) == $ac_size):;], AC_CV_NAME=$ac_size)
-+  if test x$AC_CV_NAME != x ; then break; fi
-+done
-+])
-+if test x$AC_CV_NAME = x ; then
-+  AC_MSG_ERROR([cannot determine a size for $1])
-+fi
-+AC_MSG_RESULT($AC_CV_NAME)
-+AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in type $1])
-+undefine([AC_TYPE_NAME])dnl
-+undefine([AC_CV_NAME])dnl
-+])
---- ./configure.in.orig	2005-12-19 01:48:49.000000000 +0100
-+++ ./configure.in	2005-12-19 01:50:12.000000000 +0100
-@@ -590,8 +590,8 @@
- 
- dnl ----------------------------------------------------------------
- dnl Checks for system services
--AC_CYGWIN
--AC_MINGW32
-+dnl AC_CYGWIN
-+dnl AC_MINGW32
- AC_EXEEXT
- AC_OBJEXT
- 
-@@ -2174,7 +2174,7 @@
- AC_TYPE_MODE_T
- AC_TYPE_OFF_T
- AC_TYPE_PID_T
--AM_TYPE_PTRDIFF_T
-+AC_CHECK_TYPES([ptrdiff_t])
- AC_TYPE_SIGNAL
- AC_TYPE_SIZE_T
- 
-@@ -2204,10 +2204,10 @@
- 	AC_C_BIGENDIAN
- fi
- 
--AC_COMPILE_CHECK_SIZEOF(short) 
--AC_COMPILE_CHECK_SIZEOF(int) 
--AC_COMPILE_CHECK_SIZEOF(long)
--AC_COMPILE_CHECK_SIZEOF(wchar_t)
-+OL_AC_COMPILE_CHECK_SIZEOF(short) 
-+OL_AC_COMPILE_CHECK_SIZEOF(int) 
-+OL_AC_COMPILE_CHECK_SIZEOF(long)
-+OL_AC_COMPILE_CHECK_SIZEOF(wchar_t)
- 
- if test "$ac_cv_sizeof_int" -lt 4 ; then
- 	AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.])
diff --git a/net-nds/openldap/files/openldap-2.2.28-cleartext-passwords.patch b/net-nds/openldap/files/openldap-2.2.28-cleartext-passwords.patch
deleted file mode 100644
index ceb6ece58fd2..000000000000
--- a/net-nds/openldap/files/openldap-2.2.28-cleartext-passwords.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- libraries.orig/liblutil/passwd.c	Tue Oct 11 16:22:46 2005
-+++ libraries/liblutil/passwd.c	Tue Oct 11 19:27:24 2005
-@@ -79,6 +79,10 @@
- static char *salt_format = NULL;
- #endif
- 
-+/* KLUDGE:
-+ *  chk_fn is NULL iff name is {CLEARTEXT}
-+ *     otherwise, things will break
-+ */
- struct pw_scheme {
- 	struct berval name;
- 	LUTIL_PASSWD_CHK_FUNC *chk_fn;
-@@ -161,7 +165,7 @@
- 
- #ifdef SLAPD_CLEARTEXT
- 	/* pseudo scheme */
--	{ {0, "{CLEARTEXT}"},		NULL, hash_clear },
-+	{ BER_BVC("{CLEARTEXT}"),	NULL, hash_clear },
- #endif
- 
- 	{ BER_BVNULL, NULL, NULL }
-@@ -223,9 +227,7 @@
- 	bv.bv_val = (char *) scheme;
- 
- 	for( pws=pw_schemes; pws; pws=pws->next ) {
--		if( bv.bv_len != pws->s.name.bv_len )
--			continue;
--		if( strncasecmp(bv.bv_val, pws->s.name.bv_val, bv.bv_len ) == 0 ) {
-+		if ( ber_bvstrcasecmp(&bv, &pws->s.name ) == 0 ) {
- 			return &(pws->s);
- 		}
- 	}
-@@ -317,10 +319,17 @@
- 	}
- 
- #ifdef SLAPD_CLEARTEXT
-+	/* Do we think there is a scheme specifier here that we
-+	* didn't recognize? Assume a scheme name is at least 1 character.
-+	*/
-+	if (( passwd->bv_val[0] == '{' ) &&
-+		( strchr( passwd->bv_val, '}' ) > passwd->bv_val+1 ))
-+	{
-+		return 1;
-+	}
- 	if( is_allowed_scheme("{CLEARTEXT}", schemes ) ) {
--		return (( passwd->bv_len == cred->bv_len ) &&
--				( passwd->bv_val[0] != '{' /*'}'*/ ))
--			? memcmp( passwd->bv_val, cred->bv_val, passwd->bv_len )
-+		return ( passwd->bv_len == cred->bv_len ) ?
-+			memcmp( passwd->bv_val, cred->bv_val, passwd->bv_len )
- 			: 1;
- 	}
- #endif
diff --git a/net-nds/openldap/files/openldap-2.2.28-r1-configure.in-rpath.patch b/net-nds/openldap/files/openldap-2.2.28-r1-configure.in-rpath.patch
deleted file mode 100644
index 45d94fc6c9b1..000000000000
--- a/net-nds/openldap/files/openldap-2.2.28-r1-configure.in-rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.in.orig	2005-03-14 18:06:26.000000000 +0100
-+++ ./configure.in	2005-12-03 01:46:39.607707750 +0100
-@@ -2133,7 +2133,7 @@
- 			[have_setproctitle=yes
- 			LUTIL_LIBS="$LUTIL_LIBS -lutil"],
- 			[have_setproctitle=no
--			LIBOBJS="$LIBOBJS setproctitle.o"
-+			AC_LIBOBJ([setproctitle])
- 			LIBSRCS="$LIBSRCS setproctitle.c"])])
- 
- 	if test $have_setproctitle = yes ; then
diff --git a/net-nds/openldap/files/openldap-2.2.28-tests.patch b/net-nds/openldap/files/openldap-2.2.28-tests.patch
deleted file mode 100644
index 3845707b2c21..000000000000
--- a/net-nds/openldap/files/openldap-2.2.28-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./Makefile.in.orig	2005-01-20 18:01:19.000000000 +0100
-+++ ./Makefile.in	2005-12-15 15:02:15.000000000 +0100
-@@ -20,6 +20,9 @@
- BUILD_HDB=@BUILD_HDB@
- BUILD_LDBM=@BUILD_LDBM@
- 
-+LD_LIBRARY_PATH=${pwd}../libraries/libldap_r/.libs:${pwd}../libraries/liblber/.libs:${pwd}../libraries/libldap/.libs:$LD_LIBRARY_PATH
-+export LD_LIBRARY_PATH
-+
- test tests:
- 	@$(MAKE) bdb
- 	@$(MAKE) hdb
diff --git a/net-nds/openldap/files/openldap-2.2.28-ximian_connector.patch b/net-nds/openldap/files/openldap-2.2.28-ximian_connector.patch
deleted file mode 100644
index 78ff799fe7a0..000000000000
--- a/net-nds/openldap/files/openldap-2.2.28-ximian_connector.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-(Note that this patch is not useful on its own... it just adds some
-hooks to work with the LDAP authentication process at a lower level
-than the API otherwise allows. The code that calls these hooks and
-actually drives the NTLM authentication process is in
-lib/e2k-global-catalog.c, and the code that actually implements the
-NTLM algorithms is in xntlm/.)
-
-Forward ported for 2.2.28 by Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude='*.orig' --exclude='*.rej' /dev/shm/portage/openldap-2.2.28/work/openldap-2.2.28/include/ldap.h tmp.new/include/ldap.h
---- openldap-2.2.28/include/ldap.h	2005-08-12 12:28:56.000000000 -0700
-+++ tmp.new/include/ldap.h	2005-09-07 08:33:25.000000000 -0700
-@@ -1769,5 +1769,26 @@
- 	LDAPControl **sctrls,
- 	LDAPControl **cctrls ));
- 
-+/*
-+ * hacks for NTLM
-+ */
-+#define LDAP_AUTH_NTLM_REQUEST	((ber_tag_t) 0x8aU)
-+#define LDAP_AUTH_NTLM_RESPONSE	((ber_tag_t) 0x8bU)
-+LDAP_F( int )
-+ldap_ntlm_bind LDAP_P((
-+	LDAP		*ld,
-+	LDAP_CONST char	*dn,
-+	ber_tag_t	tag,
-+	struct berval	*cred,
-+	LDAPControl	**sctrls,
-+	LDAPControl	**cctrls,
-+	int		*msgidp ));
-+LDAP_F( int )
-+ldap_parse_ntlm_bind_result LDAP_P((
-+	LDAP		*ld,
-+	LDAPMessage	*res,
-+	struct berval	*challenge));
-+
-+
- LDAP_END_DECL
- #endif /* _LDAP_H */
-diff -Nuar --exclude='*.orig' --exclude='*.rej' /dev/shm/portage/openldap-2.2.28/work/openldap-2.2.28/libraries/libldap/Makefile.in tmp.new/libraries/libldap/Makefile.in
---- openldap-2.2.28/libraries/libldap/Makefile.in	2005-01-20 09:01:01.000000000 -0800
-+++ tmp.new/libraries/libldap/Makefile.in	2005-09-07 08:34:19.000000000 -0700
-@@ -20,7 +20,7 @@
- SRCS	= bind.c open.c result.c error.c compare.c search.c \
- 	controls.c messages.c references.c extended.c cyrus.c \
- 	modify.c add.c modrdn.c delete.c abandon.c \
--	sasl.c sbind.c kbind.c unbind.c cancel.c  \
-+	sasl.c sbind.c kbind.c ntlm.c unbind.c cancel.c  \
- 	filter.c free.c sort.c passwd.c whoami.c \
- 	getdn.c getentry.c getattr.c getvalues.c addentry.c \
- 	request.c os-ip.c url.c sortctrl.c vlvctrl.c \
-@@ -29,7 +29,7 @@
- OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
- 	controls.lo messages.lo references.lo extended.lo cyrus.lo \
- 	modify.lo add.lo modrdn.lo delete.lo abandon.lo \
--	sasl.lo sbind.lo kbind.lo unbind.lo cancel.lo \
-+	sasl.lo sbind.lo kbind.lo ntlm.lo unbind.lo cancel.lo \
- 	filter.lo free.lo sort.lo passwd.lo whoami.lo \
- 	getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
- 	request.lo os-ip.lo url.lo sortctrl.lo vlvctrl.lo \
-diff -Nuar --exclude='*.orig' --exclude='*.rej' /dev/shm/portage/openldap-2.2.28/work/openldap-2.2.28/libraries/libldap/ntlm.c tmp.new/libraries/libldap/ntlm.c
---- openldap-2.2.28/libraries/libldap/ntlm.c	1969-12-31 16:00:00.000000000 -0800
-+++ tmp.new/libraries/libldap/ntlm.c	2005-09-07 08:33:25.000000000 -0700
-@@ -0,0 +1,141 @@
-+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
-+/*
-+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-+ */
-+
-+/* Mostly copied from sasl.c */
-+
-+#include "portable.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+#include <ac/socket.h>
-+#include <ac/string.h>
-+#include <ac/time.h>
-+#include <ac/errno.h>
-+
-+#include "ldap-int.h"
-+
-+int
-+ldap_ntlm_bind(
-+	LDAP		*ld,
-+	LDAP_CONST char	*dn,
-+	ber_tag_t	tag,
-+	struct berval	*cred,
-+	LDAPControl	**sctrls,
-+	LDAPControl	**cctrls,
-+	int		*msgidp )
-+{
-+	BerElement	*ber;
-+	int rc;
-+
-+	Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
-+
-+	assert( ld != NULL );
-+	assert( LDAP_VALID( ld ) );
-+	assert( msgidp != NULL );
-+
-+	if( msgidp == NULL ) {
-+		ld->ld_errno = LDAP_PARAM_ERROR;
-+		return ld->ld_errno;
-+	}
-+
-+	/* create a message to send */
-+	if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-+		ld->ld_errno = LDAP_NO_MEMORY;
-+		return ld->ld_errno;
-+	}
-+
-+	assert( LBER_VALID( ber ) );
-+
-+	rc = ber_printf( ber, "{it{istON}" /*}*/,
-+			 ++ld->ld_msgid, LDAP_REQ_BIND,
-+			 ld->ld_version, dn, tag,
-+			 cred );
-+
-+	/* Put Server Controls */
-+	if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
-+		ber_free( ber, 1 );
-+		return ld->ld_errno;
-+	}
-+
-+	if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
-+		ld->ld_errno = LDAP_ENCODING_ERROR;
-+		ber_free( ber, 1 );
-+		return ld->ld_errno;
-+	}
-+
-+#ifndef LDAP_NOCACHE
-+	if ( ld->ld_cache != NULL ) {
-+		ldap_flush_cache( ld );
-+	}
-+#endif /* !LDAP_NOCACHE */
-+
-+	/* send the message */
-+	*msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber );
-+
-+	if(*msgidp < 0)
-+		return ld->ld_errno;
-+
-+	return LDAP_SUCCESS;
-+}
-+
-+int
-+ldap_parse_ntlm_bind_result(
-+	LDAP		*ld,
-+	LDAPMessage	*res,
-+	struct berval	*challenge)
-+{
-+	ber_int_t	errcode;
-+	ber_tag_t	tag;
-+	BerElement	*ber;
-+	ber_len_t	len;
-+
-+	Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
-+
-+	assert( ld != NULL );
-+	assert( LDAP_VALID( ld ) );
-+	assert( res != NULL );
-+
-+	if ( ld == NULL || res == NULL ) {
-+		return LDAP_PARAM_ERROR;
-+	}
-+
-+	if( res->lm_msgtype != LDAP_RES_BIND ) {
-+		ld->ld_errno = LDAP_PARAM_ERROR;
-+		return ld->ld_errno;
-+	}
-+
-+	if ( ld->ld_error ) {
-+		LDAP_FREE( ld->ld_error );
-+		ld->ld_error = NULL;
-+	}
-+	if ( ld->ld_matched ) {
-+		LDAP_FREE( ld->ld_matched );
-+		ld->ld_matched = NULL;
-+	}
-+
-+	/* parse results */
-+
-+	ber = ber_dup( res->lm_ber );
-+
-+	if( ber == NULL ) {
-+		ld->ld_errno = LDAP_NO_MEMORY;
-+		return ld->ld_errno;
-+	}
-+
-+	tag = ber_scanf( ber, "{ioa" /*}*/,
-+			 &errcode, challenge, &ld->ld_error );
-+	ber_free( ber, 0 );
-+
-+	if( tag == LBER_ERROR ) {
-+		ld->ld_errno = LDAP_DECODING_ERROR;
-+		return ld->ld_errno;
-+	}
-+
-+	ld->ld_errno = errcode;
-+
-+	return( ld->ld_errno );
-+}
diff --git a/net-nds/openldap/files/openldap-2.3.27-CVE-2006-5779.patch b/net-nds/openldap/files/openldap-2.3.27-CVE-2006-5779.patch
deleted file mode 100644
index 194ceb9bad58..000000000000
--- a/net-nds/openldap/files/openldap-2.3.27-CVE-2006-5779.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Patch from upstream repository.
-
-RCS file: /repo/OpenLDAP/pkg/ldap/libraries/libldap/getdn.c,v
-retrieving revision 1.133
-retrieving revision 1.134
-diff -u -r1.133 -r1.134
---- libraries/libldap/getdn.c	2006/10/28 02:47:58	1.133
-+++ libraries/libldap/getdn.c	2006/11/08 22:57:02	1.134
-@@ -2016,7 +2016,7 @@
- strval2strlen( struct berval *val, unsigned flags, ber_len_t *len )
- {
- 	ber_len_t	l, cl = 1;
--	char		*p;
-+	char		*p, *end;
- 	int		escaped_byte_len = LDAP_DN_IS_PRETTY( flags ) ? 1 : 3;
- #ifdef PRETTY_ESCAPE
- 	int		escaped_ascii_len = LDAP_DN_IS_PRETTY( flags ) ? 2 : 3;
-@@ -2030,7 +2030,8 @@
- 		return( 0 );
- 	}
- 
--	for ( l = 0, p = val->bv_val; p < val->bv_val + val->bv_len; p += cl ) {
-+	end = val->bv_val + val->bv_len - 1;
-+	for ( l = 0, p = val->bv_val; p <= end; p += cl ) {
- 
- 		/* 
- 		 * escape '%x00' 
-@@ -2059,7 +2060,7 @@
- 		} else if ( LDAP_DN_NEEDESCAPE( p[ 0 ] )
- 				|| LDAP_DN_SHOULDESCAPE( p[ 0 ] )
- 				|| ( p == val->bv_val && LDAP_DN_NEEDESCAPE_LEAD( p[ 0 ] ) )
--				|| ( !p[ 1 ] && LDAP_DN_NEEDESCAPE_TRAIL( p[ 0 ] ) ) ) {
-+				|| ( p == end && LDAP_DN_NEEDESCAPE_TRAIL( p[ 0 ] ) ) ) {
- #ifdef PRETTY_ESCAPE
- #if 0
- 			if ( LDAP_DN_WILLESCAPE_HEX( flags, p[ 0 ] ) ) {