[pkg-kolab] r714 - in kolab-cyrus-imapd/trunk/debian: . patches po

petere at alioth.debian.org petere at alioth.debian.org
Fri Feb 22 14:11:58 UTC 2008 

Author: petere
Date: 2008-02-22 14:11:57 +0000 (Fri, 22 Feb 2008)
New Revision: 714

Added:
   kolab-cyrus-imapd/trunk/debian/patches/24-configurable-referrals.dpatch
Modified:
   kolab-cyrus-imapd/trunk/debian/README.Debian
   kolab-cyrus-imapd/trunk/debian/README.Debian.database
   kolab-cyrus-imapd/trunk/debian/changelog
   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/13-master_process_handling.dpatch
   kolab-cyrus-imapd/trunk/debian/po/cs.po
   kolab-cyrus-imapd/trunk/debian/po/nl.po
   kolab-cyrus-imapd/trunk/debian/po/sv.po
   kolab-cyrus-imapd/trunk/debian/po/vi.po
Log:
Synced against cyrus-imapd package


Modified: kolab-cyrus-imapd/trunk/debian/README.Debian
===================================================================
--- kolab-cyrus-imapd/trunk/debian/README.Debian	2008-01-06 12:50:40 UTC (rev 713)
+++ kolab-cyrus-imapd/trunk/debian/README.Debian	2008-02-22 14:11:57 UTC (rev 714)
@@ -19,7 +19,7 @@
 
 
 Cyrus IMAP for Debian
-$Id: README.Debian 578 2006-08-21 21:03:44Z sven $
+$Id: README.Debian 720 2007-05-28 01:48:39Z sven $
 ---------------------
 
    "All systems administrators have their horror stories. For me, it was
@@ -261,8 +261,8 @@
 
  o Sieveshell is really lacking on auth capabilities, and timsieved is quite
    strict on what auth capabilities it offers.  So, pay attention to
-   sasl_minimum_layer, and see bug #151925 for more details
-   (http://bugs.debian.org/151925).  Also, make sure you have the correct set
+   sasl_minimum_layer, and see bug #151295 for more details
+   (http://bugs.debian.org/151295).  Also, make sure you have the correct set
    of SASL2 modules installed in in your system.
 
  o uw-mailutils has some nice utilities to migrate mail stores from/to imap

Modified: kolab-cyrus-imapd/trunk/debian/README.Debian.database
===================================================================
--- kolab-cyrus-imapd/trunk/debian/README.Debian.database	2008-01-06 12:50:40 UTC (rev 713)
+++ kolab-cyrus-imapd/trunk/debian/README.Debian.database	2008-02-22 14:11:57 UTC (rev 714)
@@ -1,5 +1,5 @@
 Cyrus IMAP for Debian: Database backend conversion
-$Id: README.Debian.database 649 2006-10-09 17:07:53Z astronut $
+$Id: README.Debian.database 728 2007-06-19 15:18:11Z astronut $
 --------------------------------------------------
 
    "All systems administrators have their horror stories. For me, it was
@@ -73,6 +73,8 @@
    SUBS			/var/lib/cyrus/...../*.sub
    SEEN			/var/lib/cyrus/...../*.seen
 
+   For Cyrus 1.x versions, these files are in /var/spool/cyrus/...../
+
    SUBS contains the subscribed folders, and SEEN contains the seen state
    of every mail in a folder.
 

Modified: kolab-cyrus-imapd/trunk/debian/changelog
===================================================================
--- kolab-cyrus-imapd/trunk/debian/changelog	2008-01-06 12:50:40 UTC (rev 713)
+++ kolab-cyrus-imapd/trunk/debian/changelog	2008-02-22 14:11:57 UTC (rev 714)
@@ -6,9 +6,43 @@
   [ Peter Eisentraut ]
   * Upgrade to Kolab 2.1
     - Added imapd.folderchar.patch
+  * Synced against cyrus-imapd package
 
- -- Peter Eisentraut <petere at debian.org>  Sun, 17 Jun 2007 23:21:04 +0200
+ -- Peter Eisentraut <petere at debian.org>  Fri, 22 Feb 2008 15:02:30 +0100
 
+cyrus-imapd-2.2 (2.2.13-13) unstable; urgency=low
+
+  * Change messages and chown's in cyrus-makedirs (Use find instead)
+    (Closes: #404446, 411529)
+  * Fix logcheck rule to ignore nonexistant sieve scripts (Closes #416826)
+  * Update README.exim to something more debian specific. Thanks: Romain
+    Chantereau <romain at mezimail.com> and Steve Kemp <skx at debian.org>.
+    (Closes: #395504)
+  * Update README.Debian.databases. Along with other fixes from a long time
+    ago, this addresses almost all of the issues raised in an upgrade report.
+    (Closes: #409945)
+  * Add a patch by Andrew Morgan <morgan at orst.edu> that adds a config option
+    to disable referrals from frontends to backends
+
+ -- Benjamin Seidenberg <benjamin at debian.org>  Fri, 22 Jun 2007 16:50:45 +0100
+
+cyrus-imapd-2.2 (2.2.13-12) unstable; urgency=low
+
+  * The "This-would-be-a-lot-easier-if-Ross-Boylan-used-courier" Release
+
+  [ Sven Mueller ]
+  * Add rules to logcheck.violations.ignore, eliminating "SQUAT failed"
+    generic error message as far as logcheck is concerned.
+  * Fix bug number in README.Debian (151295, not 151925) (Closes: #426334)
+
+  [ Benjamin Seidenberg ]
+  * Remove a redundant part of patches//13-master_process_handling.dpatch
+    which causes a double free. (Closes: #425844, #429164)
+  * Add information about tls_[service]_* options changing in UPGRADE.Debian.
+    (Closes: #408503)
+
+ -- Benjamin Seidenberg <benjamin at debian.org>  Mon, 18 Jun 2007 15:38:01 -0400
+
 kolab-cyrus-imapd (2.2.13-3) unstable; urgency=low
 
   * Synced against cyrus-imapd package (closes: #410347, #416914)
@@ -21,7 +55,7 @@
   * Fix a bug in cyrus-common-2.2 postrm script:
     Even when a package Depends on debconf, it is not guaranteed to be there
     when postrm is called. (Closes: #416739)
-    Assume removal of spools is not desired if debconf isn't available (least
+  * Assume removal of spools is not desired if debconf isn't available (least
     surprise / least chance of data loss principle).
   * Add Xs-Vcs-Browser and Xs-Vcs-Svn control fields for the PTS.
   * Fix a number of small issues with the 64bit quota patch.

Modified: kolab-cyrus-imapd/trunk/debian/cyrus-makedirs
===================================================================
--- kolab-cyrus-imapd/trunk/debian/cyrus-makedirs	2008-01-06 12:50:40 UTC (rev 713)
+++ kolab-cyrus-imapd/trunk/debian/cyrus-makedirs	2008-02-22 14:11:57 UTC (rev 714)
@@ -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 229 2005-12-08 23:26:29Z astronut $
+# $Id: cyrus-makedirs 725 2007-06-19 11:16:53Z astronut $
 
 # See lib/util.c, dir_hash_c for Cyrus' directory hashing
 # for the new hash style
@@ -76,7 +76,7 @@
 	    } " < "$CONF" | sort | uniq | xargs`
 
 # First, fix up the entire confdir subtree
-echo "Creating cyrus control directories in ${confdir}..."
+echo "Creating/updating cyrus control directories in ${confdir}..."
 [ -d "$confdir" ] || mkdir -p "$confdir"
 chmod 750 "$confdir"
 for i in db proc socket log msg user quota; do
@@ -89,11 +89,11 @@
     	[ -d "$confdir/$i/$j" ] || mkdir "$confdir/$i/$j"
     done
 done
-chown -R cyrus:mail "$confdir"
+find "$confdir" -not -user cyrus -or -not -group mail -exec chown cyrus:mail {} \;
 
 # Now, create the spool partitions
 for i in $partitions ; do
-	echo "Creating partition spool $i..."
+	echo "Creating/updating partition spool $i..."
 	[ -d "$i" ] || mkdir -p "$i"
 	chmod 750 "$i"
 	[ $hashspool -eq 1 ] && {
@@ -102,7 +102,7 @@
 	   done
 	}
 	[ -d "$i/stage." ] || mkdir "$i/stage."
-	chown -R cyrus:mail "$i"
+	find "$i" -not -user cyrus -or -not -group mail -exec 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
-	chown -R cyrus:mail "$sievedir"
+	find "$sievedir" -not -user cyrus -or -not -group mail -exec 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-01-06 12:50:40 UTC (rev 713)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.init	2008-02-22 14:11:57 UTC (rev 714)
@@ -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 673 2006-10-25 13:24:13Z sven $
+# $Id: cyrus-common-2.2.cyrus2.2.init 729 2007-06-21 17:34:47Z astronut $
 
 # Make sure we get sane results on borked locales
 LC_ALL=C
@@ -46,7 +46,7 @@
 [ "x${PIDFILE}" = "x" ] && PIDFILE="/var/run/${NAME}.pid"
 DESC="Cyrus IMAPd"
 
-#äCheck if Cyrus 2.2 is installed
+# Check if Cyrus 2.2 is installed
 test -x ${DAEMON} || exit 0
 grep -qE '^PACKAGE_VERSION[[:blank:]]+2[.]2' \
 	/usr/lib/cyrus/cyrus-hardwired-config.txt >/dev/null 2>&1 || exit 0

Modified: kolab-cyrus-imapd/trunk/debian/logcheck.ignore
===================================================================
--- kolab-cyrus-imapd/trunk/debian/logcheck.ignore	2008-01-06 12:50:40 UTC (rev 713)
+++ kolab-cyrus-imapd/trunk/debian/logcheck.ignore	2008-02-22 14:11:57 UTC (rev 714)
@@ -53,7 +53,7 @@
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/squatter\[[0-9]+\]: (done )?(indexing|skipping) mailbox
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/notifyd\[[0-9]+\]: do_notify using method
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/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/lmtpunix\[[0-9]+\]: WARNING: sieve script /var/spool/sieve/[/[:alnum:]^]+defaultbc doesn't exist: No such file or directory
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/sieve\[[0-9]+\]: entered bc_action_emit with filelen: [0-9]+$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: no secret in database$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/cyr_expire\[[0-9]+\]: expunged 0 out of 0 messages from 0 mailboxes$

Modified: kolab-cyrus-imapd/trunk/debian/logcheck.violations.ignore
===================================================================
--- kolab-cyrus-imapd/trunk/debian/logcheck.violations.ignore	2008-01-06 12:50:40 UTC (rev 713)
+++ kolab-cyrus-imapd/trunk/debian/logcheck.violations.ignore	2008-02-22 14:11:57 UTC (rev 714)
@@ -2,6 +2,7 @@
 ^\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:
 

Modified: kolab-cyrus-imapd/trunk/debian/patches/00list
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/00list	2008-01-06 12:50:40 UTC (rev 713)
+++ kolab-cyrus-imapd/trunk/debian/patches/00list	2008-02-22 14:11:57 UTC (rev 714)
@@ -45,6 +45,7 @@
 21-fix_config-parsing.dpatch
 22-imapd_index_check.dpatch
 23-configurable_idled.dpatch
+24-configurable-referrals.dpatch
 25-update_install-sh.dpatch
 30-update_perlcalling.sh.dpatch
 35-masssievec_remove_unused_variable.dpatch

Modified: kolab-cyrus-imapd/trunk/debian/patches/13-master_process_handling.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/13-master_process_handling.dpatch	2008-01-06 12:50:40 UTC (rev 713)
+++ kolab-cyrus-imapd/trunk/debian/patches/13-master_process_handling.dpatch	2008-02-22 14:11:57 UTC (rev 714)
@@ -5,9 +5,9 @@
 ## DP: Fixes process (child) handling in master process
 
 @DPATCH@
-diff -urNad complete.dpatch/master/master.c /tmp/dpep.NKIIR9/complete.dpatch/master/master.c
---- complete.dpatch/master/master.c	2005-11-11 17:03:04.000000000 +0100
-+++ /tmp/dpep.NKIIR9/complete.dpatch/master/master.c	2005-11-11 17:04:39.273704930 +0100
+diff -urNad cyrus-imapd-2.2-2.2.13~/master/master.c cyrus-imapd-2.2-2.2.13/master/master.c
+--- cyrus-imapd-2.2-2.2.13~/master/master.c	2007-06-18 09:19:16.000000000 -0400
++++ cyrus-imapd-2.2-2.2.13/master/master.c	2007-06-18 09:21:44.000000000 -0400
 @@ -162,6 +162,8 @@
  static struct centry *ctable[child_table_size];
  static struct centry *cfreelist;
@@ -84,7 +84,7 @@
  void process_msg(const int si, struct notify_message *msg) 
  {
      struct centry *c;
-@@ -1392,8 +1424,9 @@
+@@ -1391,8 +1423,9 @@
  	snprintf(buf, sizeof(buf),
  		 "cannot find executable for service '%s'", name);
  	
@@ -96,7 +96,7 @@
      }
  
      Services[i].maxforkrate = maxforkrate;
-@@ -1405,7 +1438,7 @@
+@@ -1404,7 +1437,7 @@
  	Services[i].desired_workers = prefork;
  	Services[i].babysit = babysit;
  	Services[i].max_workers = atoi(max);
@@ -105,7 +105,7 @@
  	    Services[i].max_workers = INT_MAX;
  	}
      } else {
-@@ -1413,6 +1446,7 @@
+@@ -1412,6 +1445,7 @@
  	if (prefork > 1) prefork = 1;
  	Services[i].desired_workers = prefork;
  	Services[i].max_workers = 1;
@@ -113,16 +113,16 @@
      }
      free(max);
   
-@@ -1452,7 +1486,7 @@
-     if (!cmd) {
+@@ -1450,7 +1484,7 @@
+     if (!strcmp(cmd,"")) {
  	char buf[256];
  	snprintf(buf, sizeof(buf),
 -		 "unable to find command or port for event '%s'", name);
 +		 "unable to find command for event '%s'", name);
  
- 	if (ignore_err) {
+ 	if (rock != NULL) {
  	    syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
-@@ -1506,7 +1540,7 @@
+@@ -1504,7 +1538,7 @@
  
      rl.rlim_cur = x;
      rl.rlim_max = x;
@@ -131,7 +131,7 @@
  	syslog(LOG_ERR, "setrlimit: Unable to set file descriptors limit to %ld: %m", x);
  
  #ifdef HAVE_GETRLIMIT
-@@ -1521,11 +1555,9 @@
+@@ -1519,11 +1553,9 @@
      }
  
  
@@ -146,19 +146,7 @@
  #else
      }
  #endif /* HAVE_GETRLIMIT */
-@@ -1544,7 +1576,10 @@
- 
-     /* disable all services -
-        they will be re-enabled if they appear in config file */
--    for (i = 0; i < nservices; i++) Services[i].exec = NULL;
-+    for (i = 0; i < nservices; i++) {
-+	if (Services[i].exec) free((void*)Services[i].exec);
-+	Services[i].exec = NULL;
-+    }
- 
-     /* read services */
-     masterconf_getsection("SERVICES", &add_service, (void*) 1);
-@@ -1559,13 +1594,18 @@
+@@ -1557,13 +1589,18 @@
  		       Services[i].stat[0], Services[i].stat[1]);
  
  	    /* Only free the service info on the primary */
@@ -178,7 +166,7 @@
  
  	    /* send SIGHUP to all children */
  	    for (j = 0 ; j < child_table_size ; j++ ) {
-@@ -1648,9 +1688,9 @@
+@@ -1646,9 +1683,9 @@
      p = getenv("CYRUS_VERBOSE");
      if (p) verbose = atoi(p) + 1;
  #ifdef HAVE_NETSNMP
@@ -190,7 +178,7 @@
  #endif
  	switch (opt) {
  	case 'C': /* alt imapd.conf file */
-@@ -1683,8 +1723,15 @@
+@@ -1681,8 +1718,15 @@
  	    /* Janitor frequency */
  	    janitor_frequency = atoi(optarg);
  	    if(janitor_frequency < 1)
@@ -207,7 +195,7 @@
  #ifdef HAVE_NETSNMP
  	case 'P': /* snmp AgentXPingInterval */
  	    agentxpinginterval = atoi(optarg);
-@@ -2060,13 +2107,19 @@
+@@ -2058,13 +2102,19 @@
  	    int j;
  
  	    if (FD_ISSET(x, &rfds)) {
@@ -232,9 +220,9 @@
  	    }
  
  	    if (Services[i].exec &&
-diff -urNad complete.dpatch/master/master.h /tmp/dpep.NKIIR9/complete.dpatch/master/master.h
---- complete.dpatch/master/master.h	2005-11-11 17:03:03.000000000 +0100
-+++ /tmp/dpep.NKIIR9/complete.dpatch/master/master.h	2005-11-11 17:03:04.650994659 +0100
+diff -urNad cyrus-imapd-2.2-2.2.13~/master/master.h cyrus-imapd-2.2-2.2.13/master/master.h
+--- cyrus-imapd-2.2-2.2.13~/master/master.h	2004-12-17 11:32:24.000000000 -0500
++++ cyrus-imapd-2.2-2.2.13/master/master.h	2007-06-18 09:19:18.000000000 -0400
 @@ -43,6 +43,7 @@
  extern struct service *Services;
  extern int allocservices;

Added: kolab-cyrus-imapd/trunk/debian/patches/24-configurable-referrals.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/24-configurable-referrals.dpatch	                        (rev 0)
+++ kolab-cyrus-imapd/trunk/debian/patches/24-configurable-referrals.dpatch	2008-02-22 14:11:57 UTC (rev 714)
@@ -0,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 24-configurable-referrals.dpatch by Benjamin Seidenberg <benjamin 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~/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
+@@ -1161,7 +1161,7 @@
+     
+     /* Cleanup Globals */
+     proxyd_cmdcnt = 0;
+-    disable_referrals = 0;
++    disable_referrals = config_getswitch(IMAPOPT_PROXYD_DISABLE_MAILBOX_REFERRALS);
+     supports_referrals = 0;
+     proxyd_userisadmin = 0;
+     proxyd_starttls_done = 0;
+@@ -2769,6 +2769,10 @@
+     prot_printf(proxyd_out, "* CAPABILITY ");
+     prot_printf(proxyd_out, CAPABILITY_STRING);
+ 
++    if (config_getswitch(IMAPOPT_PROXYD_DISABLE_MAILBOX_REFERRALS) == 0) {
++      prot_printf(proxyd_out, " MAILBOX-REFERRALS");
++    }
++		
+     if (config_getint(IMAPOPT_IMAPIDLEPOLL) > 0) {
+ 	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
+@@ -55,7 +55,7 @@
+ 
+ /* CAPABILITIES are now defined here, not including sasl ones */
+ #define CAPABILITY_STRING "IMAP4 IMAP4rev1 ACL QUOTA LITERAL+ " \
+-	"MAILBOX-REFERRALS NAMESPACE UIDPLUS ID " \
++	"NAMESPACE UIDPLUS ID " \
+ 	"NO_ATOMIC_RENAME UNSELECT " \
+ 	"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 @@
+    connections that these referrals would cause, thus resulting in a higher
+    authentication load on the respective backend server. */
+ 
++{ "proxyd_disable_mailbox_referrals", 0, SWITCH }
++/* Set to true to disable the use of mailbox-referrals on the
++   proxy servers.*/
++
+ { "proxyservers", NULL, STRING }
+ /* A list of users and groups that are allowed to proxy for other
+    users, seperated by spaces.  Any user listed in this will be

Modified: kolab-cyrus-imapd/trunk/debian/po/cs.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/cs.po	2008-01-06 12:50:40 UTC (rev 713)
+++ kolab-cyrus-imapd/trunk/debian/po/cs.po	2008-02-22 14:11:57 UTC (rev 714)
@@ -1,6 +1,6 @@
 # AUTOMATICALLY GENERATED -- send updates to cyrus-imapd-2.2 package
 # Czech translation of cyrus-imapd-2.2 templates
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: cyrus-imapd-2.2\n"

Modified: kolab-cyrus-imapd/trunk/debian/po/nl.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/nl.po	2008-01-06 12:50:40 UTC (rev 713)
+++ kolab-cyrus-imapd/trunk/debian/po/nl.po	2008-02-22 14:11:57 UTC (rev 714)
@@ -1,7 +1,7 @@
 # AUTOMATICALLY GENERATED -- send updates to cyrus-imapd-2.2 package
 # Translation of cyrus-imapd-2.2 2.2.13-7_templates.po to Debian l10n Dutch
 # This file is distributed under the same license as the cyrus-imapd package.
-# 
+#
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
 #    this format, e.g. by running:
@@ -11,11 +11,11 @@
 #            /usr/share/doc/po-debconf/README-trans
 #         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
 #    Developers do not need to manually edit POT or PO files.
-# 
+#
 # Luk Claes <luk.claes at ugent.be>, 2004
 # Kurt De Bree <kdebree at telenet.be>, 2006
 # This is an unofficial translation
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: cyrus-imapd-2.2 2.2.13-7\n"

Modified: kolab-cyrus-imapd/trunk/debian/po/sv.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/sv.po	2008-01-06 12:50:40 UTC (rev 713)
+++ kolab-cyrus-imapd/trunk/debian/po/sv.po	2008-02-22 14:11:57 UTC (rev 714)
@@ -1,17 +1,17 @@
 # AUTOMATICALLY GENERATED -- send updates to cyrus-imapd-2.2 package
-# 
+#
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
 #    this format, e.g. by running:
 #         info -n '(gettext)PO Files'
 #         info -n '(gettext)Header Entry'
-# 
+#
 #    Some information specific to po-debconf are available at
 #            /usr/share/doc/po-debconf/README-trans
 #         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-# 
+#
 #    Developers do not need to manually edit POT or PO files.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: cyrus22-imapd\n"

Modified: kolab-cyrus-imapd/trunk/debian/po/vi.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/vi.po	2008-01-06 12:50:40 UTC (rev 713)
+++ kolab-cyrus-imapd/trunk/debian/po/vi.po	2008-02-22 14:11:57 UTC (rev 714)
@@ -2,7 +2,7 @@
 # Vietnamese translation for Cyrus-IMAPd.
 # Copyright © 2006 Free Software Foundation, Inc.
 # Clytie Siddall <clytie at riverland.net.au>, 2006.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: cyrus-imapd-2.2.13\n"
@@ -44,8 +44,8 @@
 "(8) utility."
 msgstr ""
 "Có nghĩa là những co sở dữ liệu cho đó hậu phương co sở dữ liệu đã thay đổi "
-"sẽ cần phải tự được chuyển đổi sang dạng thức mới, dùng tiện ích « "
-"cvt_cyrusdb(8) »."
+"sẽ cần phải tự được chuyển đổi sang dạng thức mới, dùng tiện ích « cvt_cyrusdb"
+"(8) »."
 
 #. Type: note
 #. Description

More information about the pkg-kolab-devel mailing list