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

debian at incase.de debian at incase.de
Mon May 8 13:31:11 UTC 2006 

Author: sven
Date: Mon May  8 15:31:10 2006
New Revision: 447

URL: https://mail.incase.de/viewcvs?rev=447&root=cyrus22&view=rev
Log:
Fix problem reported by Edward Shornock by doing a forward declaration of idle_{poll,idled}_done as needed - Weird that I didn't catch that error when building in pbuilder

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=447&root=cyrus22&r1=446&r2=447&view=diff
==============================================================================
--- branches/idled/debian/patches/23-configurable_idled.dpatch (original)
+++ branches/idled/debian/patches/23-configurable_idled.dpatch Mon May  8 15:31:10 2006
@@ -5,9 +5,9 @@
 ## DP: Adds imapd.conf option to select IDLE method at runtime
 
 @DPATCH@
-diff -urNad idled/configure.in /tmp/dpep.Wl9r0C/idled/configure.in
---- idled/configure.in	2006-05-08 02:14:33.000000000 +0200
-+++ /tmp/dpep.Wl9r0C/idled/configure.in	2006-05-08 02:14:34.207834408 +0200
+diff -urNad idled/configure.in /tmp/dpep.DayPV6/idled/configure.in
+--- idled/configure.in	2006-05-08 15:26:22.000000000 +0200
++++ /tmp/dpep.DayPV6/idled/configure.in	2006-05-08 15:26:26.585498702 +0200
 @@ -760,9 +760,6 @@
                            METHOD is [poll], idled or no],
  	WITH_IDLE="${withval}",WITH_IDLE="poll")
@@ -18,9 +18,9 @@
  
  dnl
  dnl see if we're compiling with NNTP support
-diff -urNad idled/imap/Makefile.in /tmp/dpep.Wl9r0C/idled/imap/Makefile.in
---- idled/imap/Makefile.in	2006-05-08 02:14:32.000000000 +0200
-+++ /tmp/dpep.Wl9r0C/idled/imap/Makefile.in	2006-05-08 02:14:34.208834314 +0200
+diff -urNad idled/imap/Makefile.in /tmp/dpep.DayPV6/idled/imap/Makefile.in
+--- idled/imap/Makefile.in	2006-05-08 15:26:22.000000000 +0200
++++ /tmp/dpep.DayPV6/idled/imap/Makefile.in	2006-05-08 15:26:26.585498702 +0200
 @@ -47,9 +47,6 @@
  # 'local' (legacy flat file).
  SEEN=seen_db.o
@@ -50,9 +50,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.Wl9r0C/idled/imap/global.c
---- idled/imap/global.c	2006-05-08 02:14:33.000000000 +0200
-+++ /tmp/dpep.Wl9r0C/idled/imap/global.c	2006-05-08 02:14:34.209834219 +0200
+diff -urNad idled/imap/global.c /tmp/dpep.DayPV6/idled/imap/global.c
+--- idled/imap/global.c	2006-05-08 15:26:22.000000000 +0200
++++ /tmp/dpep.DayPV6/idled/imap/global.c	2006-05-08 15:26:26.586498608 +0200
 @@ -94,6 +94,8 @@
  /* syslog prefix tag */
  static char syslog_prefix[20];
@@ -73,9 +73,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.Wl9r0C/idled/imap/global.h
+diff -urNad idled/imap/global.h /tmp/dpep.DayPV6/idled/imap/global.h
 --- idled/imap/global.h	2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.Wl9r0C/idled/imap/global.h	2006-05-08 02:14:34.209834219 +0200
++++ /tmp/dpep.DayPV6/idled/imap/global.h	2006-05-08 15:26:26.586498608 +0200
 @@ -152,4 +152,6 @@
  extern struct cyrusdb_backend *config_tlscache_db;
  extern struct cyrusdb_backend *config_ptscache_db;
@@ -83,9 +83,9 @@
 +extern struct idle_backend *config_idle;
 +
  #endif /* INCLUDED_GLOBAL_H */
-diff -urNad idled/imap/idle.c /tmp/dpep.Wl9r0C/idled/imap/idle.c
+diff -urNad idled/imap/idle.c /tmp/dpep.DayPV6/idled/imap/idle.c
 --- idled/imap/idle.c	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.Wl9r0C/idled/imap/idle.c	2006-05-08 02:14:34.209834219 +0200
++++ /tmp/dpep.DayPV6/idled/imap/idle.c	2006-05-08 15:26:26.587498514 +0200
 @@ -0,0 +1,87 @@
 +/* 
 + * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
@@ -174,9 +174,9 @@
 +
 +    return idle;
 +}
-diff -urNad idled/imap/idle.h /tmp/dpep.Wl9r0C/idled/imap/idle.h
+diff -urNad idled/imap/idle.h /tmp/dpep.DayPV6/idled/imap/idle.h
 --- idled/imap/idle.h	2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.Wl9r0C/idled/imap/idle.h	2006-05-08 02:17:30.286210335 +0200
++++ /tmp/dpep.DayPV6/idled/imap/idle.h	2006-05-08 15:26:26.587498514 +0200
 @@ -44,8 +44,7 @@
  #define IDLE_H
  
@@ -242,9 +242,9 @@
 +struct idle_backend *idle_fromname(const char *name);
  
  #endif
-diff -urNad idled/imap/idle_idled.c /tmp/dpep.Wl9r0C/idled/imap/idle_idled.c
---- idled/imap/idle_idled.c	2006-05-08 02:14:33.000000000 +0200
-+++ /tmp/dpep.Wl9r0C/idled/imap/idle_idled.c	2006-05-08 02:14:34.210834125 +0200
+diff -urNad idled/imap/idle_idled.c /tmp/dpep.DayPV6/idled/imap/idle_idled.c
+--- idled/imap/idle_idled.c	2006-05-08 15:26:22.000000000 +0200
++++ /tmp/dpep.DayPV6/idled/imap/idle_idled.c	2006-05-08 15:29:34.198879922 +0200
 @@ -58,8 +58,6 @@
  #include "idled.h"
  #include "global.h"
@@ -272,16 +272,19 @@
  {
      int s;
      int fdflags;
-@@ -154,7 +152,7 @@
+@@ -154,7 +152,10 @@
      }
  }
  
 -int idle_init(idle_updateproc_t *proc)
++/* forward declaration */
++static void idle_idled_done(struct mailbox *mailbox);
++
 +static int idle_idled_init(idle_updateproc_t *proc)
  {
      struct sigaction action;
  
-@@ -177,14 +175,14 @@
+@@ -177,14 +178,14 @@
  	syslog(LOG_ERR, "sigaction: %m");
  
  	/* Cancel receiving signals */
@@ -298,7 +301,7 @@
  {
      idle_started = 1;
  
-@@ -195,7 +193,7 @@
+@@ -195,7 +196,7 @@
      }
  }
  
@@ -307,7 +310,7 @@
  {
      /* Tell idled that we're done idling */
      idle_send_msg(IDLE_DONE, mailbox);
-@@ -212,7 +210,7 @@
+@@ -212,7 +213,7 @@
  /*
   * Send a message to idled
   */
@@ -316,7 +319,7 @@
  {
      idle_data_t idledata;
  
-@@ -235,10 +233,21 @@
+@@ -235,10 +236,21 @@
  /*
   * Notify imapidled of a mailbox change
   */
@@ -339,9 +342,9 @@
 +    &idle_idled_start,
 +    &idle_idled_done
 +};
-diff -urNad idled/imap/idle_no.c /tmp/dpep.Wl9r0C/idled/imap/idle_no.c
+diff -urNad idled/imap/idle_no.c /tmp/dpep.DayPV6/idled/imap/idle_no.c
 --- idled/imap/idle_no.c	2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.Wl9r0C/idled/imap/idle_no.c	2006-05-08 02:14:34.210834125 +0200
++++ /tmp/dpep.DayPV6/idled/imap/idle_no.c	2006-05-08 15:26:26.588498420 +0200
 @@ -42,23 +42,31 @@
  
  #include "idle.h"
@@ -381,9 +384,9 @@
 +    &idle_no_start,
 +    &idle_no_done
 +};
-diff -urNad idled/imap/idle_poll.c /tmp/dpep.Wl9r0C/idled/imap/idle_poll.c
+diff -urNad idled/imap/idle_poll.c /tmp/dpep.DayPV6/idled/imap/idle_poll.c
 --- idled/imap/idle_poll.c	2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.Wl9r0C/idled/imap/idle_poll.c	2006-05-08 02:14:34.211834030 +0200
++++ /tmp/dpep.DayPV6/idled/imap/idle_poll.c	2006-05-08 15:29:45.508817799 +0200
 @@ -51,15 +51,13 @@
  #include "idle.h"
  #include "global.h"
@@ -401,16 +404,19 @@
  {
      /* get polling period */
      if (idle_period == -1) {
-@@ -78,7 +76,7 @@
+@@ -78,7 +76,10 @@
      alarm(idle_period);
  }
  
 -int idle_init(idle_updateproc_t *proc)
++/* forward declaration */
++static void idle_poll_done(struct mailbox *mailbox __attribute__((unused)));
++
 +static int idle_poll_init(idle_updateproc_t *proc)
  {
      struct sigaction action;
  
-@@ -96,22 +94,33 @@
+@@ -96,22 +97,33 @@
  	syslog(LOG_ERR, "sigaction: %m");
  
  	/* Cancel receiving signals */
@@ -447,9 +453,9 @@
 +    &idle_poll_start,
 +    &idle_poll_done
 +};
-diff -urNad idled/imap/version.c /tmp/dpep.Wl9r0C/idled/imap/version.c
+diff -urNad idled/imap/version.c /tmp/dpep.DayPV6/idled/imap/version.c
 --- idled/imap/version.c	2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.Wl9r0C/idled/imap/version.c	2006-05-08 02:14:34.211834030 +0200
++++ /tmp/dpep.DayPV6/idled/imap/version.c	2006-05-08 15:26:26.588498420 +0200
 @@ -62,6 +62,7 @@
  #include "map.h"
  #include "lock.h"
@@ -458,9 +464,9 @@
  #include "idle.h"
  
  #ifdef USE_SIEVE
-diff -urNad idled/lib/Makefile.in /tmp/dpep.Wl9r0C/idled/lib/Makefile.in
---- idled/lib/Makefile.in	2006-05-08 02:14:32.000000000 +0200
-+++ /tmp/dpep.Wl9r0C/idled/lib/Makefile.in	2006-05-08 02:14:34.211834030 +0200
+diff -urNad idled/lib/Makefile.in /tmp/dpep.DayPV6/idled/lib/Makefile.in
+--- idled/lib/Makefile.in	2006-05-08 15:26:22.000000000 +0200
++++ /tmp/dpep.DayPV6/idled/lib/Makefile.in	2006-05-08 15:26:26.589498326 +0200
 @@ -74,6 +74,8 @@
  
  libdir = @libdir@
@@ -479,9 +485,9 @@
  
  imapopts.h: imapopts.c
  
-diff -urNad idled/lib/imapoptions /tmp/dpep.Wl9r0C/idled/lib/imapoptions
---- idled/lib/imapoptions	2006-05-08 02:14:33.000000000 +0200
-+++ /tmp/dpep.Wl9r0C/idled/lib/imapoptions	2006-05-08 02:14:34.212833936 +0200
+diff -urNad idled/lib/imapoptions /tmp/dpep.DayPV6/idled/lib/imapoptions
+--- idled/lib/imapoptions	2006-05-08 15:26:22.000000000 +0200
++++ /tmp/dpep.DayPV6/idled/lib/imapoptions	2006-05-08 15:26:26.589498326 +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