[Pkg-Cyrus-imapd-Debian-devel] Bug#347658: please include patch from kolab for Shell.pm

[Steffen Joeris]

Package: cyrus22-imapd
Severity: wishlist
Tags: patch

Hi

Enclosed there is a small patch for the Shell.pm file.
We also found it in the kolab-upstream.
There I can only see some additional thinks.
I think these are interesting for the mailboxes.
The mailboxes with kolab have an other look.

Greetings
Steffen

dpatch:

#! /bin/sh /usr/share/dpatch/dpatch-run
## 120-Shell.pm.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add small stuff from Kolab

@DPATCH@
--- cyrus22-imapd-2.2.12/perl/imap/IMAP/Shell.pm.orig   2006-01-02 13:19:55.000000000 +0100
+++ cyrus22-imapd-2.2.12/perl/imap/IMAP/Shell.pm        2006-01-02 13:25:06.000000000 +0100
@@ -126,7 +126,7 @@
                  [\&_sc_info, '[mailbox]',
                   'display mailbox/server metadata'],
                mboxcfg =>
-                 [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat] value',
+                 [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat|/<explicit annotation>]  value',
                   'configure mailbox'],
                mboxconfig => 'mboxcfg',
                reconstruct =>
@@ -429,7 +429,7 @@
 # programs, as opposed to things expected from within a program.)
 sub shell {
   my ($server, $port, $authz, $auth, $systemrc, $userrc, $dorc, $mech, $pw) =
-    ('', 143, undef, $ENV{USER} || $ENV{LOGNAME}, '/usr/local/etc/cyradmrc.pl',
+    ('', 143, undef, $ENV{USER} || $ENV{LOGNAME}, '/etc/cyradmrc.pl',
      "$ENV{HOME}/.cyradmrc.pl", 1, undef, undef);
   GetOptions('user|u=s' => \$auth,
             'authz|z=s' => \$authz,
@@ -459,7 +459,7 @@
                          -rock => \$cyradm});
     $cyradm->authenticate(-authz => $authz, -user => $auth,
                          -mechanism => $mech, -password => $pw)
-      or die "cyradm: cannot authenticate to server with $mech as $auth\n";
+      or die "cyradm: cannot authenticate to server" . (defined($mech)?" with $mech":"") . " as $auth\n";
   }
   my $fstk = [*STDIN, *STDOUT, *STDERR];
   if ($dorc && $systemrc ne '' && -f $systemrc) {
@@ -1339,7 +1339,7 @@
   while (defined ($opt = shift(@argv))) {
     last if $opt eq '--';
     if ($opt =~ /^-/) {
-      die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n";
+      die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
     }
     else {
       push(@nargv, $opt);
@@ -1348,7 +1348,7 @@
   }
   push(@nargv, @argv);
   if (@nargv < 2) {
-    die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n";
+    die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
   }
   if (!$cyrref || !$$cyrref) {
     die "mboxconfig: no connection to server\n";


-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-1-686
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)