[Pkg-Cyrus-imapd-Debian-devel] Bug#347657: please add imapd.patch from kolab upstream

[Henrique de Moraes Holschuh]

On Wed, 11 Jan 2006, Steffen Joeris wrote:
> -#if defined(HAVE_STDARG_H) || defined(_WINDOWS)
> +#if defined(HAVE_STDARG_H) || defined(__STDC__) || defined(_WINDOWS)
> +#ifdef __FreeBSD__
> +/* #define fdatasync(fd) fsync(fd) */
> +#define O_DSYNC 0
> +#endif
> +

Assorted fixes we can ignore in Debian.

> +#include <sys/time.h>

That one we want anyway.

> #-#ifdef HAVE_CONFIG_H
> #-#include <config.h>
> #-#endif
> #+#include "../../../config.h"

We must fix this properly. Just "config.h" should have been enough, and
<config.h> is *always* wrong :)

> +#ifdef ATVDOM /* allow '@' being a regular character in mboxname even when using virtual domains */
> +       else if ((cp = strrchr(name, '@'))) {
> +#else
>         if ((cp = strrchr(name, '@'))) {
> +#endif /* ATVDOM */

Not acceptable for regular cyrus.

> -static void db_err(const char *db_prfx, char *buffer)
> +static void db_err(const DB_ENV *dbenv, const char *db_prfx, const char *buffer)
>  {
>      syslog(LOG_WARNING, "DBERROR %s: %s", db_prfx, buffer);
>  }

We should verify this one.

-- 
  "One disk to rule them all, One disk to find them. One disk to bring
  them all and in the darkness grind them. In the Land of Redmond
  where the shadows lie." -- The Silicon Valley Tarot
  Henrique Holschuh