Version bump. Upstream build fixes as patched in previous build. 2.2.x will be here soon.

3 files changed, 127 insertions, 2 deletions

diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index e62096bc77f8..717243b6b8f5 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,9 +1,9 @@
 MD5 bb3865d691a44032e8a22ca8fd4d2790 cyrus-sasl-1.5.27-r6.ebuild 2774
 MD5 024dbc27672ffdd87a796ad9fea735bf cyrus-sasl-2.1.13.ebuild 3274
-MD5 8cec7b01f677a97a8690baad7faec071 cyrus-sasl-2.1.15.ebuild 3554
+MD5 b0d02a9986f582e439e47f641fa3e160 cyrus-sasl-2.1.15.ebuild 3556
 MD5 d9e998ef5902870ff63d9877c81981e6 cyrus-sasl-1.5.27-r5.ebuild 2701
 MD5 aed867d5c93d345a93a6980054491ea8 cyrus-sasl-2.1.14.ebuild 3912
-MD5 aa840889ae076f457b2a5a0af147d0fc ChangeLog 8829
+MD5 d397b77aa93c61028012122cb0f8be95 ChangeLog 8985
 MD5 6d3c58ecd8d6d3da231db3e44d345bbe files/cyrus-sasl-2.1.6-iovec.diff 1405
 MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448
 MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.15.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.15.ebuild
new file mode 100644
index 000000000000..f3817d33a973
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.15.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2003 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.1 2003/08/14 06:24:14 g2boojum Exp $
+
+IUSE="gdbm berkdb ldap mysql kerberos static ssl java pam" # otp krb4
+
+inherit eutils
+
+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"
+
+RDEPEND=">=sys-libs/db-3.2
+	>=sys-libs/pam-0.75
+	>=dev-libs/openssl-0.9.6d
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	berkdb? ( >=sys-libs/db-3.2.9 )
+	ldap? ( >=net-nds/openldap-2.0.25 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	kerberos? ( >=app-crypt/mit-krb5-1.2.6 )
+	java? ( virtual/jdk )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	sys-devel/autoconf
+	sys-devel/automake"
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+
+	# Updated the cyrus-sasl-2.1.12-db4.patch
+	epatch ${FILESDIR}/2.1.14-db4.patch
+}
+
+src_compile() {
+	libtoolize --copy --force
+	aclocal -I config -I cmulocal || die
+	autoheader || die
+	automake -a --foreign || die
+	autoconf || die
+	autoconf saslauthd/configure.in > saslauthd/configure || die
+	chmod +x saslauthd/configure || die
+
+	local myconf
+	myconf="--with-gnu-ld --enable-login --enable-ntlm"
+
+	use static && myconf="${myconf} --enable-static"
+
+	use ssl && myconf="${myconf} --with-openssl" \
+		|| myconf="${myconf} --without-openssl"
+
+	use ldap && myconf="${myconf} --with-ldap" \
+		|| myconf="${myconf} --without-ldap"
+
+	use mysql && myconf="${myconf} --with-mysql" \
+		|| myconf="${myconf} --without-mysql"
+
+	if use berkdb; then
+		myconf="${myconf} --with-dblib=berkeley"
+	elif use gdbm; then
+		myconf="${myconf} --with-dblib=gdbm --with-gdbm=/usr"
+	else
+		myconf="${myconf} --with-dblib=berkeley"
+	fi
+
+	use kerberos && myconf="${myconf} --enable-gssapi" \
+		|| myconf="${myconf} --disable-gssapi"
+
+	# Kerberos 4 support doesn't compile.. and i'm not sure why
+	# If you want to test/fix for me, emerge kth-krb
+	# and have at it. :) -raker 02/07/2003
+	#
+	#if [ "`use krb4`" ]; then
+	#	myconf="${myconf} --enable-krb4=/usr/athena"
+	#else
+		myconf="${myconf} --disable-krb4"
+	#fi
+
+	use java && myconf="${myconf} --enable-java --with-javabase=${JAVA_HOME}"
+
+	use pam || myconf="${myconf} --without-pam"
+
+	# opie is not in portage yet so no otp support
+	myconf="${myconf} --disable-otp"
+	# use otp && myconf="${myconf} --with-opie=/usr"
+
+	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 || die "install problem"
+
+	dodoc AUTHORS ChangeLog COPYING NEWS README doc/*.txt
+	docinto examples ; dodoc sample/{*.[ch],Makefile}
+	newdoc pwcheck/README README.pwcheck
+	dohtml doc/*
+
+	dodir /var/lib/sasl2
+	dodir /etc/sasl2
+	# generate an empty sasldb2 with correct permissions
+	LD_OLD=${LD_LIBRARY_PATH}
+	export LD_LIBRARY_PATH=${S}/lib/.libs
+	echo "gentoo" | ${D}usr/sbin/saslpasswd2 -f ${D}etc/sasl2/sasldb2 -p cyrus
+	${D}usr/sbin/saslpasswd2 -f ${D}etc/sasl2/sasldb2 -d cyrus
+	export LD_LIBRARY_PATH=${LD_OLD}
+	chown root.mail ${D}etc/sasl2/sasldb2
+	chmod 0640 ${D}etc/sasl2/sasldb2
+
+	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd-2.1 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/files/digest-cyrus-sasl-2.1.15 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.15
new file mode 100644
index 000000000000..4ffcd550cc76
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.15
@@ -0,0 +1 @@
+MD5 82c7f82a777b7bc10cc1ef68fb8e2a37 cyrus-sasl-2.1.15.tar.gz 1390131