[pkg-kolab] r798 - in kolab-cyrus-imapd/trunk/debian: . patches po
petere at alioth.debian.org
petere at alioth.debian.org
Sat Apr 26 09:37:45 UTC 2008
Author: petere
Date: 2008-04-26 09:37:44 +0000 (Sat, 26 Apr 2008)
New Revision: 798
Added:
kolab-cyrus-imapd/trunk/debian/patches/85-fix-option-passing.dpatch
kolab-cyrus-imapd/trunk/debian/patches/90-add-sasl-options-docs.dpatch
kolab-cyrus-imapd/trunk/debian/po/eu.po
kolab-cyrus-imapd/trunk/debian/po/fi.po
kolab-cyrus-imapd/trunk/debian/po/nb.po
Removed:
kolab-cyrus-imapd/trunk/debian/patches/20-drac_auth.dpatch
kolab-cyrus-imapd/trunk/debian/patches/60-lower-poptimeout-minimum.dpatch
Modified:
kolab-cyrus-imapd/trunk/debian/changelog
kolab-cyrus-imapd/trunk/debian/control
kolab-cyrus-imapd/trunk/debian/cyrus-makedirs
kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.init
kolab-cyrus-imapd/trunk/debian/logcheck.ignore
kolab-cyrus-imapd/trunk/debian/logcheck.violations.ignore
kolab-cyrus-imapd/trunk/debian/patches/00list
kolab-cyrus-imapd/trunk/debian/patches/18-fix_strlen_return_type.dpatch
kolab-cyrus-imapd/trunk/debian/patches/21-fix_config-parsing.dpatch
kolab-cyrus-imapd/trunk/debian/patches/22-imapd_index_check.dpatch
kolab-cyrus-imapd/trunk/debian/patches/24-configurable-referrals.dpatch
kolab-cyrus-imapd/trunk/debian/po/gl.po
kolab-cyrus-imapd/trunk/debian/po/pt.po
kolab-cyrus-imapd/trunk/debian/rules
Log:
Synced against cyrus-imapd package
Modified: kolab-cyrus-imapd/trunk/debian/changelog
===================================================================
--- kolab-cyrus-imapd/trunk/debian/changelog 2008-04-20 18:07:20 UTC (rev 797)
+++ kolab-cyrus-imapd/trunk/debian/changelog 2008-04-26 09:37:44 UTC (rev 798)
@@ -1,3 +1,38 @@
+kolab-cyrus-imapd (2.2.13-5) UNRELEASED; urgency=low
+
+ * Synced against cyrus-imapd package (closes: #475128)
+
+ -- Peter Eisentraut <petere at debian.org> Sat, 26 Apr 2008 11:22:29 +0200
+
+cyrus-imapd-2.2 (2.2.13-14) unstable; urgency=low
+
+ [ Sven Mueller ]
+ * Fix a problem in lib/Makefile.in with multi-word CCs
+ (problem found by Uwe Hermann's try at building all Debian packages with
+ Open64 - kudos to him for this nice little project)
+ * Update portoguese debconf translations (Closes: #439405)
+ * Add Homepage field to debian/control
+ * Use official VCS fields to document repository
+
+ [ Benjamin Seidenberg ]
+ * Fix the finds in cyrus-makedirs (which weren't working properly) to use
+ xargs instead of -exec. (Closes #442491)
+
+ [ Sven Mueller ]
+ * Fix control file (lintian warning: substvar-source-version-is-deprecated)
+ * Check for necessary changes regarding policy version 3.7.3.0, there where
+ none, so upgrading debian/control
+ * Fix init script LSB header (closes: 470110)
+ * Update logcheck rules and the rule filenames (closes: 473526)
+ * Add finnish translation (Closes: 473792)
+ * Update galician translation (Closes: 473886)
+ * Add basque translation (Closes: 473914)
+ * add norwegian bokmal translation (Closes: 474360)
+ * Add patch to add sasl_{minimum,maximum}_layer details can be found
+ in libsasl documentation. (Closes: 402814)
+
+ -- Sven Mueller <sven at debian.org> Tue, 15 Apr 2008 12:37:26 +0200
+
kolab-cyrus-imapd (2.2.13-4) unstable; urgency=low
[ Benoit Mortier ]
Modified: kolab-cyrus-imapd/trunk/debian/control
===================================================================
--- kolab-cyrus-imapd/trunk/debian/control 2008-04-20 18:07:20 UTC (rev 797)
+++ kolab-cyrus-imapd/trunk/debian/control 2008-04-26 09:37:44 UTC (rev 798)
@@ -3,10 +3,11 @@
Priority: extra
Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Peter Eisentraut <petere at debian.org>
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4.1.68), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.2-dev (>= 4.2.52), libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, dpatch, transfig, gs, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64], heimdal-dev, libldap2-dev
+Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 4.1.68), dpatch, tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.2-dev (>= 4.2.52), libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, transfig, gs, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64], heimdal-dev, libldap2-dev
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/kolab-cyrus-imapd/trunk/
Vcs-Svn: svn://svn.debian.org/pkg-kolab/kolab-cyrus-imapd/trunk/
+Homepage: http://asg.web.cmu.edu/cyrus/
Package: kolab-cyrus-common
Architecture: any
@@ -42,10 +43,10 @@
Package: kolab-cyrus-imapd
Architecture: any
Section: mail
-Depends: kolab-cyrus-common (= ${Source-Version}), ${shlibs:Depends}
-Provides: imap-server
+Depends: kolab-cyrus-common (= ${binary:Version}), ${shlibs:Depends}
+Provides: imap-server, cyrus21-imapd, cyrus22-imapd
Conflicts: imap-server, cyrus21-imapd, cyrus-imapd-2.2
-Replaces: cyrus21-imapd
+Replaces: cyrus21-imapd, cyrus22-imapd
Description: Cyrus mail system (IMAP support)
This package contains the IMAP (Internet Mail Access Protocol) portion
of the Cyrus IMAPd suite.
@@ -56,10 +57,10 @@
Package: kolab-cyrus-pop3d
Architecture: any
Section: mail
-Depends: kolab-cyrus-common (= ${Source-Version}), ${shlibs:Depends}
-Provides: pop3-server
-Conflicts: pop3-server, cyrus21-pop3d, cyrus-pop3d-2.2
-Replaces: cyrus21-pop3d
+Depends: kolab-cyrus-common (= ${binary:Version}), ${shlibs:Depends}
+Provides: cyrus21-pop3d, cyrus22-pop3d, pop3-server
+Conflicts: cyrus21-pop3d, cyrus22-pop3d, pop3-server, cyrus-pop3d-2.2
+Replaces: cyrus21-pop3d, cyrus22-pop3d
Description: Cyrus mail system (POP3 support)
This package contains the POP3 (Post Office Protocol) portion of the Cyrus
IMAPd suite.
@@ -69,7 +70,7 @@
Package: kolab-cyrus-admin
Architecture: all
Section: mail
-Depends: kolab-libcyrus-imap-perl (>= ${Source-Version})
+Depends: kolab-libcyrus-imap-perl (>= ${source:Version})
Suggests: sasl2-bin
Conflicts: cyrus-admin, cyrus21-admin, cyrus-admin-2.2
Replaces: cyrus21-admin
Modified: kolab-cyrus-imapd/trunk/debian/cyrus-makedirs
===================================================================
--- kolab-cyrus-imapd/trunk/debian/cyrus-makedirs 2008-04-20 18:07:20 UTC (rev 797)
+++ kolab-cyrus-imapd/trunk/debian/cyrus-makedirs 2008-04-26 09:37:44 UTC (rev 798)
@@ -6,7 +6,7 @@
# Copyright 2001,2002 by Henrique de Moraes Holschuh <hmh at debian.org.
# Released under the terms of the GNU General Public License (GPL) version 2
#
-# $Id: cyrus-makedirs 725 2007-06-19 11:16:53Z astronut $
+# $Id: cyrus-makedirs 750 2007-12-17 02:53:15Z astronut $
# See lib/util.c, dir_hash_c for Cyrus' directory hashing
# for the new hash style
@@ -89,7 +89,7 @@
[ -d "$confdir/$i/$j" ] || mkdir "$confdir/$i/$j"
done
done
-find "$confdir" -not -user cyrus -or -not -group mail -exec chown cyrus:mail {} \;
+find "$confdir" -print0 \( -not -user cyrus -or -not -group mail \) | xargs -r -0 chown cyrus:mail
# Now, create the spool partitions
for i in $partitions ; do
@@ -102,7 +102,7 @@
done
}
[ -d "$i/stage." ] || mkdir "$i/stage."
- find "$i" -not -user cyrus -or -not -group mail -exec chown cyrus:mail {} \;
+ find "$i" -print0 \( -not -user cyrus -or -not -group mail \) | xargs -r -0 chown cyrus:mail
# and kill any squatter indexes
[ $killsquat -ne 0 ] && find "$i" -name 'cyrus.squat' -type f -exec rm -f "{}" \;
done
@@ -115,7 +115,7 @@
[ -d "$sievedir/$j" ] || mkdir "$sievedir/$j"
chmod 755 "$sievedir/$j"
done
- find "$sievedir" -not -user cyrus -or -not -group mail -exec chown cyrus:mail {} \;
+ find "$sievedir" -print0 \( -not -user cyrus -or -not -group mail \) | xargs -r -0 chown cyrus:mail
}
[ "x${CYRUSOPTFILESYS}" != "x1" ] && exit 0
Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.init
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.init 2008-04-20 18:07:20 UTC (rev 797)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.init 2008-04-26 09:37:44 UTC (rev 798)
@@ -2,10 +2,10 @@
#
### BEGIN INIT INFO
# Provides: kolab-cyrus-common
-# Required-Start: $syslog $network
-# Required-Stop: $syslog $network
+# Required-Start: $remote_fs $syslog $network
+# Required-Stop: $remote_fs $syslog $network
# Default-Start: 2 3 4 5
-# Default-Stop: S 0 1 6
+# Default-Stop: 0 1 6
# Short-Description: common init system for kolab-cyrus IMAP/POP3 daemons.
# Description: common init system for kolab-cyrus IMAP/POP3 daemons.
# start central kolab-cyrus master process, which can
@@ -20,7 +20,7 @@
# Various modifications done by Sven Mueller <debian at incase.de>
# Distributed under the GPL version 2
#
-# $Id: cyrus-common-2.2.cyrus2.2.init 729 2007-06-21 17:34:47Z astronut $
+# $Id: cyrus-common-2.2.cyrus2.2.init 759 2008-04-02 15:06:19Z sven $
# Make sure we get sane results on borked locales
LC_ALL=C
Modified: kolab-cyrus-imapd/trunk/debian/logcheck.ignore
===================================================================
--- kolab-cyrus-imapd/trunk/debian/logcheck.ignore 2008-04-20 18:07:20 UTC (rev 797)
+++ kolab-cyrus-imapd/trunk/debian/logcheck.ignore 2008-04-26 09:37:44 UTC (rev 798)
@@ -1,4 +1,3 @@
-
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: skiplist: recovered
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: skiplist: checkpointed
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: duplicate_prune: pruning
@@ -61,4 +60,5 @@
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: Delivered: <?[^ >]+>? +to mailbox: .*$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ perl: DIGEST-MD5 client step [0-9]$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: sieve redirected: <?[^ >]+>? +to: [._[:alnum:]-]+@[._[:alnum:]-]+$
-
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: duplicate_(check|mark): .*$
+
Modified: kolab-cyrus-imapd/trunk/debian/logcheck.violations.ignore
===================================================================
--- kolab-cyrus-imapd/trunk/debian/logcheck.violations.ignore 2008-04-20 18:07:20 UTC (rev 797)
+++ kolab-cyrus-imapd/trunk/debian/logcheck.violations.ignore 2008-04-26 09:37:44 UTC (rev 798)
@@ -1,8 +1,8 @@
-
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: WARNING: sieve script %s doesn't exist: [/a-zA-Z^]+/defaultbc: No such file or directory
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0-9]+\]: SQUAT failed to open index file$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0-9]+\]: SQUAT failed$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0-9]+\]: DBERROR db[34]: [0-9]+ lockers$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: (START)?TLS( negotiation)? failed:
-
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: duplicate_(check|mark): .*$
+
Modified: kolab-cyrus-imapd/trunk/debian/patches/00list
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/00list 2008-04-20 18:07:20 UTC (rev 797)
+++ kolab-cyrus-imapd/trunk/debian/patches/00list 2008-04-26 09:37:44 UTC (rev 798)
@@ -53,11 +53,14 @@
45-kolab2-annotations.dpatch
61-64bit-quota.dpatch
65-sieveshell-enhancements.dpatch
+70-fix_readme_link.dpatch
70-allow-larger-buffers.dpatch
72-faster-isdigit.dpatch
75-update-imapd.conf-documentation.dpatch
77-change-missing-sieve-notice.dpatch
80-kbsd-no-psstrings.dpatch
+85-fix-option-passing.dpatch
+90-add-sasl-options-docs.dpatch
# optional patch: Allow upload of mails with "From " headers
# 82-allow-from_-header.dpatch
99-update-autoconf.dpatch
Modified: kolab-cyrus-imapd/trunk/debian/patches/18-fix_strlen_return_type.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/18-fix_strlen_return_type.dpatch 2008-04-20 18:07:20 UTC (rev 797)
+++ kolab-cyrus-imapd/trunk/debian/patches/18-fix_strlen_return_type.dpatch 2008-04-26 09:37:44 UTC (rev 798)
@@ -6,9 +6,9 @@
## DP: strings.
@DPATCH@
-diff -urNad complete.dpatch/imap/imapd.c /tmp/dpep.2wtF9E/complete.dpatch/imap/imapd.c
---- complete.dpatch/imap/imapd.c 2005-11-11 16:17:00.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/imap/imapd.c 2005-11-11 16:17:00.679913340 +0100
+diff -urNad cyrus-imapd-2.2.13~/imap/imapd.c cyrus-imapd-2.2.13/imap/imapd.c
+--- cyrus-imapd-2.2.13~/imap/imapd.c 2008-04-15 13:11:16.498055004 +0200
++++ cyrus-imapd-2.2.13/imap/imapd.c 2008-04-15 13:11:16.650068029 +0200
@@ -6095,8 +6095,8 @@
memset(&tmp, 0, sizeof(struct buf));
memset(&user, 0, sizeof(struct buf));
@@ -127,9 +127,9 @@
} else {
prot_printf(imapd_out, "\"%s\"", s);
}
-diff -urNad complete.dpatch/imap/mbdump.c /tmp/dpep.2wtF9E/complete.dpatch/imap/mbdump.c
---- complete.dpatch/imap/mbdump.c 2005-11-11 16:16:59.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/imap/mbdump.c 2005-11-11 16:17:00.679913340 +0100
+diff -urNad cyrus-imapd-2.2.13~/imap/mbdump.c cyrus-imapd-2.2.13/imap/mbdump.c
+--- cyrus-imapd-2.2.13~/imap/mbdump.c 2008-04-15 13:11:16.338041293 +0200
++++ cyrus-imapd-2.2.13/imap/mbdump.c 2008-04-15 13:11:16.654068370 +0200
@@ -271,8 +271,8 @@
/* send filename, size, and contents */
@@ -185,9 +185,9 @@
(!tag ? "+" : ""),
ext_fname,
len,
-diff -urNad complete.dpatch/imap/message.c /tmp/dpep.2wtF9E/complete.dpatch/imap/message.c
---- complete.dpatch/imap/message.c 2005-11-11 16:17:00.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/imap/message.c 2005-11-11 16:17:00.681913145 +0100
+diff -urNad cyrus-imapd-2.2.13~/imap/message.c cyrus-imapd-2.2.13/imap/message.c
+--- cyrus-imapd-2.2.13~/imap/message.c 2008-04-15 13:11:16.546059116 +0200
++++ cyrus-imapd-2.2.13/imap/message.c 2008-04-15 13:11:16.654068370 +0200
@@ -2060,7 +2060,7 @@
if (*p || len >= 1024) {
/* Write out as literal */
@@ -197,9 +197,9 @@
message_ibuf_ensure(ibuf, strlen(s)+strlen(buf));
for (p = buf; *p; p++) *(ibuf->end)++ = *p;
for (p = s; *p; p++) *(ibuf->end)++ = *p;
-diff -urNad complete.dpatch/imap/mupdate-client.c /tmp/dpep.2wtF9E/complete.dpatch/imap/mupdate-client.c
---- complete.dpatch/imap/mupdate-client.c 2005-11-11 16:16:59.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/imap/mupdate-client.c 2005-11-11 16:17:00.681913145 +0100
+diff -urNad cyrus-imapd-2.2.13~/imap/mupdate-client.c cyrus-imapd-2.2.13/imap/mupdate-client.c
+--- cyrus-imapd-2.2.13~/imap/mupdate-client.c 2008-04-15 13:11:15.753991248 +0200
++++ cyrus-imapd-2.2.13/imap/mupdate-client.c 2008-04-15 13:11:16.654068370 +0200
@@ -330,9 +330,11 @@
if (!handle->saslcompleted) return MUPDATE_NOAUTH;
@@ -276,9 +276,9 @@
} else {
prot_printf(handle->pout,
"X%u LIST\r\n", handle->tagn++);
-diff -urNad complete.dpatch/imap/mupdate.c /tmp/dpep.2wtF9E/complete.dpatch/imap/mupdate.c
---- complete.dpatch/imap/mupdate.c 2005-11-11 16:16:59.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/imap/mupdate.c 2005-11-11 16:17:00.682913047 +0100
+diff -urNad cyrus-imapd-2.2.13~/imap/mupdate.c cyrus-imapd-2.2.13/imap/mupdate.c
+--- cyrus-imapd-2.2.13~/imap/mupdate.c 2008-04-15 13:11:15.753991248 +0200
++++ cyrus-imapd-2.2.13/imap/mupdate.c 2008-04-15 13:11:16.654068370 +0200
@@ -1613,20 +1613,20 @@
pthread_mutex_unlock(&mailboxes_mutex); /* UNLOCK */
@@ -334,10 +334,10 @@
break;
case SET_DELETE:
-diff -urNad complete.dpatch/imap/proxyd.c /tmp/dpep.2wtF9E/complete.dpatch/imap/proxyd.c
---- complete.dpatch/imap/proxyd.c 2005-11-11 16:17:00.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/imap/proxyd.c 2005-11-11 16:17:00.685912753 +0100
-@@ -2837,7 +2837,8 @@
+diff -urNad cyrus-imapd-2.2.13~/imap/proxyd.c cyrus-imapd-2.2.13/imap/proxyd.c
+--- cyrus-imapd-2.2.13~/imap/proxyd.c 2008-04-15 13:11:16.514056374 +0200
++++ cyrus-imapd-2.2.13/imap/proxyd.c 2008-04-15 13:11:16.654068370 +0200
+@@ -2841,7 +2841,8 @@
if (!r) {
int is_active = 1;
s->context = (void*) &is_active;
@@ -347,7 +347,7 @@
if (!(r = pipe_command(s, 16384))) {
pipe_until_tag(s, tag, 0);
}
-@@ -2913,8 +2914,8 @@
+@@ -2917,8 +2918,8 @@
return;
}
@@ -358,7 +358,7 @@
switch (pipe_including_tag(backend_current, tag, 0)) {
case PROXY_OK:
proc_register("proxyd", proxyd_clienthost, proxyd_userid, mailboxname);
-@@ -3144,8 +3145,9 @@
+@@ -3148,8 +3149,9 @@
r == 0 ? "[TRYCREATE] " : "", error_message(r));
} else if (s == backend_current) {
/* this is the easy case */
@@ -370,7 +370,7 @@
pipe_including_tag(backend_current, tag, 0);
} else {
char mytag[128];
-@@ -3306,7 +3308,8 @@
+@@ -3310,7 +3312,8 @@
}
/* start the append */
@@ -380,7 +380,7 @@
prot_printf(backend_current->out, "%s %s %s (Rfc822.peek)\r\n",
mytag, usinguid ? "Uid Fetch" : "Fetch", sequence);
for (/* each FETCH response */;;) {
-@@ -3551,8 +3554,8 @@
+@@ -3555,8 +3558,8 @@
if (!r) {
/* ok, send the create to that server */
@@ -391,7 +391,7 @@
res = pipe_including_tag(s, tag, 0);
tag = "*"; /* can't send another tagged response */
-@@ -3592,8 +3595,8 @@
+@@ -3596,8 +3599,8 @@
}
if (!r) {
@@ -402,7 +402,7 @@
res = pipe_including_tag(s, tag, 0);
tag = "*"; /* can't send another tagged response */
-@@ -3694,17 +3697,17 @@
+@@ -3698,17 +3701,17 @@
/* Cross Server */
/* <tag> XFER <name> <dest server> <dest partition> */
prot_printf(s->out,
@@ -427,7 +427,7 @@
}
res = pipe_including_tag(s, tag, 0);
-@@ -3720,9 +3723,9 @@
+@@ -3724,9 +3727,9 @@
/* do MUPDATE create operations for new mailbox */
}
@@ -440,7 +440,7 @@
res = pipe_including_tag(s, tag, 0);
tag = "*"; /* can't send another tagged response */
-@@ -3757,8 +3760,8 @@
+@@ -3761,8 +3764,8 @@
if (backend_inbox) {
prot_printf(backend_inbox->out,
@@ -451,7 +451,7 @@
pipe_lsub(backend_inbox, tag, 0, "MAILBOX");
} else { /* user doesn't have an INBOX */
/* noop */
-@@ -3827,9 +3830,9 @@
+@@ -3831,9 +3834,9 @@
if (backend_inbox) {
prot_printf(backend_inbox->out,
@@ -464,7 +464,7 @@
pipe_lsub(backend_inbox, tag, 0, (listopts & LIST_LSUB) ? "LSUB" : "LIST");
} else { /* user doesn't have an INBOX */
/* noop */
-@@ -3918,14 +3921,14 @@
+@@ -3922,14 +3925,14 @@
if (namespace) {
prot_printf(backend_inbox->out,
@@ -484,7 +484,7 @@
}
pipe_including_tag(backend_inbox, tag, 0);
} else {
-@@ -4157,15 +4160,15 @@
+@@ -4161,15 +4164,15 @@
} else if (!r) {
if (rights) {
prot_printf(s->out,
@@ -507,8 +507,8 @@
}
res = pipe_including_tag(s, tag, 0);
tag = "*"; /* can't send another tagged response */
-@@ -4265,8 +4268,8 @@
- if (!r) s = proxyd_findserver(server);
+@@ -4269,8 +4272,8 @@
+ s = proxyd_findserver(server);
if (s) {
- prot_printf(s->out, "%s Getquotaroot {%d+}\r\n%s\r\n",
@@ -518,7 +518,7 @@
pipe_including_tag(s, tag, 0);
} else {
r = IMAP_SERVER_UNAVAILABLE;
-@@ -4492,8 +4495,8 @@
+@@ -4495,8 +4498,8 @@
if (!r) s = proxyd_findserver(server);
if (!r && !s) r = IMAP_SERVER_UNAVAILABLE;
if (!r) {
@@ -529,7 +529,7 @@
if (!pipe_command(s, 65536)) {
pipe_until_tag(s, tag, 0);
}
-@@ -4633,7 +4636,7 @@
+@@ -4636,7 +4639,7 @@
/* if it's too long, literal it */
if (*p || len >= 1024) {
@@ -538,7 +538,7 @@
} else {
prot_printf(proxyd_out, "\"%s\"", s);
}
-@@ -4661,7 +4664,7 @@
+@@ -4664,7 +4667,7 @@
/* if it's too long, literal it */
if (*p || len >= 1024) {
@@ -547,9 +547,9 @@
} else {
prot_printf(proxyd_out, "\"%s\"", s);
}
-diff -urNad complete.dpatch/imtest/imtest.c /tmp/dpep.2wtF9E/complete.dpatch/imtest/imtest.c
---- complete.dpatch/imtest/imtest.c 2005-11-11 16:17:00.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/imtest/imtest.c 2005-11-11 17:01:17.683492575 +0100
+diff -urNad cyrus-imapd-2.2.13~/imtest/imtest.c cyrus-imapd-2.2.13/imtest/imtest.c
+--- cyrus-imapd-2.2.13~/imtest/imtest.c 2008-04-15 13:11:16.518056717 +0200
++++ cyrus-imapd-2.2.13/imtest/imtest.c 2008-04-15 13:11:16.654068370 +0200
@@ -624,14 +624,14 @@
return (ret);
@@ -569,7 +569,7 @@
argi, ret, (unsigned int) ret);
tls_dump(argp, (int) ret);
}
-@@ -1771,7 +1771,8 @@
+@@ -1778,7 +1778,8 @@
{
int lup;
@@ -579,10 +579,10 @@
/* do normal header foo */
prot_printf(pout,HEADERS);
-diff -urNad complete.dpatch/master/master.c /tmp/dpep.2wtF9E/complete.dpatch/master/master.c
---- complete.dpatch/master/master.c 2005-11-11 16:17:00.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/master/master.c 2005-11-11 16:17:00.688912460 +0100
-@@ -1888,7 +1888,7 @@
+diff -urNad cyrus-imapd-2.2.13~/master/master.c cyrus-imapd-2.2.13/master/master.c
+--- cyrus-imapd-2.2.13~/master/master.c 2008-04-15 13:11:16.534058088 +0200
++++ cyrus-imapd-2.2.13/master/master.c 2008-04-15 13:11:16.658068714 +0200
+@@ -1883,7 +1883,7 @@
}
/* Write PID */
@@ -591,9 +591,9 @@
if(lseek(pidfd, 0, SEEK_SET) == -1 ||
ftruncate(pidfd, 0) == -1 ||
write(pidfd, buf, strlen(buf)) == -1) {
-diff -urNad complete.dpatch/timsieved/actions.c /tmp/dpep.2wtF9E/complete.dpatch/timsieved/actions.c
---- complete.dpatch/timsieved/actions.c 2005-11-11 16:16:59.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/timsieved/actions.c 2005-11-11 16:17:00.688912460 +0100
+diff -urNad cyrus-imapd-2.2.13~/timsieved/actions.c cyrus-imapd-2.2.13/timsieved/actions.c
+--- cyrus-imapd-2.2.13~/timsieved/actions.c 2008-04-15 13:11:15.757991591 +0200
++++ cyrus-imapd-2.2.13/timsieved/actions.c 2008-04-15 13:11:16.658068714 +0200
@@ -364,7 +364,8 @@
if (result != TIMSIEVE_OK) {
Deleted: kolab-cyrus-imapd/trunk/debian/patches/20-drac_auth.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/20-drac_auth.dpatch 2008-04-20 18:07:20 UTC (rev 797)
+++ kolab-cyrus-imapd/trunk/debian/patches/20-drac_auth.dpatch 2008-04-26 09:37:44 UTC (rev 798)
@@ -1,295 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_drac_auth.dpatch by Sven Mueller <debian at incase.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Enable DRAC (pop-before-smtp) authentication
-
- at DPATCH@
-diff -urNad cyrus-imapd-2.2.13/configure.in /tmp/dpep.ikKBvZ/cyrus-imapd-2.2.13/configure.in
---- cyrus-imapd-2.2.13/configure.in 2006-09-14 22:52:27.000000000 +0200
-+++ /tmp/dpep.ikKBvZ/cyrus-imapd-2.2.13/configure.in 2006-09-14 22:52:28.341085956 +0200
-@@ -974,6 +974,19 @@
- SNMP_SUBDIRS=""
- AC_SUBST(SNMP_SUBDIRS)
-
-+dnl
-+dnl Test for DRAC
-+dnl
-+DRACLIBS=
-+AC_ARG_WITH(drac, [ --with-drac=DIR use DRAC library in <DIR> [no] ],
-+ if test -d "$withval"; then
-+ LDFLAGS="$LDFLAGS -L${withval}"
-+ AC_CHECK_LIB(drac, dracauth,
-+ AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?])
-+ DRACLIBS="-ldrac")
-+ fi)
-+AC_SUBST(DRACLIBS)
-+
- CMU_LIBWRAP
- CMU_UCDSNMP
-
-diff -urNad cyrus-imapd-2.2.13/imap/Makefile.in /tmp/dpep.ikKBvZ/cyrus-imapd-2.2.13/imap/Makefile.in
---- cyrus-imapd-2.2.13/imap/Makefile.in 2006-09-14 22:52:27.000000000 +0200
-+++ /tmp/dpep.ikKBvZ/cyrus-imapd-2.2.13/imap/Makefile.in 2006-09-14 22:52:28.344085662 +0200
-@@ -69,6 +69,7 @@
- SIEVE_LIBS = @SIEVE_LIBS@
- IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
- LIB_WRAP = @LIB_WRAP@
-+DRAC_LIBS = @DRACLIBS@
- LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
- DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-
-@@ -217,17 +218,17 @@
- imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- $(CC) $(LDFLAGS) -o imapd \
- $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
-- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
-
- imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
- $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
-- $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
-
- imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
- $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
-- $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) $(DRAC_LIBS)
-
- proxyd: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- $(CC) $(LDFLAGS) -o proxyd \
-@@ -254,7 +255,7 @@
-
- pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- $(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
-- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
-
- nntpd: nntpd.o backend.o index.o smtpclient.o spool.o tls.o \
- mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
-diff -urNad cyrus-imapd-2.2.13/imap/imapd.c /tmp/dpep.ikKBvZ/cyrus-imapd-2.2.13/imap/imapd.c
---- cyrus-imapd-2.2.13/imap/imapd.c 2006-09-14 22:52:27.000000000 +0200
-+++ /tmp/dpep.ikKBvZ/cyrus-imapd-2.2.13/imap/imapd.c 2006-09-14 22:52:28.348085270 +0200
-@@ -138,6 +138,18 @@
- 1, 1, &imapd_authstate, &imapd_userisadmin, &imapd_userisproxyadmin
- };
-
-+#ifdef DRAC_AUTH
-+static struct {
-+ int interval; /* dracd "ping" interval; 0 = disabled */
-+ unsigned long clientaddr;
-+ struct prot_waitevent *event;
-+} drac;
-+
-+extern int dracconn(char *server, char **errmsg);
-+extern int dracsend(unsigned long userip, char **errmsg);
-+extern int dracdisc(char **errmsg);
-+#endif /* DRAC_AUTH */
-+
- /* current sub-user state */
- static struct mailbox mboxstruct;
- static struct mailbox *imapd_mailbox;
-@@ -560,6 +572,23 @@
- /* setup for sending IMAP IDLE notifications */
- idle_enabled();
-
-+#ifdef DRAC_AUTH
-+ /* setup for sending DRAC "pings" */
-+ drac.event = NULL;
-+ drac.interval = config_getint(IMAPOPT_DRACINTERVAL);
-+ if (drac.interval < 0) drac.interval = 0;
-+ if (drac.interval) {
-+ char *err;
-+
-+ if (dracconn((char*) config_getstring(IMAPOPT_DRACHOST), &err) != 0) {
-+ /* disable DRAC */
-+ drac.interval = 0;
-+ syslog(LOG_ERR, "dracconn: %s", err);
-+ syslog(LOG_ERR, "DRAC notifications disabled");
-+ }
-+ }
-+#endif /* DRAC_AUTH */
-+
- /* create connection to the SNMP listener, if available. */
- snmp_connect(); /* ignore return code */
- snmp_set_str(SERVER_NAME_VERSION,CYRUS_VERSION);
-@@ -652,6 +681,15 @@
- imapd_haveaddr = 1;
- }
- }
-+
-+#ifdef DRAC_AUTH
-+ if (((struct sockaddr *)&imapd_remoteaddr)->sa_family == AF_INET)
-+ drac.clientaddr = ((struct sockaddr_in *)&imapd_remoteaddr)->sin_addr.s_addr;
-+ else
-+ drac.clientaddr = 0;
-+ } else {
-+ drac.clientaddr = 0;
-+#endif /* DRAC_AUTH */
- }
-
- /* create the SASL connection */
-@@ -694,6 +732,11 @@
- prot_flush(imapd_out);
- snmp_increment(ACTIVE_CONNECTIONS, -1);
-
-+#ifdef DRAC_AUTH
-+ if (drac.event) prot_removewaitevent(imapd_in, drac.event);
-+ drac.event = NULL;
-+#endif /* DRAC_AUTH */
-+
- /* cleanup */
- imapd_reset();
-
-@@ -774,6 +817,10 @@
-
- cyrus_done();
-
-+#ifdef DRAC_AUTH
-+ if (drac.interval) (void) dracdisc((char **)NULL);
-+#endif /* DRAC_AUTH */
-+
- exit(code);
- }
-
-@@ -811,6 +858,35 @@
- shut_down(code);
- }
-
-+#ifdef DRAC_AUTH
-+/*
-+ * Ping dracd every 'drac.interval' minutes
-+ * to let it know that we are still connected
-+ */
-+struct prot_waitevent *drac_ping(struct protstream *s,
-+ struct prot_waitevent *ev, void *rock)
-+{
-+ char *err;
-+ static int nfailure = 0;
-+
-+ if (dracsend(drac.clientaddr, &err) != 0) {
-+ syslog(LOG_ERR, "dracsend: %s", err);
-+ if (++nfailure >= 3) {
-+ /* can't contact dracd for 3 consecutive tries - disable DRAC */
-+ prot_removewaitevent(s, ev);
-+ drac.event = NULL;
-+ syslog(LOG_ERR, "DRAC notifications disabled");
-+ return NULL;
-+ }
-+ }
-+ else
-+ nfailure = 0;
-+
-+ ev->mark = time(NULL) + (drac.interval * 60);
-+ return ev;
-+}
-+#endif /* DRAC_AUTH */
-+
- /*
- * Top-level command loop parsing
- */
-@@ -1851,6 +1927,11 @@
-
- prot_printf(imapd_out, "%s OK %s\r\n", tag, reply);
-
-+#ifdef DRAC_AUTH
-+ if (drac.interval && drac.clientaddr)
-+ drac.event = prot_addwaitevent(imapd_in, 0 /* now */, drac_ping, NULL);
-+#endif /* DRAC_AUTH */
-+
- /* Create telemetry log */
- imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out, 0);
-
-@@ -1999,6 +2080,11 @@
- prot_setsasl(imapd_in, imapd_saslconn);
- prot_setsasl(imapd_out, imapd_saslconn);
-
-+#ifdef DRAC_AUTH
-+ if (drac.interval && drac.clientaddr)
-+ drac.event = prot_addwaitevent(imapd_in, 0 /* now */, drac_ping, NULL);
-+#endif /* DRAC_AUTH */
-+
- /* Create telemetry log */
- imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out, 0);
-
-diff -urNad cyrus-imapd-2.2.13/imap/pop3d.c /tmp/dpep.ikKBvZ/cyrus-imapd-2.2.13/imap/pop3d.c
---- cyrus-imapd-2.2.13/imap/pop3d.c 2006-09-14 22:52:27.000000000 +0200
-+++ /tmp/dpep.ikKBvZ/cyrus-imapd-2.2.13/imap/pop3d.c 2006-09-14 22:52:28.360084093 +0200
-@@ -100,6 +100,10 @@
- extern int opterr;
-
-
-+#ifdef DRAC_AUTH
-+static int drac_enabled;
-+extern int dracauth(char *server, unsigned long userip, char **errmsg);
-+#endif /* DRAC_AUTH */
-
- #ifdef HAVE_SSL
- static SSL *tls_conn;
-@@ -408,6 +412,10 @@
- prot_settimeout(popd_in, timeout*60);
- prot_setflushonread(popd_in, popd_out);
-
-+#ifdef DRAC_AUTH
-+ drac_enabled = (config_getint(IMAPOPT_DRACINTERVAL) > 0);
-+#endif /* DRAC_AUTH */
-+
- if (kflag) kpop();
-
- /* we were connected on pop3s port so we should do
-@@ -1456,6 +1464,21 @@
- popd_mailbox = &mboxstruct;
- proc_register("pop3d", popd_clienthost, popd_userid,
- popd_mailbox->name);
-+
-+#ifdef DRAC_AUTH
-+ if (drac_enabled &&
-+ ((struct sockaddr *)&popd_remoteaddr)->sa_family == AF_INET) {
-+ char *err;
-+
-+ if (dracauth((char*) config_getstring(IMAPOPT_DRACHOST),
-+ ((struct sockaddr_in *)&popd_remoteaddr)->sin_addr.s_addr, &err) != 0) {
-+ /* disable DRAC */
-+ drac_enabled = 0;
-+ syslog(LOG_ERR, "dracauth: %s", err);
-+ syslog(LOG_ERR, "DRAC notifications disabled");
-+ }
-+ }
-+#endif /* DRAC_AUTH */
- }
-
- /* Create telemetry log */
-diff -urNad cyrus-imapd-2.2.13/imap/version.c /tmp/dpep.ikKBvZ/cyrus-imapd-2.2.13/imap/version.c
---- cyrus-imapd-2.2.13/imap/version.c 2006-09-14 22:40:12.000000000 +0200
-+++ /tmp/dpep.ikKBvZ/cyrus-imapd-2.2.13/imap/version.c 2006-09-14 22:52:28.363083799 +0200
-@@ -151,6 +151,10 @@
- snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
- "; %s", SIEVE_VERSION);
- #endif
-+#ifdef DRAC_AUTH
-+ snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
-+ "; DRAC");
-+#endif
- #ifdef HAVE_LIBWRAP
- snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
- "; TCP Wrappers");
-diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.ikKBvZ/cyrus-imapd-2.2.13/lib/imapoptions
---- cyrus-imapd-2.2.13/lib/imapoptions 2006-09-14 22:52:27.000000000 +0200
-+++ /tmp/dpep.ikKBvZ/cyrus-imapd-2.2.13/lib/imapoptions 2006-09-14 22:52:28.364083701 +0200
-@@ -199,6 +199,14 @@
- { "deleteright", "c", STRING }
- /* The right that a user needs to delete a mailbox. */
-
-+{ "dracinterval", 0, INT }
-+/* If nonzero, enables the use of DRAC (Dynamic Relay Authorization
-+ Control) by the pop3d and imapd daemons. Also sets the interval
-+ (in minutes) between re-authorization requests made by imapd. */
-+
-+{ "drachost", "localhost", STRING }
-+/* Hostname of the RPC dracd server. */
-+
- { "duplicate_db", "berkeley-nosync", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist")}
- /* The cyrusdb backend to use for the duplicate delivery suppression
- and sieve. */
Modified: kolab-cyrus-imapd/trunk/debian/patches/21-fix_config-parsing.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/21-fix_config-parsing.dpatch 2008-04-20 18:07:20 UTC (rev 797)
+++ kolab-cyrus-imapd/trunk/debian/patches/21-fix_config-parsing.dpatch 2008-04-26 09:37:44 UTC (rev 798)
@@ -5,9 +5,9 @@
## DP: Fix parsing of master.conf
@DPATCH@
-diff -urNad complete.dpatch/master/masterconf.c /tmp/dpep.CfovCR/complete.dpatch/master/masterconf.c
---- complete.dpatch/master/masterconf.c 2005-11-11 15:25:37.000000000 +0100
-+++ /tmp/dpep.CfovCR/complete.dpatch/master/masterconf.c 2005-11-11 15:27:02.084797577 +0100
+diff -urNad cyrus-imapd-2.2.13~/master/masterconf.c cyrus-imapd-2.2.13/master/masterconf.c
+--- cyrus-imapd-2.2.13~/master/masterconf.c 2008-04-15 13:11:50.700985663 +0200
++++ cyrus-imapd-2.2.13/master/masterconf.c 2008-04-15 13:11:50.852998693 +0200
@@ -150,8 +150,13 @@
const char *val = masterconf_getstring(e, key, NULL);
Modified: kolab-cyrus-imapd/trunk/debian/patches/22-imapd_index_check.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/22-imapd_index_check.dpatch 2008-04-20 18:07:20 UTC (rev 797)
+++ kolab-cyrus-imapd/trunk/debian/patches/22-imapd_index_check.dpatch 2008-04-26 09:37:44 UTC (rev 798)
@@ -5,10 +5,10 @@
## DP: Fix usage of index_check()
@DPATCH@
-diff -urNad complete.dpatch/imap/imapd.c /tmp/dpep.SYrYMP/complete.dpatch/imap/imapd.c
---- complete.dpatch/imap/imapd.c 2005-11-11 16:01:19.000000000 +0100
-+++ /tmp/dpep.SYrYMP/complete.dpatch/imap/imapd.c 2005-11-11 16:01:37.190206572 +0100
-@@ -3175,8 +3175,8 @@
+diff -urNad cyrus-imapd-2.2.13~/imap/imapd.c cyrus-imapd-2.2.13/imap/imapd.c
+--- cyrus-imapd-2.2.13~/imap/imapd.c 2008-04-15 13:12:21.487623592 +0200
++++ cyrus-imapd-2.2.13/imap/imapd.c 2008-04-15 13:12:21.703642098 +0200
+@@ -3125,8 +3125,8 @@
if (usinguid) {
fetchitems |= FETCH_UID;
@@ -18,7 +18,7 @@
fetchargs.fetchitems = fetchitems;
r = index_fetch(imapd_mailbox, sequence, usinguid, &fetchargs,
-@@ -3191,6 +3191,9 @@
+@@ -3141,6 +3141,9 @@
} else if (fetchedsomething || usinguid) {
prot_printf(imapd_out, "%s OK %s (%s sec)\r\n", tag,
error_message(IMAP_OK_COMPLETED), mytime);
@@ -28,7 +28,7 @@
} else {
/* normal FETCH, nothing came back */
prot_printf(imapd_out, "%s NO %s (%s sec)\r\n", tag,
-@@ -3309,7 +3312,8 @@
+@@ -3259,7 +3262,8 @@
index_fetch(imapd_mailbox, msgno, 0, &fetchargs, &fetchedsomething);
@@ -38,7 +38,7 @@
if (fetchedsomething) {
prot_printf(imapd_out, "%s OK %s\r\n", tag,
-@@ -3441,7 +3445,9 @@
+@@ -3391,7 +3395,9 @@
r = index_store(imapd_mailbox, sequence, usinguid, &storeargs,
flag, nflags);
Modified: kolab-cyrus-imapd/trunk/debian/patches/24-configurable-referrals.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/24-configurable-referrals.dpatch 2008-04-20 18:07:20 UTC (rev 797)
+++ kolab-cyrus-imapd/trunk/debian/patches/24-configurable-referrals.dpatch 2008-04-26 09:37:44 UTC (rev 798)
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad cyrus-imapd-2.2.13~/imap/proxyd.c cyrus-imapd-2.2.13/imap/proxyd.c
---- cyrus-imapd-2.2.13~/imap/proxyd.c 2007-06-22 17:16:23.000000000 +0100
-+++ cyrus-imapd-2.2.13/imap/proxyd.c 2007-06-22 17:16:52.000000000 +0100
+--- cyrus-imapd-2.2.13~/imap/proxyd.c 2008-04-15 13:12:51.542198785 +0200
++++ cyrus-imapd-2.2.13/imap/proxyd.c 2008-04-15 13:12:51.670209745 +0200
@@ -1161,7 +1161,7 @@
/* Cleanup Globals */
@@ -17,7 +17,7 @@
supports_referrals = 0;
proxyd_userisadmin = 0;
proxyd_starttls_done = 0;
-@@ -2769,6 +2769,10 @@
+@@ -2776,6 +2776,10 @@
prot_printf(proxyd_out, "* CAPABILITY ");
prot_printf(proxyd_out, CAPABILITY_STRING);
@@ -29,8 +29,8 @@
prot_printf(proxyd_out, " IDLE");
}
diff -urNad cyrus-imapd-2.2.13~/imap/version.h cyrus-imapd-2.2.13/imap/version.h
---- cyrus-imapd-2.2.13~/imap/version.h 2007-06-22 17:04:30.000000000 +0100
-+++ cyrus-imapd-2.2.13/imap/version.h 2007-06-22 17:16:52.000000000 +0100
+--- cyrus-imapd-2.2.13~/imap/version.h 2008-04-15 13:12:50.766132285 +0200
++++ cyrus-imapd-2.2.13/imap/version.h 2008-04-15 13:12:51.670209745 +0200
@@ -55,7 +55,7 @@
/* CAPABILITIES are now defined here, not including sasl ones */
@@ -41,9 +41,9 @@
"CHILDREN MULTIAPPEND BINARY " \
"SORT THREAD=ORDEREDSUBJECT THREAD=REFERENCES " \
diff -urNad cyrus-imapd-2.2.13~/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
---- cyrus-imapd-2.2.13~/lib/imapoptions 2007-06-22 17:16:22.000000000 +0100
-+++ cyrus-imapd-2.2.13/lib/imapoptions 2007-06-22 17:16:52.000000000 +0100
-@@ -653,6 +653,10 @@
+--- cyrus-imapd-2.2.13~/lib/imapoptions 2008-04-15 13:12:51.570201186 +0200
++++ cyrus-imapd-2.2.13/lib/imapoptions 2008-04-15 13:12:51.670209745 +0200
+@@ -668,6 +668,10 @@
connections that these referrals would cause, thus resulting in a higher
authentication load on the respective backend server. */
Deleted: kolab-cyrus-imapd/trunk/debian/patches/60-lower-poptimeout-minimum.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/60-lower-poptimeout-minimum.dpatch 2008-04-20 18:07:20 UTC (rev 797)
+++ kolab-cyrus-imapd/trunk/debian/patches/60-lower-poptimeout-minimum.dpatch 2008-04-26 09:37:44 UTC (rev 798)
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40-lower-poptimeout-minimum.dpatch by Sven Mueller <debian at incase.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Lower the minimum timeout for POP3 locks
-## DP: NOTE: Though this patch enables you to lower POP3 lock timeouts to
-## DP: less than 10 minutes, the corresponding RFC REQUIRES that the timeout
-## DP: is not shorter than 10 minutes. You may run into problems if you set
-## DP: Timeouts below that value.
-
- at DPATCH@
-diff -urNad cyrus-imapd-2.2.12/imap/pop3d.c /tmp/dpep.6Vbjgo/cyrus-imapd-2.2.12/imap/pop3d.c
---- cyrus-imapd-2.2.12/imap/pop3d.c 2005-05-25 00:07:42.000000000 +0200
-+++ /tmp/dpep.6Vbjgo/cyrus-imapd-2.2.12/imap/pop3d.c 2005-07-15 16:53:38.168045663 +0200
-@@ -402,7 +402,7 @@
-
- /* Set inactivity timer */
- timeout = config_getint(IMAPOPT_POPTIMEOUT);
-- if (timeout < 10) timeout = 10;
-+ if (timeout < 1) timeout = 1;
- prot_settimeout(popd_in, timeout*60);
- prot_setflushonread(popd_in, popd_out);
-
-diff -urNad cyrus-imapd-2.2.12/lib/imapoptions /tmp/dpep.6Vbjgo/cyrus-imapd-2.2.12/lib/imapoptions
---- cyrus-imapd-2.2.12/lib/imapoptions 2005-05-25 00:07:42.000000000 +0200
-+++ /tmp/dpep.6Vbjgo/cyrus-imapd-2.2.12/lib/imapoptions 2005-07-15 16:57:59.646502208 +0200
-@@ -601,7 +601,9 @@
-
- { "poptimeout", 10, INT }
- /* Set the length of the POP server's inactivity autologout timer,
-- in minutes. The minimum value is 10, the default. */
-+ in minutes. The minimum value is 1, the default is 10.
-+ NOTE: The standard (RFC1939) specifically states that this
-+ value MUST NOT be lower than 10.*/
-
- { "popuseacl", 0, SWITCH }
- /* Enforce IMAP ACLs in the pop server. Due to the nature of the POP3
Added: kolab-cyrus-imapd/trunk/debian/patches/85-fix-option-passing.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/85-fix-option-passing.dpatch (rev 0)
+++ kolab-cyrus-imapd/trunk/debian/patches/85-fix-option-passing.dpatch 2008-04-26 09:37:44 UTC (rev 798)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 85-fix-option-passing.dpatch by Sven Mueller <sven at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/lib/Makefile.in cyrus-imapd-2.2.13/lib/Makefile.in
+--- cyrus-imapd-2.2.13~/lib/Makefile.in 2007-08-06 21:16:23.419137227 +0200
++++ cyrus-imapd-2.2.13/lib/Makefile.in 2007-08-06 21:23:51.158077242 +0200
+@@ -134,7 +134,7 @@
+ $(RANLIB) libcyrus_min.a
+
+ imapopts.c: imapoptions $(srcdir)/../tools/config2header
+- sed -e "s/%IDLE%/$(IDLE)/g" < $(srcdir)/imapoptions | $(srcdir)/../tools/config2header CC=$(CC) $(srcdir)/imapopts.c $(srcdir)/imapopts.h
++ sed -e "s/%IDLE%/$(IDLE)/g" < $(srcdir)/imapoptions | $(srcdir)/../tools/config2header CC="$(CC)" $(srcdir)/imapopts.c $(srcdir)/imapopts.h
+
+ imapopts.h: imapopts.c
+
Added: kolab-cyrus-imapd/trunk/debian/patches/90-add-sasl-options-docs.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/90-add-sasl-options-docs.dpatch (rev 0)
+++ kolab-cyrus-imapd/trunk/debian/patches/90-add-sasl-options-docs.dpatch 2008-04-26 09:37:44 UTC (rev 798)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90-add-sasl-options-docs.dpatch by Sven Mueller <sven at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
+--- cyrus-imapd-2.2.13~/lib/imapoptions 2008-04-15 12:59:05.287411927 +0200
++++ cyrus-imapd-2.2.13/lib/imapoptions 2008-04-15 12:59:05.403421868 +0200
+@@ -755,12 +755,15 @@
+
+ { "sasl_maximum_layer", 256, INT }
+ /* Maximum SSF (security strength factor) that the server will allow a
+- client to negotiate. */
++ client to negotiate. This corresponds to the max_ssf option of libsasl.
++ Please check the libsasl documentation for available values. */
+
+ { "sasl_minimum_layer", 0, INT }
+ /* The minimum SSF that the server will allow a client to negotiate.
+- A value of 1 requires integrity protection; any higher value
+- requires some amount of encryption. */
++ A value of 1 requires integrity protection (i.e. checksums); any higher
++ value requires some amount of encryption. This corresponds to the min_ssf
++ option of libsasl. Please check libsasl documentation for available
++ values. */
+
+ # Commented out - used by libsasl
+ # { "sasl_option", 0, STRING }
Added: kolab-cyrus-imapd/trunk/debian/po/eu.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/eu.po (rev 0)
+++ kolab-cyrus-imapd/trunk/debian/po/eu.po 2008-04-26 09:37:44 UTC (rev 798)
@@ -0,0 +1,89 @@
+# AUTOMATICALLY GENERATED -- send updates to cyrus-imapd-2.2 package
+# translation of cyrus-imapd-2.2-eu.po to Euskara
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Piarres Beobide <pi at beobide.net>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2-eu\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
+"POT-Creation-Date: 2008-03-31 19:51+0200\n"
+"PO-Revision-Date: 2008-04-02 11:52+0200\n"
+"Last-Translator: Piarres Beobide <pi at beobide.net>\n"
+"Language-Team: Euskara <debian-l10n-basque at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:1001
+msgid "Database backends have changed!"
+msgstr "Datubase interfazea aldatu egin da!"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:1001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"/usr/lib/cyrus/cyrus-db-types.txt eta /usr/lib/cyrus/cyrus-db-types.active "
+"arteko parekatzeak Cyrus IMAPd-en datubase interfazea aldatu dela erakusten "
+"du."
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:1001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Honek datubase interfazea aldatu diren datubaseetan formatu berrira "
+"cvt_cyrusdb(8) lanabesa erabiliaz eskuzko bihurketa bat egin behar dela esan "
+"nahi du."
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:1001
+msgid ""
+"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
+"more information. Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Mesedez begiratu /usr/share/doc/kolab-cyrus-common/README.Debian.database "
+"argibide gehiagorako. Ez cyrmaster abiarazi datubasea formatu berrira "
+"bihurtu arte."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Remove the mail and news spools?"
+msgstr "Eposta eta ilara berriak ezabatu?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"removed when the package is purged."
+msgstr ""
+"Cyrus posta eta ilara berriak, baita erabiltzaileren sieve script-ak ere "
+"ezabatu egin daitezke paketea garbitzerakoan."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var. If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Galdera honek /var direktorioko lehenetsiriko ilara eta sieve script-ei "
+"bakarrik dagokie. Zuk horien kokapena imapd-con fitxategian aldatu baduzu, "
+"kokaleku berriaz ez dira ezabatu, /var-en daudenak zaharrak bakarrik "
+"ezabatuko dira."
Added: kolab-cyrus-imapd/trunk/debian/po/fi.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/fi.po (rev 0)
+++ kolab-cyrus-imapd/trunk/debian/po/fi.po 2008-04-26 09:37:44 UTC (rev 798)
@@ -0,0 +1,83 @@
+# AUTOMATICALLY GENERATED -- send updates to cyrus-imapd-2.2 package
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
+"POT-Creation-Date: 2008-03-31 19:51+0200\n"
+"PO-Revision-Date: 2008-04-01 20:14+0200\n"
+"Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Finnish\n"
+"X-Poedit-Country: FINLAND\n"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:1001
+msgid "Database backends have changed!"
+msgstr "Tietokantojen taustaosat ovat vaihtuneet!"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:1001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Tiedostojen /usr/lib/cyrus/cyrus-db-types.txt ja /usr/lib/cyrus/cyrus-db-"
+"types.active vertailu osoittaa, että Cyrus IMAPdin tietokantojen taustaosat "
+"on vaihdettu."
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:1001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Tämä tarkoittaa, että tietokannat, joiden taustaosat ovat vaihtuneet, täytyy "
+"ehkä muuntaa käsin uuteen muotoon käyttäen työkalua cvt_cyrusdb(8)."
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:1001
+msgid ""
+"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
+"more information. Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Lisätietoja löytyy tiedostosta /usr/share/doc/kolab-cyrus-common/README."
+"Debian.database. Ohjelmaa cyrmaster ei tule käynnistää ennen kuin "
+"tietokannat on muuunnettu uuteen muotoon."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Remove the mail and news spools?"
+msgstr "Poistetaanko sähköposti- ja uutislaatikot?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"removed when the package is purged."
+msgstr ""
+"Cyrusin sähköposti-ja uutislaatikot samoin kuin käyttäjien sieve-"
+"komentosarjat voidaan poistaa, kun paketti siivotaan."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var. If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Tämä kysymys koskee vain oletuslaatikoita ja hakemistopuussa /var olevia "
+"sieve-komentosarjahakemistoja. Jos näiden sijaintia on muokattu tiedostossa "
+"imapd.conf, uusia ei poisteta, vain vanhat hakemistopuusta /var."
Modified: kolab-cyrus-imapd/trunk/debian/po/gl.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/gl.po 2008-04-20 18:07:20 UTC (rev 797)
+++ kolab-cyrus-imapd/trunk/debian/po/gl.po 2008-04-26 09:37:44 UTC (rev 798)
@@ -1,29 +1,29 @@
# AUTOMATICALLY GENERATED -- send updates to cyrus-imapd-2.2 package
-# Galician translation of cyrus-imapd-2.2's debconf templates
-# This file is distributed under the same license as the cyrus-imapd-2.2 package.
-# Jacobo Tarrio <jtarrio at debian.org>, 2007.
+# Galician translation of cyrus21-imapd's debconf templates
+# This file is distributed under the same license as the cyrus21-imapd package.
+# Jacobo Tarrio <jtarrio at debian.org>, 2007, 2008.
#
msgid ""
msgstr ""
-"Project-Id-Version: cyrus-imapd-2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-15 17:54+0200\n"
-"PO-Revision-Date: 2007-02-28 10:47+0100\n"
+"Project-Id-Version: cyrus21-imapd\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
+"POT-Creation-Date: 2008-03-31 19:51+0200\n"
+"PO-Revision-Date: 2008-04-02 06:39+0100\n"
"Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../cyrus-common-2.2.templates:3
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:1001
msgid "Database backends have changed!"
msgstr "Os motores de bases de datos cambiaron"
-#. Type: note
-#. Description
-#: ../cyrus-common-2.2.templates:3
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:1001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
@@ -33,9 +33,9 @@
"db-types.active amosa que os motores de bases de datos de Cyrus IMAPd "
"cambiaron."
-#. Type: note
-#. Description
-#: ../cyrus-common-2.2.templates:3
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:1001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
@@ -45,9 +45,13 @@
"cambiaron se teñan que converter manualmente ao novo formato, empregando a "
"utilidade cvt_cyrusdb(8)."
-#. Type: note
-#. Description
-#: ../cyrus-common-2.2.templates:3
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:1001
+#| msgid ""
+#| "Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database "
+#| "for more information. Do not start cyrmaster until you have converted "
+#| "the databases to the new format."
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
@@ -57,25 +61,29 @@
"información. Non inicie cyrmaster ata que teña convertido as bases de datos "
"ao novo formato."
-#. Type: boolean
-#. Description
-#: ../cyrus-common-2.2.templates:19
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+#| msgid "Remove the Cyrus spools, and user sieve scripts?"
msgid "Remove the mail and news spools?"
-msgstr "¿Borrar os directorios de traballo de correo e novas?"
+msgstr "¿Eliminar os directorios de correo e novas?"
-#. Type: boolean
-#. Description
-#: ../cyrus-common-2.2.templates:19
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+#| msgid ""
+#| "Should I remove the Cyrus mail and news spools, as well as the user's "
+#| "sieve scripts, when the package is purged ?"
msgid ""
"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
"removed when the package is purged."
msgstr ""
-"Pódense eliminar os directorios de traballo de correo e novas de Cyrus, así "
-"coma os scripts de sieve dos usuarios, ao purgar o paquete."
+"Pódense eliminar os directorios de correo e novas de Cyrus, así coma os "
+"scripts de sieve dos usuarios, ao purgar o paquete."
-#. Type: boolean
-#. Description
-#: ../cyrus-common-2.2.templates:19
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
Added: kolab-cyrus-imapd/trunk/debian/po/nb.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/nb.po (rev 0)
+++ kolab-cyrus-imapd/trunk/debian/po/nb.po 2008-04-26 09:37:44 UTC (rev 798)
@@ -0,0 +1,87 @@
+# AUTOMATICALLY GENERATED -- send updates to cyrus-imapd-2.2 package
+# translation of nb.po to Norwegian Bokmål
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Bjørn Steensrud <bjornst at skogkatt.homelinux.org>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: nb\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
+"POT-Creation-Date: 2008-03-31 19:51+0200\n"
+"PO-Revision-Date: 2008-04-05 11:27+0200\n"
+"Last-Translator: Bjørn Steensrud <bjornst at skogkatt.homelinux.org>\n"
+"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:1001
+msgid "Database backends have changed!"
+msgstr "Databasemotorene i bakgrunnen er endret!"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:1001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Sammenlikning mellom /usr/lib/cyrus/cyrus-db-types.txt og /usr/lib/cyrus/"
+"cyrus-db-types.active viser at databasemotorene for Cyrus IMAPd er endret."
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:1001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Dette betyr at det kan være nødvendig å konvertere til det nye formatet de "
+"databasene der bakgrunnsmotorene er endret. Det gjøres med verktøyet "
+"cvt_cyrusdb(8)."
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:1001
+msgid ""
+"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
+"more information. Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Se etter mer informasjon i /usr/share/doc/kolab-cyrus-common/README.Debian."
+"database. Ikke start cyrmaster før databasene er blitt konvertert til det "
+"nye formatet."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Remove the mail and news spools?"
+msgstr "Skal e-postlager og njuslagre fjernes?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"removed when the package is purged."
+msgstr ""
+"E-postlageret og njuslagrene til Cyrus, og også brukerens sieve-skripter, "
+"kan fjernes når pakka fjernes fullstendig."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var. If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Dette spørsmålet gjelder bare standard lagre og sieve-skripter i mapper "
+"under /var. Hvis de er gitt nye adresser i imapd.conf, så blir ikke de nye "
+"stedene ryddet, bare de gamle i /var."
Modified: kolab-cyrus-imapd/trunk/debian/po/pt.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/pt.po 2008-04-20 18:07:20 UTC (rev 797)
+++ kolab-cyrus-imapd/trunk/debian/po/pt.po 2008-04-26 09:37:44 UTC (rev 798)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: cyrus-imapd-2.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-15 17:54+0200\n"
-"PO-Revision-Date: 2007-02-03 22:27+0000\n"
+"POT-Creation-Date: 2007-08-24 14:47+0000\n"
+"PO-Revision-Date: 2007-08-24 21:32+0100\n"
"Last-Translator: Carlos Lisboa <carloslisboa at gmail.com>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
"MIME-Version: 1.0\n"
@@ -18,37 +18,36 @@
#. Type: note
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:1001
msgid "Database backends have changed!"
-msgstr "Os bastidores das bases de dados foram alterados!"
+msgstr "Os 'backends' das bases de dados foram alterados!"
#. Type: note
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:1001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
"changed."
msgstr ""
"Comparando /usr/lib/cyrus/cyrus-db-types.txt e /usr/lib/cyrus/cyrus-db-types."
-"active mostra que o bastidor da base de dados Cyrus IMAPd foi alterado."
+"active mostra que o 'backend' da base de dados Cyrus IMAPd foi alterado."
#. Type: note
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:1001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
"(8) utility."
msgstr ""
-"Isto significa que as bases de dados cujos bastidores foram alterados "
+"Isto significa que as bases de dados cujos 'backends' foram alterados "
"poderão necessitar de conversão manual para o novo formato, usando o "
"utilitário cvt_cyrusdb(8)."
#. Type: note
#. Description
-#: ../cyrus-common-2.2.templates:3
-#, fuzzy
+#: ../cyrus-common-2.2.templates:1001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
@@ -60,25 +59,23 @@
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
-#, fuzzy
+#: ../cyrus-common-2.2.templates:2001
msgid "Remove the mail and news spools?"
-msgstr "Remover os spools do Cyrus e usar os scripts de utilizador sieve?"
+msgstr "Remover os spools de e-mail e notícias (news)?"
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
-#, fuzzy
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
"removed when the package is purged."
msgstr ""
-"Deverei remover os spools de mail e news, assim como os scripts de "
-"utilizador sieve quando este pacote for purgado?"
+"Os spools de e-mail e notícias Cyrus, assim como os scripts sieve do "
+"utilizadorpodem ser removidos quando o pacote for purgado."
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
Modified: kolab-cyrus-imapd/trunk/debian/rules
===================================================================
--- kolab-cyrus-imapd/trunk/debian/rules 2008-04-20 18:07:20 UTC (rev 797)
+++ kolab-cyrus-imapd/trunk/debian/rules 2008-04-26 09:37:44 UTC (rev 798)
@@ -90,7 +90,7 @@
# This is done to make sure the build daemon's source tree is the
# same as the one I am using to produce the i386 debs.
clean: clean-patched unpatch
-clean-patched: configure
+clean-patched: configure-stamp
dh_testdir
dh_testroot
-xargs -t -r chmod +x < debian/executable.files
@@ -269,9 +269,9 @@
# and logcheck files
install -m 644 debian/logcheck.ignore \
- $(PKGDIR)/etc/logcheck/ignore.d.server/kolab-cyrus
+ $(PKGDIR)/etc/logcheck/ignore.d.server/logcheck-kolab-cyrus
install -m 644 debian/logcheck.violations.ignore \
- $(PKGDIR)/etc/logcheck/violations.ignore.d/kolab-cyrus
+ $(PKGDIR)/etc/logcheck/violations.ignore.d/logcheck-kolab-cyrus
# Install the stuff needed for upgrades
for i in convert-sieve.pl dohash rehash undohash translatesieve \
More information about the pkg-kolab-devel
mailing list