update Dovecot to 1.2.14, from Brad.

several fixes and adds support for IDLE notifications with the
virtual storage plugin.
This commit is contained in:
sthen 2010-08-27 08:27:15 +00:00
parent 257b6a89b7
commit 02e45d0d59
3 changed files with 9 additions and 62 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.146 2010/08/08 22:21:55 sthen Exp $
# $OpenBSD: Makefile,v 1.147 2010/08/27 08:27:15 sthen Exp $
SHARED_ONLY= Yes
@ -6,15 +6,14 @@ COMMENT-server= compact IMAP/POP3 server
COMMENT-sieve= Sieve mail filtering for Dovecot
V_MAJOR= 1.2
V_DOVECOT= 1.2.13
V_DOVECOT= 1.2.14
V_SIEVE= 0.1.17
V_MANAGESIEVE= 0.11.11
PKGNAME= dovecot-${V_DOVECOT}
PKGNAME-server= dovecot-${V_DOVECOT}
REVISION-server= 0
FULLPKGNAME-sieve= dovecot-sieve-${V_SIEVE}
REVISION-sieve= 1
REVISION-sieve= 2
EPOCH-sieve= 0
FULLPKGPATH-sieve= ${PKGPATH},-sieve
@ -28,7 +27,7 @@ DISTFILES= dovecot-${V_DOVECOT}.tar.gz \
dovecot-${V_MAJOR}-managesieve-${V_MANAGESIEVE}.tar.gz:0 \
${DIST_MANAGESIEVE}:0
DIST_MANAGESIEVE= dovecot-${V_DOVECOT}-managesieve-${V_MANAGESIEVE}.diff.gz
DIST_MANAGESIEVE= dovecot-1.2.13-managesieve-${V_MANAGESIEVE}.diff.gz
HOMEPAGE= http://www.dovecot.org/

View File

@ -1,20 +1,20 @@
MD5 (dovecot-1.2-managesieve-0.11.11.tar.gz) = MrqNR6NpX4UUvSwr9zSPlg==
MD5 (dovecot-1.2-sieve-0.1.17.tar.gz) = uheooIOG6ycxeTt0MXAD4g==
MD5 (dovecot-1.2.13-managesieve-0.11.11.diff.gz) = s5ArdocGHdEtoyMR0gnGaw==
MD5 (dovecot-1.2.13.tar.gz) = qu47X9WeAXgDBVUySPaGvA==
MD5 (dovecot-1.2.14.tar.gz) = H+QemcHeoxG+7m1NmUSQzA==
RMD160 (dovecot-1.2-managesieve-0.11.11.tar.gz) = Fh0UP1pCrukpq/UbYrOw5uep8Ho=
RMD160 (dovecot-1.2-sieve-0.1.17.tar.gz) = e1N0LHOIvydSGka44RIfRadk34c=
RMD160 (dovecot-1.2.13-managesieve-0.11.11.diff.gz) = 0m+k22bHTUb8VicD9Ek+5NWhsqc=
RMD160 (dovecot-1.2.13.tar.gz) = CD3UUE2/DoYYcBmFNRSBEVXJCH8=
RMD160 (dovecot-1.2.14.tar.gz) = kWso463hZpVG4ZIRon2JcaKqv4c=
SHA1 (dovecot-1.2-managesieve-0.11.11.tar.gz) = U/hhip4C+VORI5CnuAPrYhi/lpo=
SHA1 (dovecot-1.2-sieve-0.1.17.tar.gz) = QgFCqEONduOElyfDq0veWlt/t+Q=
SHA1 (dovecot-1.2.13-managesieve-0.11.11.diff.gz) = Y2sbtNvP2egsk/r05P34Pi3O51U=
SHA1 (dovecot-1.2.13.tar.gz) = im4SzEDfAgg0gPnp7vV5Oagf168=
SHA1 (dovecot-1.2.14.tar.gz) = wdqMdWO9Ii2wPLTNW7Jr1PnWtFs=
SHA256 (dovecot-1.2-managesieve-0.11.11.tar.gz) = eSzAbmAlDin1F6+jUAaa8tcAF0ZEXTsZu/Gu+LbdhT4=
SHA256 (dovecot-1.2-sieve-0.1.17.tar.gz) = 4CpKG1lYu+HI4hbxHQAWbjPDGzBMvUGA3imxod1efQs=
SHA256 (dovecot-1.2.13-managesieve-0.11.11.diff.gz) = hkb834wP2mn4sN+I2TVoYeEk1/cMdd8a+3FHac2E6e0=
SHA256 (dovecot-1.2.13.tar.gz) = IvphK0wyUNM7xuUBDv2B0IKxDbznPacy/qZE4IVwGGk=
SHA256 (dovecot-1.2.14.tar.gz) = klzV0eil5evW4rmIeVerH5HUb/jWRmC6jtQ1Q6QNa54=
SIZE (dovecot-1.2-managesieve-0.11.11.tar.gz) = 439239
SIZE (dovecot-1.2-sieve-0.1.17.tar.gz) = 1029070
SIZE (dovecot-1.2.13-managesieve-0.11.11.diff.gz) = 6463
SIZE (dovecot-1.2.13.tar.gz) = 2946123
SIZE (dovecot-1.2.14.tar.gz) = 2947472

View File

@ -1,52 +0,0 @@
$OpenBSD: patch-src_lib-storage_index_mbox_mbox-save_c,v 1.3 2010/07/30 20:22:24 sthen Exp $
--- src/lib-storage/index/mbox/mbox-save.c.orig Wed Jul 14 08:53:24 2010
+++ src/lib-storage/index/mbox/mbox-save.c Fri Jul 30 14:11:15 2010
@@ -403,9 +403,10 @@ mbox_save_get_input_stream(struct mbox_save_context *c
i_stream_create_crlf(filter) : i_stream_create_lf(filter);
i_stream_unref(&filter);
- if (ctx->mail != NULL) {
+ if (ctx->ctx.dest_mail != NULL) {
/* caching creates a tee stream */
- cache_input = index_mail_cache_parse_init(ctx->mail, ret);
+ cache_input =
+ index_mail_cache_parse_init(ctx->ctx.dest_mail, ret);
i_stream_unref(&ret);
ret = cache_input;
}
@@ -529,10 +530,10 @@ static int mbox_save_body(struct mbox_save_context *ct
ssize_t ret;
while ((ret = i_stream_read(ctx->input)) != -1) {
- if (ctx->mail != NULL) {
+ if (ctx->ctx.dest_mail != NULL) {
/* i_stream_read() may have returned 0 at EOF
because of this parser */
- index_mail_cache_parse_continue(ctx->mail);
+ index_mail_cache_parse_continue(ctx->ctx.dest_mail);
}
if (ret == 0)
return 0;
@@ -585,8 +586,8 @@ int mbox_save_continue(struct mail_save_context *_ctx)
}
while ((ret = i_stream_read(ctx->input)) > 0) {
- if (ctx->mail != NULL)
- index_mail_cache_parse_continue(ctx->mail);
+ if (ctx->ctx.dest_mail != NULL)
+ index_mail_cache_parse_continue(ctx->ctx.dest_mail);
data = i_stream_get_data(ctx->input, &size);
for (i = 0; i < size; i++) {
@@ -675,8 +676,9 @@ int mbox_save_finish(struct mail_save_context *_ctx)
} T_END;
}
- if (ctx->mail != NULL) {
- index_mail_cache_parse_deinit(ctx->mail, ctx->ctx.received_date,
+ if (ctx->ctx.dest_mail != NULL) {
+ index_mail_cache_parse_deinit(ctx->ctx.dest_mail,
+ ctx->ctx.received_date,
!ctx->failed);
}
if (ctx->input != NULL)