From a3bbdeb14df7026484806a0ddd17e867a57eed7e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 4 Jan 2008 12:05:20 +0000 Subject: [PATCH] =?utf8?q?-=20update=20to=202.3.9=20by=20Eero=20H=C3=A4nni?= =?utf8?q?nen?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Changed files: cyrus-imapd-db45.patch -> 1.2 cyrus-imapd-shared.patch -> 1.5 cyrus-imapd.spec -> 1.117 --- cyrus-imapd-db45.patch | 16 ---------------- cyrus-imapd-shared.patch | 12 ++++++------ cyrus-imapd.spec | 6 ++---- 3 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 cyrus-imapd-db45.patch diff --git a/cyrus-imapd-db45.patch b/cyrus-imapd-db45.patch deleted file mode 100644 index ebf884a..0000000 --- a/cyrus-imapd-db45.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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(); - } - } diff --git a/cyrus-imapd-shared.patch b/cyrus-imapd-shared.patch index 605c1f4..f0a2e48 100644 --- a/cyrus-imapd-shared.patch +++ b/cyrus-imapd-shared.patch @@ -785,14 +785,14 @@ + 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 @@ -832,7 +832,7 @@ + $(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 @@ diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index d67c2f4..c177c58 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -7,12 +7,12 @@ Summary: High-performance mail store with imap and pop3 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 @@ -26,7 +26,6 @@ Source11: %{name}.init 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 @@ -166,7 +165,6 @@ Perlowy interfejs do biblioteki cyrus-imapd. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 rm -rf autom4te.cache -- 2.43.0