Submitted by:            Teddy <teddy at teddy dot ch>
Date:                    2006-10-11
Initial Package Version: 2.3.7
Upstream Status:         Submitted Upstream
Origin:                  Teddy's Computerworld http://www.teddy.ch/
Description:             Cyrus IMAP does not compile with Berkeley DB 4.5.20,
                         because set_lk_max does not exist anymore.

diff -Naur cyrus-imapd-2.3.7.orig/lib/cyrusdb_berkeley.c cyrus-imapd-2.3.7/lib/cyrusdb_berkeley.c
--- cyrus-imapd-2.3.7.orig/lib/cyrusdb_berkeley.c	2006-02-28 12:58:07.000000000 +0000
+++ cyrus-imapd-2.3.7/lib/cyrusdb_berkeley.c	2006-10-11 16:13:43.000000000 +0000
@@ -169,6 +169,7 @@
 
     dbenv->set_lk_detect(dbenv, CONFIG_DEADLOCK_DETECTION);
 
+#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR < 5)
     if ((opt = libcyrus_config_getint(CYRUSOPT_BERKELEY_LOCKS_MAX)) < 0) {
 	syslog(LOG_WARNING,
 	       "DBERROR: invalid berkeley_locks_max value, using internal default");
@@ -180,6 +181,7 @@
 	    abort();
 	}
     }
+#endif
 
     if ((opt = libcyrus_config_getint(CYRUSOPT_BERKELEY_TXNS_MAX)) < 0) {
 	syslog(LOG_WARNING,