rpms/cyrus-imapd/devel cyrus-imapd-2.3.7-db4.5.patch, NONE, 1.1 cyrus-imapd.spec, 1.17, 1.18

[Tomas Janousek (tjanouse)]

Author: tjanouse

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13921

Modified Files:
	cyrus-imapd.spec 
Added Files:
	cyrus-imapd-2.3.7-db4.5.patch 
Log Message:
* Mon Jan 08 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.7-6
- #218046: applied patches to compile with db4-4.5


cyrus-imapd-2.3.7-db4.5.patch:

--- NEW FILE cyrus-imapd-2.3.7-db4.5.patch ---
--- cyrus-imapd-2.3.7/cmulocal/berkdb.m4.db4.5	2006-05-23 15:27:15.000000000 +0200
+++ cyrus-imapd-2.3.7/cmulocal/berkdb.m4	2007-01-08 11:57:05.000000000 +0100
@@ -213,7 +213,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>],
--- cyrus-imapd-2.3.7/lib/cyrusdb_berkeley.c.db4.5	2006-02-28 13:58:07.000000000 +0100
+++ cyrus-imapd-2.3.7/lib/cyrusdb_berkeley.c	2007-01-08 12:00:29.000000000 +0100
@@ -173,7 +173,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));


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cyrus-imapd.spec	5 Dec 2006 17:21:39 -0000	1.17
+++ cyrus-imapd.spec	8 Jan 2007 12:52:34 -0000	1.18
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -146,6 +146,7 @@
 Patch13: allow_auth_plain_proxying.patch
 Patch14: cyrus-imapd-2.3.1-authid_normalize.patch
 Patch15: cyrus-imapd-2.3.1-make_md5_defaults.patch
+Patch16: cyrus-imapd-2.3.7-db4.5.patch
 # Patches >= 100 are / will be fixed in CVS
 Patch100: cyrus-imapd-2.3.1-make_md5.patch
 Patch101: cyrus-imapd-2.3.1-backend_sigsegv.patch
@@ -260,6 +261,7 @@
 %patch13 -p0 -b .allow_auth_plain
 %patch14 -p1 -b .authid_normalize
 %patch15 -p1 -b .make_md5_defaults
+%patch16 -p1 -b .db4.5
 # fixed upstream
 #%patch100 -p1 -b .make_md5
 # fixed upstream
@@ -806,6 +808,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jan 08 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.7-6
+- #218046: applied patches to compile with db4-4.5
+
 * Tue Dec  5 2006 John Dennis <jdennis at redhat.com> - 2.3.7-5
 - Resolves: bug# 218046: Cyrus-imapd in rawhide needs to be rebuilt
   against new snmp package