[SVN] r335 - /trunk/cyrus-imapd-2.2/debian/patches/45-kolab2-annotations.dpatch

[debian at incase.de]

Author: sven
Date: Fri Mar 31 21:35:44 2006
New Revision: 335

URL: https://mail.incase.de/viewcvs?rev=335&root=cyrus22&view=rev
Log:
Update 45-kolab2-annotations.dpatch for v2.2.13

Modified:
    trunk/cyrus-imapd-2.2/debian/patches/45-kolab2-annotations.dpatch

Modified: trunk/cyrus-imapd-2.2/debian/patches/45-kolab2-annotations.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/debian/patches/45-kolab2-annotations.dpatch?rev=335&root=cyrus22&r1=334&r2=335&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/debian/patches/45-kolab2-annotations.dpatch (original)
+++ trunk/cyrus-imapd-2.2/debian/patches/45-kolab2-annotations.dpatch Fri Mar 31 21:35:44 2006
@@ -8,7 +8,7 @@
 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
-@@ -1606,6 +1606,11 @@
+@@ -1667,6 +1667,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,
-@@ -1618,6 +1623,7 @@
+@@ -1679,6 +1684,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));
-@@ -1639,37 +1645,55 @@
+@@ -1700,37 +1706,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;
-@@ -1679,7 +1703,7 @@
+@@ -1740,7 +1764,7 @@
  		    goto cleanup;
  		}
  		value = annotate_canon_value(av->value,
@@ -101,7 +101,7 @@
  		if (!value) {
  		    r = IMAP_ANNOTATION_BADVALUE;
  		    goto cleanup;
-@@ -1705,7 +1729,7 @@
+@@ -1766,7 +1790,7 @@
  		    goto cleanup;
  		}
  		value = annotate_canon_value(av->value,
@@ -110,7 +110,7 @@
  		if (!value) {
  		    r = IMAP_ANNOTATION_BADVALUE;
  		    goto cleanup;
-@@ -1807,6 +1831,12 @@
+@@ -1868,6 +1892,12 @@
      /* Free the entry list */
      while (sdata.entry_list) {
  	struct annotate_st_entry_list *freeme = sdata.entry_list;
@@ -126,14 +126,14 @@
 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
-@@ -782,19 +782,21 @@
-   my %values = ( "comment" => "/comment",
+@@ -784,15 +784,19 @@
  		 "news2mail" => "/vendor/cmu/cyrus-imapd/news2mail",
  		 "expire" => "/vendor/cmu/cyrus-imapd/expire",
+ 		 "sieve" => "/vendor/cmu/cyrus-imapd/sieve",
 -		 "squat" => "/vendor/cmu/cyrus-imapd/squat" );
 +		 "squat" => "/vendor/cmu/cyrus-imapd/squat",
-+		 "folder-type" => "/vendor/kolab/folder-type",
-+		 "h-share-uid" => "/vendor/kolab/h-share-uid" );
++ 		 "folder-type" => "/vendor/kolab/folder-type",
++ 		 "h-share-uid" => "/vendor/kolab/h-share-uid" );
  
    if(!$self->{support_annotatemore}) {
      $self->{error} = "Remote does not support ANNOTATEMORE.";
@@ -148,8 +148,4 @@
 +    $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
    }
  
--  $entry = $values{$entry};
--
-   my ($rc, $msg);
- 
-   $value = undef if($value eq "none");
+   $entry = $values{$entry};