[SVN] r427 - /branches/idled/debian/patches/23-configurable_idled.dpatch

debian at incase.de debian at incase.de
Sat May 6 15:38:36 UTC 2006 

Author: sven
Date: Sat May  6 17:38:35 2006
New Revision: 427

URL: https://mail.incase.de/viewcvs?rev=427&root=cyrus22&view=rev
Log:
Remove unneeded IDLE #defines, show selected idle backend in version info

Modified:
    branches/idled/debian/patches/23-configurable_idled.dpatch

Modified: branches/idled/debian/patches/23-configurable_idled.dpatch
URL: https://mail.incase.de/viewcvs/branches/idled/debian/patches/23-configurable_idled.dpatch?rev=427&root=cyrus22&r1=426&r2=427&view=diff
==============================================================================
--- branches/idled/debian/patches/23-configurable_idled.dpatch (original)
+++ branches/idled/debian/patches/23-configurable_idled.dpatch Sat May  6 17:38:35 2006
@@ -5,9 +5,9 @@
 ## DP: Adds imapd.conf option to select IDLE method at runtime
 
 @DPATCH@
-diff -urNad idled/configure.in /tmp/dpep.d0Pjbd/idled/configure.in
---- idled/configure.in	2006-05-06 17:01:54.000000000 +0200
-+++ /tmp/dpep.d0Pjbd/idled/configure.in	2006-05-06 17:01:55.898178258 +0200
+diff -urNad idled/configure.in /tmp/dpep.Tv0u6M/idled/configure.in
+--- idled/configure.in	2006-05-06 17:26:18.000000000 +0200
++++ /tmp/dpep.Tv0u6M/idled/configure.in	2006-05-06 17:26:23.914080538 +0200
 @@ -754,17 +754,6 @@
  AC_DEFINE_UNQUOTED(MASTER_PIDFILE, $MASTERPIDFILE,[Name of the pidfile for master])
  
@@ -26,9 +26,9 @@
  dnl see if we're compiling with NNTP support
  dnl
  ENABLE_NNTP=no
-diff -urNad idled/imap/Makefile.in /tmp/dpep.d0Pjbd/idled/imap/Makefile.in
---- idled/imap/Makefile.in	2006-05-06 17:01:54.000000000 +0200
-+++ /tmp/dpep.d0Pjbd/idled/imap/Makefile.in	2006-05-06 17:01:55.898178258 +0200
+diff -urNad idled/imap/Makefile.in /tmp/dpep.Tv0u6M/idled/imap/Makefile.in
+--- idled/imap/Makefile.in	2006-05-06 17:26:18.000000000 +0200
++++ /tmp/dpep.Tv0u6M/idled/imap/Makefile.in	2006-05-06 17:26:23.914080538 +0200
 @@ -47,9 +47,6 @@
  # 'local' (legacy flat file).
  SEEN=seen_db.o
@@ -58,9 +58,9 @@
  	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.d0Pjbd/idled/imap/global.c
---- idled/imap/global.c	2006-05-06 17:01:54.000000000 +0200
-+++ /tmp/dpep.d0Pjbd/idled/imap/global.c	2006-05-06 17:01:55.899178164 +0200
+diff -urNad idled/imap/global.c /tmp/dpep.Tv0u6M/idled/imap/global.c
+--- idled/imap/global.c	2006-05-06 17:26:19.000000000 +0200
++++ /tmp/dpep.Tv0u6M/idled/imap/global.c	2006-05-06 17:26:23.915080444 +0200
 @@ -94,6 +94,8 @@
  /* syslog prefix tag */
  static char syslog_prefix[20];
@@ -81,9 +81,9 @@
  	/* 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.d0Pjbd/idled/imap/global.h
+diff -urNad idled/imap/global.h /tmp/dpep.Tv0u6M/idled/imap/global.h
 --- idled/imap/global.h	2006-05-06 17:01:45.000000000 +0200
-+++ /tmp/dpep.d0Pjbd/idled/imap/global.h	2006-05-06 17:01:55.899178164 +0200
++++ /tmp/dpep.Tv0u6M/idled/imap/global.h	2006-05-06 17:26:23.915080444 +0200
 @@ -152,4 +152,6 @@
  extern struct cyrusdb_backend *config_tlscache_db;
  extern struct cyrusdb_backend *config_ptscache_db;
@@ -91,9 +91,9 @@
 +extern struct idle_backend *config_idle;
 +
  #endif /* INCLUDED_GLOBAL_H */
-diff -urNad idled/imap/idle.c /tmp/dpep.d0Pjbd/idled/imap/idle.c
+diff -urNad idled/imap/idle.c /tmp/dpep.Tv0u6M/idled/imap/idle.c
 --- idled/imap/idle.c	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.d0Pjbd/idled/imap/idle.c	2006-05-06 17:01:55.899178164 +0200
++++ /tmp/dpep.Tv0u6M/idled/imap/idle.c	2006-05-06 17:26:23.915080444 +0200
 @@ -0,0 +1,86 @@
 +/* 
 + * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
@@ -181,9 +181,9 @@
 +
 +    return idle;
 +}
-diff -urNad idled/imap/idle.h /tmp/dpep.d0Pjbd/idled/imap/idle.h
+diff -urNad idled/imap/idle.h /tmp/dpep.Tv0u6M/idled/imap/idle.h
 --- idled/imap/idle.h	2006-05-06 17:01:45.000000000 +0200
-+++ /tmp/dpep.d0Pjbd/idled/imap/idle.h	2006-05-06 17:01:55.900178070 +0200
++++ /tmp/dpep.Tv0u6M/idled/imap/idle.h	2006-05-06 17:26:23.916080350 +0200
 @@ -45,8 +45,6 @@
  
  #include "mailbox.h"
@@ -239,9 +239,9 @@
 +struct idle_backend *idle_fromname(const char *name);
  
  #endif
-diff -urNad idled/imap/idle_idled.c /tmp/dpep.d0Pjbd/idled/imap/idle_idled.c
---- idled/imap/idle_idled.c	2006-05-06 17:01:54.000000000 +0200
-+++ /tmp/dpep.d0Pjbd/idled/imap/idle_idled.c	2006-05-06 17:01:55.900178070 +0200
+diff -urNad idled/imap/idle_idled.c /tmp/dpep.Tv0u6M/idled/imap/idle_idled.c
+--- idled/imap/idle_idled.c	2006-05-06 17:26:18.000000000 +0200
++++ /tmp/dpep.Tv0u6M/idled/imap/idle_idled.c	2006-05-06 17:26:23.916080350 +0200
 @@ -58,8 +58,6 @@
  #include "idled.h"
  #include "global.h"
@@ -328,9 +328,9 @@
 +    &idle_start,
 +    &idle_done
 +};
-diff -urNad idled/imap/idle_no.c /tmp/dpep.d0Pjbd/idled/imap/idle_no.c
+diff -urNad idled/imap/idle_no.c /tmp/dpep.Tv0u6M/idled/imap/idle_no.c
 --- idled/imap/idle_no.c	2006-05-06 17:01:45.000000000 +0200
-+++ /tmp/dpep.d0Pjbd/idled/imap/idle_no.c	2006-05-06 17:01:55.900178070 +0200
++++ /tmp/dpep.Tv0u6M/idled/imap/idle_no.c	2006-05-06 17:26:23.916080350 +0200
 @@ -42,23 +42,31 @@
  
  #include "idle.h"
@@ -370,9 +370,9 @@
 +    &idle_start,
 +    &idle_done
 +};
-diff -urNad idled/imap/idle_poll.c /tmp/dpep.d0Pjbd/idled/imap/idle_poll.c
+diff -urNad idled/imap/idle_poll.c /tmp/dpep.Tv0u6M/idled/imap/idle_poll.c
 --- idled/imap/idle_poll.c	2006-05-06 17:01:45.000000000 +0200
-+++ /tmp/dpep.d0Pjbd/idled/imap/idle_poll.c	2006-05-06 17:01:55.901177976 +0200
++++ /tmp/dpep.Tv0u6M/idled/imap/idle_poll.c	2006-05-06 17:26:23.917080256 +0200
 @@ -51,15 +51,13 @@
  #include "idle.h"
  #include "global.h"
@@ -428,9 +428,9 @@
 +    &idle_start,
 +    &idle_done
 +};
-diff -urNad idled/imap/imapd.c /tmp/dpep.d0Pjbd/idled/imap/imapd.c
---- idled/imap/imapd.c	2006-05-06 17:01:55.000000000 +0200
-+++ /tmp/dpep.d0Pjbd/idled/imap/imapd.c	2006-05-06 17:01:55.904177694 +0200
+diff -urNad idled/imap/imapd.c /tmp/dpep.Tv0u6M/idled/imap/imapd.c
+--- idled/imap/imapd.c	2006-05-06 17:26:19.000000000 +0200
++++ /tmp/dpep.Tv0u6M/idled/imap/imapd.c	2006-05-06 17:26:23.920079973 +0200
 @@ -94,6 +94,8 @@
  
  #include "pushstats.h"		/* SNMP interface */
@@ -492,9 +492,9 @@
  	prot_printf(imapd_out, " IDLE");
      }
  
-diff -urNad idled/imap/lmtpd.c /tmp/dpep.d0Pjbd/idled/imap/lmtpd.c
---- idled/imap/lmtpd.c	2006-05-06 17:01:54.000000000 +0200
-+++ /tmp/dpep.d0Pjbd/idled/imap/lmtpd.c	2006-05-06 17:01:55.905177600 +0200
+diff -urNad idled/imap/lmtpd.c /tmp/dpep.Tv0u6M/idled/imap/lmtpd.c
+--- idled/imap/lmtpd.c	2006-05-06 17:26:18.000000000 +0200
++++ /tmp/dpep.Tv0u6M/idled/imap/lmtpd.c	2006-05-06 17:26:23.921079879 +0200
 @@ -95,6 +95,8 @@
  static sieve_interp_t *sieve_interp = NULL;
  #endif
@@ -513,17 +513,10 @@
  
      /* Set namespace */
      if ((r = mboxname_init_namespace(&lmtpd_namespace, 0)) != 0) {
-diff -urNad idled/imap/pop3d.c /tmp/dpep.d0Pjbd/idled/imap/pop3d.c
---- idled/imap/pop3d.c	2006-05-06 17:01:54.000000000 +0200
-+++ /tmp/dpep.d0Pjbd/idled/imap/pop3d.c	2006-05-06 17:02:11.153743401 +0200
-@@ -84,11 +84,14 @@
- #include "telemetry.h"
- #include "backend.h"
- 
-+#define IDLE config_idle
-+
- #ifdef HAVE_KRB
- /* kerberos des is purported to conflict with OpenSSL DES */
+diff -urNad idled/imap/pop3d.c /tmp/dpep.Tv0u6M/idled/imap/pop3d.c
+--- idled/imap/pop3d.c	2006-05-06 17:26:18.000000000 +0200
++++ /tmp/dpep.Tv0u6M/idled/imap/pop3d.c	2006-05-06 17:26:58.458830970 +0200
+@@ -89,6 +89,7 @@
  #define DES_DEFS
  #include <krb.h>
  
@@ -531,28 +524,27 @@
  /* MIT's kpop authentication kludge */
  char klrealm[REALM_SZ];
  AUTH_DAT kdata;
-@@ -301,7 +304,7 @@
+@@ -301,7 +302,7 @@
      quotadb_open(NULL);
  
      /* setup for sending IMAP IDLE notifications */
 -    idle_enabled();
-+    IDLE->enabled();
++    config_idle->enabled();
  
      /* Set namespace */
      if ((r = mboxname_init_namespace(&popd_namespace, 0)) != 0) {
-diff -urNad idled/imap/version.c /tmp/dpep.d0Pjbd/idled/imap/version.c
+diff -urNad idled/imap/version.c /tmp/dpep.Tv0u6M/idled/imap/version.c
 --- idled/imap/version.c	2006-05-06 17:01:45.000000000 +0200
-+++ /tmp/dpep.d0Pjbd/idled/imap/version.c	2006-05-06 17:01:55.909177223 +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 @@
++++ /tmp/dpep.Tv0u6M/idled/imap/version.c	2006-05-06 17:30:58.265270187 +0200
+@@ -62,6 +62,7 @@
+ #include "map.h"
+ #include "lock.h"
+ #include "nonblock.h"
++#include "global.h"
+ #include "idle.h"
+ 
+ #ifdef USE_SIEVE
+@@ -173,9 +174,8 @@
      snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
  	     " (%s)", krb4_version);
  #endif
@@ -560,13 +552,13 @@
 -	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");
++             "; idle = %s", config_idle->name);
  
      prot_printf(pout, " \"environment\" \"%s\"", env_buf);
  }
-diff -urNad idled/lib/imapoptions /tmp/dpep.d0Pjbd/idled/lib/imapoptions
---- idled/lib/imapoptions	2006-05-06 17:01:54.000000000 +0200
-+++ /tmp/dpep.d0Pjbd/idled/lib/imapoptions	2006-05-06 17:01:55.909177223 +0200
+diff -urNad idled/lib/imapoptions /tmp/dpep.Tv0u6M/idled/lib/imapoptions
+--- idled/lib/imapoptions	2006-05-06 17:26:19.000000000 +0200
++++ /tmp/dpep.Tv0u6M/idled/lib/imapoptions	2006-05-06 17:26:23.923079691 +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 */

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