Update to Dovecot 1.1.5.

ok sthen@
This commit is contained in:
brad 2008-10-23 18:37:49 +00:00
parent b061bc5423
commit 5d5af46a90
4 changed files with 8 additions and 57 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.106 2008/10/08 23:03:55 brad Exp $
# $OpenBSD: Makefile,v 1.107 2008/10/23 18:37:49 brad Exp $
SHARED_ONLY= Yes
@ -6,12 +6,12 @@ COMMENT-server= compact IMAP/POP3 server
COMMENT-sieve= Sieve mail filtering for Dovecot
V_MAJOR= 1.1
V_DOVECOT= 1.1.4
V_DOVECOT= 1.1.5
V_SIEVE= 1.1.5
PKGNAME= dovecot-${V_DOVECOT}
PKGNAME-server= dovecot-${V_DOVECOT}
FULLPKGNAME-sieve= dovecot-sieve-${V_SIEVE}p1
FULLPKGNAME-sieve= dovecot-sieve-${V_SIEVE}p2
DISTNAME= dovecot-${V_DOVECOT}
CATEGORIES= mail

View File

@ -1,10 +1,10 @@
MD5 (dovecot-1.1.4.tar.gz) = AFDdYJy0VsjlJWWoU3PfKA==
MD5 (dovecot-1.1.5.tar.gz) = ZOeAmu7nUOfIbYF3cHjkNA==
MD5 (dovecot-sieve-1.1.5.tar.gz) = tDYt7+P8GIZduM+OHJQLEw==
RMD160 (dovecot-1.1.4.tar.gz) = GZDRJ2RU9qN2x/4GgfCWnWuleik=
RMD160 (dovecot-1.1.5.tar.gz) = YzC6A5OhyAX46a6PuNqn7tz5AKA=
RMD160 (dovecot-sieve-1.1.5.tar.gz) = glqOwH1JUn2FUctfP4a2OP3br70=
SHA1 (dovecot-1.1.4.tar.gz) = V20NEyO3fngg8oT654ipjRdAmPg=
SHA1 (dovecot-1.1.5.tar.gz) = Cxk4Wd1b6l9EbvA1YexdIfR2zjo=
SHA1 (dovecot-sieve-1.1.5.tar.gz) = ZyrfCi8WJ9lvl/xj/srwJN2fekI=
SHA256 (dovecot-1.1.4.tar.gz) = N+2w9/eQh5o8yaatn7ib8SzFn9Wx05Fz+jTwBNr2oS4=
SHA256 (dovecot-1.1.5.tar.gz) = DCawvXiiP+BJV7nigB1HLAriEx8Q4IiUP62uWWLIvoU=
SHA256 (dovecot-sieve-1.1.5.tar.gz) = 7B6pQxHV+2y13X5FFyh4Svs5UhpqWA9kC00hFVBaXd8=
SIZE (dovecot-1.1.4.tar.gz) = 2314155
SIZE (dovecot-1.1.5.tar.gz) = 2320452
SIZE (dovecot-sieve-1.1.5.tar.gz) = 468913

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_lib-storage_index_mbox_istream-raw-mbox_c,v 1.1 2008/10/08 23:03:55 brad Exp $
--- src/lib-storage/index/mbox/istream-raw-mbox.c.orig Mon Oct 6 19:19:32 2008
+++ src/lib-storage/index/mbox/istream-raw-mbox.c Mon Oct 6 19:19:55 2008
@@ -83,7 +83,7 @@ static int mbox_read_from_line(struct raw_mbox_istream
mbox_from_parse(buf+5, pos-5, &received_time, &sender) < 0) {
/* broken From - should happen only at beginning of
file if this isn't a mbox.. */
- rstream->istream.istream.stream_errno = EBADMSG;
+ rstream->istream.istream.stream_errno = EINVAL;
return -1;
}
@@ -307,7 +307,7 @@ static ssize_t i_stream_raw_mbox_read(struct istream_p
rstream->hdr_offset + rstream->mail_size);
rstream->eof = TRUE;
rstream->corrupted = TRUE;
- rstream->istream.istream.stream_errno = EBADMSG;
+ rstream->istream.istream.stream_errno = EINVAL;
stream->pos = 0;
return -1;
}

View File

@ -1,28 +0,0 @@
$OpenBSD: patch-src_plugins_expire_expire-plugin_c,v 1.1 2008/10/08 23:03:55 brad Exp $
--- src/plugins/expire/expire-plugin.c.orig Mon Oct 6 19:29:14 2008
+++ src/plugins/expire/expire-plugin.c Mon Oct 6 19:30:36 2008
@@ -99,6 +99,7 @@ expire_mailbox_transaction_commit(struct mailbox_trans
{
struct expire_mailbox *xpr_box = EXPIRE_CONTEXT(t->box);
struct expire_transaction_context *xt = EXPIRE_CONTEXT(t);
+ struct mailbox *box = t->box;
time_t new_stamp;
bool update_dict = FALSE;
int ret;
@@ -117,13 +118,14 @@ expire_mailbox_transaction_commit(struct mailbox_trans
i_free(xt);
return -1;
}
+ /* transaction is freed now */
+ t = NULL;
if (xt->first_expunged || xt->saves) T_BEGIN {
const char *key, *value;
key = t_strconcat(DICT_PATH_SHARED, expire.username, "/",
- t->box->storage->ns->prefix,
- t->box->name, NULL);
+ box->storage->ns->prefix, box->name, NULL);
if (!xt->first_expunged && xt->saves) {
/* saved new mails. dict needs to be updated only if
this is the first mail in the database */