Fixing #160158 and removing unneeded files.
authorTorsten Veller <tove@gentoo.org>
Mon, 8 Jan 2007 20:56:25 +0000 (20:56 +0000)
committerTorsten Veller <tove@gentoo.org>
Mon, 8 Jan 2007 20:56:25 +0000 (20:56 +0000)
Package-Manager: portage-2.1.2_rc4-r6

dev-libs/cyrus-sasl/Manifest
dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r2.ebuild [deleted file]
dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r3.ebuild [deleted file]
dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.20-configdir.patch [deleted file]
dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.20-gcc4.patch [deleted file]
dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.21-configure.patch [deleted file]
dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.21-r2 [deleted file]
dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.21-r3 [deleted file]
dev-libs/cyrus-sasl/files/saslauthd-2.1.20.conf [deleted file]
dev-libs/cyrus-sasl/files/saslauthd.pam [deleted file]

index 2beae9b692b40362bec3fdf4e240f130285cc6e0..5f01d46d81ba5103b717ae85ba9125bb5e8adfe6 100644 (file)
@@ -9,18 +9,6 @@ AUX cyrus-sasl-2.1.19-checkpw.c.patch 4858 RMD160 04f03808803b7a6f73bec5325c867b
 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.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
-SHA256 00656e62e10984c629adb58d3ac8f139158d5f0faf4b20a60f90fdc53089c11e files/cyrus-sasl-2.1.20-configdir.patch 8231
-AUX cyrus-sasl-2.1.20-gcc4.patch 462 RMD160 2e82f2636e8cbb8c3930ccadecea2a81d6aeea76 SHA1 e469d042df066c37e2ab8eb44d4e889f8f4f0b5a SHA256 b4ee552e696af01f0d2e5a9c6d250c7b841a071881a1731da9b8c6b0d0e90043
-MD5 f8ad054201be2531b337375299c4c39b files/cyrus-sasl-2.1.20-gcc4.patch 462
-RMD160 2e82f2636e8cbb8c3930ccadecea2a81d6aeea76 files/cyrus-sasl-2.1.20-gcc4.patch 462
-SHA256 b4ee552e696af01f0d2e5a9c6d250c7b841a071881a1731da9b8c6b0d0e90043 files/cyrus-sasl-2.1.20-gcc4.patch 462
-AUX cyrus-sasl-2.1.21-configure.patch 559 RMD160 d671aa365a190fd79ea4d3b28e2bc32d98c22290 SHA1 9cc1b20d10a028c9c5c4a0c39858baf3a5a28470 SHA256 318c94fd97fe6528b14d2ab82261eeea31f2c85b1d4c435b3f1c6e17921ce00f
-MD5 2ae00e9ffd84efc610f478b88ce7e099 files/cyrus-sasl-2.1.21-configure.patch 559
-RMD160 d671aa365a190fd79ea4d3b28e2bc32d98c22290 files/cyrus-sasl-2.1.21-configure.patch 559
-SHA256 318c94fd97fe6528b14d2ab82261eeea31f2c85b1d4c435b3f1c6e17921ce00f files/cyrus-sasl-2.1.21-configure.patch 559
 AUX cyrus-sasl-2.1.22-as-needed.patch 463 RMD160 190cfa32c54ad9417adaca7c6d0d75d771fee450 SHA1 438a7a8a3394bfefdb5280617e4f67deb7af1002 SHA256 bc26996cbafb59f4daf1d7acc077bae9a60e4746109a9ec4a580eaba5cb9ca78
 MD5 3bfcb3fa69cb559eabfcd2af9a18e37f files/cyrus-sasl-2.1.22-as-needed.patch 463
 RMD160 190cfa32c54ad9417adaca7c6d0d75d771fee450 files/cyrus-sasl-2.1.22-as-needed.patch 463
@@ -37,18 +25,10 @@ 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.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
-SHA256 db204d9e7620799ed676290ac8d9e0db59b0c8fe0ec1a1317ca6b52b12bca0de files/saslauthd-2.1.20.conf 906
 AUX saslauthd-2.1.21.conf 906 RMD160 51ca03cf8df80a282edb0720b52e644f95c3d76d SHA1 2b9babfd9d47787bfdb3b1cd5ddb919dd6366d2b SHA256 5164b4b0179f45f6ee3148d02ddd882f52ed2c56671671e5ae9b9c7088c79330
 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.pam 223 RMD160 d9f66a8e27e716d96ee7426c307d273c481f7e00 SHA1 aa4a4ce854b8465a5d3833d1be60b0abe0403699 SHA256 ad398d7b8fa147fdcaecbb266c32f99a7e55c5efffedb16ca854484f809ec0ae
-MD5 7b24e99c21a5924543fe82cd82a1d741 files/saslauthd.pam 223
-RMD160 d9f66a8e27e716d96ee7426c307d273c481f7e00 files/saslauthd.pam 223
-SHA256 ad398d7b8fa147fdcaecbb266c32f99a7e55c5efffedb16ca854484f809ec0ae files/saslauthd.pam 223
 AUX saslauthd.pam-include 160 RMD160 643057c1c0e6fc859114b152dab1bf0e89c13c70 SHA1 4202ff7752fd39614211dfc099faace5509c632f SHA256 97166de49d227cf5ff305168ea75ca584feda9ab87d1eb1437638861986e70ba
 MD5 a1b5b72d1285487654685fc497aa81b5 files/saslauthd.pam-include 160
 RMD160 643057c1c0e6fc859114b152dab1bf0e89c13c70 files/saslauthd.pam-include 160
@@ -57,40 +37,24 @@ AUX saslauthd2.rc6 527 RMD160 d7862bf389349b6cf9248f8dc7ed69fb0a7f5ca8 SHA1 eeea
 MD5 5d79108b7b67bd3af315e3142023fef5 files/saslauthd2.rc6 527
 RMD160 d7862bf389349b6cf9248f8dc7ed69fb0a7f5ca8 files/saslauthd2.rc6 527
 SHA256 55e59c02dcfeab84b777b9a4f1d1bb79645aab43538e1ba593c61dcb82a9e1f7 files/saslauthd2.rc6 527
-DIST cyrus-sasl-2.1.21-ntlm_impl-spnego.patch.gz 7465 RMD160 acf1d479c4559acdda66ab66da999ffc2f68d029 SHA1 46cc3664004bb33bf9a5642e47e401e43555fb46 SHA256 b02b97bbc3968248c4f04d3d67a9aac4baa4aa4f8388eefec548475784a2d968
-DIST cyrus-sasl-2.1.21.tar.gz 1584931 RMD160 93e0e1868453c5781602b5cce23e746b8823a26b SHA1 6449f730c963d29d43600a95373a6e2db52d6d66 SHA256 fa37bcc8b855597aa1e6b72915b38985991b4abd4e7bc116c3e88fd4e86fb0fb
 DIST cyrus-sasl-2.1.22-ntlm_impl-spnego.patch.gz 7466 RMD160 70e498d2ca27289bd729563793dcdabe650ffac4 SHA1 2f944004dbd828ca9bbd53bc7619d79c8b8714ab SHA256 a696dddc27d46ab1950b546fcf49efc1a03a8380ecc4537d085d8daacb88ccf0
 DIST cyrus-sasl-2.1.22.tar.gz 1609278 RMD160 086e20d01588cb86decad001244b72a37223354c SHA1 d23454ab12054714ab97d229c86cb934ce63fbb1 SHA256 c69e3853f35b14ee2c3f6e876e42d880927258ff4678aa052e5f0853db209962
-EBUILD cyrus-sasl-2.1.21-r2.ebuild 9217 RMD160 dfa25b6296d236877cbf311c5a8564ad00209f0f SHA1 f9f87b48bc626250020c66c3b5662d8bcd9e0396 SHA256 70285cf532855664dafc10d32a01a1d4d44af4ceb788b449d6d5619cb1b10d04
-MD5 d28523c6caf700fa7e0ef2d69b872ac7 cyrus-sasl-2.1.21-r2.ebuild 9217
-RMD160 dfa25b6296d236877cbf311c5a8564ad00209f0f cyrus-sasl-2.1.21-r2.ebuild 9217
-SHA256 70285cf532855664dafc10d32a01a1d4d44af4ceb788b449d6d5619cb1b10d04 cyrus-sasl-2.1.21-r2.ebuild 9217
-EBUILD cyrus-sasl-2.1.21-r3.ebuild 9266 RMD160 30c241b301ffb02426008b788abfeea2cd4196a4 SHA1 84b2173070c1fb9e97a921114e8dcef4802f24b1 SHA256 d36e9e4fd841a998f8674decd38673a4faea5c4893706bf1af0eff850d45fa24
-MD5 340f468ba032ea6f470a0e70423c1b03 cyrus-sasl-2.1.21-r3.ebuild 9266
-RMD160 30c241b301ffb02426008b788abfeea2cd4196a4 cyrus-sasl-2.1.21-r3.ebuild 9266
-SHA256 d36e9e4fd841a998f8674decd38673a4faea5c4893706bf1af0eff850d45fa24 cyrus-sasl-2.1.21-r3.ebuild 9266
-EBUILD cyrus-sasl-2.1.22-r1.ebuild 9095 RMD160 ddcb38eaae8af7b67045e62ab322befbc266ee39 SHA1 e5f80c87d7652a706776bec5060c6c9418d2b244 SHA256 e013bfc5752525ec40e63dbb159251d4c3a01fb27fa6cfdf848eaebe2d8c3f31
-MD5 18281e73d382e9c822438405925e265c cyrus-sasl-2.1.22-r1.ebuild 9095
-RMD160 ddcb38eaae8af7b67045e62ab322befbc266ee39 cyrus-sasl-2.1.22-r1.ebuild 9095
-SHA256 e013bfc5752525ec40e63dbb159251d4c3a01fb27fa6cfdf848eaebe2d8c3f31 cyrus-sasl-2.1.22-r1.ebuild 9095
-EBUILD cyrus-sasl-2.1.22.ebuild 9062 RMD160 4377e289656ff34ebd975e04b3ba7c880a5e0d52 SHA1 f0eb12539dc6241e841aafcbd2fe1351fc5a9a72 SHA256 289d853624fc09c02e2129cb7e4966e4fc00ee7304a7e9fb9a4f091c4989a042
-MD5 1dce724d1902d460d12878fc8f14de55 cyrus-sasl-2.1.22.ebuild 9062
-RMD160 4377e289656ff34ebd975e04b3ba7c880a5e0d52 cyrus-sasl-2.1.22.ebuild 9062
-SHA256 289d853624fc09c02e2129cb7e4966e4fc00ee7304a7e9fb9a4f091c4989a042 cyrus-sasl-2.1.22.ebuild 9062
-MISC ChangeLog 29922 RMD160 6078efc60200fcd2641ef532db372966f54ff8fd SHA1 d4803480e1ac0b56060b82874100801807cf7faf SHA256 a348c01052b40552b662d6edf021bd781d266c3e455a41cce7936013fe49df81
-MD5 1bab1d2caedd8c6cab3b27ed1db14803 ChangeLog 29922
-RMD160 6078efc60200fcd2641ef532db372966f54ff8fd ChangeLog 29922
-SHA256 a348c01052b40552b662d6edf021bd781d266c3e455a41cce7936013fe49df81 ChangeLog 29922
+EBUILD cyrus-sasl-2.1.22-r1.ebuild 8792 RMD160 7b54fa36a6ed5e09eb097149190624148dfcfb35 SHA1 00ac204fcb66adb94b23fd1c38ebcadd0143d008 SHA256 cf90725f6fe6b13674224ab27961a004356304fd7de905f8f0a937e26e4c60d0
+MD5 8c20d2c36a29341d76c9d119dd6012f7 cyrus-sasl-2.1.22-r1.ebuild 8792
+RMD160 7b54fa36a6ed5e09eb097149190624148dfcfb35 cyrus-sasl-2.1.22-r1.ebuild 8792
+SHA256 cf90725f6fe6b13674224ab27961a004356304fd7de905f8f0a937e26e4c60d0 cyrus-sasl-2.1.22-r1.ebuild 8792
+EBUILD cyrus-sasl-2.1.22.ebuild 8759 RMD160 5048f3f95646dd47d4b98760f4a8760a8bdea85c SHA1 ff603f9842e74f25547041f85bf4cf6c8e75d8b9 SHA256 af946487bdeb3c7b6ec625560a6c1257a0440f81872a8a897768401838cd2921
+MD5 e38946d538c009324defb0270d013ad7 cyrus-sasl-2.1.22.ebuild 8759
+RMD160 5048f3f95646dd47d4b98760f4a8760a8bdea85c cyrus-sasl-2.1.22.ebuild 8759
+SHA256 af946487bdeb3c7b6ec625560a6c1257a0440f81872a8a897768401838cd2921 cyrus-sasl-2.1.22.ebuild 8759
+MISC ChangeLog 30310 RMD160 350f489929ce43c057d6a89f8c26ee43b4c4b7bb SHA1 aab73ebf5983189a0fd8a18049e0fb1aed9d8521 SHA256 e3e37e887f6314dac48bdeac3dd64752ce120380b945b15a84837924eca2f9b8
+MD5 ee95463f6eaae00553ef41e9d6d2230d ChangeLog 30310
+RMD160 350f489929ce43c057d6a89f8c26ee43b4c4b7bb ChangeLog 30310
+SHA256 e3e37e887f6314dac48bdeac3dd64752ce120380b945b15a84837924eca2f9b8 ChangeLog 30310
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
-MD5 f834cac9cb71cbdb5f80b22f6f79d1d3 files/digest-cyrus-sasl-2.1.21-r2 560
-RMD160 dfa902833d1cefe847969ccef5b54be841b96bc5 files/digest-cyrus-sasl-2.1.21-r2 560
-SHA256 b32d41e1a514f5363d5747eedf3f52e1a01e44ec21faf8f885fa752ffb2193a4 files/digest-cyrus-sasl-2.1.21-r2 560
-MD5 f834cac9cb71cbdb5f80b22f6f79d1d3 files/digest-cyrus-sasl-2.1.21-r3 560
-RMD160 dfa902833d1cefe847969ccef5b54be841b96bc5 files/digest-cyrus-sasl-2.1.21-r3 560
-SHA256 b32d41e1a514f5363d5747eedf3f52e1a01e44ec21faf8f885fa752ffb2193a4 files/digest-cyrus-sasl-2.1.21-r3 560
 MD5 867cdff3326eba0a057e9f78e16f9de1 files/digest-cyrus-sasl-2.1.22 560
 RMD160 70eac19a0f9ef23cfefcd6061eb588cab116b3d1 files/digest-cyrus-sasl-2.1.22 560
 SHA256 69ae66e16518d7fa10bfda885a7994bdedea8a317b51cf7e27bb6d823f332cbb files/digest-cyrus-sasl-2.1.22 560
@@ -100,7 +64,7 @@ SHA256 69ae66e16518d7fa10bfda885a7994bdedea8a317b51cf7e27bb6d823f332cbb files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFomNyAiZjviIA2XgRAlywAJ9w1D9CiNImvbj4vfpNqyzErBu4rwCgvtE4
-BlBrnZs98OPGZkH0c1TyINo=
-=Trp1
+iD8DBQFFoq+eV3J2n04EauwRAmTXAKC6M15S8IFucGkgZiYO7DaVpXI6ZQCffBoj
+TQwubk4J7jw5XdjuQpMHmis=
+=y+tB
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r2.ebuild
deleted file mode 100644 (file)
index 799fa55..0000000
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r2.ebuild,v 1.14 2007/01/08 15:29:46 flameeyes Exp $
-
-inherit eutils flag-o-matic java-pkg multilib pam
-
-ntlm_patch=${P}-ntlm_impl-spnego.patch.gz
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://asg.web.cmu.edu/sasl/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz
-       ntlm_unsupported_patch? ( mirror://gentoo/${ntlm_patch} )"
-
-LICENSE="as-is"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-# Removed 'static' USE flag because it is broken upstream, Bug #94137
-IUSE="berkdb crypt gdbm ldap mysql postgres kerberos ssl java pam
-               authdaemond sample urandom srp ntlm_unsupported_patch"
-
-RDEPEND="virtual/libc
-       berkdb? ( >=sys-libs/db-3.2 )
-       gdbm? ( >=sys-libs/gdbm-1.8.0 )
-       ldap? ( >=net-nds/openldap-2.0.25 )
-       mysql? ( virtual/mysql )
-       postgres? ( >=dev-db/postgresql-7.2 )
-       pam? ( virtual/pam )
-       ssl? ( >=dev-libs/openssl-0.9.6d )
-       kerberos? ( virtual/krb5 )
-       authdaemond? (
-               || (
-                       >=net-mail/courier-imap-3.0.7
-                       >=mail-mta/courier-0.46
-               )
-       )
-       java? ( virtual/jdk )
-       ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )"
-
-DEPEND="${RDEPEND}
-       >=sys-apps/sed-4
-       >=sys-devel/autoconf-2.58
-       sys-devel/automake
-       sys-devel/libtool"
-
-pkg_setup() {
-
-       if use gdbm && use berkdb; then
-               echo
-               ewarn "You have both \"gdbm\" and \"berkdb\" in your USE flags."
-               ewarn "Will default to GNU DB as your SASLdb database backend."
-               ewarn "If you want to build with Berkeley DB support; hit Control-C now."
-               ewarn "Change your USE flag -gdbm and emerge again."
-               echo
-               has_version ">=sys-apps/portage-2.0.50" && (
-               einfo "It would be best practice to add the set of USE flags that you use for this"
-               einfo "package to the file: /etc/portage/package.use. Example:"
-               einfo "\`echo \"dev-libs/cyrus-sasl -gdbm berkdb\" >> /etc/portage/package.use\`"
-               einfo "to build cyrus-sasl with Berkeley database as your SASLdb backend."
-               )
-               echo
-               ewarn "Waiting 10 seconds before starting..."
-               ewarn "(Control-C to abort)..."
-               epause 10
-       fi
-
-       echo
-       einfo "This version include a "-r" option for saslauthd to instruct it to reassemble"
-       einfo "realm and username into a username of "user@realm" form."
-       echo
-       einfo "If you are still using postfix->sasl->saslauthd->pam->mysql for"
-       einfo "authentication, please edit /etc/conf.d/saslauthd to read:"
-       einfo "SASLAUTHD_OPTS=\"\${SASLAUTH_MECH} -a pam -r\""
-       einfo "Don't forget to restart the service: \`/etc/init.d/saslauthd restart\`."
-       echo
-       einfo "Pause 10 seconds before continuing."
-       epause 10
-}
-
-src_unpack() {
-       unpack ${A} && cd "${S}"
-
-
-       # Fix default port name for rimap auth mechanism.
-       sed -e '/define DEFAULT_REMOTE_SERVICE/s:imap:imap2:' \
-               -i saslauthd/auth_rimap.c || die "sed failed"
-
-       # Add openldap 2.3 compile patch - bug #113914
-       epatch "${FILESDIR}/${PN}-2.1.21-configure.patch"
-
-       # Add configdir support.
-       epatch "${FILESDIR}/${PN}-2.1.20-configdir.patch"
-
-       # Fix include path for newer PostgreSQL versions.
-       epatch "${FILESDIR}/${PN}-2.1.17-pgsql-include.patch"
-
-       # Fix for gcc-4.0
-       epatch "${FILESDIR}/${PN}-2.1.20-gcc4.patch"
-
-       # UNSUPPORTED ntlm patch. Bug #81342
-       use ntlm_unsupported_patch && epatch "${DISTDIR}/${ntlm_patch}"
-
-       # Recreate configure.
-       export WANT_AUTOCONF="2.5"
-       rm -rf configure config.h.in autom4te.cache
-       ebegin "Recreating configure"
-       aclocal -I cmulocal -I config && autoheader && autoconf || \
-               die "recreate configure failed"
-       eend $?
-
-       # Support for crypted passwords. Bug #45181
-       use crypt && epatch "${FILESDIR}/cyrus-sasl-2.1.19-checkpw.c.patch"
-
-       # Upstream doesn't even honor their own configure options... grumble
-       sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile.{am,in}
-}
-
-src_compile() {
-       local myconf="--enable-login --enable-ntlm --disable-krb4 --disable-otp"
-#      myconf="${myconf} `use_enable static`" -- doesn't work upstream Bug #94137
-       myconf="${myconf} `use_with ssl openssl`"
-       myconf="${myconf} `use_with pam`"
-       myconf="${myconf} `use_with ldap`"
-       myconf="${myconf} `use_enable ldap ldapdb`"
-       myconf="${myconf} `use_enable sample`"
-       myconf="${myconf} `use_enable kerberos gssapi`"
-       myconf="${myconf} `use_with mysql` `use_enable mysql`"
-       myconf="${myconf} `use_with postgres pgsql` `use_enable postgres`"
-       # Add use srp. Bug #81970.
-       myconf="${myconf} `use_enable srp`"
-       myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`"
-       # bug #56523. add authdaemond support.
-       myconf="${myconf} `use_with authdaemond`"
-
-       # fix for bug #59634. langthang 20040810.
-       if ! use ssl; then
-               myconf="${myconf} --without-des"
-       fi
-
-       if use mysql || use postgres ; then
-               myconf="${myconf} --enable-sql"
-       else
-               myconf="${myconf} --disable-sql"
-       fi
-
-       # default to GDBM if both 'gdbm' and 'berkdb' present.
-       if use gdbm; then
-               einfo "build with GNU DB as database backend for your SASLdb."
-               myconf="${myconf} --with-dblib=gdbm"
-       elif use berkdb ; then
-               einfo "build with Berkeley DB as database backend for your SASLdb."
-               myconf="${myconf} --with-dblib=berkeley"
-       else
-               einfo "build without SASLdb support"
-               myconf="${myconf} --with-dblib=none"
-       fi
-
-       # Use /dev/urandom instead of /dev/random. Bug #46038
-       use urandom && myconf="${myconf} --with-devrandom=/dev/urandom"
-
-       econf \
-               --with-saslauthd=/var/lib/sasl2 \
-               --with-pwcheck=/var/lib/sasl2 \
-               --with-configdir=/etc/sasl2 \
-               --with-plugindir=/usr/$(get_libdir)/sasl2 \
-               --with-dbpath=/etc/sasl2/sasldb2 \
-               ${myconf} || die "econf failed"
-
-       # Upstream doesn't even honor their own configure options... grumble
-       sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile
-
-       einfo "build with MAKEOPTS=$MAKEOPTS"
-       # we force -j1 for bug #110066
-       emake -j1 || die "compile problem"
-
-       # Bug #60769. Default location for java classes breaks OpenOffice.
-       # Thanks to axxo@gentoo.org for the solution.
-       cd "${S}"
-       if use java; then
-               jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-       fi
-
-       # Bug #58768. Add testsaslauthd.
-       cd "${S}/saslauthd"
-       emake testsaslauthd || die "failed to make"
-}
-
-src_install () {
-       #einstall
-       make DESTDIR=${D} install || die "failed to install."
-       keepdir /var/lib/sasl2 /etc/sasl2
-
-       # Install everything necessary so user can build sample client/server
-       # (bug #64733)
-       if use sample; then
-               insinto /usr/share/${PN}-2/examples
-               doins aclocal.m4 config.h config.status configure.in
-               dosym /usr/include/sasl /usr/share/${PN}-2/examples/include
-               exeinto /usr/share/${PN}-2/examples
-               doexe libtool
-               insinto /usr/share/${PN}-2/examples/sample
-               doins sample/*.{c,h} sample/*Makefile*
-               insinto /usr/share/${PN}-2/examples/sample/.deps
-               doins sample/.deps/*
-               dodir /usr/share/${PN}-2/examples/lib
-               dosym /usr/$(get_libdir)/libsasl2.la /usr/share/${PN}-2/examples/lib/libsasl2.la
-               dodir /usr/share/${PN}-2/examples/lib/.libs
-               dosym /usr/$(get_libdir)/libsasl2.so /usr/share/${PN}-2/examples/lib/.libs/libsasl2.so
-       fi
-
-       # Bug #60769. Default location for java classes breaks OpenOffice.
-       if use java; then
-               java-pkg_dojar ${PN}.jar
-               #hackish, don't wanna dig though makefile
-               rm -rf ${D}/usr/$(get_libdir)/java
-               docinto java
-               dodoc ${S}/java/README ${FILESDIR}/java.README.gentoo ${S}/java/doc/*
-               mkdir ${D}/usr/share/doc/${PF}/java/Test/ \
-                       || die "failed to create ${D}/usr/share/doc/${PF}/java/Test/"
-               cp ${S}/java/Test/*.java ${D}/usr/share/doc/${PF}/java/Test/ \
-                       || die "failed to copy java files to ${D}/usr/share/doc/${PF}/java/Test/"
-       fi
-
-       # Generate an empty sasldb2 with correct permissions.
-       if use berkdb || use gdbm; then
-               LD_OLD="${LD_LIBRARY_PATH}"
-               export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" SASL_PATH="${D}/usr/$(get_libdir)/sasl2"
-               echo "p" | "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -p login
-               "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -d login
-               export LD_LIBRARY_PATH="${LD_OLD}"
-               chown root:mail "${D}/etc/sasl2/sasldb2"
-               chmod 0640 "${D}/etc/sasl2/sasldb2"
-       fi
-
-       docinto ""
-       dodoc AUTHORS COPYING ChangeLog NEWS README doc/TODO doc/*.txt
-       newdoc pwcheck/README README.pwcheck
-       dohtml doc/*.html
-
-       docinto saslauthd
-       dodoc saslauthd/{AUTHORS,COPYING,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-       newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-       newinitd "${FILESDIR}/pwcheck.rc6" pwcheck || \
-               die "failed to install pwcheck to /etc/init.d"
-       newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd || \
-               die "failed to install saslauthd to /etc/init.d"
-       newconfd "${FILESDIR}/saslauthd-${PV}.conf" saslauthd || \
-               die "failed to install /etc/conf.d/saslauthd"
-
-       exeinto ${ROOT}/usr/sbin
-       newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || \
-               die "failed to install testsaslauthd."
-}
-
-pkg_postinst () {
-       if use sample; then
-               einfo "You have chosen to install sources for example client and server."
-               einfo "To build these, please type:"
-               einfo "\tcd /usr/share/${PN}-2/examples/sample && make"
-       fi
-
-       if use authdaemond; then
-               ewarn "You need to add a user running a service using Courier's"
-               ewarn "authdaemon to the 'mail' group. For example, do:"
-               echo "  gpasswd -a postfix mail"
-               ewarn "to add postfix to 'mail' group."
-       fi
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r3.ebuild
deleted file mode 100644 (file)
index 8f0007e..0000000
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r3.ebuild,v 1.4 2007/01/08 15:29:46 flameeyes Exp $
-
-inherit eutils flag-o-matic java-pkg multilib pam
-
-ntlm_patch=${P}-ntlm_impl-spnego.patch.gz
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://asg.web.cmu.edu/sasl/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz
-       ntlm_unsupported_patch? ( mirror://gentoo/${ntlm_patch} )"
-
-LICENSE="as-is"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-# Removed 'static' USE flag because it is broken upstream, Bug #94137
-IUSE="berkdb crypt gdbm ldap mysql postgres kerberos ssl java pam
-               authdaemond sample urandom srp ntlm_unsupported_patch"
-
-RDEPEND="virtual/libc
-       berkdb? ( >=sys-libs/db-3.2 )
-       gdbm? ( >=sys-libs/gdbm-1.8.0 )
-       ldap? ( >=net-nds/openldap-2.0.25 )
-       mysql? ( virtual/mysql )
-       postgres? ( >=dev-db/postgresql-7.2 )
-       pam? ( virtual/pam )
-       ssl? ( >=dev-libs/openssl-0.9.6d )
-       kerberos? ( virtual/krb5 )
-       authdaemond? (
-               || (
-                       >=net-mail/courier-imap-3.0.7
-                       >=mail-mta/courier-0.46
-               )
-       )
-       java? ( =virtual/jdk-1.4* )
-       ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )"
-
-DEPEND="${RDEPEND}
-       >=sys-apps/sed-4
-       >=sys-devel/autoconf-2.58
-       sys-devel/automake
-       sys-devel/libtool"
-
-pkg_setup() {
-
-       use java && java-pkg_pkg_setup
-
-       if use gdbm && use berkdb; then
-               echo
-               ewarn "You have both \"gdbm\" and \"berkdb\" in your USE flags."
-               ewarn "Will default to GNU DB as your SASLdb database backend."
-               ewarn "If you want to build with Berkeley DB support; hit Control-C now."
-               ewarn "Change your USE flag -gdbm and emerge again."
-               echo
-               has_version ">=sys-apps/portage-2.0.50" && (
-               einfo "It would be best practice to add the set of USE flags that you use for this"
-               einfo "package to the file: /etc/portage/package.use. Example:"
-               einfo "\`echo \"dev-libs/cyrus-sasl -gdbm berkdb\" >> /etc/portage/package.use\`"
-               einfo "to build cyrus-sasl with Berkeley database as your SASLdb backend."
-               )
-               echo
-               ewarn "Waiting 10 seconds before starting..."
-               ewarn "(Control-C to abort)..."
-               epause 10
-       fi
-
-       echo
-       einfo "This version include a "-r" option for saslauthd to instruct it to reassemble"
-       einfo "realm and username into a username of "user@realm" form."
-       echo
-       einfo "If you are still using postfix->sasl->saslauthd->pam->mysql for"
-       einfo "authentication, please edit /etc/conf.d/saslauthd to read:"
-       einfo "SASLAUTHD_OPTS=\"\${SASLAUTH_MECH} -a pam -r\""
-       einfo "Don't forget to restart the service: \`/etc/init.d/saslauthd restart\`."
-       echo
-       einfo "Pause 10 seconds before continuing."
-       epause 10
-}
-
-src_unpack() {
-       unpack ${A} && cd "${S}"
-
-
-       # Fix default port name for rimap auth mechanism.
-       sed -e '/define DEFAULT_REMOTE_SERVICE/s:imap:imap2:' \
-               -i saslauthd/auth_rimap.c || die "sed failed"
-
-       # Add openldap 2.3 compile patch - bug #113914
-       epatch "${FILESDIR}/${PN}-2.1.21-configure.patch"
-
-       # Add configdir support.
-       epatch "${FILESDIR}/${PN}-2.1.20-configdir.patch"
-
-       # Fix include path for newer PostgreSQL versions.
-       epatch "${FILESDIR}/${PN}-2.1.17-pgsql-include.patch"
-
-       # Fix for gcc-4.0
-       epatch "${FILESDIR}/${PN}-2.1.20-gcc4.patch"
-
-       # UNSUPPORTED ntlm patch. Bug #81342
-       use ntlm_unsupported_patch && epatch "${DISTDIR}/${ntlm_patch}"
-
-       # Recreate configure.
-       export WANT_AUTOCONF="2.5"
-       rm -rf configure config.h.in autom4te.cache
-       ebegin "Recreating configure"
-       aclocal -I cmulocal -I config && autoheader && autoconf || \
-               die "recreate configure failed"
-       eend $?
-
-       # Support for crypted passwords. Bug #45181
-       use crypt && epatch "${FILESDIR}/cyrus-sasl-2.1.19-checkpw.c.patch"
-
-       # Upstream doesn't even honor their own configure options... grumble
-       sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile.{am,in}
-}
-
-src_compile() {
-       local myconf="--enable-login --enable-ntlm --disable-krb4 --disable-otp"
-#      myconf="${myconf} `use_enable static`" -- doesn't work upstream Bug #94137
-       myconf="${myconf} `use_with ssl openssl`"
-       myconf="${myconf} `use_with pam`"
-       myconf="${myconf} `use_with ldap`"
-       myconf="${myconf} `use_enable ldap ldapdb`"
-       myconf="${myconf} `use_enable sample`"
-       myconf="${myconf} `use_enable kerberos gssapi`"
-       myconf="${myconf} `use_with mysql` `use_enable mysql`"
-       myconf="${myconf} `use_with postgres pgsql` `use_enable postgres`"
-       # Add use srp. Bug #81970.
-       myconf="${myconf} `use_enable srp`"
-       myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`"
-       # bug #56523. add authdaemond support.
-       myconf="${myconf} `use_with authdaemond`"
-
-       # fix for bug #59634. langthang 20040810.
-       if ! use ssl; then
-               myconf="${myconf} --without-des"
-       fi
-
-       if use mysql || use postgres ; then
-               myconf="${myconf} --enable-sql"
-       else
-               myconf="${myconf} --disable-sql"
-       fi
-
-       # default to GDBM if both 'gdbm' and 'berkdb' present.
-       if use gdbm; then
-               einfo "build with GNU DB as database backend for your SASLdb."
-               myconf="${myconf} --with-dblib=gdbm"
-       elif use berkdb ; then
-               einfo "build with Berkeley DB as database backend for your SASLdb."
-               myconf="${myconf} --with-dblib=berkeley"
-       else
-               einfo "build without SASLdb support"
-               myconf="${myconf} --with-dblib=none"
-       fi
-
-       # Use /dev/urandom instead of /dev/random. Bug #46038
-       use urandom && myconf="${myconf} --with-devrandom=/dev/urandom"
-
-       econf \
-               --with-saslauthd=/var/lib/sasl2 \
-               --with-pwcheck=/var/lib/sasl2 \
-               --with-configdir=/etc/sasl2 \
-               --with-plugindir=/usr/$(get_libdir)/sasl2 \
-               --with-dbpath=/etc/sasl2/sasldb2 \
-               ${myconf} || die "econf failed"
-
-       # Upstream doesn't even honor their own configure options... grumble
-       sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile
-
-       einfo "build with MAKEOPTS=$MAKEOPTS"
-       # we force -j1 for bug #110066
-       emake -j1 || die "compile problem"
-
-       # Bug #60769. Default location for java classes breaks OpenOffice.
-       # Thanks to axxo@gentoo.org for the solution.
-       cd "${S}"
-       if use java; then
-               jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-       fi
-
-       # Bug #58768. Add testsaslauthd.
-       cd "${S}/saslauthd"
-       emake testsaslauthd || die "failed to make"
-}
-
-src_install () {
-       #einstall
-       make DESTDIR=${D} install || die "failed to install."
-       keepdir /var/lib/sasl2 /etc/sasl2
-
-       # Install everything necessary so user can build sample client/server
-       # (bug #64733)
-       if use sample; then
-               insinto /usr/share/${PN}-2/examples
-               doins aclocal.m4 config.h config.status configure.in
-               dosym /usr/include/sasl /usr/share/${PN}-2/examples/include
-               exeinto /usr/share/${PN}-2/examples
-               doexe libtool
-               insinto /usr/share/${PN}-2/examples/sample
-               doins sample/*.{c,h} sample/*Makefile*
-               insinto /usr/share/${PN}-2/examples/sample/.deps
-               doins sample/.deps/*
-               dodir /usr/share/${PN}-2/examples/lib
-               dosym /usr/$(get_libdir)/libsasl2.la /usr/share/${PN}-2/examples/lib/libsasl2.la
-               dodir /usr/share/${PN}-2/examples/lib/.libs
-               dosym /usr/$(get_libdir)/libsasl2.so /usr/share/${PN}-2/examples/lib/.libs/libsasl2.so
-       fi
-
-       # Bug #60769. Default location for java classes breaks OpenOffice.
-       if use java; then
-               java-pkg_dojar ${PN}.jar
-               #hackish, don't wanna dig though makefile
-               rm -rf ${D}/usr/$(get_libdir)/java
-               docinto java
-               dodoc ${S}/java/README ${FILESDIR}/java.README.gentoo ${S}/java/doc/*
-               mkdir ${D}/usr/share/doc/${PF}/java/Test/ \
-                       || die "failed to create ${D}/usr/share/doc/${PF}/java/Test/"
-               cp ${S}/java/Test/*.java ${D}/usr/share/doc/${PF}/java/Test/ \
-                       || die "failed to copy java files to ${D}/usr/share/doc/${PF}/java/Test/"
-       fi
-
-       # Generate an empty sasldb2 with correct permissions.
-       if use berkdb || use gdbm; then
-               LD_OLD="${LD_LIBRARY_PATH}"
-               export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" SASL_PATH="${D}/usr/$(get_libdir)/sasl2"
-               echo "p" | "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -p login
-               "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -d login
-               export LD_LIBRARY_PATH="${LD_OLD}"
-               chown root:mail "${D}/etc/sasl2/sasldb2"
-               chmod 0640 "${D}/etc/sasl2/sasldb2"
-       fi
-
-       docinto ""
-       dodoc AUTHORS COPYING ChangeLog NEWS README doc/TODO doc/*.txt
-       newdoc pwcheck/README README.pwcheck
-       dohtml doc/*.html
-
-       docinto saslauthd
-       dodoc saslauthd/{AUTHORS,COPYING,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-       newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-       newinitd "${FILESDIR}/pwcheck.rc6" pwcheck || \
-               die "failed to install pwcheck to /etc/init.d"
-       newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd || \
-               die "failed to install saslauthd to /etc/init.d"
-       newconfd "${FILESDIR}/saslauthd-${PV}.conf" saslauthd || \
-               die "failed to install /etc/conf.d/saslauthd"
-
-       exeinto ${ROOT}/usr/sbin
-       newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || \
-               die "failed to install testsaslauthd."
-}
-
-pkg_postinst () {
-       if use sample; then
-               einfo "You have chosen to install sources for example client and server."
-               einfo "To build these, please type:"
-               einfo "\tcd /usr/share/${PN}-2/examples/sample && make"
-       fi
-
-       if use authdaemond; then
-               ewarn "You need to add a user running a service using Courier's"
-               ewarn "authdaemon to the 'mail' group. For example, do:"
-               echo "  gpasswd -a postfix mail"
-               ewarn "to add postfix to 'mail' group."
-       fi
-}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.20-configdir.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.20-configdir.patch
deleted file mode 100644 (file)
index 80510f7..0000000
+++ /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.20-gcc4.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.20-gcc4.patch
deleted file mode 100644 (file)
index 7311d86..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur cyrus-sasl-2.1.20.orig/lib/client.c cyrus-sasl-2.1.20.gcc4/lib/client.c
---- cyrus-sasl-2.1.20.orig/lib/client.c        2004-10-27 16:43:35.259949000 -0700
-+++ cyrus-sasl-2.1.20.gcc4/lib/client.c        2004-10-27 16:43:58.139183000 -0700
-@@ -61,7 +61,7 @@
- static cmech_list_t *cmechlist; /* global var which holds the list */
--static sasl_global_callbacks_t global_callbacks;
-+sasl_global_callbacks_t global_callbacks;
- static int _sasl_client_active = 0;
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.21-configure.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.21-configure.patch
deleted file mode 100644 (file)
index 7b392c8..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmulocal/openldap.m4.orig  2005-11-30 00:27:10.000000000 +0000
-+++ cmulocal/openldap.m4       2005-11-30 00:27:41.000000000 +0000
-@@ -28,6 +28,8 @@
- char *__openldap_compat = "2.1.27 or better okay";
- #elif LDAP_VENDOR_VERSION_MAJOR == 2  && LDAP_VENDOR_VERSION_MINOR == 2 && LDAP_VENDOR_VERSION_PATCH > 5
- char *__openldap_compat = "2.2.6 or better okay";
-+#elif LDAP_VENDOR_VERSION_MAJOR == 2  && LDAP_VENDOR_VERSION_MINOR > 2
-+char *__openldap_compat = "2.3.1 or better okay";
- #endif
- ],      [cmu_cv_openldap_compat=yes], [cmu_cv_openldap_compat=no])])
- ])
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.21-r2 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.21-r2
deleted file mode 100644 (file)
index a57afed..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9a8de902bf642a4f66007d07c16335ce cyrus-sasl-2.1.21-ntlm_impl-spnego.patch.gz 7465
-RMD160 acf1d479c4559acdda66ab66da999ffc2f68d029 cyrus-sasl-2.1.21-ntlm_impl-spnego.patch.gz 7465
-SHA256 b02b97bbc3968248c4f04d3d67a9aac4baa4aa4f8388eefec548475784a2d968 cyrus-sasl-2.1.21-ntlm_impl-spnego.patch.gz 7465
-MD5 dde02db234dea892bee298390890502e cyrus-sasl-2.1.21.tar.gz 1584931
-RMD160 93e0e1868453c5781602b5cce23e746b8823a26b cyrus-sasl-2.1.21.tar.gz 1584931
-SHA256 fa37bcc8b855597aa1e6b72915b38985991b4abd4e7bc116c3e88fd4e86fb0fb cyrus-sasl-2.1.21.tar.gz 1584931
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.21-r3 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.21-r3
deleted file mode 100644 (file)
index a57afed..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9a8de902bf642a4f66007d07c16335ce cyrus-sasl-2.1.21-ntlm_impl-spnego.patch.gz 7465
-RMD160 acf1d479c4559acdda66ab66da999ffc2f68d029 cyrus-sasl-2.1.21-ntlm_impl-spnego.patch.gz 7465
-SHA256 b02b97bbc3968248c4f04d3d67a9aac4baa4aa4f8388eefec548475784a2d968 cyrus-sasl-2.1.21-ntlm_impl-spnego.patch.gz 7465
-MD5 dde02db234dea892bee298390890502e cyrus-sasl-2.1.21.tar.gz 1584931
-RMD160 93e0e1868453c5781602b5cce23e746b8823a26b cyrus-sasl-2.1.21.tar.gz 1584931
-SHA256 fa37bcc8b855597aa1e6b72915b38985991b4abd4e7bc116c3e88fd4e86fb0fb cyrus-sasl-2.1.21.tar.gz 1584931
diff --git a/dev-libs/cyrus-sasl/files/saslauthd-2.1.20.conf b/dev-libs/cyrus-sasl/files/saslauthd-2.1.20.conf
deleted file mode 100644 (file)
index 988f4ec..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd-2.1.20.conf,v 1.1 2004/10/31 06:13:48 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.pam b/dev-libs/cyrus-sasl/files/saslauthd.pam
deleted file mode 100644 (file)
index b6654c4..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-
-auth       required     pam_nologin.so
-auth       required     pam_stack.so service=system-auth
-
-account    required     pam_stack.so service=system-auth
-
-session    required     pam_stack.so service=system-auth