summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/cyrus-sasl/ChangeLog9
-rw-r--r--dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild (renamed from dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild)13
-rw-r--r--dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-db4.patch27
-rw-r--r--dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-db4.patch28
-rw-r--r--dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.171
-rw-r--r--dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.181
6 files changed, 42 insertions, 37 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/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