[SVN] r422 -
/branches/idled/debian/patches/23-configurable_idled.dpatch
debian at incase.de
debian at incase.de
Sat May 6 14:47:10 UTC 2006
Author: sven
Date: Sat May 6 16:47:09 2006
New Revision: 422
URL: https://mail.incase.de/viewcvs?rev=422&root=cyrus22&view=rev
Log:
Avoid name conflicts
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=422&root=cyrus22&r1=421&r2=422&view=diff
==============================================================================
--- branches/idled/debian/patches/23-configurable_idled.dpatch (original)
+++ branches/idled/debian/patches/23-configurable_idled.dpatch Sat May 6 16:47:09 2006
@@ -5,9 +5,9 @@
## DP: Adds imapd.conf option to select IDLE method at runtime
@DPATCH@
-diff -urNad idled/configure.in /tmp/dpep.BCB2vc/idled/configure.in
---- idled/configure.in 2006-05-06 16:31:01.000000000 +0200
-+++ /tmp/dpep.BCB2vc/idled/configure.in 2006-05-06 16:31:02.843617852 +0200
+diff -urNad idled/configure.in /tmp/dpep.F5sjyU/idled/configure.in
+--- idled/configure.in 2006-05-06 16:39:42.000000000 +0200
++++ /tmp/dpep.F5sjyU/idled/configure.in 2006-05-06 16:39:44.041454485 +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.BCB2vc/idled/imap/Makefile.in
---- idled/imap/Makefile.in 2006-05-06 16:31:01.000000000 +0200
-+++ /tmp/dpep.BCB2vc/idled/imap/Makefile.in 2006-05-06 16:31:02.843617852 +0200
+diff -urNad idled/imap/Makefile.in /tmp/dpep.F5sjyU/idled/imap/Makefile.in
+--- idled/imap/Makefile.in 2006-05-06 16:39:42.000000000 +0200
++++ /tmp/dpep.F5sjyU/idled/imap/Makefile.in 2006-05-06 16:39:44.041454485 +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.BCB2vc/idled/imap/global.c
---- idled/imap/global.c 2006-05-06 16:31:01.000000000 +0200
-+++ /tmp/dpep.BCB2vc/idled/imap/global.c 2006-05-06 16:31:02.843617852 +0200
+diff -urNad idled/imap/global.c /tmp/dpep.F5sjyU/idled/imap/global.c
+--- idled/imap/global.c 2006-05-06 16:39:42.000000000 +0200
++++ /tmp/dpep.F5sjyU/idled/imap/global.c 2006-05-06 16:39:44.042454391 +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.BCB2vc/idled/imap/global.h
+diff -urNad idled/imap/global.h /tmp/dpep.F5sjyU/idled/imap/global.h
--- idled/imap/global.h 2006-05-06 14:51:15.000000000 +0200
-+++ /tmp/dpep.BCB2vc/idled/imap/global.h 2006-05-06 16:31:02.844617758 +0200
++++ /tmp/dpep.F5sjyU/idled/imap/global.h 2006-05-06 16:39:44.042454391 +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.BCB2vc/idled/imap/idle.c
+diff -urNad idled/imap/idle.c /tmp/dpep.F5sjyU/idled/imap/idle.c
--- idled/imap/idle.c 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.BCB2vc/idled/imap/idle.c 2006-05-06 16:31:02.844617758 +0200
++++ /tmp/dpep.F5sjyU/idled/imap/idle.c 2006-05-06 16:46:13.783791955 +0200
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
@@ -157,9 +157,9 @@
+#include "exitcodes.h"
+
+struct idle_backend *idle_backends[] = {
-+ &idle_no,
-+ &idle_poll,
-+ &idle_idled,
++ &id_bk_no,
++ &id_bk_poll,
++ &id_bk_idled,
+ NULL };
+
+struct idle_backend *idle_fromname(const char *name)
@@ -181,9 +181,9 @@
+
+ return idle;
+}
-diff -urNad idled/imap/idle.h /tmp/dpep.BCB2vc/idled/imap/idle.h
+diff -urNad idled/imap/idle.h /tmp/dpep.F5sjyU/idled/imap/idle.h
--- idled/imap/idle.h 2006-05-06 14:51:15.000000000 +0200
-+++ /tmp/dpep.BCB2vc/idled/imap/idle.h 2006-05-06 16:31:02.845617664 +0200
++++ /tmp/dpep.F5sjyU/idled/imap/idle.h 2006-05-06 16:46:07.721362200 +0200
@@ -45,8 +45,6 @@
#include "mailbox.h"
@@ -231,17 +231,17 @@
+
+/* 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;
++extern struct idle_backend id_bk_no;
++extern struct idle_backend id_bk_poll;
++extern struct idle_backend id_bk_idled;
+
+/* Configuration */
+struct idle_backend *idle_fromname(const char *name);
#endif
-diff -urNad idled/imap/idle_idled.c /tmp/dpep.BCB2vc/idled/imap/idle_idled.c
---- idled/imap/idle_idled.c 2006-05-06 16:31:01.000000000 +0200
-+++ /tmp/dpep.BCB2vc/idled/imap/idle_idled.c 2006-05-06 16:31:02.845617664 +0200
+diff -urNad idled/imap/idle_idled.c /tmp/dpep.F5sjyU/idled/imap/idle_idled.c
+--- idled/imap/idle_idled.c 2006-05-06 16:39:42.000000000 +0200
++++ /tmp/dpep.F5sjyU/idled/imap/idle_idled.c 2006-05-06 16:46:28.053449728 +0200
@@ -58,8 +58,6 @@
#include "idled.h"
#include "global.h"
@@ -318,7 +318,7 @@
idle_send_msg(IDLE_NOTIFY, mailbox);
}
+
-+struct idle_backend idle_idled =
++struct idle_backend id_bk_idled =
+{
+ "idled", /* name */
+
@@ -328,9 +328,9 @@
+ &idle_start,
+ &idle_done
+};
-diff -urNad idled/imap/idle_no.c /tmp/dpep.BCB2vc/idled/imap/idle_no.c
+diff -urNad idled/imap/idle_no.c /tmp/dpep.F5sjyU/idled/imap/idle_no.c
--- idled/imap/idle_no.c 2006-05-06 14:51:15.000000000 +0200
-+++ /tmp/dpep.BCB2vc/idled/imap/idle_no.c 2006-05-06 16:35:21.900151421 +0200
++++ /tmp/dpep.F5sjyU/idled/imap/idle_no.c 2006-05-06 16:46:20.495160672 +0200
@@ -42,23 +42,31 @@
#include "idle.h"
@@ -360,7 +360,7 @@
{
}
+
-+struct idle_backend idle_no =
++struct idle_backend id_bk_no =
+{
+ "no", /* name */
+
@@ -370,9 +370,9 @@
+ &idle_start,
+ &idle_done
+};
-diff -urNad idled/imap/idle_poll.c /tmp/dpep.BCB2vc/idled/imap/idle_poll.c
+diff -urNad idled/imap/idle_poll.c /tmp/dpep.F5sjyU/idled/imap/idle_poll.c
--- idled/imap/idle_poll.c 2006-05-06 14:51:15.000000000 +0200
-+++ /tmp/dpep.BCB2vc/idled/imap/idle_poll.c 2006-05-06 16:31:02.846617569 +0200
++++ /tmp/dpep.F5sjyU/idled/imap/idle_poll.c 2006-05-06 16:46:17.998395522 +0200
@@ -51,15 +51,13 @@
#include "idle.h"
#include "global.h"
@@ -418,7 +418,7 @@
idle_update = NULL;
}
+
-+struct idle_backend idle_poll =
++struct idle_backend id_bk_poll =
+{
+ "poll", /* name */
+
@@ -428,9 +428,9 @@
+ &idle_start,
+ &idle_done
+};
-diff -urNad idled/imap/imapd.c /tmp/dpep.BCB2vc/idled/imap/imapd.c
---- idled/imap/imapd.c 2006-05-06 16:31:01.000000000 +0200
-+++ /tmp/dpep.BCB2vc/idled/imap/imapd.c 2006-05-06 16:31:02.849617286 +0200
+diff -urNad idled/imap/imapd.c /tmp/dpep.F5sjyU/idled/imap/imapd.c
+--- idled/imap/imapd.c 2006-05-06 16:39:43.000000000 +0200
++++ /tmp/dpep.F5sjyU/idled/imap/imapd.c 2006-05-06 16:39:44.047453921 +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.BCB2vc/idled/imap/lmtpd.c
---- idled/imap/lmtpd.c 2006-05-06 16:31:01.000000000 +0200
-+++ /tmp/dpep.BCB2vc/idled/imap/lmtpd.c 2006-05-06 16:31:02.850617191 +0200
+diff -urNad idled/imap/lmtpd.c /tmp/dpep.F5sjyU/idled/imap/lmtpd.c
+--- idled/imap/lmtpd.c 2006-05-06 16:39:42.000000000 +0200
++++ /tmp/dpep.F5sjyU/idled/imap/lmtpd.c 2006-05-06 16:39:44.048453827 +0200
@@ -95,6 +95,8 @@
static sieve_interp_t *sieve_interp = NULL;
#endif
@@ -513,9 +513,9 @@
/* Set namespace */
if ((r = mboxname_init_namespace(&lmtpd_namespace, 0)) != 0) {
-diff -urNad idled/imap/pop3d.c /tmp/dpep.BCB2vc/idled/imap/pop3d.c
---- idled/imap/pop3d.c 2006-05-06 16:31:01.000000000 +0200
-+++ /tmp/dpep.BCB2vc/idled/imap/pop3d.c 2006-05-06 16:31:02.851617097 +0200
+diff -urNad idled/imap/pop3d.c /tmp/dpep.F5sjyU/idled/imap/pop3d.c
+--- idled/imap/pop3d.c 2006-05-06 16:39:42.000000000 +0200
++++ /tmp/dpep.F5sjyU/idled/imap/pop3d.c 2006-05-06 16:39:44.049453733 +0200
@@ -89,6 +89,8 @@
#define DES_DEFS
#include <krb.h>
@@ -534,9 +534,9 @@
/* Set namespace */
if ((r = mboxname_init_namespace(&popd_namespace, 0)) != 0) {
-diff -urNad idled/imap/version.c /tmp/dpep.BCB2vc/idled/imap/version.c
+diff -urNad idled/imap/version.c /tmp/dpep.F5sjyU/idled/imap/version.c
--- idled/imap/version.c 2006-05-06 14:51:15.000000000 +0200
-+++ /tmp/dpep.BCB2vc/idled/imap/version.c 2006-05-06 16:31:02.851617097 +0200
++++ /tmp/dpep.F5sjyU/idled/imap/version.c 2006-05-06 16:39:44.049453733 +0200
@@ -68,6 +68,8 @@
#include "sieve_interface.h"
#endif
@@ -558,9 +558,9 @@
prot_printf(pout, " \"environment\" \"%s\"", env_buf);
}
-diff -urNad idled/lib/imapoptions /tmp/dpep.BCB2vc/idled/lib/imapoptions
---- idled/lib/imapoptions 2006-05-06 16:31:01.000000000 +0200
-+++ /tmp/dpep.BCB2vc/idled/lib/imapoptions 2006-05-06 16:31:02.852617002 +0200
+diff -urNad idled/lib/imapoptions /tmp/dpep.F5sjyU/idled/lib/imapoptions
+--- idled/lib/imapoptions 2006-05-06 16:39:43.000000000 +0200
++++ /tmp/dpep.F5sjyU/idled/lib/imapoptions 2006-05-06 16:39:44.050453639 +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