[SVN] r707 - in /trunk/cyrus-imapd-2.2.13/debian: changelog
patches/0022-upstream-dont-send-empty-literal-response.dpatch
patches/0023-sort-illegal-dates-first.dpatch patches/00list
debian at incase.de
debian at incase.de
Tue Feb 27 05:06:55 CET 2007
Author: sven
Date: Tue Feb 27 05:06:53 2007
New Revision: 707
URL: https://mail.incase.de/viewcvs?rev=707&root=cyrus22&view=rev
Log:
Add two upstream patches from December
Added:
trunk/cyrus-imapd-2.2.13/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch (with props)
trunk/cyrus-imapd-2.2.13/debian/patches/0023-sort-illegal-dates-first.dpatch (with props)
Modified:
trunk/cyrus-imapd-2.2.13/debian/changelog
trunk/cyrus-imapd-2.2.13/debian/patches/00list
Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=707&root=cyrus22&r1=706&r2=707&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Tue Feb 27 05:06:53 2007
@@ -5,14 +5,16 @@
when postrm is called.
Assume removal of spools is not desired if debconf isn't available (least
surprise / least chance of data loss principle).
- * Add Xs-Vcs-Browser and Xs-Vcs-Svn control fields for the PTS
- * Fix a number of small issues with the 64bit quota patch
+ * Add Xs-Vcs-Browser and Xs-Vcs-Svn control fields for the PTS.
+ * Fix a number of small issues with the 64bit quota patch.
* update automake/autoconf patch with latest autotools-dev and
- automake/autoconf packages from unstable
+ automake/autoconf packages from unstable.
* Add optional patch which allows uploads of messages with "From " headers.
- Taken from fastmail.fm patchset
-
- -- Sven Mueller <sven at debian.org> Mon, 26 Feb 2007 18:06:47 +0100
+ Taken from fastmail.fm patchset.
+ * Add upstream patch to avoid sending empty literal responses.
+ * Add upstream patch to sort illegal dates before legal ones.
+
+ -- Sven Mueller <sven at debian.org> Tue, 27 Feb 2007 05:04:28 +0100
cyrus-imapd-2.2 (2.2.13-10) unstable; urgency=high
Added: trunk/cyrus-imapd-2.2.13/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch?rev=707&root=cyrus22&view=auto
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch (added)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch Tue Feb 27 05:06:53 2007
@@ -1,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## filehHM2MA.dpatch by Sven Mueller <sven at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/saslclient.c /tmp/dpep.8onULu/cyrus-imapd-2.2.13/imap/saslclient.c
+--- cyrus-imapd-2.2.13/imap/saslclient.c 2007-02-27 05:01:09.000000000 +0100
++++ /tmp/dpep.8onULu/cyrus-imapd-2.2.13/imap/saslclient.c 2007-02-27 05:03:11.579096512 +0100
+@@ -39,7 +39,7 @@
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+-/* $Id: saslclient.c,v 1.13 2004/07/07 19:49:05 rjs3 Exp $ */
++/* $Id: saslclient.c,v 1.14.2.1 2006/12/19 14:30:28 murch Exp $ */
+
+ #include <config.h>
+
+@@ -217,21 +217,22 @@
+ sprintf(cmdbuf, "%s %s", sasl_cmd->cmd, mech);
+ prot_printf(pout, "%s", cmdbuf);
+
+- if (clientout) { /* initial response */
+- if (!clientoutlen) { /* zero-length initial response */
+- prot_printf(pout, " =");
++ if (!clientout) goto noinitresp; /* no initial response */
+
+- clientout = NULL;
+- }
+- else if (!sendliteral &&
+- ((strlen(cmdbuf) + clientoutlen + 3) > sasl_cmd->maxlen)) {
+- /* initial response is too long for auth command,
+- so wait for a server challenge before sending it */
+- goto noinitresp;
+- }
+- else { /* full response -- encoded below */
+- prot_printf(pout, " ");
+- }
++ /* initial response */
++ if (!clientoutlen) { /* zero-length initial response */
++ prot_printf(pout, " =");
++
++ clientout = NULL;
++ }
++ else if (!sendliteral &&
++ ((strlen(cmdbuf) + clientoutlen + 3) > sasl_cmd->maxlen)) {
++ /* initial response is too long for auth command,
++ so wait for a server challenge before sending it */
++ goto noinitresp;
++ }
++ else { /* full response -- encoded below */
++ prot_printf(pout, " ");
+ }
+
+ do {
Propchange: trunk/cyrus-imapd-2.2.13/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/cyrus-imapd-2.2.13/debian/patches/0023-sort-illegal-dates-first.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0023-sort-illegal-dates-first.dpatch?rev=707&root=cyrus22&view=auto
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0023-sort-illegal-dates-first.dpatch (added)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0023-sort-illegal-dates-first.dpatch Tue Feb 27 05:06:53 2007
@@ -1,0 +1,88 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## filezzWItT.dpatch by Sven Mueller <sven at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/index.c /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/index.c
+--- cyrus-imapd-2.2.13/imap/index.c 2007-02-27 05:01:09.000000000 +0100
++++ /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/index.c 2007-02-27 05:03:44.276846274 +0100
+@@ -41,7 +41,7 @@
+ *
+ */
+ /*
+- * $Id: index.c,v 1.218 2005/06/02 15:47:58 ken3 Exp $
++ * $Id: index.c,v 1.218.2.2 2006/12/19 19:32:59 murch Exp $
+ */
+ #include <config.h>
+
+@@ -3285,7 +3285,8 @@
+ break;
+ case SORT_DATE:
+ cur->date = message_parse_date(envtokens[ENV_DATE],
+- PARSE_TIME | PARSE_ZONE);
++ PARSE_TIME | PARSE_ZONE
++ | PARSE_NOCREATE);
+ break;
+ case SORT_FROM:
+ cur->from = get_localpart_addr(from + CACHE_ITEM_SIZE_SKIP);
+@@ -3780,10 +3781,12 @@
+ case SORT_CC:
+ ret = strcmp(md1->cc, md2->cc);
+ break;
+- case SORT_DATE:
+- ret = (md1->date && md2->date) ?
+- numcmp(md1->date, md2->date) : numcmp(md1->msgno, md2->msgno);
++ case SORT_DATE: {
++ time_t d1 = md1->date ? md1->date : INTERNALDATE(md1->msgno);
++ time_t d2 = md2->date ? md2->date : INTERNALDATE(md2->msgno);
++ ret = numcmp(d1, d2);
+ break;
++ }
+ case SORT_FROM:
+ ret = strcmp(md1->from, md2->from);
+ break;
+diff -urNad cyrus-imapd-2.2.13/imap/message.c /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/message.c
+--- cyrus-imapd-2.2.13/imap/message.c 2007-02-27 05:01:09.000000000 +0100
++++ /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/message.c 2007-02-27 05:03:44.277846175 +0100
+@@ -41,7 +41,7 @@
+ */
+
+ /*
+- * $Id: message.c,v 1.99 2004/09/16 17:58:54 ken3 Exp $
++ * $Id: message.c,v 1.99.2.1 2006/12/19 18:57:48 murch Exp $
+ */
+
+ #include <config.h>
+@@ -1429,7 +1429,7 @@
+ if (t >= 0) return (t - zone_off * 60);
+
+ baddate:
+- return time(0);
++ return (flags & PARSE_NOCREATE) ? 0 : time(0);
+ }
+
+ /*
+diff -urNad cyrus-imapd-2.2.13/imap/message.h /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/message.h
+--- cyrus-imapd-2.2.13/imap/message.h 2007-02-27 05:01:09.000000000 +0100
++++ /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/message.h 2007-02-27 05:03:44.278846076 +0100
+@@ -1,5 +1,5 @@
+ /* message.h -- Message parsing
+- $Id: message.h,v 1.6 2003/02/13 20:15:28 rjs3 Exp $
++ $Id: message.h,v 1.6.6.1 2006/12/19 18:57:48 murch Exp $
+
+ * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
+ *
+@@ -61,9 +61,10 @@
+ unsigned size));
+
+ /* Flags for parsing message date/time - to be bitwise OR'd */
+-#define PARSE_DATE (1<<0)
++#define PARSE_DATE (1<<0) /* Default (always parsed) */
+ #define PARSE_TIME (1<<1)
+ #define PARSE_ZONE (1<<2)
++#define PARSE_NOCREATE (1<<15) /* Don't create one if its missing/invalid */
+
+ extern time_t message_parse_date P((char *hdr, unsigned flags));
+ extern int message_parse_file P((FILE *infile, struct mailbox *mailbox,
Propchange: trunk/cyrus-imapd-2.2.13/debian/patches/0023-sort-illegal-dates-first.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/00list?rev=707&root=cyrus22&r1=706&r2=707&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/00list Tue Feb 27 05:06:53 2007
@@ -20,6 +20,8 @@
# 0019-upstream-sieve_allowreferrals.dpatch
0020-upstream-client-literal-prefix.dpatch
0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch
+0022-upstream-dont-send-empty-literal-response.dpatch
+0023-sort-illegal-dates-first.dpatch
0090-fix-casts.dpatch
01-fix_Makefile.in.dpatch
02-add_mkinstalldirs.dpatch
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list