| 1 |
wrobel 08/09/29 16:06:21 |
| 2 |
|
| 3 |
Added: KOLAB_cyrus-cyradm_Annotations.patch |
| 4 |
Log: |
| 5 |
Added kolab support to cyrus-imap-admin (#231503). |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-mail/cyrus-imap-admin/files/KOLAB_cyrus-cyradm_Annotations.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imap-admin/files/KOLAB_cyrus-cyradm_Annotations.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imap-admin/files/KOLAB_cyrus-cyradm_Annotations.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: KOLAB_cyrus-cyradm_Annotations.patch |
| 15 |
=================================================================== |
| 16 |
Allows to use arbitrary annotations with the cyradm tool. |
| 17 |
|
| 18 |
diff -r a07884e259c3 doc/man/cyradm.1.html |
| 19 |
--- a/doc/man/cyradm.1.html Thu Oct 25 08:24:39 2007 +0200 |
| 20 |
+++ b/doc/man/cyradm.1.html Thu Oct 25 08:29:40 2007 +0200 |
| 21 |
@@ -241,6 +241,13 @@ The currently supported attributes are:< |
| 22 |
<dd> |
| 23 |
<p>Sets an email address to which messages injected into the server via NNTP |
| 24 |
will be sent.</p> |
| 25 |
+</dd> |
| 26 |
+</li> |
| 27 |
+<dt><strong><a NAME="item__2fexplicit_2fannotation"><code>/explicit/annotation</code></a></strong> |
| 28 |
+ |
| 29 |
+<dd> |
| 30 |
+<p>Sets the annotation <em>/explicit/annotation</em> |
| 31 |
+on <em>mailbox</em> to <em>value</em>.</p> |
| 32 |
</dd> |
| 33 |
</li> |
| 34 |
<dt><strong><a name="item_sharedseen"><code>sharedseen</code></a></strong> |
| 35 |
diff -r a07884e259c3 perl/imap/IMAP/Admin.pm |
| 36 |
--- a/perl/imap/IMAP/Admin.pm Thu Oct 25 08:24:39 2007 +0200 |
| 37 |
+++ b/perl/imap/IMAP/Admin.pm Thu Oct 25 08:29:40 2007 +0200 |
| 38 |
@@ -796,11 +796,11 @@ sub mboxconfig { |
| 39 |
return undef; |
| 40 |
} |
| 41 |
|
| 42 |
- if(!exists($values{$entry})) { |
| 43 |
- $self->{error} = "Unknown parameter $entry"; |
| 44 |
- } |
| 45 |
- |
| 46 |
- $entry = $values{$entry}; |
| 47 |
+ if(exists($values{$entry})) { |
| 48 |
+ $entry = $values{$entry}; |
| 49 |
+ } else { |
| 50 |
+ $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/"; |
| 51 |
+ } |
| 52 |
|
| 53 |
my ($rc, $msg); |
| 54 |
|
| 55 |
diff -r a07884e259c3 perl/imap/IMAP/Shell.pm |
| 56 |
--- a/perl/imap/IMAP/Shell.pm Thu Oct 25 08:24:39 2007 +0200 |
| 57 |
+++ b/perl/imap/IMAP/Shell.pm Thu Oct 25 08:29:40 2007 +0200 |
| 58 |
@@ -126,7 +126,7 @@ my %builtins = (exit => |
| 59 |
[\&_sc_info, '[mailbox]', |
| 60 |
'display mailbox/server metadata'], |
| 61 |
mboxcfg => |
| 62 |
- [\&_sc_mboxcfg, 'mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value', |
| 63 |
+ [\&_sc_mboxcfg, 'mailbox [comment|condstore|news2mail|expire|sieve|squat|/<explicit annotation>] value', |
| 64 |
'configure mailbox'], |
| 65 |
mboxconfig => 'mboxcfg', |
| 66 |
reconstruct => |
| 67 |
@@ -1436,7 +1436,7 @@ sub _sc_mboxcfg { |
| 68 |
while (defined ($opt = shift(@argv))) { |
| 69 |
last if $opt eq '--'; |
| 70 |
if ($opt =~ /^-/) { |
| 71 |
- die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n"; |
| 72 |
+ die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value\n"; |
| 73 |
} |
| 74 |
else { |
| 75 |
push(@nargv, $opt); |
| 76 |
@@ -1445,7 +1445,7 @@ sub _sc_mboxcfg { |
| 77 |
} |
| 78 |
push(@nargv, @argv); |
| 79 |
if (@nargv < 2) { |
| 80 |
- die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n"; |
| 81 |
+ die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value\n"; |
| 82 |
} |
| 83 |
if (!$cyrref || !$$cyrref) { |
| 84 |
die "mboxconfig: no connection to server\n"; |
| 85 |
diff -r a07884e259c3 perl/imap/cyradm.sh |
| 86 |
--- a/perl/imap/cyradm.sh Thu Oct 25 08:24:39 2007 +0200 |
| 87 |
+++ b/perl/imap/cyradm.sh Thu Oct 25 08:29:40 2007 +0200 |
| 88 |
@@ -241,6 +241,10 @@ mailboxes). |
| 89 |
|
| 90 |
Indicates that the mailbox should have a squat index created for it. |
| 91 |
|
| 92 |
+=item C</explicit/annotation> |
| 93 |
+ |
| 94 |
+Sets the annotation I</explicit/annotation> on I<mailbox> to I<value>. |
| 95 |
+ |
| 96 |
=back |
| 97 |
|
| 98 |
=item C<renamemailbox> [C<--partition> I<partition>] I<oldname> I<newname> |
Archives