OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 29-Sep-2006 08:52:17
Branch: HEAD Handle: 2006092907521700
Modified files:
openpkg-src/imapd imapd.patch imapd.spec rc.imapd
Log:
allow building against DB 4.5; adjust rc.imapd shebang (seems to be
overlooked)
Summary:
Revision Changes Path
1.19 +19 -0 openpkg-src/imapd/imapd.patch
1.163 +1 -1 openpkg-src/imapd/imapd.spec
1.27 +1 -1 openpkg-src/imapd/rc.imapd
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.patch
============================================================================
$ cvs diff -u -r1.18 -r1.19 imapd.patch
--- openpkg-src/imapd/imapd.patch 7 Mar 2006 14:30:32 -0000 1.18
+++ openpkg-src/imapd/imapd.patch 29 Sep 2006 06:52:17 -0000 1.19
@@ -100,3 +100,22 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
+Index: lib/cyrusdb_berkeley.c
+--- lib/cyrusdb_berkeley.c.orig 2006-02-28 13:58:07 +0100
++++ lib/cyrusdb_berkeley.c 2006-09-29 08:46:51 +0200
+@@ -169,6 +169,7 @@
+
+ dbenv->set_lk_detect(dbenv, CONFIG_DEADLOCK_DETECTION);
+
++#if (DB_VERSION_MAJOR < 4) || (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,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.162 -r1.163 imapd.spec
--- openpkg-src/imapd/imapd.spec 7 Sep 2006 12:33:59 -0000 1.162
+++ openpkg-src/imapd/imapd.spec 29 Sep 2006 06:52:17 -0000 1.163
@@ -33,7 +33,7 @@
Group: Mail
License: BSD
Version: 2.3.7
-Release: 20060907
+Release: 20060929
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/rc.imapd
============================================================================
$ cvs diff -u -r1.26 -r1.27 rc.imapd
--- openpkg-src/imapd/rc.imapd 7 Sep 2006 12:33:59 -0000 1.26
+++ openpkg-src/imapd/rc.imapd 29 Sep 2006 06:52:17 -0000 1.27
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
[EMAIL PROTECTED]@/bin/openpkg rc
##
## rc.imapd -- Run-Commands
##
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
