updated the db4 patch for 2.1.14

4 files changed, 59 insertions, 10 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index ea262514c86f..03149912fee8 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,14 +1,16 @@
 # 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.40 2003/07/09 07:53:38 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.41 2003/07/09 08:37:13 raker Exp $
 
 *cyrus-sasl-2.1.14 (09 Jul 2003)
 
   09 Jul 2003; Nick Hadaway <raker@gentoo.org> cyrus-sasl-2.1.14.ebuild,
-  files/2.1.14-kerberos.patch, files/2.1.14-mysql.patch:
+  files/2.1.14-kerberos.patch, files/2.1.14-mysql.patch,
+  files/2.1.14-db4.patch:
   Version bump.  2 fixes included from cvs which were noted immediately
   after release on the dev mailing list.  Added java and pam to IUSE.
-  otp support will be added as soon as opie is in portage.
+  otp support will be added as soon as opie is in portage.  Updated the
+  db4 patch.
 
 *cyrus-sasl-2.1.13 (09 Jun 2003)
 
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index c86f25a0db5d..1bad77d2de19 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,8 +1,8 @@
 MD5 3f81216b8fbe549b9c885473bfab579d cyrus-sasl-1.5.27-r6.ebuild 2774
 MD5 5c4224dce90af6c87ba69282674a2bf3 cyrus-sasl-2.1.13.ebuild 3284
 MD5 ea6ea07ae111539aa580d35a09bf2afe cyrus-sasl-1.5.27-r5.ebuild 2699
-MD5 00c5f0384f7c4800a881106e4fc5fc36 cyrus-sasl-2.1.14.ebuild 3827
-MD5 40f4413e63a6b1596984df933ff85b2d ChangeLog 8173
+MD5 a366b68fa5b938cf6239408ee38f9217 cyrus-sasl-2.1.14.ebuild 3932
+MD5 467787eac24a3884f2700d0ef11f05dd ChangeLog 8225
 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
@@ -22,6 +22,7 @@ MD5 8e605da1bfdae5c2d9da9a3919d3d5cb files/saslauthd.confd-2.1 751
 MD5 7c0958ee10762956aa0f7b2d549ca86e files/saslauthd2.rc6 542
 MD5 a302e1b2ed33b7965de1a307cd25a32d files/cyrus-sasl-2.1.12-db4.patch 1902
 MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938
+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 216eb279339ba0b6e3f94bac8ee0dc03 files/cyrus-sasl-2.1.14-kerberos.patch 456
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 fe737ce65779..118268c33e46 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.
 # 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.14.ebuild,v 1.1 2003/07/09 07:53:38 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.14.ebuild,v 1.2 2003/07/09 08:37:13 raker Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="2"
 KEYWORDS="~x86 ~ppc ~sparc ~hppa"
-IUSE="gdbm berkdb ldap mysql kerberos static ssl java pam" #add otp
+IUSE="gdbm berkdb ldap mysql kerberos static ssl java pam" #otp krb4
 
 RDEPEND=">=sys-libs/db-3.2
 	>=sys-libs/pam-0.75
@@ -21,6 +21,7 @@ RDEPEND=">=sys-libs/db-3.2
 	ldap? ( >=net-nds/openldap-2.0.25 )
 	mysql? ( >=dev-db/mysql-3.23.51 )
 	kerberos? ( virtual/krb5 )
+	krb4? ( app-crypt/kth-krb )
 	java? ( virtual/jdk )"
 DEPEND="${RDEPEND}
 	sys-devel/libtool
@@ -37,6 +38,9 @@ src_unpack() {
 	# Fix for compatibility with MySQL 4.x
 	# http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/plugins/mysql.c.diff?r1=1.10&r2=1.11
 	epatch ${FILESDIR}/2.1.14-mysql.patch
+
+	# Updated the cyrus-sasl-2.1.12-db4.patch
+	epatch ${FILESDIR}/2.1.14-db4.patch
 }
 
 src_compile() {
@@ -75,7 +79,8 @@ src_compile() {
 	# 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 [ "$ENABLE_KRB4" = "yes" ]; then
+	#
+	#if [ "`use krb4`" ]; then
 	#	myconf="${myconf} --enable-krb4=/usr/athena"
 	#else
 		myconf="${myconf} --disable-krb4"
@@ -85,8 +90,7 @@ src_compile() {
 
 	use pam || myconf="${myconf} --without-pam"
 
-
-	# otp support via opie is not in portage yet
+	# opie is not in portage yet so no otp support
 	myconf="${myconf} --disable-otp"
 	# use otp && myconf="${myconf} --with-opie=/usr"
 
diff --git a/dev-libs/cyrus-sasl/files/2.1.14-db4.patch b/dev-libs/cyrus-sasl/files/2.1.14-db4.patch
new file mode 100644
index 000000000000..27c0cea48638
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/2.1.14-db4.patch
@@ -0,0 +1,42 @@
+diff -urN cyrus-sasl-2.1.14/cmulocal/berkdb.m4 cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4
+--- cyrus-sasl-2.1.14/cmulocal/berkdb.m4	2003-04-15 17:25:41.000000000 -0500
++++ cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4	2003-07-09 03:17:48.000000000 -0500
+@@ -211,12 +211,20 @@
+ 	    BDB_LIBADD=""
+ 	fi
+ 
+-        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
+           do
+-            AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
+-              dblib="berkeley"; break, dblib="no")
++            AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname";
++              dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname";
++               dblib="berkeley"; break, dblib="no"))
+           done
+         if test "$dblib" = "no"; then
++          for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
++            do
++              AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
++                dblib="berkeley"; break, dblib="no")
++            done
++       fi
++        if test "$dblib" = "no"; then
+           AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb";
+             dblib="berkeley"; dbname=db,
+             dblib="no")
+diff -urN cyrus-sasl-2.1.14/cmulocal/sasl2.m4 cyrus-sasl-2.1.14-modified/cmulocal/sasl2.m4
+--- cyrus-sasl-2.1.14/cmulocal/sasl2.m4	2003-05-14 13:36:41.000000000 -0500
++++ cyrus-sasl-2.1.14-modified/cmulocal/sasl2.m4	2003-07-09 03:18:31.000000000 -0500
+@@ -25,8 +25,9 @@
+   dnl
+   dnl The choice is reflected in GSSAPIBASE_LIBS
+   dnl we might need libdb
+-  AC_CHECK_LIB(db, db_open)
+-
++  AC_CHECK_LIB(db, db_open,,
++       AC_CHECK_LIB(db, db_open_4001,,
++       AC_CHECK_LIB(db, db_open_4000)))
+   gss_impl="mit";
+   AC_CHECK_LIB(resolv,res_search)
+   if test -d ${gssapi}; then