[SVN] r631 - in /trunk/cyrus-imapd-2.2.13/debian: changelog
patches/45-kolab2-annotations.dpatch
debian at incase.de
debian at incase.de
Tue Sep 26 19:36:44 UTC 2006
Author: sven
Date: Tue Sep 26 21:36:43 2006
New Revision: 631
URL: https://mail.incase.de/viewcvs?rev=631&root=cyrus22&view=rev
Log:
Apply patch by Ben Poliakoff closing #389597: Inability to set Annotations from IMAP::Admin perl module
Modified:
trunk/cyrus-imapd-2.2.13/debian/changelog
trunk/cyrus-imapd-2.2.13/debian/patches/45-kolab2-annotations.dpatch
Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=631&root=cyrus22&r1=630&r2=631&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Tue Sep 26 21:36:43 2006
@@ -10,6 +10,8 @@
(Closes: #388242)
* Run autoconf to generate update configure script after above patch was
applied to configure.in
+ * Add patch by Ben Poliakoff which fixes an inability to set annotations
+ from IMAP::Admin perl module (Closes: #389597)
[ Henrique de Moraes Holschuh ]
* Update pt_BR debconf translation
@@ -19,7 +21,7 @@
* Fix mistake in init script, ! check_status instead of !check_status.
Thanks to Farzad FARID
- -- Sven Mueller <sven at debian.org> Mon, 25 Sep 2006 20:47:41 +0200
+ -- Sven Mueller <sven at debian.org> Tue, 26 Sep 2006 21:34:49 +0200
cyrus-imapd-2.2 (2.2.13-7) unstable; urgency=low
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/45-kolab2-annotations.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/45-kolab2-annotations.dpatch?rev=631&root=cyrus22&r1=630&r2=631&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/45-kolab2-annotations.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/45-kolab2-annotations.dpatch Tue Sep 26 21:36:43 2006
@@ -5,10 +5,10 @@
## DP: Add kolab2 compatible annotation functionality
@DPATCH@
-diff -urNad cyrus22-imapd-2.2.12/imap/annotate.c /tmp/dpep.AQbIR0/cyrus22-imapd-2.2.12/imap/annotate.c
---- cyrus22-imapd-2.2.12/imap/annotate.c 2005-03-12 23:09:22.000000000 +0100
-+++ /tmp/dpep.AQbIR0/cyrus22-imapd-2.2.12/imap/annotate.c 2005-06-30 13:15:22.121300304 +0200
-@@ -1667,6 +1667,11 @@
+diff -urNad cyrus-imapd-2.2.13/imap/annotate.c /tmp/dpep.BSsfxj/cyrus-imapd-2.2.13/imap/annotate.c
+--- cyrus-imapd-2.2.13/imap/annotate.c 2006-09-26 21:33:43.000000000 +0200
++++ /tmp/dpep.BSsfxj/cyrus-imapd-2.2.13/imap/annotate.c 2006-09-26 21:33:53.973964626 +0200
+@@ -1673,6 +1673,11 @@
{ NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL }
};
@@ -20,7 +20,7 @@
int annotatemore_store(char *mailbox,
struct entryattlist *l,
struct namespace *namespace,
-@@ -1679,6 +1684,7 @@
+@@ -1685,6 +1690,7 @@
struct attvaluelist *av;
struct storedata sdata;
const struct annotate_st_entry *entries;
@@ -28,7 +28,7 @@
time_t now = time(0);
memset(&sdata, 0, sizeof(struct storedata));
-@@ -1700,37 +1706,55 @@
+@@ -1706,37 +1712,55 @@
while (e) {
int entrycount, attribs;
struct annotate_st_entry_list *nentry = NULL;
@@ -92,7 +92,7 @@
av = e->attvalues;
while (av) {
const char *value;
-@@ -1740,7 +1764,7 @@
+@@ -1746,7 +1770,7 @@
goto cleanup;
}
value = annotate_canon_value(av->value,
@@ -101,7 +101,7 @@
if (!value) {
r = IMAP_ANNOTATION_BADVALUE;
goto cleanup;
-@@ -1766,7 +1790,7 @@
+@@ -1772,7 +1796,7 @@
goto cleanup;
}
value = annotate_canon_value(av->value,
@@ -110,7 +110,7 @@
if (!value) {
r = IMAP_ANNOTATION_BADVALUE;
goto cleanup;
-@@ -1868,6 +1892,12 @@
+@@ -1874,6 +1898,12 @@
/* Free the entry list */
while (sdata.entry_list) {
struct annotate_st_entry_list *freeme = sdata.entry_list;
@@ -123,10 +123,10 @@
sdata.entry_list = sdata.entry_list->next;
free(freeme);
}
-diff -urNad cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm /tmp/dpep.AQbIR0/cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm
---- cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm 2005-03-12 23:09:22.000000000 +0100
-+++ /tmp/dpep.AQbIR0/cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm 2005-06-30 13:16:29.270725801 +0200
-@@ -784,15 +784,19 @@
+diff -urNad cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm /tmp/dpep.BSsfxj/cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm
+--- cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm 2006-09-25 20:41:19.000000000 +0200
++++ /tmp/dpep.BSsfxj/cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm 2006-09-26 21:34:36.112138623 +0200
+@@ -784,19 +784,21 @@
"news2mail" => "/vendor/cmu/cyrus-imapd/news2mail",
"expire" => "/vendor/cmu/cyrus-imapd/expire",
"sieve" => "/vendor/cmu/cyrus-imapd/sieve",
@@ -148,4 +148,8 @@
+ $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
}
- $entry = $values{$entry};
+- $entry = $values{$entry};
+-
+ my ($rc, $msg);
+
+ $value = undef if($value eq "none");
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list