[SVN] r583 - in /trunk/cyrus-imapd-2.2.13/debian: changelog
patches/23-configurable_idled.dpatch
debian at incase.de
debian at incase.de
Wed Aug 23 16:36:24 UTC 2006
Author: sven
Date: Wed Aug 23 18:36:22 2006
New Revision: 583
URL: https://mail.incase.de/viewcvs?rev=583&root=cyrus22&view=rev
Log:
Fix an implicit pointer conversion in imap/global.c (Closes: #384279)
Modified:
trunk/cyrus-imapd-2.2.13/debian/changelog
trunk/cyrus-imapd-2.2.13/debian/patches/23-configurable_idled.dpatch
Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=583&root=cyrus22&r1=582&r2=583&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Wed Aug 23 18:36:22 2006
@@ -18,9 +18,10 @@
* Change wording regarding installsieve in README.Debian. (Closes: #383485)
* Add a "WARNING" prefix to the error message about missing sieve scripts.
(Closes: #383640)
- * Add a logcheck ignore clause for sieve redirects. (Closes: #384265)
-
- -- Sven Mueller <sven at debian.org> Wed, 23 Aug 2006 18:05:08 +0200
+ * Add a logcheck ignore clause for sieve redirects. (Closes: #384265)
+ * Fix an implicit pointer conversion in imap/global.c (Closes: #384279)
+
+ -- Sven Mueller <sven at debian.org> Wed, 23 Aug 2006 18:35:31 +0200
cyrus-imapd-2.2 (2.2.13-6) unstable; urgency=low
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/23-configurable_idled.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/23-configurable_idled.dpatch?rev=583&root=cyrus22&r1=582&r2=583&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/23-configurable_idled.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/23-configurable_idled.dpatch Wed Aug 23 18:36:22 2006
@@ -5,9 +5,9 @@
## DP: Adds imapd.conf option to select IDLE method at runtime
@DPATCH@
-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
+diff -urNad cyrus-imapd-2.2.13/configure.in /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/configure.in
+--- cyrus-imapd-2.2.13/configure.in 2006-08-23 18:13:47.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/configure.in 2006-08-23 18:13:56.178920138 +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.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
+diff -urNad cyrus-imapd-2.2.13/imap/Makefile.in /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/Makefile.in
+--- cyrus-imapd-2.2.13/imap/Makefile.in 2006-08-23 18:13:47.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/Makefile.in 2006-08-23 18:13:56.178920138 +0200
@@ -47,9 +47,6 @@
# 'local' (legacy flat file).
SEEN=seen_db.o
@@ -50,10 +50,18 @@
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.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 @@
+diff -urNad cyrus-imapd-2.2.13/imap/global.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.c
+--- cyrus-imapd-2.2.13/imap/global.c 2006-08-23 18:13:47.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.c 2006-08-23 18:28:28.243411698 +0200
+@@ -72,6 +72,7 @@
+ #include "prot.h" /* for PROT_BUFSIZE */
+ #include "util.h"
+ #include "xmalloc.h"
++#include "idle.h"
+
+ static enum {
+ NOT_RUNNING = 0,
+@@ -94,6 +95,8 @@
/* syslog prefix tag */
static char syslog_prefix[20];
@@ -62,7 +70,7 @@
/* Called before a cyrus application starts (but after command line parameters
* are read) */
int cyrus_init(const char *alt_config, const char *ident, unsigned flags)
-@@ -185,6 +187,10 @@
+@@ -185,6 +188,10 @@
config_ptscache_db =
cyrusdb_fromname(config_getstring(IMAPOPT_PTSCACHE_DB));
@@ -73,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.DayPV6/idled/imap/global.h
---- idled/imap/global.h 2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.DayPV6/idled/imap/global.h 2006-05-08 15:26:26.586498608 +0200
+diff -urNad cyrus-imapd-2.2.13/imap/global.h /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.h
+--- cyrus-imapd-2.2.13/imap/global.h 2006-08-21 23:32:39.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.h 2006-08-23 18:13:56.179920040 +0200
@@ -152,4 +152,6 @@
extern struct cyrusdb_backend *config_tlscache_db;
extern struct cyrusdb_backend *config_ptscache_db;
@@ -83,9 +91,9 @@
+extern struct idle_backend *config_idle;
+
#endif /* INCLUDED_GLOBAL_H */
-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.DayPV6/idled/imap/idle.c 2006-05-08 15:26:26.587498514 +0200
+diff -urNad cyrus-imapd-2.2.13/imap/idle.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.c
+--- cyrus-imapd-2.2.13/imap/idle.c 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.c 2006-08-23 18:13:56.179920040 +0200
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
@@ -174,9 +182,9 @@
+
+ return idle;
+}
-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.DayPV6/idled/imap/idle.h 2006-05-08 15:26:26.587498514 +0200
+diff -urNad cyrus-imapd-2.2.13/imap/idle.h /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.h
+--- cyrus-imapd-2.2.13/imap/idle.h 2006-08-21 23:32:39.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.h 2006-08-23 18:13:56.180919942 +0200
@@ -44,8 +44,7 @@
#define IDLE_H
@@ -242,9 +250,9 @@
+struct idle_backend *idle_fromname(const char *name);
#endif
-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
+diff -urNad cyrus-imapd-2.2.13/imap/idle_idled.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_idled.c
+--- cyrus-imapd-2.2.13/imap/idle_idled.c 2006-08-23 18:13:47.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_idled.c 2006-08-23 18:13:56.180919942 +0200
@@ -58,8 +58,6 @@
#include "idled.h"
#include "global.h"
@@ -342,9 +350,9 @@
+ &idle_idled_start,
+ &idle_idled_done
+};
-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.DayPV6/idled/imap/idle_no.c 2006-05-08 15:26:26.588498420 +0200
+diff -urNad cyrus-imapd-2.2.13/imap/idle_no.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_no.c
+--- cyrus-imapd-2.2.13/imap/idle_no.c 2006-08-21 23:32:39.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_no.c 2006-08-23 18:13:56.181919844 +0200
@@ -42,23 +42,31 @@
#include "idle.h"
@@ -384,9 +392,9 @@
+ &idle_no_start,
+ &idle_no_done
+};
-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.DayPV6/idled/imap/idle_poll.c 2006-05-08 15:29:45.508817799 +0200
+diff -urNad cyrus-imapd-2.2.13/imap/idle_poll.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_poll.c
+--- cyrus-imapd-2.2.13/imap/idle_poll.c 2006-08-21 23:32:39.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_poll.c 2006-08-23 18:13:56.181919844 +0200
@@ -51,15 +51,13 @@
#include "idle.h"
#include "global.h"
@@ -453,9 +461,9 @@
+ &idle_poll_start,
+ &idle_poll_done
+};
-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.DayPV6/idled/imap/version.c 2006-05-08 15:26:26.588498420 +0200
+diff -urNad cyrus-imapd-2.2.13/imap/version.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/version.c
+--- cyrus-imapd-2.2.13/imap/version.c 2006-08-21 23:32:39.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/version.c 2006-08-23 18:13:56.181919844 +0200
@@ -62,6 +62,7 @@
#include "map.h"
#include "lock.h"
@@ -464,9 +472,9 @@
#include "idle.h"
#ifdef USE_SIEVE
-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
+diff -urNad cyrus-imapd-2.2.13/lib/Makefile.in /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/Makefile.in
+--- cyrus-imapd-2.2.13/lib/Makefile.in 2006-08-23 18:13:47.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/Makefile.in 2006-08-23 18:13:56.182919747 +0200
@@ -74,6 +74,8 @@
libdir = @libdir@
@@ -485,9 +493,9 @@
imapopts.h: imapopts.c
-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
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/imapoptions
+--- cyrus-imapd-2.2.13/lib/imapoptions 2006-08-23 18:13:47.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/imapoptions 2006-08-23 18:13:56.182919747 +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