[Pkg-Cyrus-imapd-Debian-devel] [SVN] r253 - in
branches/sarge/cyrus22/cyrus-imapd-2.2.12/debian: changelog
patches/65-sieveshell-enhancements.dpatch
debian at incase.de
debian at incase.de
Thu Jan 12 19:49:00 UTC 2006
Author: sven
Date: Thu Jan 12 16:22:12 2006
New Revision: 253
URL: https://mail.incase.de/viewcvs?root=cyrus22?view=rev&rev=253
Log:
Add Shell.pm documentation fix (#347658) to sarge branch
Modified:
branches/sarge/cyrus22/cyrus-imapd-2.2.12/debian/changelog
branches/sarge/cyrus22/cyrus-imapd-2.2.12/debian/patches/65-sieveshell-enhancements.dpatch
Modified: branches/sarge/cyrus22/cyrus-imapd-2.2.12/debian/changelog
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/sarge/cyrus22/cyrus-imapd-2.2.12/debian/changelog?view=diff&rev=253&p1=branches/sarge/cyrus22/cyrus-imapd-2.2.12/debian/changelog&r1=252&p2=branches/sarge/cyrus22/cyrus-imapd-2.2.12/debian/changelog&r2=253
==============================================================================
--- branches/sarge/cyrus22/cyrus-imapd-2.2.12/debian/changelog (original)
+++ branches/sarge/cyrus22/cyrus-imapd-2.2.12/debian/changelog Thu Jan 12 16:22:12 2006
@@ -31,6 +31,7 @@
team) with a spelling correction from Ondrej Surý.
* Adjust kolab2 annotation patch according to patch from Steffen Joeris
(Closes: #347527)
+ * Apply patch fixing some error messages in Shell.pm (Closes: #347658)
-- Sven Mueller <debian at incase.de> Thu, 29 Dec 2005 17:42:05 +0100
Modified: branches/sarge/cyrus22/cyrus-imapd-2.2.12/debian/patches/65-sieveshell-enhancements.dpatch
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/sarge/cyrus22/cyrus-imapd-2.2.12/debian/patches/65-sieveshell-enhancements.dpatch?view=diff&rev=253&p1=branches/sarge/cyrus22/cyrus-imapd-2.2.12/debian/patches/65-sieveshell-enhancements.dpatch&r1=252&p2=branches/sarge/cyrus22/cyrus-imapd-2.2.12/debian/patches/65-sieveshell-enhancements.dpatch&r2=253
==============================================================================
--- branches/sarge/cyrus22/cyrus-imapd-2.2.12/debian/patches/65-sieveshell-enhancements.dpatch (original)
+++ branches/sarge/cyrus22/cyrus-imapd-2.2.12/debian/patches/65-sieveshell-enhancements.dpatch Thu Jan 12 16:22:12 2006
@@ -5,9 +5,18 @@
## DP: Adds some enhancements to sieveshell and fixes some paths.
@DPATCH@
-diff -urNad cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm /tmp/dpep.YFoauN/cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm
---- cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm 2005-11-17 04:21:24.000000000 +0100
-+++ /tmp/dpep.YFoauN/cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm 2005-11-21 20:21:43.907367956 +0100
+diff -urNad cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm
+--- cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm 2006-01-12 16:03:50.000000000 +0100
++++ /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm 2006-01-12 16:06:24.305462117 +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 {
@@ -26,9 +35,27 @@
}
my $fstk = [*STDIN, *STDOUT, *STDERR];
if ($dorc && $systemrc ne '' && -f $systemrc) {
-diff -urNad cyrus-imapd-2.2.12/perl/sieve/lib/request.c /tmp/dpep.YFoauN/cyrus-imapd-2.2.12/perl/sieve/lib/request.c
---- cyrus-imapd-2.2.12/perl/sieve/lib/request.c 2005-11-17 04:21:24.000000000 +0100
-+++ /tmp/dpep.YFoauN/cyrus-imapd-2.2.12/perl/sieve/lib/request.c 2005-11-21 20:21:43.907367956 +0100
+@@ -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";
+diff -urNad cyrus-imapd-2.2.12/perl/sieve/lib/request.c /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/sieve/lib/request.c
+--- cyrus-imapd-2.2.12/perl/sieve/lib/request.c 2006-01-12 16:03:50.000000000 +0100
++++ /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/sieve/lib/request.c 2006-01-12 16:06:24.305462117 +0100
@@ -560,7 +560,6 @@
char **refer_to, char **errstrp)
{
@@ -37,9 +64,9 @@
mystring_t *errstr=NULL;
lexstate_t state;
int ret = 0;
-diff -urNad cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl /tmp/dpep.YFoauN/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl
---- cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 2005-11-21 20:21:42.000000000 +0100
-+++ /tmp/dpep.YFoauN/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 2005-11-21 20:22:58.422064261 +0100
+diff -urNad cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl
+--- cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 2006-01-12 16:06:23.000000000 +0100
++++ /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 2006-01-12 16:06:24.306462019 +0100
@@ -60,7 +60,9 @@
my $username = $ENV{USER};
my $authname = $ENV{USER};
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list