Bump to version 2.1.18. Should fix bug #38699.

7 files changed, 63 insertions, 58 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index f8a20f02774c..0dca113676fd 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.59 2004/02/28 00:51:17 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.60 2004/03/15 20:03:20 max Exp $
+
+*cyrus-sasl-2.1.18 (15 Mar 2004)
+
+  15 Mar 2004; Max Kalika <max@gentoo.org> cyrus-sasl-2.1.17.ebuild,
+  cyrus-sasl-2.1.18.ebuild, files/cyrus-sasl-2.1.17-db4.patch,
+  files/cyrus-sasl-2.1.18-db4.patch:
+  Bump to version 2.1.18. Should fix bug #38699.
 
   27 Feb 2004; Joshua Kinard <kumba@gentoo.org> cyrus-sasl-2.1.17.ebuild:
   Forgot to add gnuconfig detection in for mips
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 265e299746b8..5bb7f1bcab90 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,31 +1,31 @@
-MD5 2904c6ed8ca40438bfb23e6b2d55f4e6 ChangeLog 11887
-MD5 adc5fe7dc04f8b77f22bd78960423693 cyrus-sasl-1.5.27-r5.ebuild 2694
 MD5 15a2da2ec8147eb55baf0f19d268ec52 cyrus-sasl-1.5.27-r6.ebuild 2767
-MD5 17cd291abdb8bec3feeee17adcbcb6ea cyrus-sasl-2.1.14.ebuild 3913
+MD5 4de6e047cc73354cf1a549727c1fb42a cyrus-sasl-2.1.18.ebuild 4147
 MD5 932faa05d57000adae98609ab35e8325 cyrus-sasl-2.1.15.ebuild 3737
-MD5 2fe0ea09149a47d8e0d3c36453a0ce43 cyrus-sasl-2.1.17.ebuild 4239
+MD5 adc5fe7dc04f8b77f22bd78960423693 cyrus-sasl-1.5.27-r5.ebuild 2694
+MD5 17cd291abdb8bec3feeee17adcbcb6ea cyrus-sasl-2.1.14.ebuild 3913
+MD5 2431a7dac3e798e7b938f417e0ad36ab ChangeLog 12138
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
-MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148
-MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730
-MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242
 MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448
+MD5 13c15e58d2fa734adeb718e4e3dea757 files/cyrus-sasl-2.1.18-db4.patch 1604
+MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
+MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69
+MD5 81cec2fe43610499ef4372d0dff44292 files/saslauthd2.conf 745
 MD5 5f96ab675ae2ff1da8e0ee4503340df5 files/cyrus-sasl-1.5.27-scram.patch 480
-MD5 397ec1b24d4efe6efafa4782ba0f3493 files/cyrus-sasl-2.1.17-configdir.patch 8095
-MD5 cb4a5c5160219818e04196847ba9f7a1 files/cyrus-sasl-2.1.17-db4.patch 1451
+MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242
+MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730
+MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148
 MD5 b9ab0670db5b9b5a74de379c18e5370d files/cyrus-sasl-2.1.17-pgsql-include.patch 617
-MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510
+MD5 7b24e99c21a5924543fe82cd82a1d741 files/saslauthd.pam 223
+MD5 d34cf414f5afcb61a8ebaa2295b16934 files/saslauthd.rc6 532
 MD5 228579b200f0a570f9c02d222f400672 files/cyrus-sasl-gcc32.patch 426
-MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624
+MD5 346ac637058b838ef7a2e0df3e2a6e62 files/pwcheck.rc6 547
+MD5 b3e4b485d66d1b6c6cc5bb726f065492 files/saslauthd2.rc6 534
+MD5 8a11a6b269e544ee863f098f5fab601d files/saslauthd.conf 897
 MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938
-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 6ba386a4eb5f9addf367d41093ba369e files/digest-cyrus-sasl-2.1.14 70
 MD5 6109117a3ea3c1141364d60d212f48d9 files/digest-cyrus-sasl-2.1.15 70
-MD5 960ffd4d83e165ccaa68cf43937ff63d files/digest-cyrus-sasl-2.1.17 70
-MD5 1c211557e54537ad23feb847b3a23b48 files/pwcheck.rc6 557
-MD5 a8346e22abd563bd4f1f951849f7b9dd files/saslauthd.conf 904
-MD5 7b24e99c21a5924543fe82cd82a1d741 files/saslauthd.pam 223
-MD5 ef29bc68cc564b85a86fd21d103748d5 files/saslauthd.rc6 539
-MD5 81cec2fe43610499ef4372d0dff44292 files/saslauthd2.conf 745
-MD5 ff263123f1cc0c43b0a69fc8b71758d7 files/saslauthd2.rc6 541
+MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18 70
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild
index 153f9942dc11..9967a8c4196d 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild
@@ -1,8 +1,8 @@
 # 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.11 2004/02/28 00:51:17 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild,v 1.1 2004/03/15 20:03:20 max Exp $
 
-inherit eutils flag-o-matic gnuconfig
+inherit eutils flag-o-matic
 
 DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
 HOMEPAGE="http://asg.web.cmu.edu/sasl/"
@@ -10,14 +10,14 @@ SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 alpha ia64 hppa ~mips"
+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-2.58
+	sys-devel/autoconf
 	sys-devel/automake
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	ldap? ( >=net-nds/openldap-2.0.25 )
@@ -40,7 +40,7 @@ src_unpack() {
 		-i saslauthd/auth_rimap.c || die "sed failed"
 
 	# DB4 detection and versioned symbols.
-	epatch "${FILESDIR}/cyrus-sasl-2.1.17-db4.patch"
+	epatch "${FILESDIR}/cyrus-sasl-2.1.18-db4.patch"
 
 	# Add configdir support.
 	epatch "${FILESDIR}/cyrus-sasl-2.1.17-configdir.patch"
@@ -89,9 +89,6 @@ src_compile() {
 	# taviso #24998 (17 Aug 03)
 	use alpha && append-flags -D_REENTRANT -pthread
 
-	# Detect mips systems properly
-	use mips && gnuconfig_update
-
 	econf \
 		--with-saslauthd=/var/lib/sasl2 \
 		--with-pwcheck=/var/lib/sasl2 \
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
deleted file mode 100644
index ef0156770dd8..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-db4.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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.18-db4.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-db4.patch
new file mode 100644
index 000000000000..17ea7e1db673
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-db4.patch
@@ -0,0 +1,28 @@
+diff -urN cyrus-sasl-2.1.18/cmulocal/berkdb.m4 cyrus-sasl-2.1.18/cmulocal/berkdb.m4
+--- cyrus-sasl-2.1.18/cmulocal/berkdb.m4	2003-04-15 17:25:41.000000000 -0500
++++ cyrus-sasl-2.1.18/cmulocal/berkdb.m4	2003-07-09 03:17:48.000000000 -0500
+@@ -211,12 +211,21 @@
+ 	    BDB_LIBADD=""
+ 	fi
+ 
+-        for dbname in db-4.2 db4.2 db42 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.2 db4.2 db42 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, AC_CHECK_LIB($dbname, db_create_4002, BDB_LIBADD="$BDB_LIBADD -l$dbname";
++                dblib="berkeley"; break, dblib="no")))
+           done
+         if test "$dblib" = "no"; then
++          for dbname in db-4.2 db4.2 db42 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/digest-cyrus-sasl-2.1.17 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.17
deleted file mode 100644
index 954839a230d0..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4add6be2f194dc51aafc64193a1dd77b cyrus-sasl-2.1.17.tar.gz 1499725
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18
new file mode 100644
index 000000000000..2993b6dbb3ed
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18
@@ -0,0 +1 @@
+MD5 1eafae95f0289c10f187d8b2bc4032cf cyrus-sasl-2.1.18.tar.gz 1522578