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

debian at incase.de debian at incase.de
Sat May 6 14:27:40 UTC 2006 

Author: sven
Date: Sat May  6 16:27:38 2006
New Revision: 420

URL: https://mail.incase.de/viewcvs?rev=420&root=cyrus22&view=rev
Log:
Fix another error and hopefully a few warnings

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=420&root=cyrus22&r1=419&r2=420&view=diff
==============================================================================
--- branches/idled/debian/patches/23-configurable_idled.dpatch (original)
+++ branches/idled/debian/patches/23-configurable_idled.dpatch Sat May  6 16:27:38 2006
@@ -5,9 +5,9 @@
 ## DP: Adds imapd.conf option to select IDLE method at runtime
 
 @DPATCH@
-diff -urNad idled/configure.in /tmp/dpep.JGdoug/idled/configure.in
---- idled/configure.in	2006-05-06 14:51:16.000000000 +0200
-+++ /tmp/dpep.JGdoug/idled/configure.in	2006-05-06 14:51:18.163885333 +0200
+diff -urNad idled/configure.in /tmp/dpep.NpaAFa/idled/configure.in
+--- idled/configure.in	2006-05-06 16:22:42.000000000 +0200
++++ /tmp/dpep.NpaAFa/idled/configure.in	2006-05-06 16:22:45.129649549 +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.JGdoug/idled/imap/Makefile.in
---- idled/imap/Makefile.in	2006-05-06 14:51:16.000000000 +0200
-+++ /tmp/dpep.JGdoug/idled/imap/Makefile.in	2006-05-06 14:51:18.164885239 +0200
+diff -urNad idled/imap/Makefile.in /tmp/dpep.NpaAFa/idled/imap/Makefile.in
+--- idled/imap/Makefile.in	2006-05-06 16:22:42.000000000 +0200
++++ /tmp/dpep.NpaAFa/idled/imap/Makefile.in	2006-05-06 16:22:45.129649549 +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.JGdoug/idled/imap/global.c
---- idled/imap/global.c	2006-05-06 14:51:16.000000000 +0200
-+++ /tmp/dpep.JGdoug/idled/imap/global.c	2006-05-06 14:51:18.164885239 +0200
+diff -urNad idled/imap/global.c /tmp/dpep.NpaAFa/idled/imap/global.c
+--- idled/imap/global.c	2006-05-06 16:22:42.000000000 +0200
++++ /tmp/dpep.NpaAFa/idled/imap/global.c	2006-05-06 16:22:45.130649454 +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.JGdoug/idled/imap/global.h
+diff -urNad idled/imap/global.h /tmp/dpep.NpaAFa/idled/imap/global.h
 --- idled/imap/global.h	2006-05-06 14:51:15.000000000 +0200
-+++ /tmp/dpep.JGdoug/idled/imap/global.h	2006-05-06 14:51:18.165885145 +0200
++++ /tmp/dpep.NpaAFa/idled/imap/global.h	2006-05-06 16:22:45.130649454 +0200
 @@ -152,4 +152,6 @@
  extern struct cyrusdb_backend *config_tlscache_db;
  extern struct cyrusdb_backend *config_ptscache_db;
@@ -91,10 +91,10 @@
 +extern struct idle_backend *config_idle;
 +
  #endif /* INCLUDED_GLOBAL_H */
-diff -urNad idled/imap/idle.c /tmp/dpep.JGdoug/idled/imap/idle.c
+diff -urNad idled/imap/idle.c /tmp/dpep.NpaAFa/idled/imap/idle.c
 --- idled/imap/idle.c	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.JGdoug/idled/imap/idle.c	2006-05-06 14:52:45.950631259 +0200
-@@ -0,0 +1,85 @@
++++ /tmp/dpep.NpaAFa/idled/imap/idle.c	2006-05-06 16:26:59.392618512 +0200
+@@ -0,0 +1,86 @@
 +/* 
 + * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
 + *
@@ -151,6 +151,7 @@
 +#include <sys/stat.h>
 +#include <unistd.h>
 +#include <fcntl.h>
++#include "makedepend/def.h"
 +
 +#include "idle.h"
 +#include "exitcodes.h"
@@ -175,14 +176,14 @@
 +        char errbuf[1024];
 +        snprintf(errbuf, sizeof(errbuf),
 +                 "idle backend %s not supported", name);
-+        fatal(errbug, EC_CONFIG);
++        fatal(errbuf, EC_CONFIG);
 +    }
 +
 +    return idle;
 +}
-diff -urNad idled/imap/idle.h /tmp/dpep.JGdoug/idled/imap/idle.h
+diff -urNad idled/imap/idle.h /tmp/dpep.NpaAFa/idled/imap/idle.h
 --- idled/imap/idle.h	2006-05-06 14:51:15.000000000 +0200
-+++ /tmp/dpep.JGdoug/idled/imap/idle.h	2006-05-06 14:51:18.165885145 +0200
++++ /tmp/dpep.NpaAFa/idled/imap/idle.h	2006-05-06 16:22:45.131649360 +0200
 @@ -45,8 +45,6 @@
  
  #include "mailbox.h"
@@ -238,9 +239,9 @@
 +struct idle_backend *idle_fromname(const char *name);
  
  #endif
-diff -urNad idled/imap/idle_idled.c /tmp/dpep.JGdoug/idled/imap/idle_idled.c
---- idled/imap/idle_idled.c	2006-05-06 14:51:16.000000000 +0200
-+++ /tmp/dpep.JGdoug/idled/imap/idle_idled.c	2006-05-06 14:51:18.166885051 +0200
+diff -urNad idled/imap/idle_idled.c /tmp/dpep.NpaAFa/idled/imap/idle_idled.c
+--- idled/imap/idle_idled.c	2006-05-06 16:22:42.000000000 +0200
++++ /tmp/dpep.NpaAFa/idled/imap/idle_idled.c	2006-05-06 16:22:45.131649360 +0200
 @@ -58,8 +58,6 @@
  #include "idled.h"
  #include "global.h"
@@ -327,9 +328,9 @@
 +    &idle_start,
 +    &idle_done
 +};
-diff -urNad idled/imap/idle_no.c /tmp/dpep.JGdoug/idled/imap/idle_no.c
+diff -urNad idled/imap/idle_no.c /tmp/dpep.NpaAFa/idled/imap/idle_no.c
 --- idled/imap/idle_no.c	2006-05-06 14:51:15.000000000 +0200
-+++ /tmp/dpep.JGdoug/idled/imap/idle_no.c	2006-05-06 14:51:18.166885051 +0200
++++ /tmp/dpep.NpaAFa/idled/imap/idle_no.c	2006-05-06 16:22:45.132649265 +0200
 @@ -42,23 +42,31 @@
  
  #include "idle.h"
@@ -369,9 +370,9 @@
 +    &start,
 +    &done
 +};
-diff -urNad idled/imap/idle_poll.c /tmp/dpep.JGdoug/idled/imap/idle_poll.c
+diff -urNad idled/imap/idle_poll.c /tmp/dpep.NpaAFa/idled/imap/idle_poll.c
 --- idled/imap/idle_poll.c	2006-05-06 14:51:15.000000000 +0200
-+++ /tmp/dpep.JGdoug/idled/imap/idle_poll.c	2006-05-06 14:51:18.166885051 +0200
++++ /tmp/dpep.NpaAFa/idled/imap/idle_poll.c	2006-05-06 16:22:45.132649265 +0200
 @@ -51,15 +51,13 @@
  #include "idle.h"
  #include "global.h"
@@ -427,9 +428,9 @@
 +    &idle_start,
 +    &idle_done
 +};
-diff -urNad idled/imap/imapd.c /tmp/dpep.JGdoug/idled/imap/imapd.c
---- idled/imap/imapd.c	2006-05-06 14:51:16.000000000 +0200
-+++ /tmp/dpep.JGdoug/idled/imap/imapd.c	2006-05-06 14:51:18.170884675 +0200
+diff -urNad idled/imap/imapd.c /tmp/dpep.NpaAFa/idled/imap/imapd.c
+--- idled/imap/imapd.c	2006-05-06 16:22:42.000000000 +0200
++++ /tmp/dpep.NpaAFa/idled/imap/imapd.c	2006-05-06 16:22:45.136648887 +0200
 @@ -94,6 +94,8 @@
  
  #include "pushstats.h"		/* SNMP interface */
@@ -491,9 +492,9 @@
  	prot_printf(imapd_out, " IDLE");
      }
  
-diff -urNad idled/imap/lmtpd.c /tmp/dpep.JGdoug/idled/imap/lmtpd.c
---- idled/imap/lmtpd.c	2006-05-06 14:51:16.000000000 +0200
-+++ /tmp/dpep.JGdoug/idled/imap/lmtpd.c	2006-05-06 14:51:18.170884675 +0200
+diff -urNad idled/imap/lmtpd.c /tmp/dpep.NpaAFa/idled/imap/lmtpd.c
+--- idled/imap/lmtpd.c	2006-05-06 16:22:42.000000000 +0200
++++ /tmp/dpep.NpaAFa/idled/imap/lmtpd.c	2006-05-06 16:22:45.136648887 +0200
 @@ -95,6 +95,8 @@
  static sieve_interp_t *sieve_interp = NULL;
  #endif
@@ -512,9 +513,9 @@
  
      /* Set namespace */
      if ((r = mboxname_init_namespace(&lmtpd_namespace, 0)) != 0) {
-diff -urNad idled/imap/pop3d.c /tmp/dpep.JGdoug/idled/imap/pop3d.c
---- idled/imap/pop3d.c	2006-05-06 14:51:16.000000000 +0200
-+++ /tmp/dpep.JGdoug/idled/imap/pop3d.c	2006-05-06 14:51:18.171884581 +0200
+diff -urNad idled/imap/pop3d.c /tmp/dpep.NpaAFa/idled/imap/pop3d.c
+--- idled/imap/pop3d.c	2006-05-06 16:22:42.000000000 +0200
++++ /tmp/dpep.NpaAFa/idled/imap/pop3d.c	2006-05-06 16:22:45.137648793 +0200
 @@ -89,6 +89,8 @@
  #define DES_DEFS
  #include <krb.h>
@@ -533,9 +534,9 @@
  
      /* Set namespace */
      if ((r = mboxname_init_namespace(&popd_namespace, 0)) != 0) {
-diff -urNad idled/imap/version.c /tmp/dpep.JGdoug/idled/imap/version.c
+diff -urNad idled/imap/version.c /tmp/dpep.NpaAFa/idled/imap/version.c
 --- idled/imap/version.c	2006-05-06 14:51:15.000000000 +0200
-+++ /tmp/dpep.JGdoug/idled/imap/version.c	2006-05-06 14:51:18.172884487 +0200
++++ /tmp/dpep.NpaAFa/idled/imap/version.c	2006-05-06 16:22:45.138648698 +0200
 @@ -68,6 +68,8 @@
  #include "sieve_interface.h"
  #endif
@@ -557,9 +558,9 @@
  
      prot_printf(pout, " \"environment\" \"%s\"", env_buf);
  }
-diff -urNad idled/lib/imapoptions /tmp/dpep.JGdoug/idled/lib/imapoptions
---- idled/lib/imapoptions	2006-05-06 14:51:16.000000000 +0200
-+++ /tmp/dpep.JGdoug/idled/lib/imapoptions	2006-05-06 14:51:18.172884487 +0200
+diff -urNad idled/lib/imapoptions /tmp/dpep.NpaAFa/idled/lib/imapoptions
+--- idled/lib/imapoptions	2006-05-06 16:22:42.000000000 +0200
++++ /tmp/dpep.NpaAFa/idled/lib/imapoptions	2006-05-06 16:22:45.138648698 +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