remove unused files

(Portage version: 2.1.1_pre2-r6)
 (Signed Manifest commit)

23 files changed, 7 insertions, 1569 deletions

diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index c34410bd67d2..99b98bcea607 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,70 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 2.1.14-db4.patch 2032 RMD160 a52b214b1938961df7a8932b0d73ccd68013208f SHA1 19b1f6cb07e63fe0a7fed6eec2519eca91123e38 SHA256 3b4fe7ca6080c3c07ffc72b63baee0a56c998a6838415f4602b76820cec701bf
-MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
-RMD160 a52b214b1938961df7a8932b0d73ccd68013208f files/2.1.14-db4.patch 2032
-SHA256 3b4fe7ca6080c3c07ffc72b63baee0a56c998a6838415f4602b76820cec701bf files/2.1.14-db4.patch 2032
-AUX 2.1.14-kerberos.patch 1148 RMD160 07e64be6d2b1c6606a779fab7911653bc4d8ae2f SHA1 6247e122d38c403736fbde87b468eafac535fdc4 SHA256 50d5ee542861ace4f7c60a783457077d694f9bc2978f7e96ffd47d27d1ea0fb3
-MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148
-RMD160 07e64be6d2b1c6606a779fab7911653bc4d8ae2f files/2.1.14-kerberos.patch 1148
-SHA256 50d5ee542861ace4f7c60a783457077d694f9bc2978f7e96ffd47d27d1ea0fb3 files/2.1.14-kerberos.patch 1148
-AUX 2.1.14-mysql.patch 730 RMD160 41ec4de02aec0361766a213f49d575a4ec45a6bc SHA1 5d05e073b9db02646e2ef4adea4a4dcfc67235eb SHA256 04cedfea47e7f28c1530015a5cf97bd2347c132d86442d0ecdf6b108afef084a
-MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730
-RMD160 41ec4de02aec0361766a213f49d575a4ec45a6bc files/2.1.14-mysql.patch 730
-SHA256 04cedfea47e7f28c1530015a5cf97bd2347c132d86442d0ecdf6b108afef084a files/2.1.14-mysql.patch 730
-AUX cyrus-sasl-1.5.21-des.patch 242 RMD160 396cc6d9f65aa311b3e2dda9e9aedce06885c7b6 SHA1 4255ce407be46c460f1300a1538529ea1c362512 SHA256 7f4cd1d01a378d09079ad17f66caa56e545e0908a7b909a472b9d89091550667
-MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242
-RMD160 396cc6d9f65aa311b3e2dda9e9aedce06885c7b6 files/cyrus-sasl-1.5.21-des.patch 242
-SHA256 7f4cd1d01a378d09079ad17f66caa56e545e0908a7b909a472b9d89091550667 files/cyrus-sasl-1.5.21-des.patch 242
-AUX cyrus-sasl-1.5.24-rpath.patch 448 RMD160 7f5ec8ece8fe2de6c134ac2c2bc200e10b3d708a SHA1 09f2250900d42c8e5d33b3c2187cf5f9865893a5 SHA256 2e7547c40daf8a2d52a9c21f134f800d68c05e68c4ad54885d4d4b7c3924b03b
-MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448
-RMD160 7f5ec8ece8fe2de6c134ac2c2bc200e10b3d708a files/cyrus-sasl-1.5.24-rpath.patch 448
-SHA256 2e7547c40daf8a2d52a9c21f134f800d68c05e68c4ad54885d4d4b7c3924b03b files/cyrus-sasl-1.5.24-rpath.patch 448
-AUX cyrus-sasl-1.5.27-scram.patch 480 RMD160 2f837ce422f82f1bebd40b9ca1afa197a14e0328 SHA1 1224881414a7b0bdab7b9058feddc022d57972aa SHA256 0266f74aa48e14ba2929fa1763416f57638ff60538ef16d468faf39a0964cf2e
-MD5 5f96ab675ae2ff1da8e0ee4503340df5 files/cyrus-sasl-1.5.27-scram.patch 480
-RMD160 2f837ce422f82f1bebd40b9ca1afa197a14e0328 files/cyrus-sasl-1.5.27-scram.patch 480
-SHA256 0266f74aa48e14ba2929fa1763416f57638ff60538ef16d468faf39a0964cf2e files/cyrus-sasl-1.5.27-scram.patch 480
-AUX cyrus-sasl-2.1.17-configdir.patch 8095 RMD160 bc06b58ddd9d238ff37b7fd7d48dcc2a8b255724 SHA1 ef34d95af22ac7758de4ee2aad3e80eee9fb1aca SHA256 0712faa263a86ab3d894209501758a30c0584ba260ecb937443624c407d7cf46
-MD5 397ec1b24d4efe6efafa4782ba0f3493 files/cyrus-sasl-2.1.17-configdir.patch 8095
-RMD160 bc06b58ddd9d238ff37b7fd7d48dcc2a8b255724 files/cyrus-sasl-2.1.17-configdir.patch 8095
-SHA256 0712faa263a86ab3d894209501758a30c0584ba260ecb937443624c407d7cf46 files/cyrus-sasl-2.1.17-configdir.patch 8095
-AUX cyrus-sasl-2.1.17-db4.patch 1451 RMD160 0b94366422a7f573d908a6452be25ca575a606f5 SHA1 e35b10af09bf64de504f332a457962f00f7a1249 SHA256 189236e4c226802f856638fcb965cc448b6bcec60de1295d253ee019d34b8302
-MD5 cb4a5c5160219818e04196847ba9f7a1 files/cyrus-sasl-2.1.17-db4.patch 1451
-RMD160 0b94366422a7f573d908a6452be25ca575a606f5 files/cyrus-sasl-2.1.17-db4.patch 1451
-SHA256 189236e4c226802f856638fcb965cc448b6bcec60de1295d253ee019d34b8302 files/cyrus-sasl-2.1.17-db4.patch 1451
 AUX cyrus-sasl-2.1.17-pgsql-include.patch 617 RMD160 b6a01c3447b49c8cc33ae0c7ca63294cad8e672c SHA1 a7a22f113044d8bda07e8345781913c317941f53 SHA256 394b196e7d5d7abb3d340de69ddea718bf80936de1eb667580ebae40b9cca228
 MD5 b9ab0670db5b9b5a74de379c18e5370d files/cyrus-sasl-2.1.17-pgsql-include.patch 617
 RMD160 b6a01c3447b49c8cc33ae0c7ca63294cad8e672c files/cyrus-sasl-2.1.17-pgsql-include.patch 617
 SHA256 394b196e7d5d7abb3d340de69ddea718bf80936de1eb667580ebae40b9cca228 files/cyrus-sasl-2.1.17-pgsql-include.patch 617
-AUX cyrus-sasl-2.1.18-cvs-1.172.patch 5056 RMD160 c708f0f09df3cbbcdf844055c63e8c32c827f14b SHA1 a975c99d9de6bc86c9b0eeb499e7044fefd9af19 SHA256 28aab46b848597bf53376d7a5f259ae2fa3dc691c40ae76a91f419d2df5756c4
-MD5 e8b9357dba2bde4dac0b1cf38d5942eb files/cyrus-sasl-2.1.18-cvs-1.172.patch 5056
-RMD160 c708f0f09df3cbbcdf844055c63e8c32c827f14b files/cyrus-sasl-2.1.18-cvs-1.172.patch 5056
-SHA256 28aab46b848597bf53376d7a5f259ae2fa3dc691c40ae76a91f419d2df5756c4 files/cyrus-sasl-2.1.18-cvs-1.172.patch 5056
-AUX cyrus-sasl-2.1.18-db4.patch 1604 RMD160 4d413eb09057a9c5baad458bc72048188a0bebd0 SHA1 2b7dd1eb99a903b48200d09ca53054f9c8216731 SHA256 3bcc9ef2a3d17a1198eeb88645124421696b987b5706bd574b4ccd2ae2a1748b
-MD5 13c15e58d2fa734adeb718e4e3dea757 files/cyrus-sasl-2.1.18-db4.patch 1604
-RMD160 4d413eb09057a9c5baad458bc72048188a0bebd0 files/cyrus-sasl-2.1.18-db4.patch 1604
-SHA256 3bcc9ef2a3d17a1198eeb88645124421696b987b5706bd574b4ccd2ae2a1748b files/cyrus-sasl-2.1.18-db4.patch 1604
-AUX cyrus-sasl-2.1.18-pam_mysql.patch 1388 RMD160 c7a0012c315d11dc9d296b51bdfe10ed36a8c033 SHA1 bc0a6913c2eae22a3ea1cb2fae57b0a25087a925 SHA256 68361934131d130e7b9b296e409d2fbb1b5f7bd96e4af7e49c8f8c578fbc3cb9
-MD5 d6cb936d23646d9e5312d63d08f6f563 files/cyrus-sasl-2.1.18-pam_mysql.patch 1388
-RMD160 c7a0012c315d11dc9d296b51bdfe10ed36a8c033 files/cyrus-sasl-2.1.18-pam_mysql.patch 1388
-SHA256 68361934131d130e7b9b296e409d2fbb1b5f7bd96e4af7e49c8f8c578fbc3cb9 files/cyrus-sasl-2.1.18-pam_mysql.patch 1388
-AUX cyrus-sasl-2.1.18-sasl-path-fix.patch 529 RMD160 2daffb9ee9cec0cd99107c4c3c973a22526b1cf6 SHA1 915ab0bb2e7be0fece48fa425304e1315876ac33 SHA256 15c85234ed900c0514b88a26435dcdcb92c80e9dc2ba9b35e7516fc505ecdfea
-MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.18-sasl-path-fix.patch 529
-RMD160 2daffb9ee9cec0cd99107c4c3c973a22526b1cf6 files/cyrus-sasl-2.1.18-sasl-path-fix.patch 529
-SHA256 15c85234ed900c0514b88a26435dcdcb92c80e9dc2ba9b35e7516fc505ecdfea files/cyrus-sasl-2.1.18-sasl-path-fix.patch 529
 AUX cyrus-sasl-2.1.19-checkpw.c.patch 4858 RMD160 04f03808803b7a6f73bec5325c867b6e96e50f73 SHA1 60949a168c99b445298b3af786dae6e1b0f129d9 SHA256 57bc424e617ca4bac9e27f0f20da1bab6806a39801945c180b94ae29160981a8
 MD5 e27ddff076342e7a3041c4759817d04b files/cyrus-sasl-2.1.19-checkpw.c.patch 4858
 RMD160 04f03808803b7a6f73bec5325c867b6e96e50f73 files/cyrus-sasl-2.1.19-checkpw.c.patch 4858
 SHA256 57bc424e617ca4bac9e27f0f20da1bab6806a39801945c180b94ae29160981a8 files/cyrus-sasl-2.1.19-checkpw.c.patch 4858
-AUX cyrus-sasl-2.1.19-configdir.patch 8231 RMD160 7f920f00964a185bd22d2669330ce1e906708dc9 SHA1 39127f0c133a88d10012b4f6889b62102fb6eb41 SHA256 00656e62e10984c629adb58d3ac8f139158d5f0faf4b20a60f90fdc53089c11e
-MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.19-configdir.patch 8231
-RMD160 7f920f00964a185bd22d2669330ce1e906708dc9 files/cyrus-sasl-2.1.19-configdir.patch 8231
-SHA256 00656e62e10984c629adb58d3ac8f139158d5f0faf4b20a60f90fdc53089c11e files/cyrus-sasl-2.1.19-configdir.patch 8231
-AUX cyrus-sasl-2.1.19-sasl-path-fix.patch 529 RMD160 2daffb9ee9cec0cd99107c4c3c973a22526b1cf6 SHA1 915ab0bb2e7be0fece48fa425304e1315876ac33 SHA256 15c85234ed900c0514b88a26435dcdcb92c80e9dc2ba9b35e7516fc505ecdfea
-MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.19-sasl-path-fix.patch 529
-RMD160 2daffb9ee9cec0cd99107c4c3c973a22526b1cf6 files/cyrus-sasl-2.1.19-sasl-path-fix.patch 529
-SHA256 15c85234ed900c0514b88a26435dcdcb92c80e9dc2ba9b35e7516fc505ecdfea files/cyrus-sasl-2.1.19-sasl-path-fix.patch 529
 AUX cyrus-sasl-2.1.20-configdir.patch 8231 RMD160 7f920f00964a185bd22d2669330ce1e906708dc9 SHA1 39127f0c133a88d10012b4f6889b62102fb6eb41 SHA256 00656e62e10984c629adb58d3ac8f139158d5f0faf4b20a60f90fdc53089c11e
 MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.20-configdir.patch 8231
 RMD160 7f920f00964a185bd22d2669330ce1e906708dc9 files/cyrus-sasl-2.1.20-configdir.patch 8231
@@ -81,22 +25,6 @@ AUX cyrus-sasl-2.1.22-as-needed.patch 463 RMD160 190cfa32c54ad9417adaca7c6d0d75d
 MD5 3bfcb3fa69cb559eabfcd2af9a18e37f files/cyrus-sasl-2.1.22-as-needed.patch 463
 RMD160 190cfa32c54ad9417adaca7c6d0d75d771fee450 files/cyrus-sasl-2.1.22-as-needed.patch 463
 SHA256 bc26996cbafb59f4daf1d7acc077bae9a60e4746109a9ec4a580eaba5cb9ca78 files/cyrus-sasl-2.1.22-as-needed.patch 463
-AUX cyrus-sasl-configdir.patch 8510 RMD160 1668364b8784824c3bb3a7b92bf51e1766516970 SHA1 4c873fe9d47e7594dc0a6d984cd4cab4af4a5e78 SHA256 80354d581b4faa0072d6e3af64e162ecbf8b5aa74dcdb0b04f2b5eb133c6da2c
-MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510
-RMD160 1668364b8784824c3bb3a7b92bf51e1766516970 files/cyrus-sasl-configdir.patch 8510
-SHA256 80354d581b4faa0072d6e3af64e162ecbf8b5aa74dcdb0b04f2b5eb133c6da2c files/cyrus-sasl-configdir.patch 8510
-AUX cyrus-sasl-gcc32.patch 426 RMD160 6c1f575caa172a1050c1397d2c3bec65743608cf SHA1 6ead56b220be45d889534ac32b5e01c63dfcfbc0 SHA256 4d5e78879c1da4bb9a8101639247ed6a8052551ce2c5546d178562f8fa75a4ed
-MD5 228579b200f0a570f9c02d222f400672 files/cyrus-sasl-gcc32.patch 426
-RMD160 6c1f575caa172a1050c1397d2c3bec65743608cf files/cyrus-sasl-gcc32.patch 426
-SHA256 4d5e78879c1da4bb9a8101639247ed6a8052551ce2c5546d178562f8fa75a4ed files/cyrus-sasl-gcc32.patch 426
-AUX cyrus-sasl-heimdal-deps.patch 624 RMD160 0724e015e3a7854b6e0e3b42590799e1d8bedab4 SHA1 a67da0bad54c60f441f984d8ffb79bdb3b725d24 SHA256 1ea439511eb4682f1b53bc888c212dd815842aeadc5a07cde70fe57d1cc52226
-MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624
-RMD160 0724e015e3a7854b6e0e3b42590799e1d8bedab4 files/cyrus-sasl-heimdal-deps.patch 624
-SHA256 1ea439511eb4682f1b53bc888c212dd815842aeadc5a07cde70fe57d1cc52226 files/cyrus-sasl-heimdal-deps.patch 624
-AUX cyrus-sasl-saslauthd.patch 4938 RMD160 0782782b5899e446c543f546a633bbc3224b4d28 SHA1 61bba31c81d61f55c2b7daacfabf4d5bdbcdf88b SHA256 ee973dfaff300893a51f40af86ad6ff11e678b25354356705481d8b13d4d61cd
-MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938
-RMD160 0782782b5899e446c543f546a633bbc3224b4d28 files/cyrus-sasl-saslauthd.patch 4938
-SHA256 ee973dfaff300893a51f40af86ad6ff11e678b25354356705481d8b13d4d61cd files/cyrus-sasl-saslauthd.patch 4938
 AUX java.README.gentoo 934 RMD160 53369bc85186e7be3e86a98d19a0a19ca4535c2b SHA1 8ddb577ffe968d4ff3cda27402ce21988c55519a SHA256 aeb733ab6371c1fe50e413e8469dcd11f0750b5afff489408c45f118857fc3fe
 MD5 bc046561db59ed3f4d0cc417b099c2f9 files/java.README.gentoo 934
 RMD160 53369bc85186e7be3e86a98d19a0a19ca4535c2b files/java.README.gentoo 934
@@ -105,10 +33,6 @@ AUX pwcheck.rc6 540 RMD160 d675a5e80564dde8978d117c50bc49f209d81718 SHA1 0022731
 MD5 ba1fb0a42418f5a5bcf2577fb27a136e files/pwcheck.rc6 540
 RMD160 d675a5e80564dde8978d117c50bc49f209d81718 files/pwcheck.rc6 540
 SHA256 e534c0a2f1a88db2024b3e67b77446eeddafaf4346794b72a833720c826090ca files/pwcheck.rc6 540
-AUX saslauthd-2.1.19.conf 906 RMD160 371bb42529545735ca180d79c85cb0400d80734d SHA1 8818a50dc09d33a3df43ed4a8f596a9ff1ab8b6e SHA256 fb0101d9f672b995d285923bb4e4af741cd142ccdbfbe9ee8754d22089e88e58
-MD5 52645b3330ddad9ce06f2a0eebb8d345 files/saslauthd-2.1.19.conf 906
-RMD160 371bb42529545735ca180d79c85cb0400d80734d files/saslauthd-2.1.19.conf 906
-SHA256 fb0101d9f672b995d285923bb4e4af741cd142ccdbfbe9ee8754d22089e88e58 files/saslauthd-2.1.19.conf 906
 AUX saslauthd-2.1.20.conf 906 RMD160 ad399656ec66ebc71e0e1d7af557c88e963e7f0c SHA1 d653f2e46d6934a30a1f84e2eb0a1bdce9f1f652 SHA256 db204d9e7620799ed676290ac8d9e0db59b0c8fe0ec1a1317ca6b52b12bca0de
 MD5 41c1024f02bc0725406a23eeff93edd5 files/saslauthd-2.1.20.conf 906
 RMD160 ad399656ec66ebc71e0e1d7af557c88e963e7f0c files/saslauthd-2.1.20.conf 906
@@ -117,10 +41,6 @@ AUX saslauthd-2.1.21.conf 906 RMD160 51ca03cf8df80a282edb0720b52e644f95c3d76d SH
 MD5 4717e635830a067d9abb83da6b2700cb files/saslauthd-2.1.21.conf 906
 RMD160 51ca03cf8df80a282edb0720b52e644f95c3d76d files/saslauthd-2.1.21.conf 906
 SHA256 5164b4b0179f45f6ee3148d02ddd882f52ed2c56671671e5ae9b9c7088c79330 files/saslauthd-2.1.21.conf 906
-AUX saslauthd.conf 890 RMD160 aa95dc9059975ccfec690985f802963c24bc76bd SHA1 7a11a1e5deacfe82a3458666e8c64645745a881e SHA256 baa57052ad0a840d77654b63ca4b9038f631e3d13be22a713216280776b2243f
-MD5 a46ddb41677b9b08046d193d9db8a4bb files/saslauthd.conf 890
-RMD160 aa95dc9059975ccfec690985f802963c24bc76bd files/saslauthd.conf 890
-SHA256 baa57052ad0a840d77654b63ca4b9038f631e3d13be22a713216280776b2243f files/saslauthd.conf 890
 AUX saslauthd.pam 223 RMD160 d9f66a8e27e716d96ee7426c307d273c481f7e00 SHA1 aa4a4ce854b8465a5d3833d1be60b0abe0403699 SHA256 ad398d7b8fa147fdcaecbb266c32f99a7e55c5efffedb16ca854484f809ec0ae
 MD5 7b24e99c21a5924543fe82cd82a1d741 files/saslauthd.pam 223
 RMD160 d9f66a8e27e716d96ee7426c307d273c481f7e00 files/saslauthd.pam 223
@@ -129,14 +49,6 @@ AUX saslauthd.pam-include 160 RMD160 643057c1c0e6fc859114b152dab1bf0e89c13c70 SH
 MD5 a1b5b72d1285487654685fc497aa81b5 files/saslauthd.pam-include 160
 RMD160 643057c1c0e6fc859114b152dab1bf0e89c13c70 files/saslauthd.pam-include 160
 SHA256 97166de49d227cf5ff305168ea75ca584feda9ab87d1eb1437638861986e70ba files/saslauthd.pam-include 160
-AUX saslauthd.rc6 541 RMD160 baa50b0762038f3b5524bcaf5c9f01f5e8e4e863 SHA1 b69d1e69ef9bc8bdc10cb652dca43209f6591e7b SHA256 82efbf7be8daa64be873a62e1b72ceaf0d08f79d55808e9112395afba0edcae4
-MD5 bfda634830e1525c8a1a5750f8d54fca files/saslauthd.rc6 541
-RMD160 baa50b0762038f3b5524bcaf5c9f01f5e8e4e863 files/saslauthd.rc6 541
-SHA256 82efbf7be8daa64be873a62e1b72ceaf0d08f79d55808e9112395afba0edcae4 files/saslauthd.rc6 541
-AUX saslauthd2.conf 752 RMD160 9b603371c49ec99b7f3e7e308dc8ea271ad30200 SHA1 abd0bf840ce69d239acba2c723f4891fbf3a62e9 SHA256 6fec0775fa39a03ea18982b803e3abd42fac18d5581d530bb285b3c554f66b24
-MD5 fc0d11e115e65597419803dad9727aa8 files/saslauthd2.conf 752
-RMD160 9b603371c49ec99b7f3e7e308dc8ea271ad30200 files/saslauthd2.conf 752
-SHA256 6fec0775fa39a03ea18982b803e3abd42fac18d5581d530bb285b3c554f66b24 files/saslauthd2.conf 752
 AUX saslauthd2.rc6 527 RMD160 d7862bf389349b6cf9248f8dc7ed69fb0a7f5ca8 SHA1 eeea12a2bbf0fda12e118d16d1f7aa0437b414ed SHA256 55e59c02dcfeab84b777b9a4f1d1bb79645aab43538e1ba593c61dcb82a9e1f7
 MD5 5d79108b7b67bd3af315e3142023fef5 files/saslauthd2.rc6 527
 RMD160 d7862bf389349b6cf9248f8dc7ed69fb0a7f5ca8 files/saslauthd2.rc6 527
@@ -158,10 +70,10 @@ EBUILD cyrus-sasl-2.1.22.ebuild 9495 RMD160 6e9414a09325b29aa943ec2033c9bbac68ca
 MD5 159f0692adab9edaa621977139d91202 cyrus-sasl-2.1.22.ebuild 9495
 RMD160 6e9414a09325b29aa943ec2033c9bbac68ca5449 cyrus-sasl-2.1.22.ebuild 9495
 SHA256 1c9c1a6165c473222a61beef49a5fc349139540314b65019dbcbc7b448d52a9a cyrus-sasl-2.1.22.ebuild 9495
-MISC ChangeLog 25668 RMD160 e004422f49700c13e89960ad7437f55fcac73921 SHA1 88dc63c3387b19f78cc8b72e74a664a799277e24 SHA256 09c06d6830ede776284b38ab6c2d35b9460a9ad257b72c9f943428108300d315
-MD5 3cfefae55d64dba580bb599c97162ffa ChangeLog 25668
-RMD160 e004422f49700c13e89960ad7437f55fcac73921 ChangeLog 25668
-SHA256 09c06d6830ede776284b38ab6c2d35b9460a9ad257b72c9f943428108300d315 ChangeLog 25668
+MISC ChangeLog 26536 RMD160 3eb0fe5c1181e52d12791eb976b62aa7b89e6bcf SHA1 72293bb84412f07ab489fcb3c1f709d416ab851b SHA256 6f1fe8605bf36c5760964938cbc40331945350caddf2f4ad0b38f829702d1eaf
+MD5 ed078a274c22b90695779fb332df60a9 ChangeLog 26536
+RMD160 3eb0fe5c1181e52d12791eb976b62aa7b89e6bcf ChangeLog 26536
+SHA256 6f1fe8605bf36c5760964938cbc40331945350caddf2f4ad0b38f829702d1eaf ChangeLog 26536
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
@@ -178,7 +90,7 @@ SHA256 69ae66e16518d7fa10bfda885a7994bdedea8a317b51cf7e27bb6d823f332cbb files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEuWuw5FrxP71izLARAqm9AJ91oX5fVp8QSK78HeVhhBcCAjTR/QCfX6+o
-8iPscnVIztIKrG+E/vJ+u0I=
-=rA+q
+iD8DBQFEuXNk5FrxP71izLARAsX0AJ9BGs9aCkCGnnN+90zptOEtPyqCrwCfSqoQ
+EHDy7EZy3EVf/ZwVZUHOMgU=
+=zvrk
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/files/2.1.14-db4.patch b/dev-libs/cyrus-sasl/files/2.1.14-db4.patch
deleted file mode 100644
index 27c0cea48638..000000000000
--- a/dev-libs/cyrus-sasl/files/2.1.14-db4.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -urN cyrus-sasl-2.1.14/cmulocal/berkdb.m4 cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4
---- cyrus-sasl-2.1.14/cmulocal/berkdb.m4	2003-04-15 17:25:41.000000000 -0500
-+++ cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4	2003-07-09 03:17:48.000000000 -0500
-@@ -211,12 +211,20 @@
- 	    BDB_LIBADD=""
- 	fi
- 
--        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-           do
--            AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
--              dblib="berkeley"; break, dblib="no")
-+            AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+              dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+               dblib="berkeley"; break, dblib="no"))
-           done
-         if test "$dblib" = "no"; then
-+          for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+            do
-+              AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+                dblib="berkeley"; break, dblib="no")
-+            done
-+       fi
-+        if test "$dblib" = "no"; then
-           AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb";
-             dblib="berkeley"; dbname=db,
-             dblib="no")
-diff -urN cyrus-sasl-2.1.14/cmulocal/sasl2.m4 cyrus-sasl-2.1.14-modified/cmulocal/sasl2.m4
---- cyrus-sasl-2.1.14/cmulocal/sasl2.m4	2003-05-14 13:36:41.000000000 -0500
-+++ cyrus-sasl-2.1.14-modified/cmulocal/sasl2.m4	2003-07-09 03:18:31.000000000 -0500
-@@ -25,8 +25,9 @@
-   dnl
-   dnl The choice is reflected in GSSAPIBASE_LIBS
-   dnl we might need libdb
--  AC_CHECK_LIB(db, db_open)
--
-+  AC_CHECK_LIB(db, db_open,,
-+       AC_CHECK_LIB(db, db_open_4001,,
-+       AC_CHECK_LIB(db, db_open_4000)))
-   gss_impl="mit";
-   AC_CHECK_LIB(resolv,res_search)
-   if test -d ${gssapi}; then 
diff --git a/dev-libs/cyrus-sasl/files/2.1.14-kerberos.patch b/dev-libs/cyrus-sasl/files/2.1.14-kerberos.patch
deleted file mode 100644
index 0fb657a47339..000000000000
--- a/dev-libs/cyrus-sasl/files/2.1.14-kerberos.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN cyrus-sasl-2.1.14/acconfig.h cyrus-sasl-2.1.14-modified/acconfig.h
---- cyrus-sasl-2.1.14/acconfig.h	2003-04-15 11:24:04.000000000 -0500
-+++ cyrus-sasl-2.1.14-modified/acconfig.h	2003-07-09 00:24:07.000000000 -0500
-@@ -109,6 +109,9 @@
- /* what flavor of GSSAPI are we using? */
- #undef HAVE_GSS_C_NT_HOSTBASED_SERVICE
- 
-+/* does GSSAPI provide GSS_C_NT_USER_NAME? */
-+#undef HAVE_GSS_C_NT_USER_NAME
-+
- /* do we have gssapi.h or gssapi/gssapi.h? */
- #undef HAVE_GSSAPI_H
- 
-diff -urN cyrus-sasl-2.1.14/plugins/gssapi.c cyrus-sasl-2.1.14-modified/plugins/gssapi.c
---- cyrus-sasl-2.1.14/plugins/gssapi.c	2003-05-30 18:17:48.000000000 -0500
-+++ cyrus-sasl-2.1.14-modified/plugins/gssapi.c	2003-07-09 00:27:41.000000000 -0500
-@@ -772,7 +772,12 @@
- 	    
- 	    maj_stat = gss_import_name (&min_stat,
- 					&name_without_realm,
--					GSS_C_NT_USER_NAME,
-+					/* Solaris 8/9 gss_import_name doesn't accept GSS_C_NULL_OID here, so use GSS_C_NT_USER_NAME instead if available. */
-+					#ifdef HAVE_GSS_C_NT_USER_NAME
-+						GSS_C_NT_USER_NAME,
-+					#else
-+						GSS_C_NULL_OID,
-+					#endif
- 					&without);
- 	    
- 	    if (GSS_ERROR(maj_stat)) {
diff --git a/dev-libs/cyrus-sasl/files/2.1.14-mysql.patch b/dev-libs/cyrus-sasl/files/2.1.14-mysql.patch
deleted file mode 100644
index 9a2a12b42d16..000000000000
--- a/dev-libs/cyrus-sasl/files/2.1.14-mysql.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urN cyrus-sasl-2.1.14/plugins/mysql.c cyrus-sasl-2.1.14-modified/plugins/mysql.c
---- cyrus-sasl-2.1.14/plugins/mysql.c	2003-05-14 13:46:02.000000000 -0500
-+++ cyrus-sasl-2.1.14-modified/plugins/mysql.c	2003-07-09 00:49:42.000000000 -0500
-@@ -323,9 +323,14 @@
- 	
- 	if (settings->mysql_verbose)
- 	    sparams->utils->log(NULL, SASL_LOG_WARN,
--				"mysql plugin try and connect to %s\n",
-+				"mysql plugin trying to connect to %s\n",
- 				cur_host);
- 
-+	if(mysql_init(&mysql) == NULL) {
-+		sparams->utils->log(NULL, SASL_LOG_WARN,
-+ 	               "mysql plugin: could not execute mysql_init");
-+		goto done;
-+	}
- 	sock = mysql_real_connect(&mysql,cur_host,
- 				  settings->mysql_user,
- 			          settings->mysql_passwd,
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-1.5.21-des.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-1.5.21-des.patch
deleted file mode 100644
index 4d4fdea7d3ae..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-1.5.21-des.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cyrus-sasl-1.5.21/configure.in	Thu Jun  8 13:35:00 2000
-+++ cyrus-sasl-1.5.21/configure.in	Thu Jun  8 13:40:15 2000
-@@ -356,7 +356,6 @@
- 
- if test "$with_des" != no; then
-   AC_DEFINE(WITH_DES)
--  LIB_DES="-ldes"
- fi
- 
- AC_SUBST(LIB_DES)
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-1.5.24-rpath.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-1.5.24-rpath.patch
deleted file mode 100644
index 5fd8cfae2a6e..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-1.5.24-rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cyrus-sasl-1.5.24/aclocal.m4.fred	Wed Jun 13 10:00:31 2001
-+++ cyrus-sasl-1.5.24/aclocal.m4	Wed Jun 13 10:02:06 2001
-@@ -204,7 +204,7 @@
-     LDFLAGS="-R /usr/lib"
-     AC_TRY_LINK([],[],[andrew_runpath_switch="-R"], [
-   	LDFLAGS="-Wl,-rpath,/usr/lib"
--    AC_TRY_LINK([],[],[andrew_runpath_switch="-Wl,-rpath,"],
-+    AC_TRY_LINK([],[],[andrew_runpath_switch="none"],
-     [andrew_runpath_switch="none"])
-     ])
-   LDFLAGS="${SAVE_LDFLAGS}"
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-1.5.27-scram.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-1.5.27-scram.patch
deleted file mode 100644
index 1bc3c9d595b4..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-1.5.27-scram.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- plugins/scram.c.gentoo	Sat Jan 19 03:28:55 2002
-+++ plugins/scram.c	Sat Jan 19 03:28:02 2002
-@@ -255,7 +255,7 @@
-     if (! getsecret)
-       return SASL_FAIL;
- 
--    result = getsecret(getsecret_context, "SCRAM-MD5", user, &sec);
-+    result = getsecret(getsecret_context, "SCRAM-MD5", user, "", &sec);
-     if (result != SASL_OK)
-       return result;
- 
-@@ -600,6 +600,7 @@
-   return putsecret(putsecret_context,
- 		   "SCRAM-MD5",
- 		   user,
-+		   "",
- 		   secret);
- }
- 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-configdir.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-configdir.patch
deleted file mode 100644
index b954d6e3993a..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-configdir.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-diff -urN cyrus-sasl-2.1.17.orig/configure.in cyrus-sasl-2.1.17/configure.in
---- cyrus-sasl-2.1.17.orig/configure.in	Tue May  9 19:52:53 2000
-+++ cyrus-sasl-2.1.17/configure.in	Thu Jun  1 13:48:11 2000
-@@ -710,6 +710,13 @@
- AC_DEFINE_UNQUOTED(PLUGINDIR, "$plugindir", [Runtime plugin location])
- AC_SUBST(plugindir)
- 
-+AC_ARG_WITH(configdir, [   --with-configdir=DIR    set the directory where config files will
-+                          be found [/etc/sasl] ],
-+  configdir=$withval,
-+  configdir=/etc/sasl)
-+AC_DEFINE_UNQUOTED(CONFIGDIR, "$configdir", [Runtime config file location])
-+AC_SUBST(configdir)
-+
- dnl look for rc4 libraries. we accept the CMU one or one from openSSL
- AC_ARG_WITH(rc4, [  --with-rc4              use internal rc4 routines [yes] ],
- 	with_rc4=$withval,
-@@ -1006,6 +1013,7 @@
- #endif
- 
- #define SASL_PATH_ENV_VAR "SASL_PATH"
-+#define SASL_CONF_PATH_ENV_VAR "SASL_CONF_PATH"
- 
- #include <stdlib.h>
- #include <sys/types.h>
-diff -urN cyrus-sasl-2.1.17.orig/include/sasl.h cyrus-sasl-2.1.17/include/sasl.h
---- cyrus-sasl-2.1.17.orig/include/sasl.h	Tue May  9 19:52:53 2000
-+++ cyrus-sasl-2.1.17/include/sasl.h	Thu Jun  1 13:04:48 2000
-@@ -25,6 +25,7 @@
-  *
-  * Server only Callbacks:
-  *  sasl_authorize_t             user authorization policy callback
-+ *  sasl_getconfpath_t           get path to search for config file
-  *  sasl_server_userdb_checkpass check password and auxprops in userdb
-  *  sasl_server_userdb_setpass   set password in userdb
-  *  sasl_server_canon_user       canonicalize username routine
-@@ -439,6 +440,24 @@
-                               const char *file, sasl_verify_type_t type);
- #define SASL_CB_VERIFYFILE  4
- 
-+/* getconfpath callback -- this allows applications to specify the
-+ * colon-separated path to search for config files (by default,
-+ * taken from the SASL_CONF_PATH environment variable).
-+ * inputs:
-+ *  context     -- getconfpath context from the callback record
-+ * outputs:
-+ *  path        -- colon seperated path (allocated on the heap; the
-+ *                 library will free it using the sasl_free_t *
-+ *                 passed to sasl_set_callback, or the standard free()
-+ *                 library call).
-+ * returns:
-+ *  SASL_OK     -- no error
-+ *  SASL_FAIL   -- error
-+ */
-+typedef int sasl_getconfpath_t(void *context,
-+                               char **path);
-+
-+#define SASL_CB_GETCONFPATH  5
- 
- /* client/user interaction callbacks:
-  */
-diff -urN cyrus-sasl-2.1.17.orig/lib/common.c cyrus-sasl-2.1.17/lib/common.c
---- cyrus-sasl-2.1.17.orig/lib/common.c	Fri May  5 14:41:42 2000
-+++ cyrus-sasl-2.1.17/lib/common.c	Thu Jun  1 12:53:19 2000
-@@ -1047,6 +1047,20 @@
- }
- 
- static int
-+_sasl_getconfpath(void *context __attribute__((unused)),
-+	      char ** path_dest)
-+{
-+  char *path;
-+
-+  if (! path_dest)
-+    return SASL_BADPARAM;
-+  path = getenv(SASL_CONF_PATH_ENV_VAR);
-+  if (! path)
-+    path = CONFIGDIR;
-+  return _sasl_strdup(path, path_dest, NULL);
-+}
-+
-+static int
- _sasl_verifyfile(void *context __attribute__((unused)),
- 		 char *file  __attribute__((unused)),
- 		 int type  __attribute__((unused)))
-@@ -1154,6 +1168,10 @@
-     *pproc = (int (*)()) &_sasl_getpath;
-     *pcontext = NULL;
-     return SASL_OK;
-+  case SASL_CB_GETCONFPATH:
-+    *pproc = (int (*)()) &_sasl_getconfpath;
-+    *pcontext = NULL;
-+    return SASL_OK;
-   case SASL_CB_AUTHNAME:
-     *pproc = (int (*)()) &_sasl_getsimple;
-     *pcontext = conn;
-@@ -1498,6 +1516,30 @@
-   
-   return &default_getpath_cb;
- }
-+
-+const sasl_callback_t *
-+_sasl_find_getconfpath_callback(const sasl_callback_t *callbacks)
-+{
-+  static const sasl_callback_t default_getconfpath_cb = {
-+    SASL_CB_GETCONFPATH,
-+    &_sasl_getconfpath,
-+    NULL
-+  };
-+
-+  if (callbacks)
-+    while (callbacks->id != SASL_CB_LIST_END)
-+    {
-+      if (callbacks->id == SASL_CB_GETCONFPATH)
-+      {
-+	return callbacks;
-+      } else {
-+	++callbacks;
-+      }
-+    }
-+  
-+  return &default_getconfpath_cb;
-+}
-+
- 
- const sasl_callback_t *
- _sasl_find_verifyfile_callback(const sasl_callback_t *callbacks)
-diff -urN cyrus-sasl-2.1.17.orig/lib/saslint.h cyrus-sasl-2.1.17/lib/saslint.h
---- cyrus-sasl-2.1.17.orig/lib/saslint.h	Wed Mar 29 06:45:21 2000
-+++ cyrus-sasl-2.1.17/lib/saslint.h	Thu Jun  1 12:56:37 2000
-@@ -360,6 +360,9 @@
- _sasl_find_getpath_callback(const sasl_callback_t *callbacks);
- 
- extern const sasl_callback_t *
-+_sasl_find_getconfpath_callback(const sasl_callback_t *callbacks);
-+
-+extern const sasl_callback_t *
- _sasl_find_verifyfile_callback(const sasl_callback_t *callbacks);
- 
- extern int _sasl_common_init(sasl_global_callbacks_t *global_callbacks);
-diff -urN cyrus-sasl-2.1.17.orig/lib/server.c cyrus-sasl-2.1.17/lib/server.c
---- cyrus-sasl-2.1.17.orig/lib/server.c	Tue May  9 19:52:53 2000
-+++ cyrus-sasl-2.1.17/lib/server.c	Thu Jun  1 12:59:03 2000
-@@ -436,15 +436,15 @@
-   size_t path_len;
-   char *config_filename=NULL;
-   size_t len;
--  const sasl_callback_t *getpath_cb=NULL;
-+  const sasl_callback_t *getconfpath_cb=NULL;
- 
-   /* get the path to the plugins; for now the config file will reside there */
--  getpath_cb=_sasl_find_getpath_callback( global_callbacks.callbacks );
--  if (getpath_cb==NULL) return SASL_BADPARAM;
-+  getconfpath_cb=_sasl_find_getconfpath_callback( global_callbacks.callbacks );
-+  if (getconfpath_cb==NULL) return SASL_BADPARAM;
- 
--  /* getpath_cb->proc MUST be a sasl_getpath_t; if only c had a type
-+  /* getconfpath_cb->proc MUST be a sasl_getconfpath_t; if only c had a type
-      system */
--  result = ((sasl_getpath_t *)(getpath_cb->proc))(getpath_cb->context,
-+  result = ((sasl_getconfpath_t *)(getconfpath_cb->proc))(getconfpath_cb->context,
- 						  &path_to_config);
-   if (result!=SASL_OK) goto done;
-   if (path_to_config == NULL) path_to_config = "";
-diff -urN cyrus-sasl-2.1.17.orig/man/sasl_getconfpath_t.3 cyrus-sasl-2.1.17/man/sasl_getconfpath_t.3
---- cyrus-sasl-2.1.17.orig/man/sasl_getconfpath_t.3	Thu Jan  1 01:00:00 1970
-+++ cyrus-sasl-2.1.17/man/sasl_getconfpath_t.3	Thu Jun  1 13:54:07 2000
-@@ -0,0 +1,47 @@
-+.\" Hey Emacs! This file is -*- nroff -*- source.
-+.\"
-+.\" This manpage is Copyright (C) 1999 Tim Martin
-+.\"
-+.\" Permission is granted to make and distribute verbatim copies of this
-+.\" manual provided the copyright notice and this permission notice are
-+.\" preserved on all copies.
-+.\"
-+.\" Permission is granted to copy and distribute modified versions of this
-+.\" manual under the conditions for verbatim copying, provided that the
-+.\" entire resulting derived work is distributed under the terms of a
-+.\" permission notice identical to this one
-+.\" 
-+.\" Formatted or processed versions of this manual, if unaccompanied by
-+.\" the source, must acknowledge the copyright and authors of this work.
-+.\"
-+.\"
-+.TH sasl_getpath_t "26 March 2000" SASL "SASL man pages"
-+.SH NAME
-+sasl_getconfpath_t \- The SASL callback to indicate location of the config files
-+
-+
-+.SH SYNOPSIS
-+.nf
-+.B #include <sasl.h>
-+
-+.sp
-+.BI "int sasl_getconfpath_t(void " *context ", "
-+.BI "		        char ** " path ")";
-+
-+.fi
-+.SH DESCRIPTION
-+
-+.B sasl_getconfpath_t
-+is used if the application wishes to use a different location for the SASL cofiguration files. If this callback is not used SASL will either use the location in the enviornment variable SASL_CONF_PATH or /etc/sasl by default.
-+.PP
-+
-+.SH "RETURN VALUE"
-+
-+SASL callback functions should return SASL return codes. See sasl.h for a complete list. SASL_OK indicates success.
-+
-+.SH "CONFORMING TO"
-+RFC 2222
-+.SH "SEE ALSO"
-+.BR other sasl stuff
-+.BR 
-+.BR 
-\ No newline at end of file
-diff -urN cyrus-sasl-2.1.17.orig/win32/include/config.h cyrus-sasl-2.1.17/win32/include/config.h
---- cyrus-sasl-2.1.17.orig/win32/include/config.h	Tue May  9 19:52:53 2000
-+++ cyrus-sasl-2.1.17/win32/include/config.h	Thu Jun  1 13:07:47 2000
-@@ -91,7 +91,9 @@
- #define HAVE_MEMCPY 1
- 
- #define SASL_PATH_ENV_VAR "SASL_PATH"
-+#define SASL_CONF_PATH_ENV_VAR "SASL_CONF_PATH"
- #define PLUGINDIR "C:\\CMU\\bin\\sasl2"
-+#define CONFIGDIR "C:\\CMU\\config\\sasl2"
- 
- /* Windows calls these functions something else
-  */
-
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-db4.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-db4.patch
deleted file mode 100644
index ef0156770dd8..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-db4.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urN cyrus-sasl-2.1.14/cmulocal/berkdb.m4 cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4
---- cyrus-sasl-2.1.14/cmulocal/berkdb.m4	2003-04-15 17:25:41.000000000 -0500
-+++ cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4	2003-07-09 03:17:48.000000000 -0500
-@@ -211,12 +211,20 @@
- 	    BDB_LIBADD=""
- 	fi
- 
--        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-           do
--            AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
--              dblib="berkeley"; break, dblib="no")
-+            AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+              dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+               dblib="berkeley"; break, dblib="no"))
-           done
-         if test "$dblib" = "no"; then
-+          for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+            do
-+              AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+                dblib="berkeley"; break, dblib="no")
-+            done
-+       fi
-+        if test "$dblib" = "no"; then
-           AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb";
-             dblib="berkeley"; dbname=db,
-             dblib="no")
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-cvs-1.172.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-cvs-1.172.patch
deleted file mode 100644
index 77547e37e88c..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-cvs-1.172.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-diff -Naur cyrus-sasl-2.1.18-orig/plugins/digestmd5.c cyrus-sasl-2.1.18/plugins/digestmd5.c
---- cyrus-sasl-2.1.18-orig/plugins/digestmd5.c	2004-02-23 17:03:09.000000000 -0500
-+++ cyrus-sasl-2.1.18/plugins/digestmd5.c	2004-07-06 22:08:23.159206640 -0400
-@@ -151,6 +151,10 @@
- #define SP	(32)
- #define DEL	(127)
- 
-+#define NEED_ESCAPING	"\"\\"	
-+
-+static char *quote (char *str);
-+
- struct context;
- 
- /* function definitions for cipher encode/decode */
-@@ -498,21 +502,42 @@
-     ret = _plug_buf_alloc(utils, str, buflen,
- 			  *curlen + 1 + namesize + 2 + valuesize + 2);
-     if(ret != SASL_OK) return ret;
--    
--    *curlen = *curlen + 1 + namesize + 2 + valuesize + 2;
--    
-+
-+	if (*curlen > 0) {
-     strcat(*str, ",");
-     strcat(*str, name);
--    
-+	} else {
-+	strcpy(*str, name);
-+	}
-+
-     if (need_quotes) {
--	strcat(*str, "=\"");
--	strcat(*str, (char *) value);	/* XXX. What about quoting??? */
--	strcat(*str, "\"");
--    } else {
--	strcat(*str, "=");
--	strcat(*str, (char *) value);
--    }
--    
-+		strcat(*str, "=\"");
-+
-+		/* Check if the value needs quoting */
-+		if (strpbrk ((char *)value, NEED_ESCAPING) != NULL) {
-+			char * quoted = quote ((char *) value);
-+			valuesize = strlen(quoted);
-+			/* As the quoted string is bigger, make sure we have enough
-+			   space now */
-+			ret = _plug_buf_alloc(utils, str, buflen,
-+				*curlen + 1 + namesize + 2 + valuesize + 2);
-+			if (ret == SASL_OK) {
-+				strcat(*str, quoted);
-+				free (quoted);
-+			} else {
-+				free (quoted);
-+				return ret;
-+			}
-+		} else {
-+			strcat(*str, (char *) value);
-+		}
-+		strcat(*str, "\"");
-+	} else {
-+		strcat(*str, "=");
-+		strcat(*str, (char *) value);
-+	}
-+
-+	*curlen = *curlen + 1 + namesize + 2 + valuesize + 2;  
-     return SASL_OK;
- }
- 
-@@ -622,7 +647,8 @@
- }
- 
- /* NULL - error (unbalanced quotes), 
--   otherwise pointer to the first character after value */
-+   otherwise pointer to the first character after value
-+   The function performs work in place. */
- static char *unquote (char *qstr)
- {
-     char *endvalue;
-@@ -663,12 +689,49 @@
- 	endvalue++;
-     }
-     else { /* not qouted value (token) */
-+	/* qstr already contains output */
- 	endvalue = skip_token(qstr,0);
-     };
-     
-     return endvalue;  
- } 
- 
-+/* Unlike unquote, this function returns an allocated quoted copy */
-+static char *quote (char *str)
-+{
-+	char *p;
-+	char *outp;
-+	char *result;
-+	int num_to_escape;		/* How many characters need escaping */
-+
-+	if (!str) return NULL;
-+
-+	num_to_escape = 0;
-+	p = strpbrk (str, NEED_ESCAPING);
-+	while (p != NULL) {
-+		num_to_escape++;
-+		p = strpbrk (p + 1, NEED_ESCAPING);
-+	}
-+
-+	if (num_to_escape == 0) {
-+		return (strdup (str));
-+	}
-+
-+	result = malloc (strlen(str) + num_to_escape + 1);
-+	for (p = str, outp = result; *p; p++) {
-+		if (*p == '"' || *p == '\\') {
-+			*outp = '\\';
-+			outp++;
-+		}
-+		*outp = *p;
-+		outp++;
-+	}
-+
-+	*outp = '\0';
-+
-+	return (result);
-+}
-+
- static void get_pair(char **in, char **name, char **value)
- {
-     char  *endpair;
-@@ -1791,12 +1854,16 @@
- 	return SASL_FAIL;
-     }
-     
--    resplen = strlen(nonce) + strlen("nonce") + 5;
--    result = _plug_buf_alloc(sparams->utils, &(text->out_buf),
--			     &(text->out_buf_len), resplen);
--    if(result != SASL_OK) return result;
--    
--    sprintf(text->out_buf, "nonce=\"%s\"", nonce);
-+	resplen = 0;
-+	text->out_buf = NULL;
-+	text->out_buf_len = 0;
-+	if (add_to_challenge(sparams->utils,
-+						&text->out_buf, &text->out_buf_len, &resplen,
-+						"nonce", (unsigned char *) nonce,
-+						TRUE) != SASL_OK) {
-+		SETERROR(sparams->utils, "internal error: add_to_challenge failed");
-+		return SASL_FAIL;
-+	}
-     
-     /* add to challenge; if we chose not to specify a realm, we won't
-      * send one to the client */
-@@ -2830,7 +2897,7 @@
-     char           maxbufstr[64];
-     char           *response = NULL;
-     unsigned        resplen = 0;
--    int result;
-+    int result = SASL_OK;
- 
-     switch (ctext->protection) {
-     case DIGEST_PRIVACY:
-@@ -2892,13 +2959,16 @@
- 			   &text->response_value);
-     
-     
--    resplen = strlen(oparams->authid) + strlen("username") + 5;
--    result =_plug_buf_alloc(params->utils, &(text->out_buf),
--			    &(text->out_buf_len),
--			    resplen);
--    if (result != SASL_OK) goto FreeAllocatedMem;
--    
--    sprintf(text->out_buf, "username=\"%s\"", oparams->authid);
-+	resplen = 0;
-+	text->out_buf = NULL;
-+	text->out_buf_len = 0;
-+	if (add_to_challenge(params->utils,
-+					&text->out_buf, &text->out_buf_len, &resplen,
-+					"username", (unsigned char *) oparams->authid,
-+					TRUE) != SASL_OK) {
-+		result = SASL_FAIL;
-+		goto FreeAllocatedMem;
-+	}
-     
-     if (add_to_challenge(params->utils,
- 			 &text->out_buf, &text->out_buf_len, &resplen,
-@@ -3733,7 +3803,7 @@
- 	    if (strcmp(text->response_value, value) != 0) {
- 		params->utils->seterror(params->utils->conn, 0,
- 					"DIGEST-MD5: This server wants us to believe that he knows shared secret");
--		result = SASL_FAIL;
-+		result = SASL_BADSERV;
- 	    } else {
- 		oparams->doneflag = 1;
- 		oparams->param_version = 0;
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-db4.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-db4.patch
deleted file mode 100644
index 17ea7e1db673..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-db4.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN cyrus-sasl-2.1.18/cmulocal/berkdb.m4 cyrus-sasl-2.1.18/cmulocal/berkdb.m4
---- cyrus-sasl-2.1.18/cmulocal/berkdb.m4	2003-04-15 17:25:41.000000000 -0500
-+++ cyrus-sasl-2.1.18/cmulocal/berkdb.m4	2003-07-09 03:17:48.000000000 -0500
-@@ -211,12 +211,21 @@
- 	    BDB_LIBADD=""
- 	fi
- 
--        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-           do
--            AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
--              dblib="berkeley"; break, dblib="no")
-+            AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+              dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+               dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4002, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+                dblib="berkeley"; break, dblib="no")))
-           done
-         if test "$dblib" = "no"; then
-+          for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+            do
-+              AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+                dblib="berkeley"; break, dblib="no")
-+            done
-+       fi
-+        if test "$dblib" = "no"; then
-           AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb";
-             dblib="berkeley"; dbname=db,
-             dblib="no")
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-pam_mysql.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-pam_mysql.patch
deleted file mode 100644
index 5883a345ddbd..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-pam_mysql.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur cyrus-sasl-2.1.18-orig/saslauthd/auth_pam.c cyrus-sasl-2.1.18/saslauthd/auth_pam.c
---- cyrus-sasl-2.1.18-orig/saslauthd/auth_pam.c	2003-05-31 13:00:24.000000000 -0400
-+++ cyrus-sasl-2.1.18/saslauthd/auth_pam.c	2004-07-06 23:13:06.303220973 -0400
-@@ -178,7 +178,7 @@
-   const char *login,			/* I: plaintext authenticator */
-   const char *password,			/* I: plaintext password */
-   const char *service,			/* I: service name */
--  const char *realm __attribute__((unused))
-+  const char *realm
-   /* END PARAMETERS */
-   )
- {
-@@ -186,17 +186,25 @@
-     pam_appdata my_appdata;		/* application specific data */
-     struct pam_conv my_conv;		/* pam conversion data */
-     pam_handle_t *pamh;			/* pointer to PAM handle */
-+    char user[256];
-     int rc;				/* return code holder */
-     /* END VARIABLES */
- 
--    my_appdata.login = login;
-+    strlcpy(user, login, 256);
-+
-+    if (realm) {
-+	    strlcat(user, "@", 256);
-+	    strlcat(user, realm, 256);
-+    }
-+
-+    my_appdata.login = user;
-     my_appdata.password = password;
-     my_appdata.pamh = NULL;
- 
-     my_conv.conv = saslauthd_pam_conv;
-     my_conv.appdata_ptr = &my_appdata;
- 
--    rc = pam_start(service, login, &my_conv, &pamh);
-+    rc = pam_start(service, user, &my_conv, &pamh);
-     if (rc != PAM_SUCCESS) {
- 	syslog(LOG_DEBUG, "DEBUG: auth_pam: pam_start failed: %s",
- 	       pam_strerror(pamh, rc));
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-sasl-path-fix.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-sasl-path-fix.patch
deleted file mode 100644
index 060e87807137..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-sasl-path-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur cyrus-sasl-2.1.18-orig/lib/common.c cyrus-sasl-2.1.18/lib/common.c
---- cyrus-sasl-2.1.18-orig/lib/common.c	2004-03-10 10:51:35.000000000 -0500
-+++ cyrus-sasl-2.1.18/lib/common.c	2004-07-07 21:20:21.953011443 -0400
-@@ -1794,7 +1794,10 @@
-   if (! path)
-     return SASL_BADPARAM;
- 
--  *path = getenv(SASL_PATH_ENV_VAR);
-+  /* Honor external variable only in a safe environment */
-+  if (getuid() == geteuid() && getgid() == getegid())
-+    *path = getenv(SASL_PATH_ENV_VAR);
-+
-   if (! *path)
-     *path = PLUGINDIR;
- 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.19-configdir.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.19-configdir.patch
deleted file mode 100644
index 80510f70a595..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.19-configdir.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-diff -urN cyrus-sasl-2.1.17.orig/configure.in cyrus-sasl-2.1.17/configure.in
---- cyrus-sasl-2.1.17.orig/configure.in	Tue May  9 19:52:53 2000
-+++ cyrus-sasl-2.1.17/configure.in	Thu Jun  1 13:48:11 2000
-@@ -710,6 +710,13 @@
- AC_DEFINE_UNQUOTED(PLUGINDIR, "$plugindir", [Runtime plugin location])
- AC_SUBST(plugindir)
- 
-+AC_ARG_WITH(configdir, [   --with-configdir=DIR    set the directory where config files will
-+                          be found [/etc/sasl] ],
-+  configdir=$withval,
-+  configdir=/etc/sasl)
-+AC_DEFINE_UNQUOTED(CONFIGDIR, "$configdir", [Runtime config file location])
-+AC_SUBST(configdir)
-+
- dnl look for rc4 libraries. we accept the CMU one or one from openSSL
- AC_ARG_WITH(rc4, [  --with-rc4              use internal rc4 routines [yes] ],
- 	with_rc4=$withval,
-@@ -1006,6 +1013,7 @@
- #endif
- 
- #define SASL_PATH_ENV_VAR "SASL_PATH"
-+#define SASL_CONF_PATH_ENV_VAR "SASL_CONF_PATH"
- 
- #include <stdlib.h>
- #include <sys/types.h>
-diff -urN cyrus-sasl-2.1.17.orig/include/sasl.h cyrus-sasl-2.1.17/include/sasl.h
---- cyrus-sasl-2.1.17.orig/include/sasl.h	Tue May  9 19:52:53 2000
-+++ cyrus-sasl-2.1.17/include/sasl.h	Thu Jun  1 13:04:48 2000
-@@ -25,6 +25,7 @@
-  *
-  * Server only Callbacks:
-  *  sasl_authorize_t             user authorization policy callback
-+ *  sasl_getconfpath_t           get path to search for config file
-  *  sasl_server_userdb_checkpass check password and auxprops in userdb
-  *  sasl_server_userdb_setpass   set password in userdb
-  *  sasl_server_canon_user       canonicalize username routine
-@@ -439,6 +440,24 @@
-                               const char *file, sasl_verify_type_t type);
- #define SASL_CB_VERIFYFILE  4
- 
-+/* getconfpath callback -- this allows applications to specify the
-+ * colon-separated path to search for config files (by default,
-+ * taken from the SASL_CONF_PATH environment variable).
-+ * inputs:
-+ *  context     -- getconfpath context from the callback record
-+ * outputs:
-+ *  path        -- colon seperated path (allocated on the heap; the
-+ *                 library will free it using the sasl_free_t *
-+ *                 passed to sasl_set_callback, or the standard free()
-+ *                 library call).
-+ * returns:
-+ *  SASL_OK     -- no error
-+ *  SASL_FAIL   -- error
-+ */
-+typedef int sasl_getconfpath_t(void *context,
-+                               char **path);
-+
-+#define SASL_CB_GETCONFPATH  5
- 
- /* client/user interaction callbacks:
-  */
-diff -urN cyrus-sasl-2.1.17.orig/lib/common.c cyrus-sasl-2.1.17/lib/common.c
---- cyrus-sasl-2.1.17.orig/lib/common.c	Fri May  5 14:41:42 2000
-+++ cyrus-sasl-2.1.17/lib/common.c	Thu Jun  1 12:53:19 2000
-@@ -1047,6 +1047,20 @@
- }
- 
- static int
-+_sasl_getconfpath(void *context __attribute__((unused)),
-+	      char ** path_dest)
-+{
-+  char *path;
-+
-+  if (! path_dest)
-+    return SASL_BADPARAM;
-+  path = getenv(SASL_CONF_PATH_ENV_VAR);
-+  if (! path)
-+    path = CONFIGDIR;
-+  return _sasl_strdup(path, path_dest, NULL);
-+}
-+
-+static int
- _sasl_verifyfile(void *context __attribute__((unused)),
- 		 char *file  __attribute__((unused)),
- 		 int type  __attribute__((unused)))
-@@ -1154,6 +1168,10 @@
-     *pproc = (int (*)()) &_sasl_getpath;
-     *pcontext = NULL;
-     return SASL_OK;
-+  case SASL_CB_GETCONFPATH:
-+    *pproc = (int (*)()) &_sasl_getconfpath;
-+    *pcontext = NULL;
-+    return SASL_OK;
-   case SASL_CB_AUTHNAME:
-     *pproc = (int (*)()) &_sasl_getsimple;
-     *pcontext = conn;
-@@ -1498,6 +1516,30 @@
-   
-   return &default_getpath_cb;
- }
-+
-+const sasl_callback_t *
-+_sasl_find_getconfpath_callback(const sasl_callback_t *callbacks)
-+{
-+  static const sasl_callback_t default_getconfpath_cb = {
-+    SASL_CB_GETCONFPATH,
-+    &_sasl_getconfpath,
-+    NULL
-+  };
-+
-+  if (callbacks)
-+    while (callbacks->id != SASL_CB_LIST_END)
-+    {
-+      if (callbacks->id == SASL_CB_GETCONFPATH)
-+      {
-+	return callbacks;
-+      } else {
-+	++callbacks;
-+      }
-+    }
-+  
-+  return &default_getconfpath_cb;
-+}
-+
- 
- const sasl_callback_t *
- _sasl_find_verifyfile_callback(const sasl_callback_t *callbacks)
-diff -urN cyrus-sasl-2.1.17.orig/lib/saslint.h cyrus-sasl-2.1.17/lib/saslint.h
---- cyrus-sasl-2.1.17.orig/lib/saslint.h	Wed Mar 29 06:45:21 2000
-+++ cyrus-sasl-2.1.17/lib/saslint.h	Thu Jun  1 12:56:37 2000
-@@ -360,6 +360,9 @@
- _sasl_find_getpath_callback(const sasl_callback_t *callbacks);
- 
- extern const sasl_callback_t *
-+_sasl_find_getconfpath_callback(const sasl_callback_t *callbacks);
-+
-+extern const sasl_callback_t *
- _sasl_find_verifyfile_callback(const sasl_callback_t *callbacks);
- 
- extern int _sasl_common_init(sasl_global_callbacks_t *global_callbacks);
-diff -urN cyrus-sasl-2.1.17.orig/lib/server.c cyrus-sasl-2.1.17/lib/server.c
---- cyrus-sasl-2.1.17.orig/lib/server.c	Tue May  9 19:52:53 2000
-+++ cyrus-sasl-2.1.17/lib/server.c	Thu Jun  1 12:59:03 2000
-@@ -462,7 +462,7 @@
-   size_t path_len;
-   char *config_filename=NULL;
-   size_t len;
--  const sasl_callback_t *getpath_cb=NULL;
-+  const sasl_callback_t *getconfpath_cb=NULL;
- 
-   /* If appname was not provided, behave as if there is no config file 
-      (see also sasl_config_init() */
-@@ -471,12 +471,12 @@
-   }
-
-   /* get the path to the plugins; for now the config file will reside there */
--  getpath_cb=_sasl_find_getpath_callback( global_callbacks.callbacks );
--  if (getpath_cb==NULL) return SASL_BADPARAM;
-+  getconfpath_cb=_sasl_find_getconfpath_callback( global_callbacks.callbacks );
-+  if (getconfpath_cb==NULL) return SASL_BADPARAM;
-
--  /* getpath_cb->proc MUST be a sasl_getpath_t; if only c had a type
-+  /* getconfpath_cb->proc MUST be a sasl_getconfpath_t; if only c had a type
-      system */
--  result = ((sasl_getpath_t *)(getpath_cb->proc))(getpath_cb->context,
-+  result = ((sasl_getconfpath_t *)(getconfpath_cb->proc))(getconfpath_cb->context,
- 						  &path_to_config);
-   if (result!=SASL_OK) goto done;
-   if (path_to_config == NULL) path_to_config = "";
-diff -urN cyrus-sasl-2.1.17.orig/man/sasl_getconfpath_t.3 cyrus-sasl-2.1.17/man/sasl_getconfpath_t.3
---- cyrus-sasl-2.1.17.orig/man/sasl_getconfpath_t.3	Thu Jan  1 01:00:00 1970
-+++ cyrus-sasl-2.1.17/man/sasl_getconfpath_t.3	Thu Jun  1 13:54:07 2000
-@@ -0,0 +1,47 @@
-+.\" Hey Emacs! This file is -*- nroff -*- source.
-+.\"
-+.\" This manpage is Copyright (C) 1999 Tim Martin
-+.\"
-+.\" Permission is granted to make and distribute verbatim copies of this
-+.\" manual provided the copyright notice and this permission notice are
-+.\" preserved on all copies.
-+.\"
-+.\" Permission is granted to copy and distribute modified versions of this
-+.\" manual under the conditions for verbatim copying, provided that the
-+.\" entire resulting derived work is distributed under the terms of a
-+.\" permission notice identical to this one
-+.\" 
-+.\" Formatted or processed versions of this manual, if unaccompanied by
-+.\" the source, must acknowledge the copyright and authors of this work.
-+.\"
-+.\"
-+.TH sasl_getpath_t "26 March 2000" SASL "SASL man pages"
-+.SH NAME
-+sasl_getconfpath_t \- The SASL callback to indicate location of the config files
-+
-+
-+.SH SYNOPSIS
-+.nf
-+.B #include <sasl.h>
-+
-+.sp
-+.BI "int sasl_getconfpath_t(void " *context ", "
-+.BI "		        char ** " path ")";
-+
-+.fi
-+.SH DESCRIPTION
-+
-+.B sasl_getconfpath_t
-+is used if the application wishes to use a different location for the SASL cofiguration files. If this callback is not used SASL will either use the location in the enviornment variable SASL_CONF_PATH or /etc/sasl by default.
-+.PP
-+
-+.SH "RETURN VALUE"
-+
-+SASL callback functions should return SASL return codes. See sasl.h for a complete list. SASL_OK indicates success.
-+
-+.SH "CONFORMING TO"
-+RFC 2222
-+.SH "SEE ALSO"
-+.BR other sasl stuff
-+.BR 
-+.BR 
-\ No newline at end of file
-diff -urN cyrus-sasl-2.1.17.orig/win32/include/config.h cyrus-sasl-2.1.17/win32/include/config.h
---- cyrus-sasl-2.1.17.orig/win32/include/config.h	Tue May  9 19:52:53 2000
-+++ cyrus-sasl-2.1.17/win32/include/config.h	Thu Jun  1 13:07:47 2000
-@@ -91,7 +91,9 @@
- #define HAVE_MEMCPY 1
- 
- #define SASL_PATH_ENV_VAR "SASL_PATH"
-+#define SASL_CONF_PATH_ENV_VAR "SASL_CONF_PATH"
- #define PLUGINDIR "C:\\CMU\\bin\\sasl2"
-+#define CONFIGDIR "C:\\CMU\\config\\sasl2"
- 
- /* Windows calls these functions something else
-  */
-
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.19-sasl-path-fix.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.19-sasl-path-fix.patch
deleted file mode 100644
index 060e87807137..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.19-sasl-path-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur cyrus-sasl-2.1.18-orig/lib/common.c cyrus-sasl-2.1.18/lib/common.c
---- cyrus-sasl-2.1.18-orig/lib/common.c	2004-03-10 10:51:35.000000000 -0500
-+++ cyrus-sasl-2.1.18/lib/common.c	2004-07-07 21:20:21.953011443 -0400
-@@ -1794,7 +1794,10 @@
-   if (! path)
-     return SASL_BADPARAM;
- 
--  *path = getenv(SASL_PATH_ENV_VAR);
-+  /* Honor external variable only in a safe environment */
-+  if (getuid() == geteuid() && getgid() == getegid())
-+    *path = getenv(SASL_PATH_ENV_VAR);
-+
-   if (! *path)
-     *path = PLUGINDIR;
- 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-configdir.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-configdir.patch
deleted file mode 100644
index 56156bcb39fb..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-configdir.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-diff -urN cyrus-sasl-1.5.21.orig/acconfig.h cyrus-sasl-1.5.21/acconfig.h
---- cyrus-sasl-1.5.21.orig/acconfig.h	Tue Mar  7 06:19:51 2000
-+++ cyrus-sasl-1.5.21/acconfig.h	Thu Jun  1 13:08:35 2000
-@@ -64,6 +64,9 @@
- /* This is where plugins will live at runtime */
- #undef PLUGINDIR
- 
-+/* This is where config files will live at runtime */
-+#undef CONFIGDIR
-+
- /* Make autoheader happy */
- #undef WITH_SYMBOL_UNDERSCORE
- 
-@@ -152,6 +155,7 @@
- #endif
- 
- #define SASL_PATH_ENV_VAR "SASL_PATH"
-+#define SASL_CONF_PATH_ENV_VAR "SASL_CONF_PATH"
- 
- #include <stdlib.h>
- #include <sys/types.h>
-diff -urN cyrus-sasl-1.5.21.orig/configure.in cyrus-sasl-1.5.21/configure.in
---- cyrus-sasl-1.5.21.orig/configure.in	Tue May  9 19:52:53 2000
-+++ cyrus-sasl-1.5.21/configure.in	Thu Jun  1 13:48:11 2000
-@@ -583,6 +583,13 @@
- AC_DEFINE_UNQUOTED(PLUGINDIR, "$plugindir")
- AC_SUBST(plugindir)
- 
-+AC_ARG_WITH(configdir, [   --with-configdir=DIR    set the directory where config files will
-+                          be found [/etc/sasl] ],
-+  configdir=$withval,
-+  configdir=/etc/sasl)
-+AC_DEFINE_UNQUOTED(CONFIGDIR, "$configdir")
-+AC_SUBST(configdir)
-+
- dnl look for rc4 libraries. we accept the CMU one or one from openSSL
- AC_ARG_WITH(rc4, [  --with-rc4=DIR          use rc4 (look in DIR) [yes] ],
- 	with_rc4=$withval,
-diff -urN cyrus-sasl-1.5.21.orig/include/sasl.h cyrus-sasl-1.5.21/include/sasl.h
---- cyrus-sasl-1.5.21.orig/include/sasl.h	Tue May  9 19:52:53 2000
-+++ cyrus-sasl-1.5.21/include/sasl.h	Thu Jun  1 13:04:48 2000
-@@ -14,6 +14,7 @@
-  *  sasl_getopt_t     client/server: Get an option value
-  *  sasl_log_t        client/server: Log message handler
-  *  sasl_getpath_t    client/server: Get path to search for mechanisms
-+ *  sasl_getconfpath_t server: Get path to search for config file
-  *  sasl_getsimple_t  client: Get user/language list
-  *  sasl_getsecret_t  client: Get authentication secret
-  *  sasl_chalprompt_t client: Display challenge and prompt for response
-@@ -401,6 +402,25 @@
-                               const char * file, const int type);
- 
- #define SASL_CB_VERIFYFILE  (4)
-+
-+/* getconfpath callback -- this allows applications to specify the
-+ * colon-separated path to search for config files (by default,
-+ * taken from the SASL_CONF_PATH environment variable).
-+ * inputs:
-+ *  context     -- getconfpath context from the callback record
-+ * outputs:
-+ *  path	-- colon seperated path (allocated on the heap; the
-+ *                 library will free it using the sasl_free_t *
-+ *                 passed to sasl_set_callback, or the standard free()
-+ *                 library call).
-+ * returns:
-+ *  SASL_OK     -- no error
-+ *  SASL_FAIL   -- error
-+ */
-+typedef int sasl_getconfpath_t(void * context,
-+			   char ** path);
-+
-+#define SASL_CB_GETCONFPATH	    (5)
- 
- /* these are the types of files libsasl will ask about */
- #define SASL_VRFY_PLUGIN	(1)
-diff -urN cyrus-sasl-1.5.21.orig/lib/common.c cyrus-sasl-1.5.21/lib/common.c
---- cyrus-sasl-1.5.21.orig/lib/common.c	Fri May  5 14:41:42 2000
-+++ cyrus-sasl-1.5.21/lib/common.c	Thu Jun  1 12:53:19 2000
-@@ -666,6 +666,20 @@
- }
- 
- static int
-+_sasl_getconfpath(void *context __attribute__((unused)),
-+	      char ** path_dest)
-+{
-+  char *path;
-+
-+  if (! path_dest)
-+    return SASL_BADPARAM;
-+  path = getenv(SASL_CONF_PATH_ENV_VAR);
-+  if (! path)
-+    path = CONFIGDIR;
-+  return _sasl_strdup(path, path_dest, NULL);
-+}
-+
-+static int
- _sasl_verifyfile(void *context __attribute__((unused)),
- 		 char *file  __attribute__((unused)),
- 		 int type  __attribute__((unused)))
-@@ -768,6 +782,10 @@
-     *pproc = (int (*)()) &_sasl_getpath;
-     *pcontext = NULL;
-     return SASL_OK;
-+  case SASL_CB_GETCONFPATH:
-+    *pproc = (int (*)()) &_sasl_getconfpath;
-+    *pcontext = NULL;
-+    return SASL_OK;
-   case SASL_CB_AUTHNAME:
-     *pproc = (int (*)()) &_sasl_getsimple;
-     *pcontext = conn;
-@@ -1093,6 +1111,30 @@
-   
-   return &default_getpath_cb;
- }
-+
-+const sasl_callback_t *
-+_sasl_find_getconfpath_callback(const sasl_callback_t *callbacks)
-+{
-+  static const sasl_callback_t default_getconfpath_cb = {
-+    SASL_CB_GETCONFPATH,
-+    &_sasl_getconfpath,
-+    NULL
-+  };
-+
-+  if (callbacks)
-+    while (callbacks->id != SASL_CB_LIST_END)
-+    {
-+      if (callbacks->id == SASL_CB_GETCONFPATH)
-+      {
-+	return callbacks;
-+      } else {
-+	++callbacks;
-+      }
-+    }
-+  
-+  return &default_getconfpath_cb;
-+}
-+
- 
- const sasl_callback_t *
- _sasl_find_verifyfile_callback(const sasl_callback_t *callbacks)
-diff -urN cyrus-sasl-1.5.21.orig/lib/saslint.h cyrus-sasl-1.5.21/lib/saslint.h
---- cyrus-sasl-1.5.21.orig/lib/saslint.h	Wed Mar 29 06:45:21 2000
-+++ cyrus-sasl-1.5.21/lib/saslint.h	Thu Jun  1 12:56:37 2000
-@@ -59,6 +59,9 @@
- _sasl_find_getpath_callback(const sasl_callback_t *callbacks);
- 
- extern const sasl_callback_t *
-+_sasl_find_getconfpath_callback(const sasl_callback_t *callbacks);
-+
-+extern const sasl_callback_t *
- _sasl_find_verifyfile_callback(const sasl_callback_t *callbacks);
- 
- extern int _sasl_done_with_plugin(void *plugin);
-diff -urN cyrus-sasl-1.5.21.orig/lib/server.c cyrus-sasl-1.5.21/lib/server.c
---- cyrus-sasl-1.5.21.orig/lib/server.c	Tue May  9 19:52:53 2000
-+++ cyrus-sasl-1.5.21/lib/server.c	Thu Jun  1 12:59:03 2000
-@@ -540,15 +540,15 @@
-   char *path_to_config=NULL, *c;
-   char *config_filename=NULL;
-   int len;
--  const sasl_callback_t *getpath_cb=NULL;
-+  const sasl_callback_t *getconfpath_cb=NULL;
- 
-   /* get the path to the plugins; for now the config file will reside there */
--  getpath_cb=_sasl_find_getpath_callback( global_callbacks.callbacks );
--  if (getpath_cb==NULL) return SASL_BADPARAM;
-+  getconfpath_cb=_sasl_find_getconfpath_callback( global_callbacks.callbacks );
-+  if (getconfpath_cb==NULL) return SASL_BADPARAM;
- 
--  /* getpath_cb->proc MUST be a sasl_getpath_t; if only c had a type
-+  /* getconfpath_cb->proc MUST be a sasl_getconfpath_t; if only c had a type
-      system */
--  result = ((sasl_getpath_t *)(getpath_cb->proc))(getpath_cb->context,
-+  result = ((sasl_getconfpath_t *)(getconfpath_cb->proc))(getconfpath_cb->context,
- 						  &path_to_config);
-   if (result!=SASL_OK) goto done;
-   if (path_to_config == NULL) path_to_config = "";
-diff -urN cyrus-sasl-1.5.21.orig/man/sasl_getconfpath_t.3 cyrus-sasl-1.5.21/man/sasl_getconfpath_t.3
---- cyrus-sasl-1.5.21.orig/man/sasl_getconfpath_t.3	Thu Jan  1 01:00:00 1970
-+++ cyrus-sasl-1.5.21/man/sasl_getconfpath_t.3	Thu Jun  1 13:54:07 2000
-@@ -0,0 +1,47 @@
-+.\" Hey Emacs! This file is -*- nroff -*- source.
-+.\"
-+.\" This manpage is Copyright (C) 1999 Tim Martin
-+.\"
-+.\" Permission is granted to make and distribute verbatim copies of this
-+.\" manual provided the copyright notice and this permission notice are
-+.\" preserved on all copies.
-+.\"
-+.\" Permission is granted to copy and distribute modified versions of this
-+.\" manual under the conditions for verbatim copying, provided that the
-+.\" entire resulting derived work is distributed under the terms of a
-+.\" permission notice identical to this one
-+.\" 
-+.\" Formatted or processed versions of this manual, if unaccompanied by
-+.\" the source, must acknowledge the copyright and authors of this work.
-+.\"
-+.\"
-+.TH sasl_getpath_t "26 March 2000" SASL "SASL man pages"
-+.SH NAME
-+sasl_getconfpath_t \- The SASL callback to indicate location of the config files
-+
-+
-+.SH SYNOPSIS
-+.nf
-+.B #include <sasl.h>
-+
-+.sp
-+.BI "int sasl_getconfpath_t(void " *context ", "
-+.BI "		        char ** " path ")";
-+
-+.fi
-+.SH DESCRIPTION
-+
-+.B sasl_getconfpath_t
-+is used if the application wishes to use a different location for the SASL cofiguration files. If this callback is not used SASL will either use the location in the enviornment variable SASL_CONF_PATH or /etc/sasl by default.
-+.PP
-+
-+.SH "RETURN VALUE"
-+
-+SASL callback functions should return SASL return codes. See sasl.h for a complete list. SASL_OK indicates success.
-+
-+.SH "CONFORMING TO"
-+RFC 2222
-+.SH "SEE ALSO"
-+.BR other sasl stuff
-+.BR 
-+.BR 
-\ No newline at end of file
-diff -urN cyrus-sasl-1.5.21.orig/win32/include/config.h cyrus-sasl-1.5.21/win32/include/config.h
---- cyrus-sasl-1.5.21.orig/win32/include/config.h	Tue May  9 19:52:53 2000
-+++ cyrus-sasl-1.5.21/win32/include/config.h	Thu Jun  1 13:07:47 2000
-@@ -72,7 +72,9 @@
- #define HAVE_MEMCPY 1
- 
- #define SASL_PATH_ENV_VAR "SASL_PATH"
-+#define SASL_CONF_PATH_ENV_VAR "SASL_CONF_PATH"
- #define PLUGINDIR "\\sasl-plugins"
-+#define CONFIGDIR "\\sasl-configs"
- 
- /* Windows calls these functions something else
-  */
-
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-gcc32.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-gcc32.patch
deleted file mode 100644
index d781bfd2161a..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-gcc32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../cyrus-sasl-2.1.7/configure.in	2002-08-09 10:40:37.000000000 -0500
-+++ configure.in	2002-09-17 04:03:54.000000000 -0500
-@@ -74,7 +74,7 @@
- dnl check for -R, etc. switch
- CMU_GUESS_RUNPATH_SWITCH
- dnl let's just link against local.  otherwise we never find anything useful.
--CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
-+#CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
- CMU_ADD_LIBPATH("/usr/local/lib")
- 
- AM_DISABLE_STATIC
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-heimdal-deps.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-heimdal-deps.patch
deleted file mode 100644
index f6bca5f8a0c7..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-heimdal-deps.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN cyrus-sasl-1.5.27.old/configure.in cyrus-sasl-1.5.27/configure.in
---- cyrus-sasl-1.5.27.old/configure.in	2002-12-06 05:13:39.000000000 -0600
-+++ cyrus-sasl-1.5.27/configure.in	2002-12-06 05:24:43.000000000 -0600
-@@ -507,7 +507,7 @@
-   if test "$gss_impl" = mit; then
-      GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-   elif test "$gss_impl" = "heimdal"; then
--     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS/lib -lgssapi -lkrb5 -ldes -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
-+     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS/lib -lgssapi"
-   else
-      gssapi="no"
-      AC_WARN(Disabling GSSAPI)
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-saslauthd.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-saslauthd.patch
deleted file mode 100644
index 5282655cf2c9..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-saslauthd.patch
+++ /dev/null
@@ -1,199 +0,0 @@
---- cyrus-sasl-1.5.27/saslauthd/Makefile.am.wiget	Tue Apr 24 18:09:22 2001
-+++ cyrus-sasl-1.5.27/saslauthd/Makefile.am	Tue Apr 24 18:10:05 2001
-@@ -2,7 +2,7 @@
- man_MANS	= saslauthd.8
- 
- saslauthd_SOURCES = saslauthd.c mechanisms.c globals.h mechanisms.h auth_dce.c auth_dce.h auth_getpwent.c auth_getpwent.h auth_krb4.c auth_krb4.h auth_pam.c auth_pam.h auth_rimap.c auth_rimap.h auth_shadow.c auth_shadow.h auth_sia.c auth_sia.h
--saslauthd_LDADD	= @SASL_KRB_LIB@
-+saslauthd_LDADD	= @SASL_KRB_LIB@ @LIB_PAM@ @LIB_CRYPT@
- 
- INCLUDES	= -I$(top_srcdir)/include
- EXTRA_DIST	= saslauthd.8
---- cyrus-sasl-1.5.27/saslauthd/saslauthd.8.in.mdk	Wed Oct 17 14:35:31 2001
-+++ cyrus-sasl-1.5.27/saslauthd/saslauthd.8.in	Wed Oct 17 14:35:40 2001
-@@ -1,29 +1,28 @@
- .\" $Id: cyrus-sasl-saslauthd.patch,v 1.1 2002/02/19 00:36:20 woodchip Exp $
- .\" Copyright 1997-2000 Messaging Direct Ltd. All rights reserved.
--.Dt SASLAUTHD 8
--.Os "CMU-SASL"
--.Sh NAME
--.Nm saslauthd
--.Nd message store authentication server
--.Sh SYNOPSIS
--.Nm
-+.TH SASLAUTHD 8 "CMU-SASL"
-+.B saslauthd saslauthd
-+.SH NAME
-+saslauthd \- message store authentication server
-+.SH SYNOPSIS
-+.B saslauthd
- .Fl a
- .Ar authmech
- .Op Fl \&Tv
- .Op Fl H Ar hostname
- .Op Fl m Ar mux_path
--.Sh DESCRIPTION
--.Nm
-+.SH DESCRIPTION
-+.B saslauthd
- is a daemon process that handles plaintext authentication requests
- on behalf of the SASL library.
--.Pp
-+.PP
- The server fulfills two roles: it isolates all code requiring superuser
- privileges into a single process, and it can be used to provide
- .Em proxy
- authentication services to clients that do not understand
- SASL based authentication.
--.Pp
--.Nm
-+.PP
-+.B saslauthd
- should be
- started from the system boot scripts when going to
- multi-user mode. When running against a protected authentication
-@@ -31,7 +30,7 @@
- .Li shadow
- mechanism),
- it must be run as the superuser.
--.Ss Options
-+.Sx Options
- Options named by lower\-case letters configure the server itself.
- Upper\-case options control the behavior of specific authentication
- mechanisms; their applicability to a particular authentication
-@@ -61,14 +60,14 @@
- mechanisms on standard error, then exit.
- .El
- .Ss Logging
--.Nm
-+.B saslauthd
- logs it's activities via
--.Nm syslogd
-+.B syslogd
- using the
- .Dv LOG_AUTH
- facility.
--.Sh AUTHENTICATION MECHANISMS
--.Nm
-+.SH AUTHENTICATION MECHANISMS
-+.B saslauthd
- supports one or more
- .Qq authentication mechanisms ,
- dependent upon the facilities provided by the underlying operating system.
-@@ -78,17 +77,17 @@
- .Bl -tag -width "kerberos4"
- .It Li sasldb
- .Em (All platforms)
--.Pp
-+.PP
- Authenticate against the
- SASL
- authentication database.
- .It Li dce
- .Em (AIX)
--.Pp
-+.PP
- Authenticate using the DCE authentication environment.
- .It Li getpwent
- .Em (All platforms)
--.Pp
-+.PP
- Authenticate using the
- .Fn getpwent
- library function. Typically this authenticates against the
-@@ -97,13 +96,13 @@
- man page for details.
- .It Li kerberos4
- .Em (All platforms)
--.Pp
-+.PP
- Authenticate against the local Kerberos 4 realm. (See the
- .Sx NOTES
- section for caveats about this driver.)
- .It Li rimap
- .Em (All platforms)
--.Pp
-+.PP
- Forward authentication requests to a remote IMAP server. This driver
- connects to a remote IMAP server, specified using the -H flag,
- and attempts to login (via an IMAP
-@@ -116,7 +115,7 @@
- .Ql LOGIN
- command is received from the remote
- server.
--.Pp
-+.PP
- The
- .Ar hostname
- parameter to the
-@@ -134,7 +133,7 @@
- to the
- .Ar hostname
- argument.
--.Pp
-+.PP
- The
- .Fl H
- flag and argument are mandatory when using the
-@@ -142,11 +141,11 @@
- mechanism.
- .It Li shadow
- .Em (AIX, Irix, Linux, Solaris)
--.Pp
-+.PP
- Authenticate against the local
- .Qq shadow password file .
- The exact mechanism is system dependent.
--.Nm
-+.B saslauthd
- currently understands the
- .Fn getspnam
- and
-@@ -157,14 +156,14 @@
- flag.
- .It Li sia
- .Em (Digital UNIX)
--.Pp
-+.PP
- Authenticate using the Digital
--.Ux
-+.UX
- Security Integration Architecture
- (a.k.a.
- .Qq enhanced security ) .
- .El
--.Sh NOTES
-+.SH NOTES
- The
- .Li kerberos4
- authentication driver consumes considerable resources. To perform an
-@@ -175,20 +174,21 @@
- local ticket file, on the reasonable assumption that you will want
- to save the TGT for use by other Kerberos applications. These ticket
- files are unusable by
-+.B saslauthd
- .Nm No ,
- however there is no way not to create them. The overhead of creating
- and removing
- these ticket files can cause serious performance degradation on busy
- servers. (Kerberos
- was never intended to be used in this manner, anyway.)
--.Sh FILES
-+.SH FILES
- .Bl -tag -compact
- .It Pa @MAN_PATH_SASLAUTHD_RUNDIR@/mux
- The default communications socket.
--.Sh SEE ALSO
--.Xr passwd 1 ,
--.Xr getpwent 3 ,
--.Xr getspnam 3 ,
--.Xr getuserpw 3 ,
--.Xr sia_authenticate_user 3 ,
--.Xr saslpasswd 8
-+.SH SEE ALSO
-+.BR passwd (1) ,
-+.BR getpwent (3) ,
-+.BR getspnam (3) ,
-+.BR getuserpw (3) ,
-+.BR sia_authenticate_user (3) ,
-+.BR saslpasswd (8)
diff --git a/dev-libs/cyrus-sasl/files/saslauthd-2.1.19.conf b/dev-libs/cyrus-sasl/files/saslauthd-2.1.19.conf
deleted file mode 100644
index 15e607225043..000000000000
--- a/dev-libs/cyrus-sasl/files/saslauthd-2.1.19.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd-2.1.19.conf,v 1.1 2004/07/16 23:53:38 langthang Exp $
-
-# Config file for /etc/init.d/saslauthd
-
-# Initial (empty) options.
-SASLAUTHD_OPTS=""
-
-# Specify the authentications mechanism.
-# *NOTE* For list see: saslauthd -v
-# From 2.1.19, add "-r" to options for old behavior
-# ie. reassemble user and realm to user@realm form.
-# SASLAUTHD_OPTS="${SASLAUTH_MECH} -a pam -r"
-SASLAUTHD_OPTS="${SASLAUTH_MECH} -a pam"
-
-# Specify the hostname for remote IMAP server.
-# *NOTE* Only needed if rimap auth mech is used.
-#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -O localhost"
-
-# Specify the number of worker processes to create.
-#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -n 5"
-
-# Enable credential cache, cache size, and timeout.
-# *NOTE* Size is measured in kilobytes 
-#        Timeout is measured in seconds
-#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -c -s 128 -t 30"
diff --git a/dev-libs/cyrus-sasl/files/saslauthd.conf b/dev-libs/cyrus-sasl/files/saslauthd.conf
deleted file mode 100644
index 4a5f129f70ef..000000000000
--- a/dev-libs/cyrus-sasl/files/saslauthd.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd.conf,v 1.3 2004/07/14 22:02:41 agriffis Exp $
-
-# Config file for /etc/init.d/saslauthd
-
-# Authentications mechanism (for list see saslauthd -v)
-SASL_AUTHMECH=pam
-
-# Hostname for remote IMAP server (if rimap auth mech is used)
-SASL_RIMAP_HOSTNAME=""
-
-# Honour time-of-day login restrictions (if shadow auth mech is used)
-# Make this ="" to turn it off.  Putting =no will turn it on!
-SASL_TIME_OF_DAY_LOGIN_RESTRICTIONS=yes
-
-
-# Tack the above options together
-[ -n ${SASL_AUTHMECH} ] && \
-	SASLAUTHD_OPTS="-a ${SASL_AUTHMECH}"
-[ -n ${SASL_RIMAP_HOSTNAME} ] && \
-	SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -H ${SASL_RIMAP_HOSTNAME}"
-[ -n ${SASL_TIME_OF_DAY_LOGIN_RESTRICTIONS} ] && \
-	SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -T"
diff --git a/dev-libs/cyrus-sasl/files/saslauthd.rc6 b/dev-libs/cyrus-sasl/files/saslauthd.rc6
deleted file mode 100644
index b146ff2b815a..000000000000
--- a/dev-libs/cyrus-sasl/files/saslauthd.rc6
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd.rc6,v 1.6 2005/10/12 16:11:02 strerror Exp $
-
-depend() {
-	need net
-	use ldap slapd
-}
-
-start() {
-	ebegin "Starting saslauthd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/saslauthd \
-		-- ${SASLAUTHD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping saslauthd"
-	start-stop-daemon --stop --quiet --pidfile /var/lib/sasl/saslauthd.pid
-	eend $?
-}
diff --git a/dev-libs/cyrus-sasl/files/saslauthd2.conf b/dev-libs/cyrus-sasl/files/saslauthd2.conf
deleted file mode 100644
index 4aa46b8517e7..000000000000
--- a/dev-libs/cyrus-sasl/files/saslauthd2.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd2.conf,v 1.3 2004/07/18 02:56:59 dragonheart Exp $
-
-# Config file for /etc/init.d/saslauthd
-
-# Initial (empty) options.
-SASLAUTHD_OPTS=""
-
-# Specify the authentications mechanism.
-# *NOTE* For list see: saslauthd -v
-SASLAUTHD_OPTS="${SASLAUTH_MECH} -a pam"
-
-# Specify the hostname for remote IMAP server.
-# *NOTE* Only needed if rimap auth mech is used.
-#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -O localhost"
-
-# Specify the number of worker processes to create.
-#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -n 5"
-
-# Enable credential cache, cache size, and timeout.
-# *NOTE* Size is measured in kilobytes 
-#        Timeout is measured in seconds
-#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -c -s 128 -t 30"