[SVN] r443 -
/branches/idled/debian/patches/23-configurable_idled.dpatch
debian at incase.de
debian at incase.de
Sun May 7 23:28:47 UTC 2006
Author: sven
Date: Mon May 8 01:28:46 2006
New Revision: 443
URL: https://mail.incase.de/viewcvs?rev=443&root=cyrus22&view=rev
Log:
Fix a few more typos
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=443&root=cyrus22&r1=442&r2=443&view=diff
==============================================================================
--- branches/idled/debian/patches/23-configurable_idled.dpatch (original)
+++ branches/idled/debian/patches/23-configurable_idled.dpatch Mon May 8 01:28:46 2006
@@ -5,9 +5,9 @@
## DP: Adds imapd.conf option to select IDLE method at runtime
@DPATCH@
-diff -urNad idled/configure.in /tmp/dpep.EUtpTA/idled/configure.in
---- idled/configure.in 2006-05-08 01:20:34.000000000 +0200
-+++ /tmp/dpep.EUtpTA/idled/configure.in 2006-05-08 01:20:39.858597945 +0200
+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
@@ -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.EUtpTA/idled/imap/Makefile.in
---- idled/imap/Makefile.in 2006-05-08 01:20:34.000000000 +0200
-+++ /tmp/dpep.EUtpTA/idled/imap/Makefile.in 2006-05-08 01:20:39.859597850 +0200
+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
@@ -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.EUtpTA/idled/imap/global.c
---- idled/imap/global.c 2006-05-08 01:20:34.000000000 +0200
-+++ /tmp/dpep.EUtpTA/idled/imap/global.c 2006-05-08 01:20:39.859597850 +0200
+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
@@ -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.EUtpTA/idled/imap/global.h
+diff -urNad idled/imap/global.h /tmp/dpep.ZnLrCX/idled/imap/global.h
--- idled/imap/global.h 2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.EUtpTA/idled/imap/global.h 2006-05-08 01:20:39.860597756 +0200
++++ /tmp/dpep.ZnLrCX/idled/imap/global.h 2006-05-08 01:28:02.460695227 +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.EUtpTA/idled/imap/idle.c
+diff -urNad idled/imap/idle.c /tmp/dpep.ZnLrCX/idled/imap/idle.c
--- idled/imap/idle.c 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.EUtpTA/idled/imap/idle.c 2006-05-08 01:20:39.860597756 +0200
++++ /tmp/dpep.ZnLrCX/idled/imap/idle.c 2006-05-08 01:27:22.452481716 +0200
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
@@ -174,19 +174,20 @@
+
+ return idle;
+}
-diff -urNad idled/imap/idle.h /tmp/dpep.EUtpTA/idled/imap/idle.h
+diff -urNad idled/imap/idle.h /tmp/dpep.ZnLrCX/idled/imap/idle.h
--- idled/imap/idle.h 2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.EUtpTA/idled/imap/idle.h 2006-05-08 01:24:21.146644267 +0200
-@@ -45,8 +45,6 @@
++++ /tmp/dpep.ZnLrCX/idled/imap/idle.h 2006-05-08 01:28:18.915138005 +0200
+@@ -44,8 +44,7 @@
+ #define IDLE_H
#include "mailbox.h"
-
+-
-extern const char *idle_method_desc;
--
++#include "global.h"
+
typedef enum {
IDLE_MAILBOX = 0x1,
- IDLE_ALERT = 0x2
-@@ -54,20 +52,69 @@
+@@ -54,20 +53,68 @@
typedef void idle_updateproc_t(idle_flags_t flags);
@@ -242,9 +243,8 @@
+{
+ if (config_idle)
+ {
-+ return config_idle->start(mailbox);
++ config_idle->start(mailbox);
+ }
-+ return 0;
+}
+inline void idle_done(struct mailbox *mailbox)
+{
@@ -267,9 +267,9 @@
+struct idle_backend *idle_fromname(const char *name);
#endif
-diff -urNad idled/imap/idle_idled.c /tmp/dpep.EUtpTA/idled/imap/idle_idled.c
---- idled/imap/idle_idled.c 2006-05-08 01:20:34.000000000 +0200
-+++ /tmp/dpep.EUtpTA/idled/imap/idle_idled.c 2006-05-08 01:20:39.861597661 +0200
+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
@@ -58,8 +58,6 @@
#include "idled.h"
#include "global.h"
@@ -356,9 +356,9 @@
+ &idle_start,
+ &idle_done
+};
-diff -urNad idled/imap/idle_no.c /tmp/dpep.EUtpTA/idled/imap/idle_no.c
+diff -urNad idled/imap/idle_no.c /tmp/dpep.ZnLrCX/idled/imap/idle_no.c
--- idled/imap/idle_no.c 2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.EUtpTA/idled/imap/idle_no.c 2006-05-08 01:20:39.861597661 +0200
++++ /tmp/dpep.ZnLrCX/idled/imap/idle_no.c 2006-05-08 01:27:22.453481622 +0200
@@ -42,23 +42,31 @@
#include "idle.h"
@@ -398,9 +398,9 @@
+ &idle_start,
+ &idle_done
+};
-diff -urNad idled/imap/idle_poll.c /tmp/dpep.EUtpTA/idled/imap/idle_poll.c
+diff -urNad idled/imap/idle_poll.c /tmp/dpep.ZnLrCX/idled/imap/idle_poll.c
--- idled/imap/idle_poll.c 2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.EUtpTA/idled/imap/idle_poll.c 2006-05-08 01:20:39.862597566 +0200
++++ /tmp/dpep.ZnLrCX/idled/imap/idle_poll.c 2006-05-08 01:27:22.453481622 +0200
@@ -51,15 +51,13 @@
#include "idle.h"
#include "global.h"
@@ -456,9 +456,9 @@
+ &idle_start,
+ &idle_done
+};
-diff -urNad idled/imap/version.c /tmp/dpep.EUtpTA/idled/imap/version.c
+diff -urNad idled/imap/version.c /tmp/dpep.ZnLrCX/idled/imap/version.c
--- idled/imap/version.c 2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.EUtpTA/idled/imap/version.c 2006-05-08 01:20:39.862597566 +0200
++++ /tmp/dpep.ZnLrCX/idled/imap/version.c 2006-05-08 01:27:22.453481622 +0200
@@ -62,6 +62,7 @@
#include "map.h"
#include "lock.h"
@@ -467,9 +467,9 @@
#include "idle.h"
#ifdef USE_SIEVE
-diff -urNad idled/lib/Makefile.in /tmp/dpep.EUtpTA/idled/lib/Makefile.in
---- idled/lib/Makefile.in 2006-05-08 01:20:34.000000000 +0200
-+++ /tmp/dpep.EUtpTA/idled/lib/Makefile.in 2006-05-08 01:20:39.862597566 +0200
+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
@@ -74,6 +74,8 @@
libdir = @libdir@
@@ -488,9 +488,9 @@
imapopts.h: imapopts.c
-diff -urNad idled/lib/imapoptions /tmp/dpep.EUtpTA/idled/lib/imapoptions
---- idled/lib/imapoptions 2006-05-08 01:20:34.000000000 +0200
-+++ /tmp/dpep.EUtpTA/idled/lib/imapoptions 2006-05-08 01:20:39.863597471 +0200
+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
@@ -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