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

[Steffen Joeris]

Package: cyrus22-imapd
Severity: wishlist
Tags: patch

Hi

This is one of the patches we found in the src-rpm of the
kolab upstream (openpkg).
I am currently not sure about the function, but maybe you can look
at it and give a small feedback.
I just see some additional things, like including a new header
and checking the mailbox for allowing @'s :)

Greetings
Steffen

dpatch:

#! /bin/sh /usr/share/dpatch/dpatch-run
## 100-kolab-imapd.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Include imapd.patch from kolab upstream


@DPATCH@
--- cyrus22-imap-2.2.12.orig/et/com_err.c.orig  2003-06-04 05:27:50.000000000 +0200
+++ cyrus22-imap-2.2.12/et/com_err.c    2004-02-02 19:56:00.000000000 +0100
@@ -50,7 +50,7 @@
 #include <string.h>
 #include "mit-sipb-copyright.h"

-#if defined(HAVE_STDARG_H) || defined(_WINDOWS)
+#if defined(HAVE_STDARG_H) || defined(__STDC__) || defined(_WINDOWS)
 #include <stdarg.h>
 #else
 #include <varargs.h>
--- cyrus22-imapd-2.2.12.orig/lib/cyrusdb_skiplist.c.orig       2003-12-15 17:04:35.000000000 +0100
+++ cyrus22-imapd-2.2.12/lib/cyrusdb_skiplist.c 2004-02-02 19:56:00.000000000 +0100
@@ -71,6 +71,11 @@

 #define PROB (0.5)

+#ifdef __FreeBSD__
+/* #define fdatasync(fd) fsync(fd) */
+#define O_DSYNC 0
+#endif
+
 /*
  *
  * disk format; all numbers in network byte order
--- cyrus22-imapd-2.2.12.orig/lib/prot.h.orig   2003-10-22 20:50:12.000000000 +0200
+++ cyrus22-imapd-2.2.12/lib/prot.h     2004-02-02 19:58:47.000000000 +0100
@@ -49,6 +49,7 @@
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/time.h>

 #include <sasl/sasl.h>

#--- cyrus22-imapd-2.2.12.orig/perl/sieve/lib/isieve.c.orig     2003-10-22 20:50:25.000000000 +0200
#+++ cyrus22-imapd-2.2.12/perl/sieve/lib/isieve.c       2004-02-02 20:01:21.000000000 +0100
#@@ -41,9 +41,7 @@
#
# /* $Id: imapd.patch,v 1.12 2004/11/13 14:53:34 rse Exp $ */
#
#-#ifdef HAVE_CONFIG_H
#-#include <config.h>
#-#endif
#+#include "../../../config.h"
#
# #ifdef HAVE_UNISTD_H
# #include <unistd.h>
--- cyrus22-imapd-2.2.12.orig/imap/mboxname.c.orig      2004-03-17 10:03:40.000000000 +0200
+++ cyrus22-imapd-2.2.12/imap/mboxname.c        2004-03-17 10:03:40.000000000 +0200
@@ -129,7 +129,11 @@
                domainlen = strlen(result);
            }
        }
+#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 */
            /* mailbox specified as mbox at domain */
            namelen = cp - name;


Index: lib/cyrusdb_berkeley.c
--- cyrus22-imapd-2.2.12.orig/lib/cyrusdb_berkeley.c.orig       2004-03-11 19:36:44 +0100
+++ cyrus22-imapd-2.2.12/lib/cyrusdb_berkeley.c 2004-11-13 13:48:28 +0100
@@ -104,7 +104,7 @@
     exit(EC_TEMPFAIL);
 }

-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);
 }



-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-1-686
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)