Added a patch to fix compilation against db-4.5

Package-Manager: portage-2.1.3_rc6

4 files changed, 60 insertions, 10 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/Manifest b/net-mail/cyrus-imapd/Manifest
index 9bac0a747121..49811cd8baf3 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cyrus-imapd-2.2.10-drac.patch 926 RMD160 7a587e2f756e6058262348d19c80fd27ad169a52 SHA1 bae33be47b618516caea435d52990abca38e6fe7 SHA256 9c9b297767ef787bc76fa134b178848695199b662860515f0157f59f726b5b84
 MD5 945aad1ac6ce2e72b6dede038c37c934 files/cyrus-imapd-2.2.10-drac.patch 926
 RMD160 7a587e2f756e6058262348d19c80fd27ad169a52 files/cyrus-imapd-2.2.10-drac.patch 926
@@ -6,6 +9,10 @@ AUX cyrus-imapd-2.2.10-libwrap.patch 390 RMD160 4ed2b14f549ccfab487cff66e5f2cb8e
 MD5 88f50354abbcae1950a2d11c74db5fe5 files/cyrus-imapd-2.2.10-libwrap.patch 390
 RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 files/cyrus-imapd-2.2.10-libwrap.patch 390
 SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e files/cyrus-imapd-2.2.10-libwrap.patch 390
+AUX cyrus-imapd-2.2.12-db45.patch 1283 RMD160 e3925988a6c628eb5567aa482351bb6a8ab01113 SHA1 b074166f6092ee58db685038c45382f77479bdb1 SHA256 4d814546280b83cf420855faf067ac95d36818be8b2a9ad9973805f261c1d90e
+MD5 94e33770741d5309d51ba7f4edbe1fc5 files/cyrus-imapd-2.2.12-db45.patch 1283
+RMD160 e3925988a6c628eb5567aa482351bb6a8ab01113 files/cyrus-imapd-2.2.12-db45.patch 1283
+SHA256 4d814546280b83cf420855faf067ac95d36818be8b2a9ad9973805f261c1d90e files/cyrus-imapd-2.2.12-db45.patch 1283
 AUX cyrus-imapd-2.2.12-drac.patch 926 RMD160 7a587e2f756e6058262348d19c80fd27ad169a52 SHA1 bae33be47b618516caea435d52990abca38e6fe7 SHA256 9c9b297767ef787bc76fa134b178848695199b662860515f0157f59f726b5b84
 MD5 945aad1ac6ce2e72b6dede038c37c934 files/cyrus-imapd-2.2.12-drac.patch 926
 RMD160 7a587e2f756e6058262348d19c80fd27ad169a52 files/cyrus-imapd-2.2.12-drac.patch 926
@@ -80,10 +87,10 @@ DIST cyrus-imapd-2.3.1.tar.gz 2212999 RMD160 68b40b89f5558afe19886724a8bb8736139
 DIST cyrus-imapd-2.3.6.tar.gz 2250241 RMD160 c7a07a2e95ca08d0348ce7de2849d56e21341eb0 SHA1 adbd02f629d38152a1380360a7348f79261aa078 SHA256 6fc963c7d1f34b3b3368bb14f3604c7309e1f42d157e871bc186f8832e1a9cbd
 DIST cyrus-imapd-2.3.7-uoa.tbz2 17788 RMD160 22f2aa3f0755bc924e9bef8613e59924b3d971a6 SHA1 678eea9049058ad7ea8e34da51034f3d70b0f92e SHA256 5a79970e70af26525d48c279ed53267c6a285bc259bf9201ff289a4c1050aca7
 DIST cyrus-imapd-2.3.7.tar.gz 2254961 RMD160 5f2170677f1a013a3707b1fbb07713a8f93fc3c6 SHA1 8eaad216859d4aaa2a4ec3b37ed215bde9abb6ff SHA256 ff58c60999f2c6495e218b81a25b6f5ef1805e4a160122db2744a6645a753b6d
-EBUILD cyrus-imapd-2.2.12-r4.ebuild 9356 RMD160 d2699bbe95b0d7ce55da5306e02f1f60660e7d92 SHA1 01785013df24a36729188d7fc2e3267138f3613c SHA256 5c79f1ebaf4d13b99cc654db8e1fc0e7d96641d30715896c887f4423e4fd0cd7
-MD5 ab1d7eaf2fb5bc2b32658e3648500dde cyrus-imapd-2.2.12-r4.ebuild 9356
-RMD160 d2699bbe95b0d7ce55da5306e02f1f60660e7d92 cyrus-imapd-2.2.12-r4.ebuild 9356
-SHA256 5c79f1ebaf4d13b99cc654db8e1fc0e7d96641d30715896c887f4423e4fd0cd7 cyrus-imapd-2.2.12-r4.ebuild 9356
+EBUILD cyrus-imapd-2.2.12-r4.ebuild 9407 RMD160 54a79654500459edb1a30fdaa7fe3765be84eaff SHA1 f4872e5349d3bd7ced85b85d3b1829d78be472b9 SHA256 73eba5cdca1f1810076756e36dcd03553c26ab39c1f25f22bbe9b79fb82230f5
+MD5 b7c844eacdaeb99cce7c2d5329c60248 cyrus-imapd-2.2.12-r4.ebuild 9407
+RMD160 54a79654500459edb1a30fdaa7fe3765be84eaff cyrus-imapd-2.2.12-r4.ebuild 9407
+SHA256 73eba5cdca1f1810076756e36dcd03553c26ab39c1f25f22bbe9b79fb82230f5 cyrus-imapd-2.2.12-r4.ebuild 9407
 EBUILD cyrus-imapd-2.2.12-r5.ebuild 9415 RMD160 f0ddd2657de6e2c0ab9f4205654bf19e653e8311 SHA1 1fabcf64a35569a8ddc8dcae5b50dbce6147e943 SHA256 6a3aa6c8c86fc12bd124bfba3a848155392474787a842c678e1853b615d41bd9
 MD5 d9fb303a9673b00ef1dc57deb107d736 cyrus-imapd-2.2.12-r5.ebuild 9415
 RMD160 f0ddd2657de6e2c0ab9f4205654bf19e653e8311 cyrus-imapd-2.2.12-r5.ebuild 9415
@@ -104,10 +111,10 @@ EBUILD cyrus-imapd-2.3.7.ebuild 8234 RMD160 11da2766f98f9ccef9520682e9a3af51f54c
 MD5 0a2c5681b58ee96488248875ed5c433d cyrus-imapd-2.3.7.ebuild 8234
 RMD160 11da2766f98f9ccef9520682e9a3af51f54cf734 cyrus-imapd-2.3.7.ebuild 8234
 SHA256 9f3492aa5c9225fbecc6667f6bf6ad42aa7f2a0eaceb91cc22d1a76271f9989b cyrus-imapd-2.3.7.ebuild 8234
-MISC ChangeLog 18178 RMD160 8b9af46598927e2833eeda24098ed98904af51e1 SHA1 d2876419bbdfe5d65d267c68e9fc36460759bc39 SHA256 537ccd30efdc757dce36e31d8073b9180e2e8a3b63185abe88102daac30b6767
-MD5 17d7732202b088732232a49314a06d72 ChangeLog 18178
-RMD160 8b9af46598927e2833eeda24098ed98904af51e1 ChangeLog 18178
-SHA256 537ccd30efdc757dce36e31d8073b9180e2e8a3b63185abe88102daac30b6767 ChangeLog 18178
+MISC ChangeLog 18349 RMD160 737d662c5a06a4c91b88c0e8a50974724133a8dc SHA1 817efaa17dd75cf3977b9bbaecbd5b27160bdb27 SHA256 f1555ee7a868bb72faa0ae2ab24486f118b981ff4e20c072537f278dc069a98d
+MD5 f51e4af746da9399e6b1d6a3069655f1 ChangeLog 18349
+RMD160 737d662c5a06a4c91b88c0e8a50974724133a8dc ChangeLog 18349
+SHA256 f1555ee7a868bb72faa0ae2ab24486f118b981ff4e20c072537f278dc069a98d ChangeLog 18349
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
@@ -130,3 +137,10 @@ SHA256 6678b9c2be20b994c7f75c83a433310a2b522d7399baf7bca4098b5772934f6e files/di
 MD5 768436622f94cc5196bbb3cda4805329 files/digest-cyrus-imapd-2.3.7 512
 RMD160 b7165ccf101117cd86d58a293137f04b06400d71 files/digest-cyrus-imapd-2.3.7 512
 SHA256 1c0548867e2394baac1b0eac963fbc6074760defc5895dec4db8776109d9ff31 files/digest-cyrus-imapd-2.3.7 512
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGkSfXKhnDs22gwa8RAnYpAKCzLKubgy4fkuDBRfmg7ciOGOZKNgCgzhul
+e2ePYLxFeMCzZNdjdvjwtSc=
+=OE+q
+-----END PGP SIGNATURE-----
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>],