Massive cleanup. Remove unused files. Consolidate some other files. Add metadata.xml. Bump version.

26 files changed, 445 insertions, 397 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 311175de909f..b14486c3da13 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.48 2003/12/08 06:25:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.49 2004/01/14 19:42:47 max Exp $
+
+*cyrus-sasl-2.1.17 (14 Jan 2004)
+
+  14 Jan 2004; Max Kalika <max@gentoo.org> cyrus-sasl-1.5.27-r5.ebuild,
+  cyrus-sasl-1.5.27-r6.ebuild, cyrus-sasl-2.1.13.ebuild,
+  cyrus-sasl-2.1.14.ebuild, cyrus-sasl-2.1.15.ebuild,
+  cyrus-sasl-2.1.17.ebuild, metadata.xml, files/crypt.diff,
+  files/cyrus-sasl-1.5.21-des.patch, files/cyrus-sasl-1.5.24-rpath.patch,
+  files/cyrus-sasl-1.5.27-scram.patch, files/cyrus-sasl-2.1.10-db4.patch,
+  files/cyrus-sasl-2.1.17-configdir.patch, files/cyrus-sasl-2.1.17-db4.patch,
+  files/cyrus-sasl-2.1.6-iovec.diff, files/cyrus-sasl-iovec.diff,
+  files/cyrus-sasl2-heimdal-deps.patch, files/gssapi-sefault.patch,
+  files/saslauthd.conf, files/saslauthd.confd, files/saslauthd.confd-2.1,
+  files/saslauthd.rc6, files/saslauthd2.rc6:
+  Massive cleanup. Remove unused files. Consolidate some other files. Add
+  metadata.xml. Bump version.
 
   07 Dec 2003; Michael Sterrett <mr_bones_@gentoo.org>
   cyrus-sasl-2.1.13.ebuild, cyrus-sasl-2.1.14.ebuild,
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 351dce47b057..542fde1e67b8 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,35 +1,29 @@
-MD5 b5315888ff8f516511b4902c086c57a3 ChangeLog 9265
-MD5 1ca8c90b6a917c809ec016c5196e512d cyrus-sasl-1.5.27-r5.ebuild 2700
-MD5 bb3865d691a44032e8a22ca8fd4d2790 cyrus-sasl-1.5.27-r6.ebuild 2774
-MD5 8f7799a214dd626d012957ef73454d47 cyrus-sasl-2.1.13.ebuild 3277
-MD5 f2112ba7a2c0e05b1775bee32fcce616 cyrus-sasl-2.1.14.ebuild 3915
-MD5 d78077ba40d264024a9fd7ce9a5b6d04 cyrus-sasl-2.1.15.ebuild 3748
-MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
-MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148
+MD5 97a5886f616ca348e1455e774982ed69 cyrus-sasl-1.5.27-r6.ebuild 2768
+MD5 a48bbf38c86b01981dade4243ffa7561 cyrus-sasl-2.1.13.ebuild 3266
+MD5 14e928ddb176ad2e2f795693890273f4 cyrus-sasl-2.1.15.ebuild 3737
+MD5 adc5fe7dc04f8b77f22bd78960423693 cyrus-sasl-1.5.27-r5.ebuild 2694
+MD5 613695b7fae72f62ab32f6924a540dc1 cyrus-sasl-2.1.17.ebuild 3757
+MD5 12c1f2dce1ff1e3d6a27fcb370844c33 cyrus-sasl-2.1.14.ebuild 3905
+MD5 64e943d3106c1749668e1ee44a67a650 ChangeLog 10120
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
+MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69
 MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730
-MD5 b688f52b3c129bd50da0140b5d732e74 files/crypt.diff 529
-MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242
-MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448
-MD5 5f96ab675ae2ff1da8e0ee4503340df5 files/cyrus-sasl-1.5.27-scram.patch 480
-MD5 2bdbac1797e21ecbd4f8f95475470e80 files/cyrus-sasl-2.1.10-db4.patch 1375
-MD5 a302e1b2ed33b7965de1a307cd25a32d files/cyrus-sasl-2.1.12-db4.patch 1902
+MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148
 MD5 5f2cc406af0465a53e2a4e72b6e79a12 files/cyrus-sasl-2.1.12-kerberos.patch 1529
-MD5 6d3c58ecd8d6d3da231db3e44d345bbe files/cyrus-sasl-2.1.6-iovec.diff 1405
-MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510
+MD5 cb4a5c5160219818e04196847ba9f7a1 files/cyrus-sasl-2.1.17-db4.patch 1451
+MD5 ef29bc68cc564b85a86fd21d103748d5 files/saslauthd.rc6 539
 MD5 228579b200f0a570f9c02d222f400672 files/cyrus-sasl-gcc32.patch 426
-MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624
-MD5 0a6a28252ab81d3b3765967b11517fa8 files/cyrus-sasl-iovec.diff 1405
+MD5 1c211557e54537ad23feb847b3a23b48 files/pwcheck.rc6 557
+MD5 ff263123f1cc0c43b0a69fc8b71758d7 files/saslauthd2.rc6 541
+MD5 a8346e22abd563bd4f1f951849f7b9dd files/saslauthd.conf 904
+MD5 a302e1b2ed33b7965de1a307cd25a32d files/cyrus-sasl-2.1.12-db4.patch 1902
 MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938
-MD5 c1e3be15214652c1d1036f7cb84fe8fe files/cyrus-sasl2-heimdal-deps.patch 1478
-MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
-MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69
+MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
+MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510
+MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624
+MD5 397ec1b24d4efe6efafa4782ba0f3493 files/cyrus-sasl-2.1.17-configdir.patch 8095
 MD5 1d5bc32d69dbcb3c053f0f336086218e files/digest-cyrus-sasl-2.1.13 70
 MD5 6ba386a4eb5f9addf367d41093ba369e files/digest-cyrus-sasl-2.1.14 70
 MD5 6109117a3ea3c1141364d60d212f48d9 files/digest-cyrus-sasl-2.1.15 70
-MD5 e13f74e7ff91c036fa377c50fefe223b files/digestmd5.patch 2839
-MD5 38fca8679fe76370d26c76b9063c25b8 files/gssapi-sefault.patch 1311
-MD5 1c211557e54537ad23feb847b3a23b48 files/pwcheck.rc6 557
-MD5 5cae6fb7465603cab6243e14d0382543 files/saslauthd.confd 909
-MD5 8e605da1bfdae5c2d9da9a3919d3d5cb files/saslauthd.confd-2.1 751
-MD5 0ab944570bf61ce0ee9e907d7b1f9657 files/saslauthd.rc6 536
-MD5 7c0958ee10762956aa0f7b2d549ca86e files/saslauthd2.rc6 542
+MD5 960ffd4d83e165ccaa68cf43937ff63d files/digest-cyrus-sasl-2.1.17 70
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r5.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r5.ebuild
index 9496fbca4e35..adffaf41e046 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r5.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r5.ebuild,v 1.8 2003/09/06 22:29:24 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r5.ebuild,v 1.9 2004/01/14 19:42:47 max Exp $
 
 IUSE="kerberos"
 
@@ -88,7 +88,7 @@ src_install () {
 	newdoc pwcheck/README README.pwcheck
 	dohtml doc/*
 
-	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd saslauthd
+	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.conf saslauthd
 	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd.rc6 saslauthd
 	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
 }
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r6.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r6.ebuild
index b731f2d79936..af6d1530f86f 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r6.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r6.ebuild,v 1.5 2003/07/16 14:22:30 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r6.ebuild,v 1.6 2004/01/14 19:42:47 max Exp $
 
 IUSE="kerberos"
 
@@ -93,7 +93,7 @@ src_install () {
 	newdoc pwcheck/README README.pwcheck
 	dohtml doc/*
 
-	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd saslauthd
+	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.conf saslauthd
 	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd.rc6 saslauthd
 	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
 }
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.13.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.13.ebuild
index 1011b3ceebd3..6a589dcd4fe8 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.13.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.13.ebuild,v 1.7 2003/12/08 06:25:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.13.ebuild,v 1.8 2004/01/14 19:42:47 max Exp $
 
 inherit eutils
 
@@ -105,7 +105,7 @@ src_install () {
 	chown root:mail ${D}etc/sasl2/sasldb2
 	chmod 0640 ${D}etc/sasl2/sasldb2
 
-	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd-2.1 saslauthd
+	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.conf saslauthd
 	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd2.rc6 saslauthd
 	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
 }
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.14.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.14.ebuild
index 746ad66490c7..1f97b053f37c 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.14.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.14.ebuild,v 1.9 2003/12/08 06:25:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.14.ebuild,v 1.10 2004/01/14 19:42:47 max Exp $
 
 inherit eutils
 
@@ -125,7 +125,7 @@ src_install () {
 	chown root:mail ${D}etc/sasl2/sasldb2
 	chmod 0640 ${D}etc/sasl2/sasldb2
 
-	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd-2.1 saslauthd
+	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.conf saslauthd
 	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd2.rc6 saslauthd
 	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
 }
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.15.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.15.ebuild
index 111b0dc1120a..3df3bc1fd90d 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.15.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.15.ebuild,v 1.3 2003/12/08 06:25:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.15.ebuild,v 1.4 2004/01/14 19:42:47 max Exp $
 
 IUSE="gdbm berkdb ldap mysql kerberos static ssl java pam" # otp krb4
 
@@ -124,7 +124,7 @@ src_install () {
 	chown root:mail ${D}etc/sasl2/sasldb2
 	chmod 0640 ${D}etc/sasl2/sasldb2
 
-	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd-2.1 saslauthd
+	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.conf saslauthd
 	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd2.rc6 saslauthd
 	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
 }
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild
new file mode 100644
index 000000000000..12a7a7f8db11
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild,v 1.1 2004/01/14 19:42:47 max Exp $
+
+inherit eutils flag-o-matic
+
+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"
+
+LICENSE="as-is"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~alpha"
+IUSE="gdbm ldap mysql postgres kerberos static ssl java pam"
+
+DEPEND="virtual/glibc
+	>=sys-libs/db-3.2
+	>=sys-apps/sed-4
+	sys-devel/libtool
+	sys-devel/autoconf
+	sys-devel/automake
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	ldap? ( >=net-nds/openldap-2.0.25 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	postgres? ( >=dev-db/postgresql-7.2 )
+	pam? ( >=sys-libs/pam-0.75 )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	kerberos? ( virtual/krb5 )
+	java? ( virtual/jdk )"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	# Fix broken include.
+	sed -e 's:sasl/sasl.h:sasl.h:' -i saslauthd/lak.c || die "sed failed"
+
+	# DB4 detection and versioned symbols.
+	epatch "${FILESDIR}/cyrus-sasl-2.1.17-db4.patch"
+
+	# Add configdir support.
+	epatch "${FILESDIR}/cyrus-sasl-2.1.17-configdir.patch"
+
+	# Recreate configure.
+	export WANT_AUTOCONF_2_5=1
+	rm -f configure config.h.in saslauthd/configure
+	ebegin "Recreating configure"
+	aclocal -I cmulocal -I config && autoheader && autoconf || \
+		die "recreate configure failed"
+	eend $?
+
+	cd "${S}/saslauthd"
+	ebegin "Recreating saslauthd/configure"
+	aclocal -I ../cmulocal -I ../config && autoheader && autoconf || \
+		die "recreate configure failed"
+	eend $?
+}
+
+src_compile() {
+	local myconf="--enable-login --enable-ntlm --disable-krb4 --disable-otp"
+	myconf="${myconf} `use_enable static`"
+	myconf="${myconf} `use_with ssl openssl`"
+	myconf="${myconf} `use_with pam`"
+	myconf="${myconf} `use_with ldap`"
+	myconf="${myconf} `use_enable kerberos gssapi`"
+	myconf="${myconf} `use_with mysql` `use_enable mysql sql`"
+	myconf="${myconf} `use_with postgres pgsql` `use_enable postgres sql`"
+	myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`"
+
+	if [ "`use mysql`" -o "`use postgres`" ] ; then
+		myconf="${myconf} --enable-sql"
+	else
+		myconf="${myconf} --disable-sql"
+	fi
+	if [ "`use gdbm`" ] ; then
+		myconf="${myconf} --with-dblib=gdbm"
+	else
+		myconf="${myconf} --with-dblib=berkeley"
+	fi
+
+	# compaq-sdk checks for -D_REENTRANT and -pthread takes care the cpp stuff.
+	# taviso #24998 (17 Aug 03)
+	use alpha && append-flags -D_REENTRANT -pthread
+
+	econf \
+		--with-saslauthd=/var/lib/sasl2 \
+		--with-pwcheck=/var/lib/sasl2 \
+		--with-configdir=/etc/sasl2 \
+		--with-plugindir=/usr/lib/sasl2 \
+		--with-dbpath=/etc/sasl2/sasldb2 \
+		${myconf}
+
+	emake || die "compile problem"
+}
+
+src_install () {
+	einstall
+	keepdir /var/lib/sasl2 /etc/sasl2
+
+	# Generate an empty sasldb2 with correct permissions.
+	LD_OLD="${LD_LIBRARY_PATH}"
+	export LD_LIBRARY_PATH="${D}/usr/lib" SASL_PATH="${D}/usr/lib/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"
+
+	dodoc AUTHORS COPYING ChangeLog NEWS README doc/TODO doc/*.txt
+	newdoc pwcheck/README README.pwcheck
+	dohtml doc/*.html
+
+	docinto examples
+	dodoc sample/{*.[ch],Makefile}
+
+	docinto saslauthd
+	dodoc saslauthd/{AUTHORS,COPYING,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/pwcheck.rc6 pwcheck"
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/saslauthd.rc6 saslauthd"
+	insinto /etc/conf.d
+	newins "${FILESDIR}/saslauthd.conf saslauthd"
+}
diff --git a/dev-libs/cyrus-sasl/files/crypt.diff b/dev-libs/cyrus-sasl/files/crypt.diff
deleted file mode 100644
index 68cfaf9536c3..000000000000
--- a/dev-libs/cyrus-sasl/files/crypt.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN cyrus-sasl-2.1.7/saslauthd/Makefile.in cyrus-sasl-2.1.7-modified/saslauthd/Makefile.in
---- cyrus-sasl-2.1.7/saslauthd/Makefile.in	Fri Aug  9 11:13:07 2002
-+++ cyrus-sasl-2.1.7-modified/saslauthd/Makefile.in	Thu Aug 22 12:48:28 2002
-@@ -234,7 +234,7 @@
- 
- saslauthd: $(saslauthd_OBJECTS) $(saslauthd_DEPENDENCIES)
- 	@rm -f saslauthd
--	$(LINK) $(saslauthd_LDFLAGS) $(saslauthd_OBJECTS) $(saslauthd_LDADD) $(LIBS)
-+	$(LINK) $(saslauthd_LDFLAGS) $(saslauthd_OBJECTS) $(saslauthd_LDADD) $(LIBS) $(LIB_CRYPT)
- 
- tags: TAGS
- 
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.10-db4.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.10-db4.patch
deleted file mode 100644
index fbab83a1f1b7..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.10-db4.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN cyrus-sasl-2.1.10.orig/config/sasldb.m4 cyrus-sasl-2.1.10/config/sasldb.m4
---- cyrus-sasl-2.1.10.orig/config/sasldb.m4	2002-09-19 21:10:08.000000000 +0200
-+++ cyrus-sasl-2.1.10/config/sasldb.m4	2003-05-28 13:48:04.000000000 +0200
-@@ -15,11 +15,19 @@
- 	    BDB_LIBADD=""
- 	fi
- 
--        for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 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, SASL_DB_LIB="$BDB_LIBADD -l$dbname";
--              dblib="berkeley"; break, dblib="no")
--          done
-+        for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db
-+        do
-+          AC_CHECK_LIB($dbname, db_create_4000, SASL_DB_LIB="$BDB_LIBADD -l$dbname";
-+            dblib="berkeley"; break,AC_CHECK_LIB($dbname, db_create_4001, SASL_DB_LIB="$BDB_LIBADD -l$dbname";
-+            dblib="berkeley"; break, dblib="no"))
-+        done
-+        if test "$dblib" = "no"; then
-+          for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 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, SASL_DB_LIB="$BDB_LIBADD -l$dbname";
-+                dblib="berkeley"; break, dblib="no")
-+            done
-+	fi
-         if test "$dblib" = "no"; then
-           AC_CHECK_LIB(db, db_open, SASL_DB_LIB="$BDB_LIBADD -ldb";
-             dblib="berkeley"; dbname=db,
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
new file mode 100644
index 000000000000..b954d6e3993a
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-configdir.patch
@@ -0,0 +1,230 @@
+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
new file mode 100644
index 000000000000..ef0156770dd8
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-db4.patch
@@ -0,0 +1,27 @@
+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.6-iovec.diff b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.6-iovec.diff
deleted file mode 100644
index a6a9cc1bd0fa..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.6-iovec.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -urN cyrus-sasl-2.1.6/config.h.in cyrus-sasl-2.1.6-modified/config.h.in
---- cyrus-sasl-2.1.6/config.h.in	Mon Jun 10 09:54:19 2002
-+++ cyrus-sasl-2.1.6-modified/config.h.in	Sat Jul 13 14:50:08 2002
-@@ -302,16 +302,16 @@
- 
- 
- /* Create a struct iovec if we need one */
--#if !defined(_WIN32) && !defined(HAVE_SYS_UIO_H)
-+/* #if !defined(_WIN32) && !defined(HAVE_SYS_UIO_H) */
- /* (win32 is handled in sasl.h) */
--struct iovec {
--    char *iov_base;
--    long iov_len;
--};
--#else
-+/* struct iovec { */
-+/*   char *iov_base; */
-+/*   long iov_len; */
-+/* }; */
-+/* #else */
- #include <sys/types.h>
- #include <sys/uio.h>
--#endif
-+/* #endif */
- 
- /* location of the random number generator */
- #ifndef DEV_RANDOM
-diff -urN cyrus-sasl-2.1.6/saslauthd/saslauthd.h.in cyrus-sasl-2.1.6-modified/saslauthd/saslauthd.h.in
---- cyrus-sasl-2.1.6/saslauthd/saslauthd.h.in	Wed Jun  5 20:44:34 2002
-+++ cyrus-sasl-2.1.6-modified/saslauthd/saslauthd.h.in	Sat Jul 13 14:55:28 2002
-@@ -186,15 +186,15 @@
- #endif
- 
- /* Create a struct iovec if we need one */
--#if !defined(HAVE_SYS_UIO_H)
--struct iovec {
--    long iov_len;
--    char *iov_base;
--};
--#else
-+/* #if !defined(HAVE_SYS_UIO_H) */
-+/* struct iovec { */
-+/*   long iov_len; */
-+/*   char *iov_base; */
-+/* }; */
-+/* #else */
- #include <sys/types.h>
- #include <sys/uio.h>
--#endif
-+/* #endif */
- 
- #ifndef HAVE_GETADDRINFO
- #define getaddrinfo     sasl_getaddrinfo
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-iovec.diff b/dev-libs/cyrus-sasl/files/cyrus-sasl-iovec.diff
deleted file mode 100644
index bf1e27a425aa..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-iovec.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -urN cyrus-sasl-2.1.5/config.h.in cyrus-sasl-2.1.5-modified/config.h.in
---- cyrus-sasl-2.1.5/config.h.in	Mon Jun 10 09:54:19 2002
-+++ cyrus-sasl-2.1.5-modified/config.h.in	Sat Jul 13 14:50:08 2002
-@@ -302,16 +302,16 @@
- 
- 
- /* Create a struct iovec if we need one */
--#if !defined(_WIN32) && !defined(HAVE_SYS_UIO_H)
-+/* #if !defined(_WIN32) && !defined(HAVE_SYS_UIO_H) */
- /* (win32 is handled in sasl.h) */
--struct iovec {
--    char *iov_base;
--    long iov_len;
--};
--#else
-+/* struct iovec { */
-+/*   char *iov_base; */
-+/*   long iov_len; */
-+/* }; */
-+/* #else */
- #include <sys/types.h>
- #include <sys/uio.h>
--#endif
-+/* #endif */
- 
- /* location of the random number generator */
- #ifndef DEV_RANDOM
-diff -urN cyrus-sasl-2.1.5/saslauthd/saslauthd.h.in cyrus-sasl-2.1.5-modified/saslauthd/saslauthd.h.in
---- cyrus-sasl-2.1.5/saslauthd/saslauthd.h.in	Wed Jun  5 20:44:34 2002
-+++ cyrus-sasl-2.1.5-modified/saslauthd/saslauthd.h.in	Sat Jul 13 14:55:28 2002
-@@ -186,15 +186,15 @@
- #endif
- 
- /* Create a struct iovec if we need one */
--#if !defined(HAVE_SYS_UIO_H)
--struct iovec {
--    long iov_len;
--    char *iov_base;
--};
--#else
-+/* #if !defined(HAVE_SYS_UIO_H) */
-+/* struct iovec { */
-+/*   long iov_len; */
-+/*   char *iov_base; */
-+/* }; */
-+/* #else */
- #include <sys/types.h>
- #include <sys/uio.h>
--#endif
-+/* #endif */
- 
- #ifndef HAVE_GETADDRINFO
- #define getaddrinfo     sasl_getaddrinfo
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl2-heimdal-deps.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl2-heimdal-deps.patch
deleted file mode 100644
index 63e70bcd6608..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl2-heimdal-deps.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN cyrus-sasl-2.1.9.old/cmulocal/sasl2.m4 cyrus-sasl-2.1.9/cmulocal/sasl2.m4
---- cyrus-sasl-2.1.9.old/cmulocal/sasl2.m4	2002-09-24 10:12:33.000000000 -0500
-+++ cyrus-sasl-2.1.9/cmulocal/sasl2.m4	2002-12-06 06:16:31.000000000 -0600
-@@ -44,14 +44,15 @@
- 
-   # Check a full link against the heimdal libraries.  If this fails, assume
-   # MIT.
--  AC_CHECK_LIB(gssapi,gss_unwrap,gss_impl="heimdal",,$GSSAPIBASE_LIBS -lgssapi -lkrb5 -ldes -lasn1 -lroken ${LIB_CRYPT} -lcom_err)
--
-+  if krb5-config --libs gssapi | grep -q -e -lroken ; then
-+  AC_CHECK_LIB(gssapi,gss_unwrap,gss_impl="heimdal",,$GSSAPIBASE_LIBS `krb5-config --libs gssapi`)
-+  fi
-   if test "$gss_impl" = "mit"; then
-      GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-      GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
-   elif test "$gss_impl" = "heimdal"; then
--     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -ldes -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
--     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libdes.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
-+     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS $(krb5-config --libs gssapi)"
-+     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $(krb5-config --libs gssapi)"
-   else
-      gssapi="no"
-      AC_WARN(Disabling GSSAPI)
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.17 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.17
new file mode 100644
index 000000000000..954839a230d0
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.17
@@ -0,0 +1 @@
+MD5 4add6be2f194dc51aafc64193a1dd77b cyrus-sasl-2.1.17.tar.gz 1499725
diff --git a/dev-libs/cyrus-sasl/files/digestmd5.patch b/dev-libs/cyrus-sasl/files/digestmd5.patch
deleted file mode 100644
index 89e482a0e46c..000000000000
--- a/dev-libs/cyrus-sasl/files/digestmd5.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Index: digestmd5.c
-===================================================================
-RCS file: /afs/andrew.cmu.edu/system/cvs/src/sasl/plugins/digestmd5.c,v
-retrieving revision 1.145
-diff -u -r1.145 cyrus-sasl-2.1.10/plugins/digestmd5.c
---- cyrus-sasl-2.1.10/plugins/digestmd5.c	5 Dec 2002 22:50:42 -0000	1.145
-+++ cyrus-sasl-2.1.10-modified/plugins/digestmd5.c	29 Jan 2003 18:12:49 -0000
-@@ -3548,7 +3548,7 @@
- 
- static int ask_user_info(client_context_t *ctext,
- 			 sasl_client_params_t *params,
--			 char **realms,
-+			 char **realms, int nrealm,
- 			 sasl_interact_t **prompt_need,
- 			 sasl_out_params_t *oparams)
- {
-@@ -3559,7 +3559,7 @@
-     int user_result = SASL_OK;
-     int auth_result = SASL_OK;
-     int pass_result = SASL_OK;
--    int realm_result = SASL_OK;
-+    int realm_result = SASL_FAIL;
- 
-     /* try to get the authid */
-     if (oparams->authid == NULL) {
-@@ -3589,21 +3589,29 @@
-     }
- 
-     /* try to get the realm */
--    if (realms && text->realm == NULL) {
--	realm_result = _plug_get_realm(params->utils, (const char **) realms,
--				       (const char **) &realm,
--				       prompt_need);
--	
-+    if (text->realm == NULL) {
-+	if (realms) {
-+	    if(nrealm == 1) {
-+		/* only one choice */
-+		realm = realms[0];
-+		realm_result = SASL_OK;
-+	    } else {
-+		/* ask the user */
-+		realm_result = _plug_get_realm(params->utils,
-+					       (const char **) realms,
-+					       (const char **) &realm,
-+					       prompt_need);
-+	    }
-+	}
-+
-+	/* fake the realm if we must */
- 	if ((realm_result != SASL_OK) && (realm_result != SASL_INTERACT)) {
--	    /* Fake the realm, if we can. */
- 	    if (params->serverFQDN) {
--		_plug_strdup(params->utils, params->serverFQDN,
--			     (char **) &text->realm, NULL);
-+		realm = params->serverFQDN;
- 	    } else {
- 		return realm_result;
- 	    }
--	}
--	/* if realm_result == SASL_OK, text->realm has been filled in */
-+	}    
-     }
-     
-     /* free prompts we got */
-@@ -3665,6 +3673,7 @@
- 	if (result != SASL_OK) return result;
-     }
- 
-+    /* Get an allocated version of the realm into the structure */
-     if (realm && text->realm == NULL) {
- 	_plug_strdup(params->utils, realm, (char **) &text->realm, NULL);
-     }
-@@ -3711,7 +3720,7 @@
-     params->utils->log(params->utils->conn, SASL_LOG_DEBUG,
- 		       "DIGEST-MD5 client step 1");
- 
--    result = ask_user_info(ctext, params, NULL, prompt_need, oparams);
-+    result = ask_user_info(ctext, params, NULL, 0, prompt_need, oparams);
-     if (result != SASL_OK) return result;
- 
-     /* check if we have cached info for this user on this server */
-@@ -3797,7 +3806,8 @@
- 	}
-     }
- 
--    result = ask_user_info(ctext, params, realms, prompt_need, oparams);
-+    result = ask_user_info(ctext, params, realms, nrealm,
-+			   prompt_need, oparams);
-     if (result != SASL_OK) goto FreeAllocatedMem;
- 
-     /*
diff --git a/dev-libs/cyrus-sasl/files/gssapi-sefault.patch b/dev-libs/cyrus-sasl/files/gssapi-sefault.patch
deleted file mode 100644
index 0a87a7b0d597..000000000000
--- a/dev-libs/cyrus-sasl/files/gssapi-sefault.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urN cyrus-sasl-2.1.10/plugins/gssapi.c cyrus-sasl-2.1.10-modified/plugins/gssapi.c
---- cyrus-sasl-2.1.10/plugins/gssapi.c	2002-09-19 13:37:10.000000000 -0500
-+++ cyrus-sasl-2.1.10-modified/plugins/gssapi.c	2003-01-23 14:21:19.000000000 -0600
-@@ -999,9 +999,9 @@
- 	}	
- 	
- 	/* No matter what, set the rest of the oparams */
--        oparams->maxoutbuf = (((char *) output_token->value)[1] << 16) |
--            (((char *) output_token->value)[2] << 8) |
--            (((char *) output_token->value)[3] << 0);
-+        oparams->maxoutbuf = (((unsigned char *) output_token->value)[1] << 16) |
-+            (((unsigned char *) output_token->value)[2] << 8) |
-+            (((unsigned char *) output_token->value)[3] << 0);
- 
- 	if (oparams->mech_ssf) {
- 	    /* xxx this is probably too big */
-@@ -1413,9 +1413,9 @@
- 	    return SASL_TOOWEAK;
- 	}
- 	
--        oparams->maxoutbuf = (((char *) output_token->value)[1] << 16) |
--            (((char *) output_token->value)[2] << 8) |
--            (((char *) output_token->value)[3] << 0);
-+        oparams->maxoutbuf = (((unsigned char *) output_token->value)[1] << 16) |
-+            (((unsigned char *) output_token->value)[2] << 8) |
-+            (((unsigned char *) output_token->value)[3] << 0);
- 
- 	if(oparams->mech_ssf) {
- 	    /* xxx probably too large */
diff --git a/dev-libs/cyrus-sasl/files/saslauthd.confd b/dev-libs/cyrus-sasl/files/saslauthd.conf
index 1d4406ec531a..7dd0b7f7322e 100644
--- a/dev-libs/cyrus-sasl/files/saslauthd.confd
+++ b/dev-libs/cyrus-sasl/files/saslauthd.conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd.confd,v 1.3 2002/06/25 20:53:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd.conf,v 1.1 2004/01/14 19:42:47 max Exp $
 
 # Config file for /etc/init.d/saslauthd
 
diff --git a/dev-libs/cyrus-sasl/files/saslauthd.confd-2.1 b/dev-libs/cyrus-sasl/files/saslauthd.confd-2.1
deleted file mode 100644
index 160668f3297e..000000000000
--- a/dev-libs/cyrus-sasl/files/saslauthd.confd-2.1
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd.confd-2.1,v 1.1 2003/06/22 17:28:04 raker Exp $
-
-# Config file for /etc/init.d/saslauthd
-
-# Authentications mechanism (for list see saslauthd -v)
-# Examples: getpwent pam rimap shadow ldap
-SASL_AUTHMECH=pam
-
-# Put other startup options here.  Many options have changed recently.
-# Use -O to do things previously broken out into separate flags.
-SASL_DAEMON_OPTS=""
-
-# Tack the above options together
-[ -n ${SASL_AUTHMECH} ] && \
-	SASLAUTHD_OPTS="-a ${SASL_AUTHMECH}"
-[ -n ${SASL_DAEMON_OPTS} ] && \
-	SASLAUTHD_OPTS="${SASLAUTHD_OPTS} ${SASL_DAEMON_OPTS}"
diff --git a/dev-libs/cyrus-sasl/files/saslauthd.rc6 b/dev-libs/cyrus-sasl/files/saslauthd.rc6
index 0d04130a2fb3..a0797fd664f0 100644
--- a/dev-libs/cyrus-sasl/files/saslauthd.rc6
+++ b/dev-libs/cyrus-sasl/files/saslauthd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd.rc6,v 1.2 2003/02/14 22:40:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd.rc6,v 1.3 2004/01/14 19:42:47 max Exp $
 
 depend() {
 	need net
@@ -16,6 +16,6 @@ start() {
 
 stop() {
 	ebegin "Stopping saslauthd"
-	start-stop-daemon --stop --quiet --pidfile /var/lib/sasl/mux.pid
+	start-stop-daemon --stop --quiet --pidfile /var/lib/sasl/saslauthd.pid
 	eend $?
 }
diff --git a/dev-libs/cyrus-sasl/files/saslauthd2.rc6 b/dev-libs/cyrus-sasl/files/saslauthd2.rc6
index eb0d8ae5dc8c..55f5b92e0379 100644
--- a/dev-libs/cyrus-sasl/files/saslauthd2.rc6
+++ b/dev-libs/cyrus-sasl/files/saslauthd2.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# /space/gentoo/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd.rc6,v 1.1 2002/02/19 00:36:20 woodchip Exp
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd2.rc6,v 1.4 2004/01/14 19:42:47 max Exp $
 
 depend() {
 	need net
diff --git a/dev-libs/cyrus-sasl/metadata.xml b/dev-libs/cyrus-sasl/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/dev-libs/cyrus-sasl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>