diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2007-07-08 18:07:10 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2007-07-08 18:07:10 +0000 |
| commit | e7432f7a05f52cdb291d14b47ebe702e7582b4ed (patch) | |
| tree | b1a2dfa552bbcdd07c95d0089cb70fa3a4f67718 /net-mail | |
| parent | http://my.opera.com/desktopteam/blog/yet-another-merlin-build (diff) | |
| download | gentoo-2-e7432f7a05f52cdb291d14b47ebe702e7582b4ed.tar.gz gentoo-2-e7432f7a05f52cdb291d14b47ebe702e7582b4ed.tar.bz2 gentoo-2-e7432f7a05f52cdb291d14b47ebe702e7582b4ed.zip | |
Added a patch to fix compilation against db-4.5
(Portage version: 2.1.3_rc6)
Diffstat (limited to 'net-mail')
| -rw-r--r-- | net-mail/cyrus-imapd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild | 5 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-db45.patch | 29 |
3 files changed, 38 insertions, 2 deletions
diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog index 05eafb9d904e..3a06454772a1 100644 --- a/net-mail/cyrus-imapd/ChangeLog +++ b/net-mail/cyrus-imapd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-mail/cyrus-imapd # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.92 2007/01/08 15:31:33 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.93 2007/07/08 18:07:10 angelos Exp $ + + 08 Jul 2007; Christoph Mende <angelos@gentoo.org> + +files/cyrus-imapd-2.2.12-db45.patch, cyrus-imapd-2.2.12-r4.ebuild: + Added a patch to fix compilation against db-4.5 08 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> cyrus-imapd-2.2.12.ebuild, cyrus-imapd-2.2.12-r4.ebuild, diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild index aec0fa1de25c..1e55e611cc6c 100644 --- a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild +++ b/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild,v 1.10 2007/01/08 15:31:33 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild,v 1.11 2007/07/08 18:07:10 angelos Exp $ inherit eutils ssl-cert fixheadtails pam @@ -149,6 +149,9 @@ src_unpack() { # Parallel make fix epatch "${FILESDIR}"/${PN}-parallel.patch + # db-4.5 fix + epatch "${FILESDIR}/${P}-db45.patch" + # Add unsupported patch wrt #18706 and #80630 use unsupported_8bit && epatch "${FILESDIR}/${PN}-unsupported-8bit.patch" diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-db45.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-db45.patch new file mode 100644 index 000000000000..c92f957953c8 --- /dev/null +++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-db45.patch @@ -0,0 +1,29 @@ +--- lib.old/cyrusdb_berkeley.c 2007-04-05 01:23:42.518845824 +0200 ++++ lib/cyrusdb_berkeley.c 2007-04-05 01:22:20.000000000 +0200 +@@ -159,7 +159,15 @@ + syslog(LOG_WARNING, + "DBERROR: invalid berkeley_locks_max value, using internal default"); + } else { ++#if DB_VERSION_MAJOR >= 4 ++ r = dbenv->set_lk_max_locks(dbenv, opt); ++ if (!r) ++ r = dbenv->set_lk_max_lockers(dbenv, opt); ++ if (!r) ++ r = dbenv->set_lk_max_objects(dbenv, opt); ++#else + r = dbenv->set_lk_max(dbenv, opt); ++#endif + if (r) { + dbenv->err(dbenv, r, "set_lk_max"); + syslog(LOG_ERR, "DBERROR: set_lk_max(): %s", db_strerror(r)); +--- cmulocal/berkdb.m4.orig 2007-05-01 18:05:00.000000000 +0200 ++++ cmulocal/berkdb.m4 2007-05-01 18:05:17.000000000 +0200 +@@ -212,7 +212,7 @@ + fi + + saved_LIBS=$LIBS +- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 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.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 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 + do + LIBS="$saved_LIBS -l$dbname" + AC_TRY_LINK([#include <db.h>], |