[SVN] r387 - in /trunk/cyrus-imapd-2.2.13/debian: changelog
patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch patches/00list
debian at incase.de
debian at incase.de
Wed May 3 18:39:49 UTC 2006
Author: sven
Date: Wed May 3 20:39:48 2006
New Revision: 387
URL: https://mail.incase.de/viewcvs?rev=387&root=cyrus22&view=rev
Log:
Add upstream patch to fix dump/undump of remote mailboxes (ctl_mboxlist)
Added:
trunk/cyrus-imapd-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.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=387&root=cyrus22&r1=386&r2=387&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Wed May 3 20:39:48 2006
@@ -4,8 +4,9 @@
* Add upstream patch to disallow user probes
* Add upstream patch to properly handle timezones and DST in fetchnews
* Add upstream patch to allow ACL removal for invalid IDs
-
- -- Sven Mueller <debian at incase.de> Wed, 3 May 2006 15:30:51 +0200
+ * Add upstream patch to fix dump/undump of remote mailboxes (ctl_mboxlist)
+
+ -- Sven Mueller <debian at incase.de> Wed, 3 May 2006 20:39:21 +0200
cyrus-imapd-2.2 (2.2.13-2) unstable; urgency=low
Added: trunk/cyrus-imapd-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch?rev=387&root=cyrus22&view=auto
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch (added)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch Wed May 3 20:39:48 2006
@@ -1,0 +1,91 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fileVnqQpc.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13/doc/changes.html /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/doc/changes.html
+--- cyrus-imapd-2.2.13/doc/changes.html 2006-05-03 17:19:51.000000000 +0200
++++ /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/doc/changes.html 2006-05-03 17:26:24.115155499 +0200
+@@ -8,6 +8,12 @@
+ </head>
+ <body>
+
++<h1>Changes to the Cyrus IMAP Server since 2.2.13</h1>
++<ul>
++<li><tt>ctl_mboxlist</tt> now dumps/undumps the mailbox type flags,
++making it useful for remote mailboxes.</li>
++</ul>
++
+ <h1>Changes to the Cyrus IMAP Server since 2.2.12</h1>
+ <ul>
+ <li>Allow sieve scripts to be run on shared mailboxes (via <tt>sieve</tt>
+diff -urNad cyrus-imapd-2.2.13/imap/ctl_mboxlist.c /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/imap/ctl_mboxlist.c
+--- cyrus-imapd-2.2.13/imap/ctl_mboxlist.c 2006-05-03 17:19:51.000000000 +0200
++++ /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/imap/ctl_mboxlist.c 2006-05-03 17:26:24.129154183 +0200
+@@ -187,7 +187,7 @@
+ switch (d->op) {
+ case DUMP:
+ if(!d->partition || !strcmp(d->partition, part)) {
+- printf("%s\t%s\t%s\n", name, part, acl);
++ printf("%s\t%d %s\t%s\n", name, mbtype, part, acl);
+ if(d->purge) {
+ config_mboxlist_db->delete(mbdb, key, keylen, &(d->tid), 0);
+ }
+@@ -490,7 +490,7 @@
+ while (fgets(buf, sizeof(buf), stdin)) {
+ char *name, *partition, *acl;
+ char *p;
+- int tries = 0;
++ int mbtype = 0, tries = 0;
+
+ line++;
+
+@@ -501,6 +501,12 @@
+ continue;
+ }
+ *p++ = '\0';
++ if (isdigit((int) *p)) {
++ /* new style dump */
++ mbtype = strtol(p, &p, 10);
++ /* skip trailing space */
++ if (*p == ' ') p++;
++ }
+ partition = p;
+ for (; *p && *p != '\t'; p++) ;
+ if (!*p) {
+@@ -523,7 +529,7 @@
+ }
+
+ key = name; keylen = strlen(key);
+- data = mboxlist_makeentry(0, partition, acl); datalen = strlen(data);
++ data = mboxlist_makeentry(mbtype, partition, acl); datalen = strlen(data);
+
+ tries = 0;
+ retry:
+diff -urNad cyrus-imapd-2.2.13/man/ctl_mboxlist.8 /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/man/ctl_mboxlist.8
+--- cyrus-imapd-2.2.13/man/ctl_mboxlist.8 2006-05-03 17:19:51.000000000 +0200
++++ /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/man/ctl_mboxlist.8 2006-05-03 17:26:24.125154559 +0200
+@@ -104,7 +104,9 @@
+ .TP
+ .B \-d
+ Dump the contents of the database to standard output in a portable
+-flat-text format.
++flat-text format. NOTE: In Cyrus versions 2.2.13 and earlier, the dump
++format did not include the mailbox type flags, breaking remote
++mailboxes (frontends, mupdate master) when undumped.
+ .TP
+ .B \-x
+ When performing a dump, remove the mailboxes dumped from the mailbox list
+@@ -115,7 +117,9 @@
+ .TP
+ .B \-u
+ Load the contents of the database from standard input. The input MUST
+-be in the format output using the \fB\-d\fR option.
++be in the format output using the \fB\-d\fR option. NOTE: Both the
++old and new formats can be loaded, but the old format will break
++remote mailboxes.
+ .TP
+ .B \-m
+ For backend servers in the Cyrus Murder, synchronize the local mailbox list
Propchange: trunk/cyrus-imapd-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.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=387&root=cyrus22&r1=386&r2=387&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/00list Wed May 3 20:39:48 2006
@@ -2,6 +2,7 @@
0002-allow_invalid_id_acl_removal.dpatch
0003-upstream_disallow_userprobes.dpatch
0004-upstream-fetchnews-timezone-dst-fix.dpatch
+0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
01-fix_Makefile.in.dpatch
02-add_mkinstalldirs.dpatch
03-fix_docs.dpatch
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list