[SVN] r416 - in /branches/idled/debian: changelog patches/00list patches/23-configurable_idled.dpatch rules

debian at incase.de debian at incase.de
Sat May 6 11:15:29 UTC 2006


Author: sven
Date: Sat May  6 13:15:27 2006
New Revision: 416

URL: https://mail.incase.de/viewcvs?rev=416&root=cyrus22&view=rev
Log:
Build idled2 with configurable idled method

Added:
    branches/idled/debian/patches/23-configurable_idled.dpatch   (with props)
Modified:
    branches/idled/debian/changelog
    branches/idled/debian/patches/00list
    branches/idled/debian/rules

Modified: branches/idled/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/idled/debian/changelog?rev=416&root=cyrus22&r1=415&r2=416&view=diff
==============================================================================
--- branches/idled/debian/changelog (original)
+++ branches/idled/debian/changelog Sat May  6 13:15:27 2006
@@ -1,5 +1,13 @@
+cyrus-imapd-2.2 (2.2.13-2idled2) stable; urgency=low
+
+  [ Sven Mueller ]
+  * Use configurable idle patch from Ondřej Surý
+
+ -- Sven Mueller <debian at incase.de>  Sat,  6 May 2006 12:49:20 +0200
+
 cyrus-imapd-2.2 (2.2.13-2idled1) stable; urgency=low
 
+  [ Sven Mueller ]
   * Sarge Backport of 2.2.13-3
   * enable idled
 

Modified: branches/idled/debian/patches/00list
URL: https://mail.incase.de/viewcvs/branches/idled/debian/patches/00list?rev=416&root=cyrus22&r1=415&r2=416&view=diff
==============================================================================
--- branches/idled/debian/patches/00list (original)
+++ branches/idled/debian/patches/00list Sat May  6 13:15:27 2006
@@ -24,6 +24,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

Added: branches/idled/debian/patches/23-configurable_idled.dpatch
URL: https://mail.incase.de/viewcvs/branches/idled/debian/patches/23-configurable_idled.dpatch?rev=416&root=cyrus22&view=auto
==============================================================================
--- branches/idled/debian/patches/23-configurable_idled.dpatch (added)
+++ branches/idled/debian/patches/23-configurable_idled.dpatch Sat May  6 13:15:27 2006
@@ -1,0 +1,572 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 23-configurable_idled.dpatch by Ondřej Surý <ondrej at sury.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds imapd.conf option to select IDLE method at runtime
+
+ at DPATCH@
+diff -urNad idled/configure.in /tmp/dpep.cbgbWp/idled/configure.in
+--- idled/configure.in	2006-05-06 12:54:13.000000000 +0200
++++ /tmp/dpep.cbgbWp/idled/configure.in	2006-05-06 12:54:35.058909068 +0200
+@@ -754,17 +754,6 @@
+ AC_DEFINE_UNQUOTED(MASTER_PIDFILE, $MASTERPIDFILE,[Name of the pidfile for master])
+ 
+ dnl
+-dnl Select a method for IMAP IDLE
+-dnl
+-AC_ARG_WITH(idle,[  --with-idle=METHOD      use METHOD for IMAP IDLE
+-                          METHOD is [poll], idled or no],
+-	WITH_IDLE="${withval}",WITH_IDLE="poll")
+-AC_SUBST(WITH_IDLE)
+-if test "$WITH_IDLE" = "idled"; then
+-  IMAP_PROGS="$IMAP_PROGS idled"
+-fi
+-
+-dnl
+ dnl see if we're compiling with NNTP support
+ dnl
+ ENABLE_NNTP=no
+diff -urNad idled/imap/Makefile.in /tmp/dpep.cbgbWp/idled/imap/Makefile.in
+--- idled/imap/Makefile.in	2006-05-06 12:54:13.000000000 +0200
++++ /tmp/dpep.cbgbWp/idled/imap/Makefile.in	2006-05-06 12:54:35.070907936 +0200
+@@ -47,9 +47,6 @@
+ # 'local' (legacy flat file).
+ SEEN=seen_db.o
+ 
+-# IMAP IDLE mechanism
+-IDLE=idle_ at WITH_IDLE@.o
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -104,7 +101,8 @@
+ 	convert_code.o duplicate.o saslclient.o saslserver.o signals.o \
+ 	annotate.o search_engines.o squat.o squat_internal.o mbdump.o \
+ 	imapparse.o telemetry.o user.o notify.o protocol.o quota_db.o \
+-	$(SEEN) $(IDLE)
++	idle.o idle_no.o idle_poll.o idle_idled.o \
++	$(SEEN)
+ 
+ IMAPDOBJS=pushstats.o backend.o imapd.o index.o tls.o version.o
+ 
+@@ -118,7 +116,7 @@
+ SERVICE=../master/service.o
+ SERVICETHREAD=../master/service-thread.o
+ 
+-PROGS = imapd lmtpd pop3d \
++PROGS = imapd lmtpd pop3d idled \
+ 	fud smmapd reconstruct quota mbpath ipurge \
+ 	cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \
+ 	ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \
+diff -urNad idled/imap/global.c /tmp/dpep.cbgbWp/idled/imap/global.c
+--- idled/imap/global.c	2006-05-06 12:54:13.000000000 +0200
++++ /tmp/dpep.cbgbWp/idled/imap/global.c	2006-05-06 12:54:35.059908974 +0200
+@@ -94,6 +94,8 @@
+ /* syslog prefix tag */
+ static char syslog_prefix[20];
+ 
++struct idle_backend *config_idle;
++
+ /* Called before a cyrus application starts (but after command line parameters
+  * are read) */
+ int cyrus_init(const char *alt_config, const char *ident, unsigned flags)
+@@ -185,6 +187,10 @@
+ 	config_ptscache_db =
+ 	    cyrusdb_fromname(config_getstring(IMAPOPT_PTSCACHE_DB));
+ 
++        /* lookup idle backend */
++        config_idle =
++            idle_fromname(config_getstring(IMAPOPT_IDLEMETHOD));
++
+ 	/* configure libcyrus as needed */
+ 	libcyrus_config_setstring(CYRUSOPT_CONFIG_DIR, config_dir);
+ 	libcyrus_config_setswitch(CYRUSOPT_AUTH_UNIX_GROUP_ENABLE,
+diff -urNad idled/imap/global.h /tmp/dpep.cbgbWp/idled/imap/global.h
+--- idled/imap/global.h	2006-04-23 22:37:08.000000000 +0200
++++ /tmp/dpep.cbgbWp/idled/imap/global.h	2006-05-06 12:54:35.059908974 +0200
+@@ -152,4 +152,6 @@
+ extern struct cyrusdb_backend *config_tlscache_db;
+ extern struct cyrusdb_backend *config_ptscache_db;
+ 
++extern struct idle_backend *config_idle;
++
+ #endif /* INCLUDED_GLOBAL_H */
+diff -urNad idled/imap/idle.c /tmp/dpep.cbgbWp/idled/imap/idle.c
+--- idled/imap/idle.c	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.cbgbWp/idled/imap/idle.c	2006-05-06 12:54:35.060908880 +0200
+@@ -0,0 +1,85 @@
++/* 
++ * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer. 
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in
++ *    the documentation and/or other materials provided with the
++ *    distribution.
++ *
++ * 3. The name "Carnegie Mellon University" must not be used to
++ *    endorse or promote products derived from this software without
++ *    prior written permission. For permission or any other legal
++ *    details, please contact  
++ *      Office of Technology Transfer
++ *      Carnegie Mellon University
++ *      5000 Forbes Avenue
++ *      Pittsburgh, PA  15213-3890
++ *      (412) 268-4387, fax: (412) 268-7395
++ *      tech-transfer at andrew.cmu.edu
++ *
++ * 4. Redistributions of any form whatsoever must retain the following
++ *    acknowledgment:
++ *    "This product includes software developed by Computing Services
++ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
++ *
++ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
++ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++/* $Id: idle.c,v 1.10 2006/01/04 02:06:23 ondrej Exp $ */
++
++#include <config.h>
++#include <stdlib.h>
++#include <string.h>
++#include <stdio.h>
++#include <netdb.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++#include <errno.h>
++#include <syslog.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++#include <fcntl.h>
++
++#include "idle.h"
++#include "exitcodes.h"
++
++struct idle_backend *idle_backends[] = {
++    &idle_no,
++    &idle_poll,
++    &idle_idled,
++    NULL );
++
++struct idle_backend *idle_fromname(const char *name)
++{
++    int i;
++    struct idle_backend *idle = NULL;
++
++    for (i = 0; idle_backends[i]; i++) {
++        if (!strcmp(idle_backends[i]->name, name)) {
++            idle = idle_backends[i]; break;
++        }
++    }
++    if (!idle) {
++        char errbuf[1024];
++        snprintf(errbuf, sizeof(errbuf),
++                 "idle backend %s not supported", name);
++        fatal(errbug, EC_CONFIG);
++    }
++
++    return idle;
++}
+diff -urNad idled/imap/idle.h /tmp/dpep.cbgbWp/idled/imap/idle.h
+--- idled/imap/idle.h	2006-04-23 22:37:08.000000000 +0200
++++ /tmp/dpep.cbgbWp/idled/imap/idle.h	2006-05-06 12:54:35.060908880 +0200
+@@ -45,8 +45,6 @@
+ 
+ #include "mailbox.h"
+ 
+-extern const char *idle_method_desc;
+-
+ typedef enum {
+     IDLE_MAILBOX =	0x1,
+     IDLE_ALERT =	0x2
+@@ -54,20 +52,34 @@
+ 
+ typedef void idle_updateproc_t(idle_flags_t flags);
+ 
++struct idle_backend {
++    const char *name;
+ 
+-/* Is IDLE enabled?  Can also do initial setup, if necessary */
+-int idle_enabled(void);
++    /* Is IDLE enabled?  Can also do initial setup, if necessary */
++    int (*enabled)(void);
+ 
+-/* Setup for IDLE.
+- * 'proc' is a pointer to a function which reports mailbox updates and/or
+- * ALERTs to the client.
+- */
+-int idle_init(idle_updateproc_t *proc);
++    /* Setup for IDLE.
++     * 'proc' is a pointer to a function which reports mailbox updates and/or
++     * ALERTs to the client.
++     */
++    int (*init)(idle_updateproc_t *proc);
+ 
+-/* Start IDLEing on 'mailbox'. */
+-void idle_start(struct mailbox *mailbox);
++    /* Start IDLEing on 'mailbox'. */
++    void (*start)(struct mailbox *mailbox);
+ 
+-/* Cleanup when IDLE is completed. */
+-void idle_done(struct mailbox *mailbox);
++    /* Cleanup when IDLE is completed. */
++    void (*done)(struct mailbox *mailbox);
++};
++
++extern struct idle_backend *idle_backends[];
++
++/* Note that some of these may be undefined symbols
++ * if imapd was not built with support for them */
++extern struct idle_backend idle_no;
++extern struct idle_backend idle_poll;
++extern struct idle_backend idle_idled;
++
++/* Configuration */
++struct idle_backend *idle_fromname(const char *name);
+ 
+ #endif
+diff -urNad idled/imap/idle_idled.c /tmp/dpep.cbgbWp/idled/imap/idle_idled.c
+--- idled/imap/idle_idled.c	2006-05-06 12:54:13.000000000 +0200
++++ /tmp/dpep.cbgbWp/idled/imap/idle_idled.c	2006-05-06 12:54:35.061908785 +0200
+@@ -58,8 +58,6 @@
+ #include "idled.h"
+ #include "global.h"
+ 
+-const char *idle_method_desc = "idled";
+-
+ /* function to report mailbox updates to the client */
+ static idle_updateproc_t *idle_update = NULL;
+ 
+@@ -73,14 +71,14 @@
+ static int idle_remote_len = 0;
+ 
+ /* Forward declarations */
+-int idle_send_msg(int msg, struct mailbox *mailbox);
+-void idle_notify(struct mailbox *mailbox);
++static int idle_send_msg(int msg, struct mailbox *mailbox);
++static void idle_notify(struct mailbox *mailbox);
+ 
+ 
+ /*
+  * Create connection to idled for sending notifications
+  */
+-int idle_enabled(void)
++static int idle_enabled(void)
+ {
+     int s;
+     int fdflags;
+@@ -154,7 +152,7 @@
+     }
+ }
+ 
+-int idle_init(idle_updateproc_t *proc)
++static int idle_init(idle_updateproc_t *proc)
+ {
+     struct sigaction action;
+ 
+@@ -184,7 +182,7 @@
+     return 1;
+ }
+ 
+-void idle_start(struct mailbox *mailbox)
++static void idle_start(struct mailbox *mailbox)
+ {
+     idle_started = 1;
+ 
+@@ -195,7 +193,7 @@
+     }
+ }
+ 
+-void idle_done(struct mailbox *mailbox)
++static void idle_done(struct mailbox *mailbox)
+ {
+     /* Tell idled that we're done idling */
+     idle_send_msg(IDLE_DONE, mailbox);
+@@ -212,7 +210,7 @@
+ /*
+  * Send a message to idled
+  */
+-int idle_send_msg(int msg, struct mailbox *mailbox)
++static int idle_send_msg(int msg, struct mailbox *mailbox)
+ {
+     idle_data_t idledata;
+ 
+@@ -235,10 +233,21 @@
+ /*
+  * Notify imapidled of a mailbox change
+  */
+-void idle_notify(struct mailbox *mailbox)
++static void idle_notify(struct mailbox *mailbox)
+ {
+     /* We should try to determine if we need to send this
+      * (ie, is an imapd is IDLE on 'mailbox'?).
+      */
+     idle_send_msg(IDLE_NOTIFY, mailbox);
+ }
++
++struct idle_backend idle_idled =
++{
++    "idled", /* name */
++
++    &idle_enabled,
++    &idle_init,
++
++    &idle_start,
++    &idle_done
++};
+diff -urNad idled/imap/idle_no.c /tmp/dpep.cbgbWp/idled/imap/idle_no.c
+--- idled/imap/idle_no.c	2006-04-23 22:37:08.000000000 +0200
++++ /tmp/dpep.cbgbWp/idled/imap/idle_no.c	2006-05-06 12:54:35.061908785 +0200
+@@ -42,23 +42,31 @@
+ 
+ #include "idle.h"
+ 
+-
+-const char *idle_method_desc = (char *)0;
+-
+-int idle_enabled(void)
++static int idle_enabled(void)
+ {
+     return 0;
+ }
+ 
+-int idle_init(idle_updateproc_t *proc)
++static int idle_init(idle_updateproc_t *proc)
+ {
+     return 0;
+ }
+ 
+-void idle_start(struct mailbox *mailbox)
++static void idle_start(struct mailbox *mailbox __attribute__((unused)))
+ {
+ }
+ 
+-void idle_done(struct mailbox *mailbox)
++static void idle_done(struct mailbox *mailbox __attribute__((unused)))
+ {
+ }
++
++struct idle_backend idle_no =
++{
++    "no", /* name */
++
++    &enabled,
++    &init,
++
++    &start,
++    &done
++};
+diff -urNad idled/imap/idle_poll.c /tmp/dpep.cbgbWp/idled/imap/idle_poll.c
+--- idled/imap/idle_poll.c	2006-04-23 22:37:08.000000000 +0200
++++ /tmp/dpep.cbgbWp/idled/imap/idle_poll.c	2006-05-06 12:54:35.061908785 +0200
+@@ -51,15 +51,13 @@
+ #include "idle.h"
+ #include "global.h"
+ 
+-const char *idle_method_desc = "poll";
+-
+ /* function to report mailbox updates to the client */
+ static idle_updateproc_t *idle_update = NULL;
+ 
+ /* how often to poll the mailbox */
+ static time_t idle_period = -1;
+ 
+-int idle_enabled(void)
++static int idle_enabled(void)
+ {
+     /* get polling period */
+     if (idle_period == -1) {
+@@ -78,7 +76,7 @@
+     alarm(idle_period);
+ }
+ 
+-int idle_init(idle_updateproc_t *proc)
++static int idle_init(idle_updateproc_t *proc)
+ {
+     struct sigaction action;
+ 
+@@ -103,15 +101,26 @@
+     return 1;
+ }
+ 
+-void idle_start(struct mailbox *mailbox __attribute__((unused)))
++static void idle_start(struct mailbox *mailbox __attribute__((unused)))
+ {
+     alarm(idle_period);
+ }
+ 
+-void idle_done(struct mailbox *mailbox __attribute__((unused)))
++static void idle_done(struct mailbox *mailbox __attribute__((unused)))
+ {
+     /* Remove the polling function */
+     signal(SIGALRM, SIG_IGN);
+ 
+     idle_update = NULL;
+ }
++
++struct idle_backend idle_poll = 
++{
++    "poll", /* name */
++
++    &idle_enabled,
++    &idle_init,
++
++    &idle_start,
++    &idle_done
++};
+diff -urNad idled/imap/imapd.c /tmp/dpep.cbgbWp/idled/imap/imapd.c
+--- idled/imap/imapd.c	2006-05-06 12:54:13.000000000 +0200
++++ /tmp/dpep.cbgbWp/idled/imap/imapd.c	2006-05-06 12:54:35.068908125 +0200
+@@ -94,6 +94,8 @@
+ 
+ #include "pushstats.h"		/* SNMP interface */
+ 
++#define IDLE config_idle
++
+ extern void seen_done(void);
+ 
+ extern int optind;
+@@ -558,7 +560,7 @@
+     quotadb_open(NULL);
+ 
+     /* setup for sending IMAP IDLE notifications */
+-    idle_enabled();
++    IDLE->enabled();
+ 
+     /* create connection to the SNMP listener, if available. */
+     snmp_connect(); /* ignore return code */
+@@ -1160,7 +1162,7 @@
+ 	    }
+ 	    else if (!imapd_userid) goto nologin;
+ 	    else if (!strcmp(cmd.s, "Idle")) {
+-		if (!idle_enabled()) {
++		if (!IDLE->enabled()) {
+ 		    /* we don't support idle */
+ 		    goto badcmd;
+ 		}
+@@ -2202,7 +2204,7 @@
+     static struct buf arg;
+ 
+     /* Setup for doing mailbox updates */
+-    if (!idle_init(idle_update)) {
++    if (!IDLE->init(idle_update)) {
+ 	prot_printf(imapd_out, 
+ 		    "%s NO cannot start idling\r\n", tag);
+ 	return;
+@@ -2214,13 +2216,13 @@
+ 
+     /* Start doing mailbox updates */
+     if (imapd_mailbox) index_check(imapd_mailbox, 0, 1);
+-    idle_start(imapd_mailbox);
++    IDLE->start(imapd_mailbox);
+ 
+     /* Get continuation data */
+     c = getword(imapd_in, &arg);
+ 
+     /* Stop updates and do any necessary cleanup */
+-    idle_done(imapd_mailbox);
++    IDLE->done(imapd_mailbox);
+ 
+     if (imapd_mailbox) index_check(imapd_mailbox, 0, 1);
+ 
+@@ -2273,7 +2275,7 @@
+     }
+     prot_printf(imapd_out, "* CAPABILITY " CAPABILITY_STRING);
+ 
+-    if (idle_enabled()) {
++    if (IDLE->enabled()) {
+ 	prot_printf(imapd_out, " IDLE");
+     }
+ 
+diff -urNad idled/imap/lmtpd.c /tmp/dpep.cbgbWp/idled/imap/lmtpd.c
+--- idled/imap/lmtpd.c	2006-05-06 12:54:13.000000000 +0200
++++ /tmp/dpep.cbgbWp/idled/imap/lmtpd.c	2006-05-06 12:54:35.069908031 +0200
+@@ -95,6 +95,8 @@
+ static sieve_interp_t *sieve_interp = NULL;
+ #endif
+ 
++#define IDLE config_idle
++
+ /* forward declarations */
+ static int deliver(message_data_t *msgdata, char *authuser,
+ 		   struct auth_state *authstate);
+@@ -190,7 +192,7 @@
+     annotatemore_open(NULL);
+ 
+     /* setup for sending IMAP IDLE notifications */
+-    idle_enabled();
++    IDLE->enabled();
+ 
+     /* Set namespace */
+     if ((r = mboxname_init_namespace(&lmtpd_namespace, 0)) != 0) {
+diff -urNad idled/imap/pop3d.c /tmp/dpep.cbgbWp/idled/imap/pop3d.c
+--- idled/imap/pop3d.c	2006-05-06 12:54:13.000000000 +0200
++++ /tmp/dpep.cbgbWp/idled/imap/pop3d.c	2006-05-06 12:54:35.072907748 +0200
+@@ -89,6 +89,8 @@
+ #define DES_DEFS
+ #include <krb.h>
+ 
++#define IDLE config_idle
++
+ /* MIT's kpop authentication kludge */
+ char klrealm[REALM_SZ];
+ AUTH_DAT kdata;
+@@ -301,7 +303,7 @@
+     quotadb_open(NULL);
+ 
+     /* setup for sending IMAP IDLE notifications */
+-    idle_enabled();
++    IDLE->enabled();
+ 
+     /* Set namespace */
+     if ((r = mboxname_init_namespace(&popd_namespace, 0)) != 0) {
+diff -urNad idled/imap/version.c /tmp/dpep.cbgbWp/idled/imap/version.c
+--- idled/imap/version.c	2006-04-23 22:37:08.000000000 +0200
++++ /tmp/dpep.cbgbWp/idled/imap/version.c	2006-05-06 12:54:35.073907653 +0200
+@@ -68,6 +68,8 @@
+ #include "sieve_interface.h"
+ #endif
+ 
++#define IDLE config_idle
++
+ static char id_resp_command[MAXIDVALUELEN];
+ static char id_resp_arguments[MAXIDVALUELEN] = "";
+ 
+@@ -173,9 +175,8 @@
+     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
+ 	     " (%s)", krb4_version);
+ #endif
+-    if (idle_method_desc)
+-	snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
+-		 "; idle = %s", idle_method_desc);
++    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++             "; idle = runtime");
+ 
+     prot_printf(pout, " \"environment\" \"%s\"", env_buf);
+ }
+diff -urNad idled/lib/imapoptions /tmp/dpep.cbgbWp/idled/lib/imapoptions
+--- idled/lib/imapoptions	2006-05-06 12:54:13.000000000 +0200
++++ /tmp/dpep.cbgbWp/idled/lib/imapoptions	2006-05-06 12:54:35.075907465 +0200
+@@ -248,6 +248,9 @@
+ /* The password to use for authentication to the backend server hostname
+    (where hostname is the short hostname of the server) - Cyrus Murder */
+ 
++{ "idlemethod", "idled", STRINGLIST("no", "poll", "idled") }
++/* The idle backend to use for IDLE command. */
++
+ { "idlesocket", "{configdirectory}/socket/idle", STRING }
+ /* Unix domain socket that idled listens on. */
+ 

Propchange: branches/idled/debian/patches/23-configurable_idled.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: branches/idled/debian/rules
URL: https://mail.incase.de/viewcvs/branches/idled/debian/rules?rev=416&root=cyrus22&r1=415&r2=416&view=diff
==============================================================================
--- branches/idled/debian/rules (original)
+++ branches/idled/debian/rules Sat May  6 13:15:27 2006
@@ -99,7 +99,7 @@
 	 --with-openssl=/usr --with-auth=unix \
 	 --enable-murder --enable-nntp \
 	 --disable-listext --enable-annotatemore --with-sasl=/usr \
-	 --with-idle=idled --with-drac=/usr \
+	 --with-drac=/usr \
 	 --with-cyrus-user=cyrus --with-cyrus-group=mail \
 	 --with-tclsh=/usr/bin/tclsh --with-com_err=/usr \
 	 --with-pidfile=/var/run/cyrmaster.pid \




More information about the Pkg-Cyrus-imapd-Debian-devel mailing list