steffen: server/imapd cyradm.annotate.patch, NONE, 1.1 Makefile, 1.22, 1.23 kolab.patch, 1.22, 1.23
cvs at intevation.de
cvs at intevation.de
Tue Jun 28 14:51:40 CEST 2005
Author: steffen
Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv32529
Modified Files:
Makefile kolab.patch
Added Files:
cyradm.annotate.patch
Log Message:
general annotate support for cyradm (Issue782)
--- NEW FILE: cyradm.annotate.patch ---
diff -upr ../cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Admin.pm ./perl/imap/IMAP/Admin.pm
--- ../cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Admin.pm 2004-02-19 23:50:12.000000000 +0100
+++ ./perl/imap/IMAP/Admin.pm 2005-06-28 14:23:46.000000000 +0200
@@ -789,12 +789,12 @@ sub mboxconfig {
return undef;
}
- if(!exists($values{$entry})) {
- $self->{error} = "Unknown parameter $entry";
+ if(exists($values{$entry})) {
+ $entry = $values{$entry};
+ } else {
+ $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
}
- $entry = $values{$entry};
-
my ($rc, $msg);
$value = undef if($value eq "none");
diff -upr ../cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Shell.pm ./perl/imap/IMAP/Shell.pm
--- ../cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Shell.pm 2004-01-15 15:35:35.000000000 +0100
+++ ./perl/imap/IMAP/Shell.pm 2005-06-28 14:24:46.000000000 +0200
@@ -126,7 +126,7 @@ my %builtins = (exit =>
[\&_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 =>
@@ -1339,7 +1339,7 @@ sub _sc_mboxcfg {
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 @@ sub _sc_mboxcfg {
}
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";
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile 20 Apr 2005 23:09:35 -0000 1.22
+++ Makefile 28 Jun 2005 12:51:38 -0000 1.23
@@ -18,6 +18,7 @@
$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
cp $(KOLABCVSDIR)/imapd.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/
+ cp $(KOLABCVSDIR)/cyradm.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/
cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for imapd.spec
cp $(KOLABCVSDIR)/imapd.group2.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for case insensitive group match
cp $(KOLABCVSDIR)/imapd-goodchars.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for allowing special chars in mailbox names
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- kolab.patch 10 Jun 2005 02:03:42 -0000 1.22
+++ kolab.patch 28 Jun 2005 12:51:38 -0000 1.23
@@ -1,5 +1,5 @@
--- ../imapd.orig/imapd.spec 2005-02-21 18:02:27.000000000 +0100
-+++ imapd.spec 2005-06-10 04:00:13.000000000 +0200
++++ imapd.spec 2005-06-28 14:11:31.000000000 +0200
@@ -3,6 +3,9 @@
## Copyright (c) 2000-2005 The OpenPKG Project <http://www.openpkg.org/>
## Copyright (c) 2000-2005 Ralf S. Engelschall <rse at engelschall.com>
@@ -15,7 +15,7 @@
License: BSD
Version: 2.2.12
-Release: 2.3.0
-+Release: 2.3.0_kolab4
++Release: 2.3.0_kolab5
# package options
-%option with_fsl yes
@@ -32,18 +32,19 @@
# list of sources
Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
-@@ -50,6 +56,10 @@ Source3: imapd.conf
+@@ -50,6 +56,11 @@ Source3: imapd.conf
Source4: fsl.imapd
Patch0: imapd.patch
Patch1: imapd.patch.group
+Patch2: imapd.annotate.patch
-+Patch3: kolab-ldap.patch
-+Patch4: imapd.group2.patch
++Patch3: kolab-ldap.patch
++Patch4: imapd.group2.patch
+Patch5: imapd-goodchars.patch
++Patch6: cyradm.annotate.patch
# build information
Prefix: %{l_prefix}
-@@ -62,6 +72,10 @@ PreReq: sasl, db >= 4.2.52, openss
+@@ -62,6 +73,10 @@ PreReq: sasl, db >= 4.2.52, openss
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
%endif
@@ -54,7 +55,7 @@
AutoReq: no
AutoReqProv: no
-@@ -88,6 +102,7 @@ AutoReqProv: no
+@@ -88,6 +103,7 @@ AutoReqProv: no
%{l_shtool} subst \
-e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
lib/auth_unix.c
@@ -62,12 +63,13 @@
%endif
%if "%{with_drac}" == "yes"
%{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
-@@ -95,10 +110,21 @@ AutoReqProv: no
+@@ -95,10 +111,22 @@ AutoReqProv: no
sleep 1
touch configure
%endif
+%if "%{with_annotate}" == "yes"
+ %patch -p0 -P 2
++ %patch -p0 -P 6
+%endif
+%if "%{with_ldap}" == "yes"
+ %patch -p0 -P 3
@@ -85,7 +87,7 @@
configure
# ensure local com_err can be used
-@@ -112,12 +138,12 @@ AutoReqProv: no
+@@ -112,12 +140,12 @@ AutoReqProv: no
*-sunos* )
%{l_shtool} subst \
-e 's;^\( *.LIBS..*\)\(\"\],.*\)$;\1 -ldb -lrt\2;' \
More information about the commits
mailing list