[SVN] r544 - in /trunk/cyrus-imapd-2.2.13/debian: README.Debian changelog cyrus-imapd-2.2.install imapd.conf patches/00list patches/23-configurable_idled.dpatch

[debian at incase.de]

Author: sven
Date: Tue Aug  8 18:37:26 2006
New Revision: 544

URL: https://mail.incase.de/viewcvs?rev=544&root=cyrus22&view=rev
Log:
Merge in the configurable idle support patch

Added:
    trunk/cyrus-imapd-2.2.13/debian/patches/23-configurable_idled.dpatch
      - copied unchanged from r542, branches/idled/debian/patches/23-configurable_idled.dpatch
Modified:
    trunk/cyrus-imapd-2.2.13/debian/README.Debian
    trunk/cyrus-imapd-2.2.13/debian/changelog
    trunk/cyrus-imapd-2.2.13/debian/cyrus-imapd-2.2.install
    trunk/cyrus-imapd-2.2.13/debian/imapd.conf
    trunk/cyrus-imapd-2.2.13/debian/patches/00list

Modified: trunk/cyrus-imapd-2.2.13/debian/README.Debian
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/README.Debian?rev=544&root=cyrus22&r1=543&r2=544&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/README.Debian (original)
+++ trunk/cyrus-imapd-2.2.13/debian/README.Debian Tue Aug  8 18:37:26 2006
@@ -80,6 +80,15 @@
    use plaintext authentication methods.  The easiest thing to do is to put
    an entry for your mupdate user in sasldb2 and use DIGEST-MD5.
 
+4. Configurable idled support.
+  
+   Cyrus IMAPd supports three options of using IDLE in IMAP sessions. The first
+   option is not to support IDLE at all. The second is to use internal polling
+   in the IMAP daemon. The third option is to use an external daemon, idled.
+   Upstream only supports configuration of this during compilation, Debian
+   however includes a patch which makes this runtime-configurable. Please
+   set the 'idlemethod' imapd.conf option according to your needs and enable
+   idled in cyrus.conf if you want to use it.
 
 General notes and hints:
 ------------------------

Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=544&root=cyrus22&r1=543&r2=544&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Tue Aug  8 18:37:26 2006
@@ -29,6 +29,7 @@
     combination with sasl_mech_list.
   * Sync with 2.2 CVS tree from upstream, including a few documentation fixes
     and a fix returning empty strings for empty message parts instead of NULL
+  * Use configurable idle patch from OndÃ
~Yej Surý
   * Add some more options to /etc/default/cyrus2.2 and use them in the init
     script, including a generic OPTIONS variable to allow setting of any
     commandline option for cyrmaster. (Closes: #382061)

Modified: trunk/cyrus-imapd-2.2.13/debian/cyrus-imapd-2.2.install
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/cyrus-imapd-2.2.install?rev=544&root=cyrus22&r1=543&r2=544&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/cyrus-imapd-2.2.install (original)
+++ trunk/cyrus-imapd-2.2.13/debian/cyrus-imapd-2.2.install Tue Aug  8 18:37:26 2006
@@ -1,3 +1,4 @@
 etc/pam.d/imap
 usr/lib/cyrus/bin/imapd
+usr/lib/cyrus/bin/idled
 usr/sbin/squatter

Modified: trunk/cyrus-imapd-2.2.13/debian/imapd.conf
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/imapd.conf?rev=544&root=cyrus22&r1=543&r2=544&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/imapd.conf (original)
+++ trunk/cyrus-imapd-2.2.13/debian/imapd.conf Tue Aug  8 18:37:26 2006
@@ -294,6 +294,13 @@
 # Unix domain socket that lmtpd listens on.
 lmtpsocket: /var/run/cyrus/socket/lmtp
 
+# The idle backend to use for IDLE command.
+# Options: poll (default), idled, no
+# poll doesn't need the idled daemon and is supposed to be more robust.
+# however it doesn't update as quickly as the idled backend does. "no"
+# turns off IDLE support
+idlemethod: poll
+
 # Unix domain socket that idled listens on.
 idlesocket: /var/run/cyrus/socket/idle
 

Modified: trunk/cyrus-imapd-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/00list?rev=544&root=cyrus22&r1=543&r2=544&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/00list Tue Aug  8 18:37:26 2006
@@ -38,6 +38,7 @@
 19-fix_tls_ssl.dpatch
 21-fix_config-parsing.dpatch
 22-imapd_index_check.dpatch
+23-configurable_idled.dpatch
 25-update_install-sh.dpatch
 30-update_perlcalling.sh.dpatch
 35-masssievec_remove_unused_variable.dpatch