+++ /dev/null
---- cyrus-imapd-2.3.8/lib/cyrusdb_berkeley.c.wig 2007-02-18 22:57:48.000000000 +0100
-+++ cyrus-imapd-2.3.8/lib/cyrusdb_berkeley.c 2007-02-18 23:07:06.000000000 +0100
-@@ -176,10 +176,10 @@
- syslog(LOG_WARNING,
- "DBERROR: invalid berkeley_locks_max value, using internal default");
- } else {
-- r = dbenv->set_lk_max(dbenv, opt);
-+ r = dbenv->set_lk_max_locks(dbenv, opt);
- if (r) {
-- dbenv->err(dbenv, r, "set_lk_max");
-- syslog(LOG_ERR, "DBERROR: set_lk_max(): %s", db_strerror(r));
-+ dbenv->err(dbenv, r, "set_lk_max_locks");
-+ syslog(LOG_ERR, "DBERROR: set_lk_max_locks(): %s", db_strerror(r));
- abort();
- }
- }
+ message_uuid.lo xstrlcat.lo xstrlcpy.lo
LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xmalloc.h \
- $(srcdir)/xstrlcat.h $(srcdir)/xstrlcpy.h \
-- $(srcdir)/strhash.o $(srcdir)/libconfig.h $(srcdir)/assert.h \
-+ $(srcdir)/strhash.lo $(srcdir)/libconfig.h $(srcdir)/assert.h \
+ $(srcdir)/xstrlcat.h $(srcdir)/xstrlcpy.h $(srcdir)/util.h \
+- $(srcdir)/strhash.h $(srcdir)/libconfig.h $(srcdir)/assert.h \
++ $(srcdir)/strhash.h $(srcdir)/libconfig.h $(srcdir)/assert.h \
imapopts.h
-LIBCYRM_OBJS = libconfig.o imapopts.o hash.o mpool.o xmalloc.o strhash.o \
-- xstrlcat.o xstrlcpy.o assert.o @IPV6_OBJS@
+- xstrlcat.o xstrlcpy.o assert.o util.o @IPV6_OBJS@
+LIBCYRM_OBJS = libconfig.lo imapopts.lo hash.lo mpool.lo xmalloc.lo strhash.lo \
-+ xstrlcat.lo xstrlcpy.lo assert.lo @IPV6_OBJS@
++ xstrlcat.lo xstrlcpy.lo assert.lo util.lo @IPV6_OBJS@
-all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a
+all: $(BUILTSOURCES) libcyrus_min.la libcyrus.la
+ $(LIBTOOL) --mode=link $(CC) -o libcyrus_min.la $(LIBCYRM_OBJS) @IMAP_COM_ERR_LIBS@ -rpath $(libdir)
imapopts.c: imapoptions $(srcdir)/../tools/config2header
- $(srcdir)/../tools/config2header CC=$(CC) $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions
+ $(srcdir)/../tools/config2header CC="$(CC)" $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions
--- cyrus-imapd-2.3.8/depot/Makefile.in.wiget 2004-05-28 15:39:38.000000000 +0200
+++ cyrus-imapd-2.3.8/depot/Makefile.in 2007-02-18 23:43:17.000000000 +0100
@@ -49,7 +49,7 @@
Summary(pl.UTF-8): Wysoko wydajny serwer IMAP i POP3
Summary(pt_BR.UTF-8): Um servidor de mail de alto desempenho que suporta IMAP e POP3
Name: cyrus-imapd
-Version: 2.3.8
+Version: 2.3.9
Release: 0.1
License: BSD-like
Group: Networking/Daemons
Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%{name}-%{version}.tar.gz
-# Source0-md5: ac03b02c1ae08d52f807b58c488b204f
+# Source0-md5: 113433c1fdc777e3b0466b5ce643b8bc
Source1: cyrus-README
Source2: cyrus-procmailrc
Source3: cyrus-deliver-wrapper.c
Source12: cyrus.conf
Patch0: %{name}-et.patch
Patch1: %{name}-shared.patch
-Patch2: %{name}-db45.patch
URL: http://andrew2.andrew.cmu.edu/cyrus/imapd/
BuildRequires: autoconf >= 2.54
BuildRequires: automake
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
rm -rf autom4te.cache