Christian Wiese
12 years ago
committed by
Christian Wiese
7 changed files with 2 additions and 229 deletions
@ -1,36 +0,0 @@ |
|||||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
||||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
||||||
#
|
|
||||||
# Filename: package/.../dovecot/dovecot-2.2-0001-a7d0bb66639f.patch
|
|
||||||
# Copyright (C) 2013 The OpenSDE Project
|
|
||||||
#
|
|
||||||
# More information can be found in the files COPYING and README.
|
|
||||||
#
|
|
||||||
# This patch file is dual-licensed. It is available under the license the
|
|
||||||
# patched project is licensed under, as long as it is an OpenSource license
|
|
||||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
|
||||||
# of the GNU General Public License as published by the Free Software
|
|
||||||
# Foundation; either version 2 of the License, or (at your option) any later
|
|
||||||
# version.
|
|
||||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
||||||
|
|
||||||
|
|
||||||
# HG changeset patch
|
|
||||||
# User Timo Sirainen <tss@iki.fi>
|
|
||||||
# Date 1365961247 -10800
|
|
||||||
# Node ID a7d0bb66639f956329916020ca6717b8840f842d
|
|
||||||
# Parent 4af6b464ef9badeb0aca695f84b4f695ad4f4b15
|
|
||||||
Linking error fix.
|
|
||||||
|
|
||||||
diff -r 4af6b464ef9b -r a7d0bb66639f src/doveadm/doveadm-mail.h
|
|
||||||
--- a/src/doveadm/doveadm-mail.h Fri Apr 12 21:19:38 2013 +0300
|
|
||||||
+++ b/src/doveadm/doveadm-mail.h Sun Apr 14 20:40:47 2013 +0300
|
|
||||||
@@ -150,6 +150,6 @@
|
|
||||||
extern struct doveadm_mail_cmd cmd_mailbox_subscribe;
|
|
||||||
extern struct doveadm_mail_cmd cmd_mailbox_unsubscribe;
|
|
||||||
extern struct doveadm_mail_cmd cmd_mailbox_status;
|
|
||||||
-struct doveadm_mail_cmd cmd_batch;
|
|
||||||
+extern struct doveadm_mail_cmd cmd_batch;
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@ -1,36 +0,0 @@ |
|||||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
||||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
||||||
#
|
|
||||||
# Filename: package/.../dovecot/dovecot-2.2-0002-fc9ef7d2251a.patch
|
|
||||||
# Copyright (C) 2013 The OpenSDE Project
|
|
||||||
#
|
|
||||||
# More information can be found in the files COPYING and README.
|
|
||||||
#
|
|
||||||
# This patch file is dual-licensed. It is available under the license the
|
|
||||||
# patched project is licensed under, as long as it is an OpenSource license
|
|
||||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
|
||||||
# of the GNU General Public License as published by the Free Software
|
|
||||||
# Foundation; either version 2 of the License, or (at your option) any later
|
|
||||||
# version.
|
|
||||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
||||||
|
|
||||||
|
|
||||||
# HG changeset patch
|
|
||||||
# User Timo Sirainen <tss@iki.fi>
|
|
||||||
# Date 1365964049 -10800
|
|
||||||
# Node ID fc9ef7d2251aec477d73bacfec82c0f66cc813b3
|
|
||||||
# Parent a7d0bb66639f956329916020ca6717b8840f842d
|
|
||||||
lib-storage: mailbox_list_index=yes was still broken.
|
|
||||||
|
|
||||||
diff -r a7d0bb66639f -r fc9ef7d2251a src/lib-storage/mail-namespace.c
|
|
||||||
--- a/src/lib-storage/mail-namespace.c Sun Apr 14 20:40:47 2013 +0300
|
|
||||||
+++ b/src/lib-storage/mail-namespace.c Sun Apr 14 21:27:29 2013 +0300
|
|
||||||
@@ -467,6 +467,7 @@
|
|
||||||
user->namespaces = ns;
|
|
||||||
|
|
||||||
T_BEGIN {
|
|
||||||
+ hook_mail_namespaces_added(ns);
|
|
||||||
hook_mail_namespaces_created(ns);
|
|
||||||
} T_END;
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
@ -1,40 +0,0 @@ |
|||||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
||||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
||||||
#
|
|
||||||
# Filename: package/.../dovecot/dovecot-2.2-0003-b38d5ebacf25.patch
|
|
||||||
# Copyright (C) 2013 The OpenSDE Project
|
|
||||||
#
|
|
||||||
# More information can be found in the files COPYING and README.
|
|
||||||
#
|
|
||||||
# This patch file is dual-licensed. It is available under the license the
|
|
||||||
# patched project is licensed under, as long as it is an OpenSource license
|
|
||||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
|
||||||
# of the GNU General Public License as published by the Free Software
|
|
||||||
# Foundation; either version 2 of the License, or (at your option) any later
|
|
||||||
# version.
|
|
||||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
||||||
|
|
||||||
|
|
||||||
# HG changeset patch
|
|
||||||
# User Timo Sirainen <tss@iki.fi>
|
|
||||||
# Date 1366035726 -10800
|
|
||||||
# Node ID b38d5ebacf25379869b4d5119719f773a26fa077
|
|
||||||
# Parent fc9ef7d2251aec477d73bacfec82c0f66cc813b3
|
|
||||||
lib-mail: Don't assert-crash when multipart doesn't actually have any parts.
|
|
||||||
|
|
||||||
diff -r fc9ef7d2251a -r b38d5ebacf25 src/lib-mail/message-parser.c
|
|
||||||
--- a/src/lib-mail/message-parser.c Sun Apr 14 21:27:29 2013 +0300
|
|
||||||
+++ b/src/lib-mail/message-parser.c Mon Apr 15 17:22:06 2013 +0300
|
|
||||||
@@ -839,7 +839,10 @@
|
|
||||||
}
|
|
||||||
i_stream_skip(ctx->input, offset - ctx->input->v_offset);
|
|
||||||
|
|
||||||
- if ((ctx->part->flags & MESSAGE_PART_FLAG_MULTIPART) == 0)
|
|
||||||
+ /* multipart messages may begin with --boundary--, which makes them
|
|
||||||
+ not have any children. */
|
|
||||||
+ if ((ctx->part->flags & MESSAGE_PART_FLAG_MULTIPART) == 0 ||
|
|
||||||
+ ctx->part->children == NULL)
|
|
||||||
ctx->parse_next_block = preparsed_parse_body_more;
|
|
||||||
else
|
|
||||||
ctx->parse_next_block = preparsed_parse_prologue_more;
|
|
||||||
|
|
||||||
@ -1,39 +0,0 @@ |
|||||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
||||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
||||||
#
|
|
||||||
# Filename: package/.../dovecot/dovecot-2.2-0004-9a5b132b6832.patch
|
|
||||||
# Copyright (C) 2013 The OpenSDE Project
|
|
||||||
#
|
|
||||||
# More information can be found in the files COPYING and README.
|
|
||||||
#
|
|
||||||
# This patch file is dual-licensed. It is available under the license the
|
|
||||||
# patched project is licensed under, as long as it is an OpenSource license
|
|
||||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
|
||||||
# of the GNU General Public License as published by the Free Software
|
|
||||||
# Foundation; either version 2 of the License, or (at your option) any later
|
|
||||||
# version.
|
|
||||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
||||||
|
|
||||||
|
|
||||||
# HG changeset patch
|
|
||||||
# User Timo Sirainen <tss@iki.fi>
|
|
||||||
# Date 1366051235 -10800
|
|
||||||
# Node ID 9a5b132b6832137c5ebedb34001354267b41208e
|
|
||||||
# Parent b38d5ebacf25379869b4d5119719f773a26fa077
|
|
||||||
zlib: Don't crash when trying to use zlib_save for handler that isn't compiled in.
|
|
||||||
|
|
||||||
diff -r b38d5ebacf25 -r 9a5b132b6832 src/plugins/zlib/zlib-plugin.c
|
|
||||||
--- a/src/plugins/zlib/zlib-plugin.c Mon Apr 15 17:22:06 2013 +0300
|
|
||||||
+++ b/src/plugins/zlib/zlib-plugin.c Mon Apr 15 21:40:35 2013 +0300
|
|
||||||
@@ -295,6 +295,10 @@
|
|
||||||
zuser->save_handler = compression_lookup_handler(name);
|
|
||||||
if (zuser->save_handler == NULL)
|
|
||||||
i_error("zlib_save: Unknown handler: %s", name);
|
|
||||||
+ else if (zuser->save_handler->create_ostream == NULL) {
|
|
||||||
+ i_error("zlib_save: Support not compiled in for handler: %s", name);
|
|
||||||
+ zuser->save_handler = NULL;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
name = mail_user_plugin_getenv(user, "zlib_save_level");
|
|
||||||
if (name != NULL) {
|
|
||||||
|
|
||||||
@ -1,38 +0,0 @@ |
|||||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
||||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
||||||
#
|
|
||||||
# Filename: package/.../dovecot/dovecot-2.2-0005-f33bacb03cc2.patch
|
|
||||||
# Copyright (C) 2013 The OpenSDE Project
|
|
||||||
#
|
|
||||||
# More information can be found in the files COPYING and README.
|
|
||||||
#
|
|
||||||
# This patch file is dual-licensed. It is available under the license the
|
|
||||||
# patched project is licensed under, as long as it is an OpenSource license
|
|
||||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
|
||||||
# of the GNU General Public License as published by the Free Software
|
|
||||||
# Foundation; either version 2 of the License, or (at your option) any later
|
|
||||||
# version.
|
|
||||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
||||||
|
|
||||||
|
|
||||||
# HG changeset patch
|
|
||||||
# User Timo Sirainen <tss@iki.fi>
|
|
||||||
# Date 1366116845 -10800
|
|
||||||
# Node ID f33bacb03cc22e02ca2d11d527d8dc0d99214486
|
|
||||||
# Parent 9a5b132b6832137c5ebedb34001354267b41208e
|
|
||||||
maildir: Fixed crash in some rare situations.
|
|
||||||
|
|
||||||
diff -r 9a5b132b6832 -r f33bacb03cc2 src/lib-storage/index/maildir/maildir-util.c
|
|
||||||
--- a/src/lib-storage/index/maildir/maildir-util.c Mon Apr 15 21:40:35 2013 +0300
|
|
||||||
+++ b/src/lib-storage/index/maildir/maildir-util.c Tue Apr 16 15:54:05 2013 +0300
|
|
||||||
@@ -87,6 +87,9 @@
|
|
||||||
fname = maildir_filename_guess(mbox, uid, fname,
|
|
||||||
&flags, &have_flags);
|
|
||||||
}
|
|
||||||
+ /* make a copy, just in case callback refreshes uidlist and
|
|
||||||
+ the pointer becomes invalid. */
|
|
||||||
+ fname = t_strdup(fname);
|
|
||||||
|
|
||||||
ret = 0;
|
|
||||||
if ((flags & MAILDIR_UIDLIST_REC_FLAG_NEW_DIR) != 0) {
|
|
||||||
|
|
||||||
@ -1,38 +0,0 @@ |
|||||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
||||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
||||||
#
|
|
||||||
# Filename: package/.../dovecot/dovecot-2.2-0006-854469baa57c.patch
|
|
||||||
# Copyright (C) 2013 The OpenSDE Project
|
|
||||||
#
|
|
||||||
# More information can be found in the files COPYING and README.
|
|
||||||
#
|
|
||||||
# This patch file is dual-licensed. It is available under the license the
|
|
||||||
# patched project is licensed under, as long as it is an OpenSource license
|
|
||||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
|
||||||
# of the GNU General Public License as published by the Free Software
|
|
||||||
# Foundation; either version 2 of the License, or (at your option) any later
|
|
||||||
# version.
|
|
||||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
||||||
|
|
||||||
|
|
||||||
# HG changeset patch
|
|
||||||
# User Timo Sirainen <tss@iki.fi>
|
|
||||||
# Date 1366118430 -10800
|
|
||||||
# Node ID 854469baa57c7e3b32fdcf71928048e7db95e291
|
|
||||||
# Parent f33bacb03cc22e02ca2d11d527d8dc0d99214486
|
|
||||||
auth: Fixed multiple master passdbs.
|
|
||||||
|
|
||||||
diff -r f33bacb03cc2 -r 854469baa57c src/auth/auth-request.c
|
|
||||||
--- a/src/auth/auth-request.c Tue Apr 16 15:54:05 2013 +0300
|
|
||||||
+++ b/src/auth/auth-request.c Tue Apr 16 16:20:30 2013 +0300
|
|
||||||
@@ -583,7 +583,8 @@
|
|
||||||
request->skip_password_check = TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (request->requested_login_user != NULL) {
|
|
||||||
+ if (request->requested_login_user != NULL &&
|
|
||||||
+ *result == PASSDB_RESULT_OK) {
|
|
||||||
auth_request_master_lookup_finish(request);
|
|
||||||
/* if the passdb lookup continues, it continues with non-master
|
|
||||||
passdbs for the requested_login_user. */
|
|
||||||
|
|
||||||
Loading…
Reference in new issue