Fix sasl-2.1.10 for detection of symbol-versioned db4

5 files changed, 161 insertions, 3 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 9666280dcf27..62eee329027b 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.35 2003/05/28 11:34:58 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.36 2003/05/28 11:56:46 pauldv Exp $
+
+*cyrus-sasl-2.1.10-r3 (28 May 2003)
+
+  28 May 2003; Paul de Vrieze <pauldv@gentoo.org> cyrus-sasl-2.1.10-r3.ebuild,
+  files/cyrus-sasl-2.1.10-db4.patch:
+  Make sasl-2.1.10 also work with db4
 
   28 May 2003; Paul de Vrieze <pauldv@gentoo.org> cyrus-sasl-2.1.12.ebuild:
   Fix cyrus-sasl to compile with db4
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 8c9ce03302a4..13e6ce6ff9f4 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,9 +1,9 @@
-MD5 a4a04af05af4e6444c28411e1d146350 ChangeLog 7332
+MD5 96417367b06551275dd6534390c5a1c6 ChangeLog 7332
 MD5 b1e9974990d241c05f9cd91942d7a6ef cyrus-sasl-1.5.27-r4.ebuild 2540
 MD5 45aef0e2226751668e546b334e90ae44 cyrus-sasl-1.5.27-r5.ebuild 2692
 MD5 3f81216b8fbe549b9c885473bfab579d cyrus-sasl-1.5.27-r6.ebuild 2774
 MD5 5bcfd89895270267a066c1d3a9b28923 cyrus-sasl-2.1.10-r1.ebuild 3208
-MD5 31f2a2b7b535b476a9ba801e9b4198b7 cyrus-sasl-2.1.10-r3.ebuild 3369
+MD5 48500eedaf288a4df6a93732e118a554 cyrus-sasl-2.1.10-r3.ebuild 3369
 MD5 99dd77b1e254cd23ba82c875ff69b40b cyrus-sasl-2.1.10.ebuild 3123
 MD5 72f59bb22937f65913dc0e50e80ad541 cyrus-sasl-2.1.12.ebuild 3268
 MD5 1db741b5018ea1107a49eeae3f245814 cyrus-sasl-2.1.5-r2.ebuild 2037
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.10-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.10-r3.ebuild
new file mode 100644
index 000000000000..8e82a197b52d
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.10-r3.ebuild
@@ -0,0 +1,123 @@
+# 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/cyrus-sasl-2.1.10-r3.ebuild,v 1.1 2003/05/28 11:56:46 pauldv Exp $
+
+S=${WORKDIR}/${P}
+
+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 "
+
+IUSE="gdbm berkdb ldap mysql kerberos"
+
+inherit eutils
+
+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? ( virtual/krb5 )"
+	
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	sys-devel/autoconf
+	sys-devel/automake"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	
+	# Fix depends for heimdal needed in saslv2 too
+	epatch ${FILESDIR}/${PN}2-heimdal-deps.patch
+
+	# Fix for gssapi seg faulting problem?
+	epatch ${FILESDIR}/gssapi-sefault.patch
+
+	# Fix for digestmd5 segfault with sendmail/smart host.
+	epatch ${FILESDIR}/digestmd5.patch
+
+	# Fix to detect db4 correctly
+	epatch ${FILESDIR}/${P}-db4.patch
+}
+
+src_compile() {
+
+	local myconf
+
+	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
+
+	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 static && myconf="${myconf} --enable-static --with-staticsasl" \
+		|| myconf="${myconf} --disable-static --without-staticsasl"
+
+	use kerberos && myconf="${myconf} --enable-gssapi=/usr" \
+		|| myconf="${myconf} --disable-gssapi"
+
+	econf \
+		--with-saslauthd=/var/lib/sasl2 \
+		--with-pwcheck=/var/lib/sasl2 \
+		--with-configdir=/etc/sasl2 \
+		--with-openssl \
+		--with-plugindir=/usr/lib/sasl2 \
+		--with-dbpath=/etc/sasl2/sasldb2 \
+		--with-des \
+		--with-rc4 \
+		--disable-krb4 \
+		--with-gnu-ld \
+		--enable-shared \
+		--disable-sample \
+		--enable-login \
+		${myconf} || die "bad ./configure"
+
+	make MAKE=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 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/cyrus-sasl-2.1.10-db4.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.10-db4.patch
new file mode 100644
index 000000000000..fbab83a1f1b7
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.10-db4.patch
@@ -0,0 +1,28 @@
+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/digest-cyrus-sasl-2.1.10-r3 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.10-r3
new file mode 100644
index 000000000000..bc95eab8e136
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.10-r3
@@ -0,0 +1 @@
+MD5 3ac2a696c091a76ce6c7db27e5d859d4 cyrus-sasl-2.1.10.tar.gz 1325286