Added kolab support to cyrus-imap-admin (#231503).

Package-Manager: portage-2.1.4.4

4 files changed, 108 insertions, 5 deletions

diff --git a/net-mail/cyrus-imap-admin/ChangeLog b/net-mail/cyrus-imap-admin/ChangeLog
index 6c1dbd67c337..58bc5bf9ddfb 100644
--- a/net-mail/cyrus-imap-admin/ChangeLog
+++ b/net-mail/cyrus-imap-admin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/cyrus-imap-admin
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.70 2008/06/04 19:06:51 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.71 2008/09/29 16:06:20 wrobel Exp $
+
+  29 Sep 2008; wrobel@gentoo.org
+  +files/KOLAB_cyrus-cyradm_Annotations.patch,
+  cyrus-imap-admin-2.3.12_p2.ebuild:
+  Added kolab support to cyrus-imap-admin (#231503).
 
 *cyrus-imap-admin-2.3.12_p2 (04 Jun 2008)
 
diff --git a/net-mail/cyrus-imap-admin/Manifest b/net-mail/cyrus-imap-admin/Manifest
index c5e3bb389fba..0cfc35782132 100644
--- a/net-mail/cyrus-imap-admin/Manifest
+++ b/net-mail/cyrus-imap-admin/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX KOLAB_cyrus-cyradm_Annotations.patch 3107 RMD160 a0ad90fa8f779c6e671fa1bc0de1933fa0030f55 SHA1 204f83f03c39e400e65939648101195213f153a5 SHA256 00fb61b5f201193aa1d4a26cdb3d77380afdf05e975c8e171ff1643992692711
 AUX cyrus-imap-admin-2.2-fPIC.patch 584 RMD160 b66b94eacafb2f4bd59584701aa3e4a1f028984f SHA1 b43dc5f38abfc98220ce7ea5b2167376c8b7ed4b SHA256 958fa87050cd5eea811dc33343ef052b0a58d42597cdc3936b58d0a9b6e705dc
 DIST cyrus-imapd-2.3.11.tar.gz 2275173 RMD160 34727e08cc25f3cb6e0ea0195b96de942de10f48 SHA1 6218f0dc4f1792e786677362b8b3965e4593122e SHA256 87ce58b28ed1f8974118c02ac009377bb3de62adccd699a67f0100158106d842
 DIST cyrus-imapd-2.3.12p2.tar.gz 2305996 RMD160 35225526aaf67bf99855750debd03a85949de424 SHA1 d72064b426feb0d7d6ea60456c8ebbf6fe72a2a2 SHA256 c4ea8af68d2b14d93f662fc97f805450ef0cb98ddb986b2b7330cb4aba93c4c4
 DIST cyrus-imapd-2.3.9.tar.gz 2272004 RMD160 c9aae3476108c0face06dfe304a136015370b166 SHA1 b95e1de87ff2c7a42d4bec87c839fe439452a79c SHA256 27e6476789788b7c72f09711103f7c4bd0136dbd33ceadd0ae2dc776a17ab437
 EBUILD cyrus-imap-admin-2.3.11.ebuild 1839 RMD160 94c224e069ba7a2a80b6de862671ae95abd51df4 SHA1 62d05d677e1727f77a02b4d16505359b9df18084 SHA256 b4d1a45c7b7707efa3375e5dbecef009a2a0302ceece150ed25d5f571f179c24
-EBUILD cyrus-imap-admin-2.3.12_p2.ebuild 1864 RMD160 75d3ca7569a13deb9a3c9e24ec28c801cf2585dd SHA1 8a93728c33b305358520da65de2911a866a127d6 SHA256 6560c63847e30a087dcfbebff8a2a04fdc7c1167525e6fc2e5deb16940c0c2e0
+EBUILD cyrus-imap-admin-2.3.12_p2.ebuild 1996 RMD160 25ff7754574dcf6cc48823dbea5c0be3c303d685 SHA1 c39bf4f01f487a41f88591825c3f3206e69615c5 SHA256 fe831477519bed4091f7e541cc3821e1e1707490c46da07a0855c73732f79d61
 EBUILD cyrus-imap-admin-2.3.9.ebuild 1832 RMD160 48320d058282f78b73eebee72cc049d1eb44e5b0 SHA1 0158c0a09c4aaeadbd0203f6a79c6c5307ba98aa SHA256 60906d72291923b359545046cfb275eaf20c618a9ca13823f057b066153f1a89
-MISC ChangeLog 10520 RMD160 b721755fb40c54995a2335fc0279b209e535ea07 SHA1 a807fd1ca281862a3b1014ea630da444efb1f22c SHA256 2b561e24b70cbeb7259e8373646b0d87897a652289afec976a0f26e881b233da
+MISC ChangeLog 10687 RMD160 5642ad2079337b6641bbf09ce13dec74049139aa SHA1 ae79c6840ae3ddef6ab63f4d2c962fb816545c87 SHA256 ff8ef0410686196ecd2b959911143bba5ad9451f37e31a4938d99f872612c068
 MISC metadata.xml 227 RMD160 dea45630aba3c22da6ccfe5867e88797658a9e41 SHA1 82018ee8f0b71c0e29e01aa374a89275a46dde26 SHA256 d3c03c4962fef1e25acac4875ada3102e5122e3eb7292d83d9833df8ef581d5c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFI4P0GEEcxCpcDQ74RAmwIAJsGpZUi/1udjagShOz+MVksUaXdsgCfW7ks
+0Yxzzx1QMn9qJnwt+usJhRU=
+=kl1R
+-----END PGP SIGNATURE-----
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.12_p2.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.12_p2.ebuild
index 4d1baad83cbd..47ba7e866190 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.12_p2.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.12_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.12_p2.ebuild,v 1.1 2008/06/04 19:06:51 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.12_p2.ebuild,v 1.2 2008/09/29 16:06:20 wrobel Exp $
 
 inherit autotools perl-app eutils
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${MY_PV}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~hppa ~ppc64"
-IUSE="ssl kerberos"
+IUSE="ssl kerberos kolab"
 
 RDEPEND=">=sys-libs/db-3.2
 	>=dev-lang/perl-5.6.1
@@ -45,6 +45,10 @@ src_unpack() {
 	# When linking with rpm, you need to link with more libraries.
 	sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" -i configure || die "sed failed"
 
+	# Add kolab support.
+	if use kolab ; then
+		epatch "${FILESDIR}/KOLAB_cyrus-cyradm_Annotations.patch" || die "epatch failed"
+	fi
 }
 
 src_compile() {
diff --git a/net-mail/cyrus-imap-admin/files/KOLAB_cyrus-cyradm_Annotations.patch b/net-mail/cyrus-imap-admin/files/KOLAB_cyrus-cyradm_Annotations.patch
new file mode 100644
index 000000000000..2167f7f21874
--- /dev/null
+++ b/net-mail/cyrus-imap-admin/files/KOLAB_cyrus-cyradm_Annotations.patch
@@ -0,0 +1,83 @@
+Allows to use arbitrary annotations with the cyradm tool.
+
+diff -r a07884e259c3 doc/man/cyradm.1.html
+--- a/doc/man/cyradm.1.html	Thu Oct 25 08:24:39 2007 +0200
++++ b/doc/man/cyradm.1.html	Thu Oct 25 08:29:40 2007 +0200
+@@ -241,6 +241,13 @@ The currently supported attributes are:<
+ <dd>
+ <p>Sets an email address to which messages injected into the server via NNTP 
+ will be sent.</p>
++</dd>
++</li>
++<dt><strong><a NAME="item__2fexplicit_2fannotation"><code>/explicit/annotation</code></a></strong>
++
++<dd>
++<p>Sets the annotation <em>/explicit/annotation</em>
++on <em>mailbox</em> to <em>value</em>.</p>
+ </dd>
+ </li>
+ <dt><strong><a name="item_sharedseen"><code>sharedseen</code></a></strong>
+diff -r a07884e259c3 perl/imap/IMAP/Admin.pm
+--- a/perl/imap/IMAP/Admin.pm	Thu Oct 25 08:24:39 2007 +0200
++++ b/perl/imap/IMAP/Admin.pm	Thu Oct 25 08:29:40 2007 +0200
+@@ -796,11 +796,11 @@ sub mboxconfig {
+     return undef;
+   }
+ 
+-  if(!exists($values{$entry})) {
+-    $self->{error} = "Unknown parameter $entry";
+-  }
+-
+-  $entry = $values{$entry};
++  if(exists($values{$entry})) {
++    $entry = $values{$entry};    
++  } else {
++    $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
++  }
+ 
+   my ($rc, $msg);
+ 
+diff -r a07884e259c3 perl/imap/IMAP/Shell.pm
+--- a/perl/imap/IMAP/Shell.pm	Thu Oct 25 08:24:39 2007 +0200
++++ b/perl/imap/IMAP/Shell.pm	Thu Oct 25 08:29:40 2007 +0200
+@@ -126,7 +126,7 @@ my %builtins = (exit =>
+ 		  [\&_sc_info, '[mailbox]',
+ 		   'display mailbox/server metadata'],
+ 		mboxcfg =>
+-		  [\&_sc_mboxcfg, 'mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value',
++		  [\&_sc_mboxcfg, 'mailbox [comment|condstore|news2mail|expire|sieve|squat|/<explicit annotation>] value',
+ 		   'configure mailbox'],
+ 		mboxconfig => 'mboxcfg',
+ 		reconstruct =>
+@@ -1436,7 +1436,7 @@ sub _sc_mboxcfg {
+   while (defined ($opt = shift(@argv))) {
+     last if $opt eq '--';
+     if ($opt =~ /^-/) {
+-      die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n";
++      die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value\n";
+     }
+     else {
+       push(@nargv, $opt);
+@@ -1445,7 +1445,7 @@ sub _sc_mboxcfg {
+   }
+   push(@nargv, @argv);
+   if (@nargv < 2) {
+-    die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n";
++    die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value\n";
+   }
+   if (!$cyrref || !$$cyrref) {
+     die "mboxconfig: no connection to server\n";
+diff -r a07884e259c3 perl/imap/cyradm.sh
+--- a/perl/imap/cyradm.sh	Thu Oct 25 08:24:39 2007 +0200
++++ b/perl/imap/cyradm.sh	Thu Oct 25 08:29:40 2007 +0200
+@@ -241,6 +241,10 @@ mailboxes).
+ 
+ Indicates that the mailbox should have a squat index created for it.
+ 
++=item C</explicit/annotation>
++
++Sets the annotation I</explicit/annotation> on I<mailbox> to I<value>. 
++
+ =back 
+ 
+ =item C<renamemailbox> [C<--partition> I<partition>] I<oldname> I<newname>