[SVN] r444 -
/branches/idled/debian/patches/23-configurable_idled.dpatch
debian at incase.de
debian at incase.de
Sun May 7 23:51:40 UTC 2006
Author: sven
Date: Mon May 8 01:51:40 2006
New Revision: 444
URL: https://mail.incase.de/viewcvs?rev=444&root=cyrus22&view=rev
Log:
Avoid name reusage as much as possible
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=444&root=cyrus22&r1=443&r2=444&view=diff
==============================================================================
--- branches/idled/debian/patches/23-configurable_idled.dpatch (original)
+++ branches/idled/debian/patches/23-configurable_idled.dpatch Mon May 8 01:51:40 2006
@@ -5,9 +5,9 @@
## DP: Adds imapd.conf option to select IDLE method at runtime
@DPATCH@
-diff -urNad idled/configure.in /tmp/dpep.ZnLrCX/idled/configure.in
---- idled/configure.in 2006-05-08 01:27:21.000000000 +0200
-+++ /tmp/dpep.ZnLrCX/idled/configure.in 2006-05-08 01:27:22.450481906 +0200
+diff -urNad idled/configure.in /tmp/dpep.yJjyuS/idled/configure.in
+--- idled/configure.in 2006-05-08 01:47:24.000000000 +0200
++++ /tmp/dpep.yJjyuS/idled/configure.in 2006-05-08 01:47:25.514693671 +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.ZnLrCX/idled/imap/Makefile.in
---- idled/imap/Makefile.in 2006-05-08 01:27:21.000000000 +0200
-+++ /tmp/dpep.ZnLrCX/idled/imap/Makefile.in 2006-05-08 01:27:22.450481906 +0200
+diff -urNad idled/imap/Makefile.in /tmp/dpep.yJjyuS/idled/imap/Makefile.in
+--- idled/imap/Makefile.in 2006-05-08 01:47:24.000000000 +0200
++++ /tmp/dpep.yJjyuS/idled/imap/Makefile.in 2006-05-08 01:47:25.514693671 +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.ZnLrCX/idled/imap/global.c
---- idled/imap/global.c 2006-05-08 01:27:21.000000000 +0200
-+++ /tmp/dpep.ZnLrCX/idled/imap/global.c 2006-05-08 01:27:22.451481811 +0200
+diff -urNad idled/imap/global.c /tmp/dpep.yJjyuS/idled/imap/global.c
+--- idled/imap/global.c 2006-05-08 01:47:24.000000000 +0200
++++ /tmp/dpep.yJjyuS/idled/imap/global.c 2006-05-08 01:47:25.515693576 +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.ZnLrCX/idled/imap/global.h
+diff -urNad idled/imap/global.h /tmp/dpep.yJjyuS/idled/imap/global.h
--- idled/imap/global.h 2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.ZnLrCX/idled/imap/global.h 2006-05-08 01:28:02.460695227 +0200
++++ /tmp/dpep.yJjyuS/idled/imap/global.h 2006-05-08 01:47:25.515693576 +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.ZnLrCX/idled/imap/idle.c
+diff -urNad idled/imap/idle.c /tmp/dpep.yJjyuS/idled/imap/idle.c
--- idled/imap/idle.c 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.ZnLrCX/idled/imap/idle.c 2006-05-08 01:27:22.452481716 +0200
++++ /tmp/dpep.yJjyuS/idled/imap/idle.c 2006-05-08 01:47:25.515693576 +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.ZnLrCX/idled/imap/idle.h
+diff -urNad idled/imap/idle.h /tmp/dpep.yJjyuS/idled/imap/idle.h
--- idled/imap/idle.h 2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.ZnLrCX/idled/imap/idle.h 2006-05-08 01:28:18.915138005 +0200
++++ /tmp/dpep.yJjyuS/idled/imap/idle.h 2006-05-08 01:47:25.516693482 +0200
@@ -44,8 +44,7 @@
#define IDLE_H
@@ -267,9 +267,9 @@
+struct idle_backend *idle_fromname(const char *name);
#endif
-diff -urNad idled/imap/idle_idled.c /tmp/dpep.ZnLrCX/idled/imap/idle_idled.c
---- idled/imap/idle_idled.c 2006-05-08 01:27:21.000000000 +0200
-+++ /tmp/dpep.ZnLrCX/idled/imap/idle_idled.c 2006-05-08 01:27:22.452481716 +0200
+diff -urNad idled/imap/idle_idled.c /tmp/dpep.yJjyuS/idled/imap/idle_idled.c
+--- idled/imap/idle_idled.c 2006-05-08 01:47:24.000000000 +0200
++++ /tmp/dpep.yJjyuS/idled/imap/idle_idled.c 2006-05-08 01:49:45.691443126 +0200
@@ -58,8 +58,6 @@
#include "idled.h"
#include "global.h"
@@ -293,7 +293,7 @@
* Create connection to idled for sending notifications
*/
-int idle_enabled(void)
-+static int idle_enabled(void)
++static int idle_idle_enabled(void)
{
int s;
int fdflags;
@@ -302,16 +302,24 @@
}
-int idle_init(idle_updateproc_t *proc)
-+static int idle_init(idle_updateproc_t *proc)
++static int idle_idled_init(idle_updateproc_t *proc)
{
struct sigaction action;
-@@ -184,7 +182,7 @@
+@@ -177,14 +175,14 @@
+ syslog(LOG_ERR, "sigaction: %m");
+
+ /* Cancel receiving signals */
+- idle_done(NULL);
++ idle_idled_done(NULL);
+ return 0;
+ }
+
return 1;
}
-void idle_start(struct mailbox *mailbox)
-+static void idle_start(struct mailbox *mailbox)
++static void idle_idle_start(struct mailbox *mailbox)
{
idle_started = 1;
@@ -320,7 +328,7 @@
}
-void idle_done(struct mailbox *mailbox)
-+static void idle_done(struct mailbox *mailbox)
++static void idle_idled_done(struct mailbox *mailbox)
{
/* Tell idled that we're done idling */
idle_send_msg(IDLE_DONE, mailbox);
@@ -350,15 +358,15 @@
+{
+ "idled", /* name */
+
-+ &idle_enabled,
-+ &idle_init,
-+
-+ &idle_start,
-+ &idle_done
++ &idle_idled_enabled,
++ &idle_idled_init,
++
++ &idle_idled_start,
++ &idle_idled_done
+};
-diff -urNad idled/imap/idle_no.c /tmp/dpep.ZnLrCX/idled/imap/idle_no.c
+diff -urNad idled/imap/idle_no.c /tmp/dpep.yJjyuS/idled/imap/idle_no.c
--- idled/imap/idle_no.c 2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.ZnLrCX/idled/imap/idle_no.c 2006-05-08 01:27:22.453481622 +0200
++++ /tmp/dpep.yJjyuS/idled/imap/idle_no.c 2006-05-08 01:50:24.005821803 +0200
@@ -42,23 +42,31 @@
#include "idle.h"
@@ -367,24 +375,24 @@
-const char *idle_method_desc = (char *)0;
-
-int idle_enabled(void)
-+static int idle_enabled(void)
++static int idle_no_enabled(void)
{
return 0;
}
-int idle_init(idle_updateproc_t *proc)
-+static int idle_init(idle_updateproc_t *proc)
++static int idle_no_init(idle_updateproc_t *proc)
{
return 0;
}
-void idle_start(struct mailbox *mailbox)
-+static void idle_start(struct mailbox *mailbox __attribute__((unused)))
++static void idle_no_start(struct mailbox *mailbox __attribute__((unused)))
{
}
-void idle_done(struct mailbox *mailbox)
-+static void idle_done(struct mailbox *mailbox __attribute__((unused)))
++static void idle_no_done(struct mailbox *mailbox __attribute__((unused)))
{
}
+
@@ -392,15 +400,15 @@
+{
+ "no", /* name */
+
-+ &idle_enabled,
-+ &idle_init,
-+
-+ &idle_start,
-+ &idle_done
++ &idle_no_enabled,
++ &idle_no_init,
++
++ &idle_no_start,
++ &idle_no_done
+};
-diff -urNad idled/imap/idle_poll.c /tmp/dpep.ZnLrCX/idled/imap/idle_poll.c
+diff -urNad idled/imap/idle_poll.c /tmp/dpep.yJjyuS/idled/imap/idle_poll.c
--- idled/imap/idle_poll.c 2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.ZnLrCX/idled/imap/idle_poll.c 2006-05-08 01:27:22.453481622 +0200
++++ /tmp/dpep.yJjyuS/idled/imap/idle_poll.c 2006-05-08 01:51:11.253356401 +0200
@@ -51,15 +51,13 @@
#include "idle.h"
#include "global.h"
@@ -414,7 +422,7 @@
static time_t idle_period = -1;
-int idle_enabled(void)
-+static int idle_enabled(void)
++static int idle_poll_enabled(void)
{
/* get polling period */
if (idle_period == -1) {
@@ -423,22 +431,30 @@
}
-int idle_init(idle_updateproc_t *proc)
-+static int idle_init(idle_updateproc_t *proc)
++static int idle_poll_init(idle_updateproc_t *proc)
{
struct sigaction action;
-@@ -103,15 +101,26 @@
+@@ -96,22 +94,33 @@
+ syslog(LOG_ERR, "sigaction: %m");
+
+ /* Cancel receiving signals */
+- idle_done(NULL);
++ idle_poll_done(NULL);
+ return 0;
+ }
+
return 1;
}
-void idle_start(struct mailbox *mailbox __attribute__((unused)))
-+static void idle_start(struct mailbox *mailbox __attribute__((unused)))
++static void idle_poll_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)))
++static void idle_poll_done(struct mailbox *mailbox __attribute__((unused)))
{
/* Remove the polling function */
signal(SIGALRM, SIG_IGN);
@@ -450,15 +466,15 @@
+{
+ "poll", /* name */
+
-+ &idle_enabled,
-+ &idle_init,
-+
-+ &idle_start,
-+ &idle_done
++ &idle_poll_enabled,
++ &idle_poll_init,
++
++ &idle_poll_start,
++ &idle_poll_done
+};
-diff -urNad idled/imap/version.c /tmp/dpep.ZnLrCX/idled/imap/version.c
+diff -urNad idled/imap/version.c /tmp/dpep.yJjyuS/idled/imap/version.c
--- idled/imap/version.c 2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.ZnLrCX/idled/imap/version.c 2006-05-08 01:27:22.453481622 +0200
++++ /tmp/dpep.yJjyuS/idled/imap/version.c 2006-05-08 01:47:25.517693387 +0200
@@ -62,6 +62,7 @@
#include "map.h"
#include "lock.h"
@@ -467,9 +483,9 @@
#include "idle.h"
#ifdef USE_SIEVE
-diff -urNad idled/lib/Makefile.in /tmp/dpep.ZnLrCX/idled/lib/Makefile.in
---- idled/lib/Makefile.in 2006-05-08 01:27:21.000000000 +0200
-+++ /tmp/dpep.ZnLrCX/idled/lib/Makefile.in 2006-05-08 01:27:22.454481527 +0200
+diff -urNad idled/lib/Makefile.in /tmp/dpep.yJjyuS/idled/lib/Makefile.in
+--- idled/lib/Makefile.in 2006-05-08 01:47:24.000000000 +0200
++++ /tmp/dpep.yJjyuS/idled/lib/Makefile.in 2006-05-08 01:47:25.518693293 +0200
@@ -74,6 +74,8 @@
libdir = @libdir@
@@ -488,9 +504,9 @@
imapopts.h: imapopts.c
-diff -urNad idled/lib/imapoptions /tmp/dpep.ZnLrCX/idled/lib/imapoptions
---- idled/lib/imapoptions 2006-05-08 01:27:21.000000000 +0200
-+++ /tmp/dpep.ZnLrCX/idled/lib/imapoptions 2006-05-08 01:27:22.454481527 +0200
+diff -urNad idled/lib/imapoptions /tmp/dpep.yJjyuS/idled/lib/imapoptions
+--- idled/lib/imapoptions 2006-05-08 01:47:24.000000000 +0200
++++ /tmp/dpep.yJjyuS/idled/lib/imapoptions 2006-05-08 01:47:25.518693293 +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