From 31e95b1084c2e52f4873b2d953587c1edba22776 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Dec 22 2009 19:55:48 +0000 Subject: updated to 2.3.16 --- diff --git a/.cvsignore b/.cvsignore index 50a3235..9a827ef 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -cyrus-imapd-2.3.15.tar.gz +cyrus-imapd-2.3.16.tar.gz cyrus_sharedbackup-0.1.tar.gz diff --git a/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff b/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff index 0d9b120..8aa1f0b 100644 --- a/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff +++ b/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff @@ -1480,9 +1480,9 @@ diff -up cyrus-imapd-2.3.15/imap/mboxlist.c.autocreate cyrus-imapd-2.3.15/imap/m #define FNAME_SUBSSUFFIX ".sub" /* -@@ -3413,3 +3437,349 @@ int mboxlist_delayed_delete_isenabled(vo +@@ -3446,3 +3470,349 @@ int mboxlist_delayed_delete_isenabled(vo - return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED); + return(count); } + +/* @@ -1833,10 +1833,10 @@ diff -up cyrus-imapd-2.3.15/imap/mboxlist.c.autocreate cyrus-imapd-2.3.15/imap/m diff -up cyrus-imapd-2.3.15/imap/mboxlist.h.autocreate cyrus-imapd-2.3.15/imap/mboxlist.h --- cyrus-imapd-2.3.15/imap/mboxlist.h.autocreate 2009-05-05 03:20:03.000000000 +0200 +++ cyrus-imapd-2.3.15/imap/mboxlist.h 2009-09-18 11:11:39.778115814 +0200 -@@ -216,4 +216,8 @@ int mboxlist_commit(struct txn *tid); - int mboxlist_abort(struct txn *tid); +@@ -221,4 +221,8 @@ int mboxlist_commit(struct txn *tid); + int mboxlist_count_inferiors(char *mailboxname, int isadmin, char *userid, + struct auth_state *authstate); - int mboxlist_delayed_delete_isenabled(void); +int mboxlist_autocreateinbox(struct namespace *namespace,char *userid, + struct auth_state *auth_state, char *mailboxname, + int autocreatequota); diff --git a/cyrus-imapd-2.3.12p2-current-db.patch b/cyrus-imapd-2.3.12p2-current-db.patch index 8b09529..320c403 100644 --- a/cyrus-imapd-2.3.12p2-current-db.patch +++ b/cyrus-imapd-2.3.12p2-current-db.patch @@ -4,8 +4,8 @@ fi saved_LIBS=$LIBS -- for dbname in ${with_bdb} db-4.6 db4.6 db46 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 -+ for dbname in ${with_bdb} db db-4.6 db4.6 db46 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 +- for dbname in ${with_bdb} db-4.7 db4.7 db47 db-4.6 db4.6 db46 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 ++ for dbname in ${with_bdb} db db-4.7 db4.7 db47 db-4.6 db4.6 db46 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 do LIBS="$saved_LIBS -l$dbname" AC_TRY_LINK([#include diff --git a/cyrus-imapd-2.3.13-bufov.patch b/cyrus-imapd-2.3.13-bufov.patch deleted file mode 100644 index d2a2a1d..0000000 --- a/cyrus-imapd-2.3.13-bufov.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up cyrus-imapd-2.3.15/sieve/bc_eval.c.bufov cyrus-imapd-2.3.15/sieve/bc_eval.c ---- cyrus-imapd-2.3.15/sieve/bc_eval.c.bufov 2009-03-31 06:11:30.000000000 +0200 -+++ cyrus-imapd-2.3.15/sieve/bc_eval.c 2009-09-18 15:05:29.187990786 +0200 -@@ -500,7 +500,7 @@ static int eval_bc_test(sieve_interp_t * - int comparator=ntohl(bc[i+3].value); - int apart=ntohl(bc[i+4].value); - int count=0; -- char scount[3]; -+ char scount[21]; - int isReg = (match==B_REGEX); - int ctag = 0; - regex_t *reg; -@@ -669,7 +669,7 @@ static int eval_bc_test(sieve_interp_t * - int relation=ntohl(bc[i+2].value); - int comparator=ntohl(bc[i+3].value); - int count=0; -- char scount[3]; -+ char scount[21]; - int isReg = (match==B_REGEX); - int ctag = 0; - regex_t *reg; -@@ -790,7 +790,7 @@ static int eval_bc_test(sieve_interp_t * - int transform=ntohl(bc[i+4].value); - /* ntohl(bc[i+5].value) is the now unused 'offset' */ - int count=0; -- char scount[3]; -+ char scount[21]; - int isReg = (match==B_REGEX); - int ctag = 0; - regex_t *reg; -diff -up cyrus-imapd-2.3.15/sieve/script.c.bufov cyrus-imapd-2.3.15/sieve/script.c ---- cyrus-imapd-2.3.15/sieve/script.c.bufov 2009-09-02 15:56:18.000000000 +0200 -+++ cyrus-imapd-2.3.15/sieve/script.c 2009-09-18 15:04:00.728927938 +0200 -@@ -668,9 +668,9 @@ static int do_sieve_error(int ret, - if ((ret != SIEVE_OK) && interp->err) { - char buf[1024]; - if (lastaction == -1) /* we never executed an action */ -- sprintf(buf, "%s", errmsg ? errmsg : sieve_errstr(ret)); -+ snprintf(buf, sizeof(buf), "%s", errmsg ? errmsg : sieve_errstr(ret)); - else -- sprintf(buf, "%s: %s", action_to_string(lastaction), -+ snprintf(buf, sizeof(buf), "%s: %s", action_to_string(lastaction), - errmsg ? errmsg : sieve_errstr(ret)); - - ret |= interp->execute_err(buf, interp->interp_context, -diff -up cyrus-imapd-2.3.15/sieve/sieve.y.bufov cyrus-imapd-2.3.15/sieve/sieve.y ---- cyrus-imapd-2.3.15/sieve/sieve.y.bufov 2009-03-26 00:58:54.000000000 +0100 -+++ cyrus-imapd-2.3.15/sieve/sieve.y 2009-09-18 15:04:00.734928038 +0200 -@@ -1159,7 +1159,7 @@ static int verify_relat(char *r) - else if (!strcmp(r, "ne")) {return NE;} - else if (!strcmp(r, "eq")) {return EQ;} - else{ -- sprintf(errbuf, "flag '%s': not a valid relational operation", r); -+ snprintf(errbuf, sizeof(errbuf), "flag '%s': not a valid relational operation", r); - yyerror(errbuf); - return -1; - } diff --git a/cyrus-imapd-2.3.15-nodebug.patch b/cyrus-imapd-2.3.15-nodebug.patch deleted file mode 100644 index d91c6a2..0000000 --- a/cyrus-imapd-2.3.15-nodebug.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -up cyrus-imapd-2.3.15/lib/prot.c.nodebug cyrus-imapd-2.3.15/lib/prot.c ---- cyrus-imapd-2.3.15/lib/prot.c.nodebug 2009-11-05 14:20:53.845020152 +0100 -+++ cyrus-imapd-2.3.15/lib/prot.c 2009-11-05 14:21:35.932145246 +0100 -@@ -329,7 +329,7 @@ static int is_incompressible(const char - - while (sig->type) { - if (n >= sig->len && !memcmp(p, sig->sig, sig->len)) { -- syslog(LOG_DEBUG, "data is %s", sig->type); -+// syslog(LOG_DEBUG, "data is %s", sig->type); - return 1; - } - sig++; -@@ -642,14 +642,14 @@ int prot_fill(struct protstream *s) - s->zstrm->next_out = s->zbuf; - s->zstrm->avail_out = s->zbuf_size; - -- syslog(LOG_DEBUG, "inflate(%d bytes)", s->cnt); -+// syslog(LOG_DEBUG, "inflate(%d bytes)", s->cnt); - - do { - if (!s->zstrm->avail_out) { - /* Need more space to decompress */ -- syslog(LOG_DEBUG, -- "growing decompress buffer from %d to %d bytes", -- s->zbuf_size, s->zbuf_size + PROT_BUFSIZE); -+// syslog(LOG_DEBUG, -+// "growing decompress buffer from %d to %d bytes", -+// s->zbuf_size, s->zbuf_size + PROT_BUFSIZE); - - s->zbuf = (unsigned char *) - xrealloc(s->zbuf, s->zbuf_size + PROT_BUFSIZE); -@@ -670,7 +670,7 @@ int prot_fill(struct protstream *s) - s->ptr = s->zbuf; - s->cnt = s->zbuf_size - s->zstrm->avail_out; - -- syslog(LOG_DEBUG, " => decompressed to %d bytes", s->cnt); -+// syslog(LOG_DEBUG, " => decompressed to %d bytes", s->cnt); - } - #endif /* HAVE_ZLIB */ - -@@ -760,8 +760,8 @@ static int prot_flush_encode(struct prot - * Oversize the buffer, so we (hopefully) eliminate - * multiple small incremental reallocations. - */ -- syslog(LOG_DEBUG, "growing compress buffer from %u to %lu bytes", -- s->zbuf_size, def_size + PROT_BUFSIZE); -+// syslog(LOG_DEBUG, "growing compress buffer from %u to %lu bytes", -+// s->zbuf_size, def_size + PROT_BUFSIZE); - - s->zbuf_size = def_size + PROT_BUFSIZE; - s->zbuf = (unsigned char *) xrealloc(s->zbuf, s->zbuf_size); -@@ -772,9 +772,9 @@ static int prot_flush_encode(struct prot - s->zstrm->next_out = s->zbuf; - s->zstrm->avail_out = s->zbuf_size; - -- syslog(LOG_DEBUG, "deflate(%d bytes, level=%d, flush=%s)", -- left, s->zlevel, -- zflush == Z_FULL_FLUSH ? "FULL" : "SYNC"); -+// syslog(LOG_DEBUG, "deflate(%d bytes, level=%d, flush=%s)", -+// left, s->zlevel, -+// zflush == Z_FULL_FLUSH ? "FULL" : "SYNC"); - - if (s->boundary) { - /* Set (new) compression level */ -@@ -791,7 +791,7 @@ static int prot_flush_encode(struct prot - ptr = s->zbuf; - left = s->zbuf_size - s->zstrm->avail_out; - -- syslog(LOG_DEBUG, " => compressed to %d bytes", left); -+// syslog(LOG_DEBUG, " => compressed to %d bytes", left); - } - #endif /* HAVE_ZLIB */ - diff --git a/cyrus-imapd-2.3.7-krb4.patch b/cyrus-imapd-2.3.7-krb4.patch index 54bd40c..bdc1425 100644 --- a/cyrus-imapd-2.3.7-krb4.patch +++ b/cyrus-imapd-2.3.7-krb4.patch @@ -13,7 +13,7 @@ --- cyrus-imapd-2.3.7/imap/pop3d.c.krb4 2007-01-22 15:41:14.000000000 +0100 +++ cyrus-imapd-2.3.7/imap/pop3d.c 2007-01-22 15:41:15.000000000 +0100 @@ -88,8 +88,6 @@ - #include "sync_log.h" + #include "statuscache.h" #ifdef HAVE_KRB -/* kerberos des is purported to conflict with OpenSSL DES */ diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index cf9aec0..f7d99b9 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -1,6 +1,6 @@ Name: cyrus-imapd -Version: 2.3.15 -Release: 5%{?dist} +Version: 2.3.16 +Release: 1%{?dist} # ********************** BUILD TIME OPTIONS START ********************** @@ -115,10 +115,6 @@ Patch15: cyrus-imapd-2.3.1-make_md5_defaults.patch Patch18: cyrus-imapd-2.3.7-krb4.patch # https://bugzilla.redhat.com/show_bug.cgi?id=461875 Patch19: cyrus-imapd-2.3.12p2-current-db.patch -Patch20: cyrus-imapd-2.3.13-bufov.patch - -# required for c-i <= 2.3.15, rhbz#528093 -Patch21: cyrus-imapd-2.3.15-nodebug.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: autoconf >= 2.59 @@ -217,8 +213,6 @@ one running the server. %patch15 -p1 -b .make_md5_defaults %patch18 -p1 -b .krb4 %patch19 -p1 -b .db4.7 -%patch20 -p1 -b .bufov -%patch21 -p1 -b .nodebug # only to update config.* files automake -a -f -c || : @@ -736,6 +730,9 @@ fi %{_mandir}/man1/* %changelog +* Tue Dec 22 2009 Michal Hlavinka - 2.3.16-1 +- updated to 2.3.16 + * Fri Dec 04 2009 Michal Hlavinka - 2.3.15-5 - fix shell for daily cron job (#544182) diff --git a/sources b/sources index 4dddef4..e34d8d7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d89cb1b55023188938f332b7ef120fae cyrus-imapd-2.3.15.tar.gz +6a37feb1985974eee8a4a4b2932dd54c cyrus-imapd-2.3.16.tar.gz 8f7a26b0556369827bb5c8084a3e3ea1 cyrus_sharedbackup-0.1.tar.gz