Kolab Groupware OBS

cyrus-imapd.spec Changed

@@ -1,4 +1,8 @@
-#TODO: merge all sub-packages (except -devel) into cyrus-imapd, they are all required
+%if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
+%global with_systemd 0
+%else
+%global with_systemd 1
+%endif
 
 %global _name cyrus-imapd
 
@@ -11,22 +15,22 @@
 %global _cyrusgroup mail
 %global _cyrexecdir %{_exec_prefix}/lib/%{_name}
 
-%global real_version 2.4.17
+%global real_version 2.5
 #%%global snapshot_version git201204161439
 #%%global dot_snapshot_version .%{snapshot_version}
 
-%if 0%{?suse_version}
-%define with_systemd 1
-%endif
+##
+## Options
+##
 
-%if 0%{?rhel} > 6 || 0%{?fedora} > 16
-%define with_systemd 1
-%endif
+%global with_mysql 0
+%global with_pgsql 0
+%global with_dav 0
 
 Name:               cyrus-imapd
 Summary:            A high-performance mail server with IMAP, POP3, NNTP and SIEVE support
-Version:            2.4.17
-Release:            2%{?dist}
+Version:            2.5
+Release:            1%{?dist}
 License:            BSD
 Group:              System Environment/Daemons
 URL:                http://www.cyrusimap.org
@@ -53,78 +57,105 @@
 ##
 ## Patches
 ##
-Patch1:             http://www.oakton.edu/~jwade/cyrus/cyrus-imapd-2.1.3/cyrus-imapd-2.1.3-flock.patch
-# fedora/rhel specific, find current db lib, rhbz#461875
-Patch11:            cyrus-imapd-2.3.12p2-current-db.patch
-# for c-i <= 2.4.12
-Patch12:            cyrus-imapd-2.4.12-debugopt.patch
-Patch13:            %{name}-2.3.16-002-strip-out-krb4.patch
-# PATCH-FIX-UPSTREAM cyrus-imapd-2.4.17_htmlstrip_no_return.patch
-Patch20:            %{name}-2.4.17_htmlstrip_no_return.patch
-# Patches of which the status or upstream is unknown
-Patch903:           %{name}-2.4.15-903-normalize-authorization-id.patch
-Patch905:           cyrus-imapd-2.4.10-ptloader-ldap_user_attribute.patch
+Patch0001:          cyrus-imapd-2.5-autoconf-2.63.patch
+Patch0002:          cyrus-imapd-2.5-lt-prereq.patch
+Patch0003:          cyrus-imapd-2.5-with-dav-ifdefs.patch
 
 BuildRoot:          %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+##
+## Build Requirements
+##
 BuildRequires:      autoconf
 BuildRequires:      automake
 BuildRequires:      bison
 BuildRequires:      cyrus-sasl-devel
+
+%if 0%{?suse_version}
+BuildRequires:      db-devel
+%else
+BuildRequires:      db4-devel
+%endif
+
 BuildRequires:      flex
+BuildRequires:      gcc-c++
+
 %if 0%{?suse_version} >= 1310
 BuildRequires:      groff-full
 %else
 BuildRequires:      groff
 %endif
+
+%if 0%{?suse_version}
+BuildRequires:      libjansson4-devel
+%else
+BuildRequires:      jansson-devel
+%endif
 BuildRequires:      krb5-devel
-%if 0%{?with_mysql} > 0
+
+%if 0%{?with_dav}
+BuildRequires:      libical-devel
+%endif
+
+%if 0%{?suse_version}
+BuildRequires:      libtool
+%endif
+
+BuildRequires:      libuuid-devel
+
+%if 0%{?with_mysql}
 BuildRequires:      mysql-devel
 %endif
+
+BuildRequires:      net-snmp-devel
+%if 0%{?suse_version}
+BuildRequires:      openldap2-devel
+%else
+BuildRequires:      openldap-devel
+%endif
+
 BuildRequires:      openssl-devel
 BuildRequires:      perl(ExtUtils::MakeMaker)
-BuildRequires:      pkgconfig
-%if 0%{?with_pgsql} > 0
-BuildRequires:      postgresql-devel
-%endif
-BuildRequires:      net-snmp-devel
-BuildRequires:      transfig
 
-%if 0%{?fedora} > 8
-BuildRequires:      perl-devel
+%if 0%{?suse_version}
+BuildRequires:      perl
 %else
-%if 0%{?rhel} >= 6
 BuildRequires:      perl-devel
 %endif
+
+BuildRequires:      pkgconfig
+
+%if 0%{?with_pgsql}
+BuildRequires:      postgresql-devel
+%endif
+
+%if 0%{?with_dav}
+BuildRequires:      sqlite-devel
 %endif
 
 %if 0%{?suse_version}
-BuildRequires:      db-devel
-BuildRequires:      openldap2-devel
 BuildRequires:      tcpd-devel
-Requires:           db-utils
-PreReq:             /usr/sbin/groupadd
-PreReq:             /usr/sbin/useradd
 %else
-BuildRequires:      db4-devel
-BuildRequires:      openldap-devel
-Requires:           db4-utils
 BuildRequires:      tcp_wrappers
 %endif
 
-Requires:           %{name}-utils = %{version}-%{release}
-Requires:           file
-Requires:           perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:      transfig
+BuildRequires:      xapian-core-devel
 
 %if 0%{?suse_version}
-%if 0%{?with_systemd}
-PreReq: %fillup_prereq
-%else
-PreReq: %fillup_prereq
-PreReq: %insserv_prereq
+PreReq:             /usr/sbin/groupadd
+PreReq:             /usr/sbin/useradd
 %endif
+
+%if 0%{?suse_version}
+Requires:           db-utils
+%else
+Requires:           db4-utils
 %endif
 
+Requires:           file
+Requires:           perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
 Requires(post):     coreutils
 Requires(post):     e2fsprogs
 Requires(post):     findutils
@@ -135,6 +166,7 @@
 
 %if 0%{?with_systemd}
 %if 0%{?suse_version}
+PreReq:             %fillup_prereq
 Requires(post):     systemd
 Requires(preun):    systemd
 Requires(postun):   systemd
@@ -144,12 +176,17 @@
 Requires(postun):   systemd-units
 %endif
 %else
+%if 0%{?suse_version}
+PreReq:             %fillup_prereq
+PreReq:             %insserv_prereq

cyrus-imapd-2.1.3-flock.patch Deleted

@@ -1,78 +0,0 @@
-diff -up cyrus-imapd-2.4.6/lib/lock_flock.c.flock cyrus-imapd-2.4.6/lib/lock_flock.c
---- cyrus-imapd-2.4.6/lib/lock_flock.c.flock	2010-12-20 14:15:49.000000000 +0100
-+++ cyrus-imapd-2.4.6/lib/lock_flock.c	2011-02-10 12:56:45.262786102 +0100
-@@ -52,6 +52,10 @@
- #endif
- 
- #include "cyr_lock.h"
-+#include <syslog.h>
-+
-+/* Locking timeout parameter */
-+#define MAXTIME 99
- 
- const char *lock_method_desc = "flock";
- 
-@@ -68,6 +72,18 @@ const char *lock_method_desc = "flock";
-  * 'failaction' is provided, it is filled in with a pointer to a fixed
-  * string naming the action that failed.
-  *
-+ *  Modified by jwade 4/16/2002 to work around seen file locking problem
-+ *  Added locking timeout parameter to allow processes that are  
-+ *  waiting for a lock to eventually time out
-+ *
-+ *  Calls flock() in non-blocking fashion and then retries until a 
-+ *  maximum delay is reached or the lock succeeds.
-+ *  
-+ *  As written, uses a quadratic backoff on retries with MAXTIME being
-+ *  the longest interval delay.   Total delay time is the sum of the squares
-+ *  of all integers whose square is less than MAXTIME.  In the case of 
-+ *  MAXTIME = 99 this is 0+1+4+9+16+25+36+49+64+81= 285 Seconds   
-+ *  This time is arbitrary and can be adjusted
-  */
- int lock_reopen(fd, filename, sbuf, failaction)
- int fd;
-@@ -78,17 +94,29 @@ const char **failaction;
-     int r;
-     struct stat sbuffile, sbufspare;
-     int newfd;
-+    int delay=0, i=0;
- 
-     if (!sbuf) sbuf = &sbufspare;
- 
--    for (;;) {
--	r = flock(fd, LOCK_EX);
-+    for(i=0,delay=0;;) {
-+	r = flock(fd, LOCK_EX|LOCK_NB);
- 	if (r == -1) {
--	    if (errno == EINTR) continue;
--	    if (failaction) *failaction = "locking";
-+	    if (errno == EINTR) {
-+                 continue;
-+            }
-+            else if ((errno == EWOULDBLOCK) && (delay < MAXTIME)) {
-+                syslog(LOG_DEBUG, "lock: reopen-blocked sleeping for %d on interval %d (%d, %s)" , delay, i, fd, filename);
-+                sleep(delay);
-+                i++;
-+                delay = i*i;
-+                continue;
-+            }
-+	    if (failaction) {
-+                if (delay >= MAXTIME) *failaction = "locking_timeout";
-+                else *failaction = "locking";
-+            }
- 	    return -1;
- 	}
--
- 	fstat(fd, sbuf);
- 	r = stat(filename, &sbuffile);
- 	if (r == -1) {
-@@ -96,9 +124,7 @@ const char **failaction;
- 	    flock(fd, LOCK_UN);
- 	    return -1;
- 	}
--
- 	if (sbuf->st_ino == sbuffile.st_ino) return 0;
--
- 	newfd = open(filename, O_RDWR);
- 	if (newfd == -1) {
- 	    if (failaction) *failaction = "opening";

cyrus-imapd-2.3.12p2-current-db.patch Deleted

cyrus-imapd-2.3.16-002-strip-out-krb4.patch Deleted

@@ -1,39 +0,0 @@
-From 8e4a444ddf93984aa25ec4a1d860213af2a284ae Mon Sep 17 00:00:00 2001
-From: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
-Date: Tue, 3 Aug 2010 10:25:42 +0200
-Subject: [PATCH 11/13] Strip out krb4
-
----
- imap/pop3d.c   |    2 --
- imap/version.c |    2 +-
- 2 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/imap/pop3d.c b/imap/pop3d.c
-index ad3fdd5..3a2cb8b 100644
---- a/imap/pop3d.c
-+++ b/imap/pop3d.c
-@@ -93,8 +93,6 @@
- #include "statuscache.h"
- 
- #ifdef HAVE_KRB
--/* kerberos des is purported to conflict with OpenSSL DES */
--#define DES_DEFS
- #include <krb.h>
- 
- /* MIT's kpop authentication kludge */
-diff --git a/imap/version.c b/imap/version.c
-index 85223c2..d78a696 100644
---- a/imap/version.c
-+++ b/imap/version.c
-@@ -177,7 +177,7 @@ void id_response(struct protstream *pout)
- 	     "; lock = %s", lock_method_desc);
-     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
- 	     "; nonblock = %s", nonblock_method_desc);
--#ifdef HAVE_KRB
-+#if 0
-     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
- 	     " (%s)", krb4_version);
- #endif
--- 
-1.7.2
-

cyrus-imapd-2.4.10-ptloader-ldap_user_attribute.patch Deleted

@@ -1,1230 +0,0 @@
-diff --git a/lib/imapoptions b/lib/imapoptions
-index 464de37..98e0341 100644
---- a/lib/imapoptions
-+++ b/lib/imapoptions
-@@ -483,6 +483,9 @@ Blank lines and lines beginning with ``#'' are ignored.
- { "ldap_mech", NULL, STRING }
- /* SASL mechanism for LDAP authentication */
- 
-+{ "ldap_user_attribute", NULL, STRING }
-+/* Specify LDAP attribute to use as canonical user id */
-+
- { "ldap_member_attribute", NULL, STRING }
- /* See ldap_member_method. */
- 
-diff --git a/ptclient/ldap.c b/ptclient/ldap.c
-index 7bd8664..b3507d1 100644
---- a/ptclient/ldap.c
-+++ b/ptclient/ldap.c
-@@ -91,7 +91,7 @@
-  * This may not be restrictive enough.
-  * Here are the reasons for the restrictions:
-  *
-- * &	forbidden because of MUTF-7.  (This could be fixed.)
-+ * &    forbidden because of MUTF-7.  (This could be fixed.)
-  * :    forbidden because it's special in /etc/passwd
-  * /    forbidden because it can't be used in a mailbox name
-  * * %  forbidden because they're IMAP magic in the LIST/LSUB commands
-@@ -158,6 +158,7 @@ typedef struct _ptsm {
-     const char   *tls_cert;
-     const char   *tls_key;
-     int    member_method;
-+    const char   *user_attribute;
-     const char   *member_attribute;
-     const char   *member_filter;
-     const char   *member_base;
-@@ -182,41 +183,41 @@ typedef struct _ptsm {
- static t_ptsm *ptsm = NULL;
- 
- static int ptsmodule_interact(
--	LDAP *ld, 
--	unsigned flags __attribute__((unused)), 
--	void *def, 
--	void *inter)
-+    LDAP *ld,
-+    unsigned flags __attribute__((unused)),
-+    void *def,
-+    void *inter)
- {
--	sasl_interact_t *in = inter;
--	const char *p;
--	t_ptsm *ptsmdef = def;
--
--	for (;in->id != SASL_CB_LIST_END;in++) {
--		p = NULL;
--		switch(in->id) {
--			case SASL_CB_AUTHNAME:
--				if (ISSET(ptsmdef->id))
--					p = ptsmdef->id;
--				break;
--			case SASL_CB_USER:
--				if (ISSET(ptsmdef->authz))
--					p = ptsmdef->authz;
--				break;
--			case SASL_CB_GETREALM:
--				if (ISSET(ptsmdef->realm))
--					p = ptsmdef->realm;
--				break;          
--			case SASL_CB_PASS:
--				if (ISSET(ptsmdef->password))
--					p = ptsmdef->password;
--				break;
--		}
--
--		in->result = p ? p : "";
--		in->len = strlen(in->result);
--	}
--
--	return LDAP_SUCCESS;
-+    sasl_interact_t *in = inter;
-+    const char *p;
-+    t_ptsm *ptsmdef = def;
-+
-+    for (;in->id != SASL_CB_LIST_END;in++) {
-+        p = NULL;
-+        switch(in->id) {
-+            case SASL_CB_AUTHNAME:
-+                if (ISSET(ptsmdef->id))
-+                    p = ptsmdef->id;
-+                break;
-+            case SASL_CB_USER:
-+                if (ISSET(ptsmdef->authz))
-+                    p = ptsmdef->authz;
-+                break;
-+            case SASL_CB_GETREALM:
-+                if (ISSET(ptsmdef->realm))
-+                    p = ptsmdef->realm;
-+                break;
-+            case SASL_CB_PASS:
-+                if (ISSET(ptsmdef->password))
-+                    p = ptsmdef->password;
-+                break;
-+        }
-+
-+        in->result = p ? p : "";
-+        in->len = strlen(in->result);
-+    }
-+
-+    return LDAP_SUCCESS;
- }
- 
- /*
-@@ -259,11 +260,11 @@ static char *ptsmodule_canonifyid(const char *identifier, size_t len)
-         switch (allowedchars[*(unsigned char*) p]) {
-         case 0:
-             return NULL;
--            
-+
-         case 2:
-             sawalpha = 1;
-             /* FALL THROUGH */
--            
-+
-         default:
-             ;
-         }
-@@ -275,149 +276,149 @@ static char *ptsmodule_canonifyid(const char *identifier, size_t len)
- }
- 
- 
--static int ptsmodule_connect(void) 
-+static int ptsmodule_connect(void)
- {
--	int rc = 0;
--
--	if (ptsm == NULL)  // Sanity Check
--		return PTSM_FAIL;
--
--	if (ptsm->ld != NULL)
--		return PTSM_OK;
--
--	if (ISSET(ptsm->tls_cacert_file)) {
--		rc = ldap_set_option (NULL, LDAP_OPT_X_TLS_CACERTFILE, ptsm->tls_cacert_file);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CACERTFILE (%s).", ldap_err2string (rc));
--		}
--	}
--
--	if (ISSET(ptsm->tls_cacert_dir)) {
--		rc = ldap_set_option (NULL, LDAP_OPT_X_TLS_CACERTDIR, ptsm->tls_cacert_dir);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CACERTDIR (%s).", ldap_err2string (rc));
--		}
--	}
--
--	if (ptsm->tls_check_peer != 0) {
--		rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &ptsm->tls_check_peer);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_REQUIRE_CERT (%s).", ldap_err2string (rc));
--		}
--	}
--
--	if (ISSET(ptsm->tls_ciphers)) {
--		/* set cipher suite, certificate and private key: */
--		rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_CIPHER_SUITE, ptsm->tls_ciphers);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CIPHER_SUITE (%s).", ldap_err2string (rc));
--		}
--	}
--
--	if (ISSET(ptsm->tls_cert)) {
--		rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_CERTFILE, ptsm->tls_cert);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CERTFILE (%s).", ldap_err2string (rc));
--		}
--	}
--
--	if (ISSET(ptsm->tls_key)) {
--		rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_KEYFILE, ptsm->tls_key);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_KEYFILE (%s).", ldap_err2string (rc));
--		}
--	}
--
--	rc = ldap_initialize(&ptsm->ld, ptsm->uri);
--	if (rc != LDAP_SUCCESS) {
--		syslog(LOG_ERR, "ldap_initialize failed (%s)", ptsm->uri);
--		return PTSM_FAIL;
--	}
--
--	rc = ldap_set_option(ptsm->ld, LDAP_OPT_PROTOCOL_VERSION, &(ptsm->version));
--	if (rc != LDAP_OPT_SUCCESS) {
--
--		if (ptsm->sasl ||
--		    ptsm->start_tls) {
--			syslog(LOG_ERR, "Failed to set LDAP_OPT_PROTOCOL_VERSION %d, required for ldap_start_tls and ldap_sasl.", ptsm->version);
--			ldap_unbind(ptsm->ld);
-+    int rc = 0;
-+
-+    if (ptsm == NULL)  // Sanity Check

cyrus-imapd-2.4.12-debugopt.patch Deleted

@@ -1,109 +0,0 @@
-diff -up cyrus-imapd-2.4.12/imap/global.c.debugopt cyrus-imapd-2.4.12/imap/global.c
---- cyrus-imapd-2.4.12/imap/global.c.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/imap/global.c	2011-11-22 14:24:28.272416643 +0100
-@@ -157,6 +157,10 @@ int cyrus_init(const char *alt_config, c
- 	/* don't free the openlog() string! */
-     }
- 
-+    /* allow debug logging */
-+    if (!config_debug)
-+	setlogmask(~LOG_MASK(LOG_DEBUG));
-+
-     /* Look up default partition */
-     config_defpartition = config_getstring(IMAPOPT_DEFAULTPARTITION);
-     for (p = (char *)config_defpartition; p && *p; p++) {
-diff -up cyrus-imapd-2.4.12/imap/tls.c.debugopt cyrus-imapd-2.4.12/imap/tls.c
---- cyrus-imapd-2.4.12/imap/tls.c.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/imap/tls.c	2011-11-22 14:24:28.272416643 +0100
-@@ -255,9 +255,9 @@ static DH *load_dh_param(const char *key
- 
-     if (ret == NULL) {
- 	ret = get_dh1024();
--	syslog(LOG_NOTICE, "imapd:Loading hard-coded DH parameters");
-+	syslog(LOG_DEBUG, "imapd:Loading hard-coded DH parameters");
-     } else {
--	syslog(LOG_NOTICE, "imapd:Loading DH parameters from file");
-+	syslog(LOG_DEBUG, "imapd:Loading DH parameters from file");
-     }
- 
-     if (bio != NULL) BIO_free(bio);
-diff -up cyrus-imapd-2.4.12/lib/imapoptions.debugopt cyrus-imapd-2.4.12/lib/imapoptions
---- cyrus-imapd-2.4.12/lib/imapoptions.debugopt	2011-11-22 14:24:28.265416615 +0100
-+++ cyrus-imapd-2.4.12/lib/imapoptions	2011-11-22 14:24:28.273416647 +0100
-@@ -388,6 +388,9 @@ Blank lines and lines beginning with ``#
-    hashing done on configuration directories.  This is recommended if
-    one partition has a very bushy mailbox tree. */
- 
-+{ "debug", 0, SWITCH }
-+/* If enabled, allow syslog() to pass LOG_DEBUG messages. */
-+
- # Commented out - there's no such thing as "hostname_mechs", but we need
- # this for the man page
- # { "hostname_mechs", NULL, STRING }
-diff -up cyrus-imapd-2.4.12/lib/libconfig.c.debugopt cyrus-imapd-2.4.12/lib/libconfig.c
---- cyrus-imapd-2.4.12/lib/libconfig.c.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/lib/libconfig.c	2011-11-22 14:24:28.274416650 +0100
-@@ -84,6 +84,7 @@ int config_auditlog;
- unsigned config_maxword;
- unsigned config_maxquoted;
- int config_qosmarking;
-+int config_debug;
- 
- /* declared in each binary that uses libconfig */
- extern const int config_need_data;
-@@ -350,6 +351,9 @@ void config_read(const char *alt_config)
- 
-     ival = config_getenum(IMAPOPT_QOSMARKING);
-     config_qosmarking = qos[ival];
-+
-+    /* allow debug logging */
-+    config_debug = config_getswitch(IMAPOPT_DEBUG);
- }
- 
- #define GROWSIZE 4096
-diff -up cyrus-imapd-2.4.12/lib/libconfig.h.debugopt cyrus-imapd-2.4.12/lib/libconfig.h
---- cyrus-imapd-2.4.12/lib/libconfig.h.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/lib/libconfig.h	2011-11-22 14:24:28.274416650 +0100
-@@ -82,6 +82,7 @@ extern int config_auditlog;
- extern unsigned config_maxquoted;
- extern unsigned config_maxword;
- extern int config_qosmarking;
-+extern int config_debug;
- 
- /* config requirement flags */
- #define CONFIG_NEED_PARTITION_DATA (1<<0)
-diff -up cyrus-imapd-2.4.12/master/master.c.debugopt cyrus-imapd-2.4.12/master/master.c
---- cyrus-imapd-2.4.12/master/master.c.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/master/master.c	2011-11-22 14:30:47.243975974 +0100
-@@ -1984,7 +1984,7 @@ int main(int argc, char **argv)
- 	if(pidlock_fd != -1) close(pidlock_fd);
-     }
- 
--    syslog(LOG_NOTICE, "process started");
-+    syslog(LOG_DEBUG, "process started");
- 
- #if defined(HAVE_UCDSNMP) || defined(HAVE_NETSNMP)
-     /* initialize SNMP agent */
-@@ -2041,7 +2041,7 @@ int main(int argc, char **argv)
-     init_janitor();
-     
-     /* ok, we're going to start spawning like mad now */
--    syslog(LOG_NOTICE, "ready for work");
-+    syslog(LOG_DEBUG, "ready for work");
- 
-     now = time(NULL);
-     for (;;) {
-diff -up cyrus-imapd-2.4.12/master/masterconf.c.debugopt cyrus-imapd-2.4.12/master/masterconf.c
---- cyrus-imapd-2.4.12/master/masterconf.c.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/master/masterconf.c	2011-11-22 14:24:28.276416658 +0100
-@@ -99,6 +99,10 @@ int masterconf_init(const char *ident, c
-         /* don't free the openlog() string! */
-     }
- 
-+    /* drop debug messages locally */
-+    if (!config_debug)
-+	setlogmask(~LOG_MASK(LOG_DEBUG));
-+
-     return 0;
- }
-

cyrus-imapd-2.4.15-903-normalize-authorization-id.patch Deleted

@@ -1,97 +0,0 @@
-diff --git a/imap/global.c b/imap/global.c
-index d2e5ba7..930d539 100644
---- a/imap/global.c
-+++ b/imap/global.c
-@@ -219,6 +219,8 @@ int cyrus_init(const char *alt_config, const char *ident, unsigned flags)
- 				  config_getswitch(IMAPOPT_UNIX_GROUP_ENABLE));
- 	libcyrus_config_setswitch(CYRUSOPT_USERNAME_TOLOWER,
- 				  config_getswitch(IMAPOPT_USERNAME_TOLOWER));
-+	libcyrus_config_setswitch(CYRUSOPT_NORMALIZEUID,
-+				  config_getswitch(IMAPOPT_NORMALIZEUID));
- 	libcyrus_config_setswitch(CYRUSOPT_SKIPLIST_UNSAFE,
- 				  config_getswitch(IMAPOPT_SKIPLIST_UNSAFE));
- 	libcyrus_config_setstring(CYRUSOPT_TEMP_PATH,
-diff --git a/lib/auth_unix.c b/lib/auth_unix.c
-index c1f0329..d7abf79 100644
---- a/lib/auth_unix.c
-+++ b/lib/auth_unix.c
-@@ -156,10 +156,12 @@ const char *identifier;
- size_t len;
- {
-     static char retbuf[81];
-+    char backup[81];
-     struct group *grp;
-     char sawalpha;
-     char *p;
-     int username_tolower = 0;
-+    int ic,rbc;
- 
-     if(!len) len = strlen(identifier);
-     if(len >= sizeof(retbuf)) return NULL;
-@@ -211,6 +213,22 @@ size_t len;
-     /* now we don't */
-     /* if (!sawalpha) return NULL;  */
- 
-+    if( (libcyrus_config_getswitch(CYRUSOPT_NORMALIZEUID) == 1) ) {
-+        strcpy(backup,retbuf);
-+       /* remove leading blanks */
-+       for(ic=0; isblank(backup[ic]); ic++);
-+       for(rbc=0; backup[ic]; ic++) {
-+            retbuf[rbc] = ( isalpha(backup[ic]) ?
-+                 tolower(backup[ic]) : backup[ic] );
-+            rbc++;
-+       }
-+       retbuf[rbc] = '\0';
-+       /* remove trailing blanks */
-+       for(--rbc; isblank(retbuf[rbc]); rbc--) {
-+            retbuf[rbc] = '\0';
-+       }
-+    }
-+
-     return retbuf;
- }
- 
-diff --git a/lib/imapoptions b/lib/imapoptions
-index c049501..4d16fb5 100644
---- a/lib/imapoptions
-+++ b/lib/imapoptions
-@@ -1416,6 +1416,11 @@ product version in the capabilities */
-    the special use flag "\Drafts" added.  Later versions of Cyrus
-    have a much more flexible RFC 6154 compatible system.  */
- 
-+{ "normalizeuid", 0, SWITCH }
-+/* Lowercase uid and strip leading and trailing blanks. It is recommended
-+   to set this to yes, especially if OpenLDAP is used as authentication
-+   source. */
-+
- /*
- .SH SEE ALSO
- .PP
-diff --git a/lib/libcyr_cfg.c b/lib/libcyr_cfg.c
-index 688523c..b5c6008 100644
---- a/lib/libcyr_cfg.c
-+++ b/lib/libcyr_cfg.c
-@@ -158,6 +158,10 @@ struct cyrusopt_s cyrus_options[] = {
-       CFGVAL(long, 1),
-       CYRUS_OPT_SWITCH },
- 
-+    { CYRUSOPT_NORMALIZEUID,
-+      CFGVAL(long, 1),
-+      CYRUS_OPT_SWITCH },
-+
-     { CYRUSOPT_LAST, { NULL }, CYRUS_OPT_NOTOPT }
- };
- 
-diff --git a/lib/libcyr_cfg.h b/lib/libcyr_cfg.h
-index 7bdca06..1afe95a 100644
---- a/lib/libcyr_cfg.h
-+++ b/lib/libcyr_cfg.h
-@@ -116,6 +116,8 @@ enum cyrus_opt {
-     CYRUSOPT_SQL_USESSL,
-     /* Checkpoint after every recovery (OFF) */
-     CYRUSOPT_SKIPLIST_ALWAYS_CHECKPOINT,
-+    /* Lowercase uid and strip leading and trailing blanks (OFF) */
-+    CYRUSOPT_NORMALIZEUID,
- 
-     CYRUSOPT_LAST
-

cyrus-imapd-2.4.17_htmlstrip_no_return.patch Deleted

cyrus-imapd-2.5-autoconf-2.63.patch Added

cyrus-imapd-2.5-lt-prereq.patch Added

cyrus-imapd-2.5-with-dav-ifdefs.patch Added

@@ -0,0 +1,262 @@
+diff --git a/Makefile.am b/Makefile.am
+index 8b227ea..204dfab 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1184,7 +1184,6 @@ dist_man_MANS = \
+ 	man/deliver.8 \
+ 	man/fetchnews.8 \
+ 	man/fud.8 \
+-	man/httpd.8 \
+ 	man/idled.8 \
+ 	man/imapd.8 \
+ 	man/ipurge.8 \
+@@ -1200,17 +1199,27 @@ dist_man_MANS = \
+ 	man/rmnews.8 \
+ 	man/smmapd.8 \
+ 	man/syncnews.8 \
+-	man/sync_client.8 \
+-	man/sync_reset.8 \
+-	man/sync_server.8 \
+ 	man/timsieved.8 \
+ 	man/tls_prune.8 \
+ 	man/unexpunge.8
+-if USE_SQUAT
++
++if SQUATTER
+ dist_man_MANS += \
+ 	man/squatter.8
+ endif
+ 
++if HTTPD
++dist_man_MANS += \
++	man/httpd.8
++endif
++
++if REPLICATION
++dist_man_MANS += \
++	man/sync_client.8 \
++	man/sync_reset.8 \
++	man/sync_server.8
++endif
++
+ master_master_SOURCES = \
+ 	master/cyrusMasterMIB.c \
+ 	master/cyrusMasterMIB.h \
+diff --git a/imap/mailbox.c b/imap/mailbox.c
+index f9ae70a..3baf44e 100644
+--- a/imap/mailbox.c
++++ b/imap/mailbox.c
+@@ -51,7 +51,9 @@
+ #elif defined(HAVE_STDINT_H)
+ # include <stdint.h>
+ #endif
++#ifdef WITH_DAV
+ #include <libical/vcc.h>
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -81,8 +83,10 @@
+ 
+ #include "annotate.h"
+ #include "assert.h"
++#ifdef WITH_DAV
+ #include "caldav_db.h"
+ #include "carddav_db.h"
++#endif
+ #include "crc32.h"
+ #include "md5.h"
+ #include "exitcodes.h"
+@@ -2666,6 +2670,7 @@ out:
+     return r;
+ }
+ 
++#ifdef WITH_DAV
+ static int mailbox_update_carddav(struct mailbox *mailbox,
+ 				 struct index_record *old,
+ 				 struct index_record *new)
+@@ -2886,6 +2891,7 @@ static int mailbox_update_dav(struct mailbox *mailbox,
+ 	return mailbox_update_caldav(mailbox, old, new);
+     return 0;
+ }
++#endif //WITH_DAV
+ 
+ EXPORTED int mailbox_update_conversations(struct mailbox *mailbox,
+ 				 struct index_record *old,
+@@ -3112,8 +3118,10 @@ static int mailbox_update_indexes(struct mailbox *mailbox,
+ {
+     int r = 0;
+ 
++#ifdef WITH_DAV
+     r = mailbox_update_dav(mailbox, old, new);
+     if (r) return r;
++#endif
+ 
+     r = mailbox_update_conversations(mailbox, old, new);
+ 
+@@ -4238,6 +4246,7 @@ static int chkchildren(char *name,
+     return r;
+ }
+ 
++#ifdef WITH_DAV
+ EXPORTED int mailbox_add_dav(struct mailbox *mailbox)
+ {
+     struct index_record record;
+@@ -4257,6 +4266,7 @@ EXPORTED int mailbox_add_dav(struct mailbox *mailbox)
+ 
+     return 0;
+ }
++#endif
+ 
+ EXPORTED int mailbox_add_conversations(struct mailbox *mailbox)
+ {
+diff --git a/imap/mailbox.h b/imap/mailbox.h
+index 5d3ed01..fe0bf91 100644
+--- a/imap/mailbox.h
++++ b/imap/mailbox.h
+@@ -587,6 +587,8 @@ extern int mailbox_get_xconvmodseq(struct mailbox *mailbox, modseq_t *);
+ extern int mailbox_update_xconvmodseq(struct mailbox *mailbox, modseq_t, int force);
+ extern int mailbox_has_conversations(struct mailbox *mailbox);
+ 
++#ifdef WITH_DAV
+ extern int mailbox_add_dav(struct mailbox *mailbox);
++#endif
+ 
+ #endif /* INCLUDED_MAILBOX_H */
+diff --git a/imap/mboxevent.c b/imap/mboxevent.c
+index eabc462..13f0945 100644
+--- a/imap/mboxevent.c
++++ b/imap/mboxevent.c
+@@ -53,8 +53,10 @@
+ 
+ #include "annotate.h"
+ #include "assert.h"
++#ifdef WITH_DAV
+ #include "caldav_db.h"
+ #include "carddav_db.h"
++#endif
+ #include "exitcodes.h"
+ #include "imapurl.h"
+ #include "libconfig.h"
+@@ -131,9 +133,11 @@ static struct mboxevent event_template =
+     { EVENT_USER, "user", EVENT_PARAM_STRING, 0, 0 },
+     { EVENT_MESSAGE_SIZE, "messageSize", EVENT_PARAM_INT, 0, 0 },
+     { EVENT_MESSAGE_CID, "vnd.fastmail.cid", EVENT_PARAM_STRING, 0, 0 },
++#ifdef WITH_DAV
+     { EVENT_MBTYPE, "vnd.cmu.mbtype", EVENT_PARAM_STRING, 0, 0 },
+     { EVENT_DAV_FILENAME, "vnd.cmu.davFilename", EVENT_PARAM_STRING, 0, 0 },
+     { EVENT_DAV_UID, "vnd.cmu.davUid", EVENT_PARAM_STRING, 0, 0 },
++#endif
+     /* always at end to let the parser to easily truncate this part */
+     { EVENT_ENVELOPE, "vnd.cmu.envelope", EVENT_PARAM_STRING, 0, 0 },
+     { EVENT_BODYSTRUCTURE, "bodyStructure", EVENT_PARAM_STRING, 0, 0 },
+@@ -374,8 +378,10 @@ static int mboxevent_expected_param(enum event_type type, enum event_param param
+ 	return extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_FASTMAIL_SESSIONID;
+     case EVENT_MAILBOX_ID:
+ 	return (type & MAILBOX_EVENTS);
++#ifdef WITH_DAV
+     case EVENT_MBTYPE:
+ 	return (type & MAILBOX_EVENTS);
++#endif
+     case EVENT_MAX_MESSAGES:
+ 	return type & QUOTA_EVENTS;
+     case EVENT_MESSAGE_CONTENT:
+@@ -387,12 +393,14 @@ static int mboxevent_expected_param(enum event_type type, enum event_param param
+     case EVENT_MESSAGE_CID:
+ 	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_FASTMAIL_CID) &&
+ 	       (type & (EVENT_MESSAGE_APPEND|EVENT_MESSAGE_NEW));
++#ifdef WITH_DAV
+     case EVENT_DAV_FILENAME:
+ 	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_CMU_DAVFILENAME) &&
+ 	       (type & EVENT_CALENDAR);
+     case EVENT_DAV_UID:
+ 	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_CMU_DAVUID) &&
+ 	       (type & EVENT_CALENDAR);
++#endif
+     case EVENT_MESSAGES:
+ 	if (type & (EVENT_QUOTA_EXCEED|EVENT_QUOTA_WITHIN))
+ 	    return 1;
+@@ -738,6 +746,7 @@ EXPORTED void mboxevent_extract_record(struct mboxevent *event, struct mailbox *
+ 				   cacheitem_size(record, CACHE_BODYSTRUCTURE)));
+     }
+ 
++#ifdef WITH_DAV
+     /* add caldav items */
+     if ((mailbox->mbtype & (MBTYPES_DAV)) &&
+ 	(mboxevent_expected_param(event->type, EVENT_DAV_FILENAME) ||
+@@ -779,7 +788,7 @@ EXPORTED void mboxevent_extract_record(struct mboxevent *event, struct mailbox *
+ 	    }
+ 	}
+     }
+-
++#endif //WITH_DAV
+ }
+ 
+ void mboxevent_extract_copied_record(struct mboxevent *event,
+@@ -991,8 +1000,10 @@ EXPORTED void mboxevent_extract_mailbox(struct mboxevent *event,
+     imapurl_toURL(url, &imapurl);
+     FILL_STRING_PARAM(event, EVENT_URI, xstrdup(url));
+

cyrus-imapd-2.4.17.tar.gz -> cyrus-imapd-2.5.tar.gz Changed

cyrus-imapd.dsc Changed

@@ -2,9 +2,9 @@
 Source: cyrus-imapd
 Binary: cyrus-imapd
 Architecture: any
-Version: 2.4.17-8
-Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
-Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
+Version: 2.5~dev2014011701-0~kolab1
+Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
+Uploaders: Paul Klos <kolab@klos2day.nl>
 Homepage: http://www.cyrusimap.org/
 Standards-Version: 3.9.1
 Vcs-Browser: http://git.kolabsys.com/apt/cyrus-imapd/
@@ -21,19 +21,23 @@
     groff,
     heimdal-dev,
     libdb5.1-dev | libdb-dev,
+    libjansson-dev,
     libkvm-dev [kfreebsd-amd64],
     libkvm-dev [kfreebsd-i386],
     libldap2-dev,
     libpam0g-dev,
+    libpcre3-dev,
     libsasl2-dev (>= 2.1.9),
     libsnmp-dev | libsnmp9-dev,
     libssl-dev,
+    libtool,
     libwrap0-dev,
+    libxapian-dev,
     libzephyr-dev,
     lsb-base,
     perl,
+    pkg-config,
     po-debconf,
-    quilt,
     tcl-dev | tcl8.3-dev,
     transfig,
     xutils-dev | xutils,
@@ -41,5 +45,5 @@
 Package-List: 
  cyrus-imapd deb mail extra
 Files: 
- 00000000000000000000000000000000 0 cyrus-imapd-2.4.17.tar.gz
+ 00000000000000000000000000000000 0 cyrus-imapd-2.5.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

debian.changelog Changed

debian.control Changed

debian.rules Changed

@@ -17,8 +17,6 @@
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-include /usr/share/quilt/quilt.make
-
 # Extra version information to add to Cyrus IMAPd ID
 DEBVERSION:=$(shell LCALL=C dpkg-parsechangelog | sed -ne 's/^Version: $.*-$/\1/p')
 EXTRA_IDENT:="Debian-$(DEBVERSION)"
@@ -48,7 +46,7 @@
 	CONFFLAGS += --enable-warnings-are-errors
 endif
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	dh_clean
@@ -57,23 +55,24 @@
 
 configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	cp /usr/share/misc/config.sub config.sub
-	cp /usr/share/misc/config.guess config.guess
-	touch configure.in && touch aclocal.m4 && touch configure
-	autoheader || :
 	aclocal -I cmulocal
-	autoreconf -v -f
+	libtoolize --install
+	autoheader
+	automake --add-missing || autoreconf -v && automake --add-missing
+	autoreconf -v
+
 	#
 	# IF YOU CHANGE BERKELEY DB VERSION, MAKE SURE TO UPDATE
 	# DBENGINE AT THE TOP OF THIS MAKEFILE!
 	./configure CFLAGS="-fno-strict-aliasing -fPIC -Wall -pipe $(DEBUGFLAGS)" $(CONFFLAGS) \
+		--enable-event-notification \
 		--enable-idled \
 		--enable-gssapi --with-gss_impl=heimdal \
 		--enable-listext \
 		--enable-murder \
 		--enable-nntp \
 		--enable-replication \
-		--with-extraident=$(EXTRA_IDENT) \
+		--enable-xapian \
 		--prefix=/usr \
 		--exec-prefix=/usr \
 		--libexecdir=/usr/sbin \
@@ -86,15 +85,16 @@
 		--localstatedir=/var/lib/imap \
 		--mandir=/usr/share/man \
 		--with-auth=pts \
+		--with-com_err="" \
 		--with-cyrus-prefix=/usr/lib/cyrus-imapd \
+		--with-cyrus-group=mail \
+		--with-cyrus-user=cyrus \
+		--with-extraident=$(EXTRA_IDENT) \
 		--with-ldap=/usr \
 		--with-lock=fcntl \
 		--with-perl=/usr/bin/perl \
 		--with-openssl=/usr \
 		--with-sasl=/usr \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err="" \
 		--with-pidfile=/var/run/cyrus-master.pid \
 		--with-service-path=/usr/lib/cyrus-imapd \
 		--with-syslogfacility=MAIL \
@@ -108,7 +108,6 @@
 	grep with\ options config.status \
 	| sed -e 's/^.*options \\"/configure /;s/\\"$///' \
 		>> debian/README.configure-options
-	sed -i 's/ -lsensors//' master/Makefile
 	touch configure-stamp
 
 build-arch: build-arch-stamp

debian.series Changed

debian.tar.gz/cyrus-imapd.install Changed

@@ -2,54 +2,56 @@
 etc/imapd.annotations.conf
 etc/imapd.conf
 usr/bin/*
-usr/sbin/cyrus-makedirs
-/usr/lib/cyrus-imapd/arbitron
-/usr/lib/cyrus-imapd/chk_cyrus
-/usr/lib/cyrus-imapd/ctl_cyrusdb
-/usr/lib/cyrus-imapd/ctl_deliver
-/usr/lib/cyrus-imapd/ctl_mboxlist
-/usr/lib/cyrus-imapd/cvt_cyrusdb
-/usr/lib/cyrus-imapd/cyr_dbtool
-/usr/lib/cyrus-imapd/cyr_df
-/usr/lib/cyrus-imapd/cyrdump
-/usr/lib/cyrus-imapd/cyr_expire
-/usr/lib/cyrus-imapd/cyr_sequence
-/usr/lib/cyrus-imapd/cyr_synclog
-/usr/lib/cyrus-imapd/cyr_userseen
-/usr/lib/cyrus-imapd/cyrus-master
-/usr/lib/cyrus-imapd/deliver
-/usr/lib/cyrus-imapd/fud
-/usr/lib/cyrus-imapd/idled
-/usr/lib/cyrus-imapd/imapd
-/usr/lib/cyrus-imapd/ipurge
-/usr/lib/cyrus-imapd/lmtpd
-/usr/lib/cyrus-imapd/lmtpproxyd
-/usr/lib/cyrus-imapd/mbexamine
-/usr/lib/cyrus-imapd/mbpath
-/usr/lib/cyrus-imapd/mupdate
-/usr/lib/cyrus-imapd/nntpd
-/usr/lib/cyrus-imapd/notifyd
-/usr/lib/cyrus-imapd/pop3d
-/usr/lib/cyrus-imapd/proxyd
-/usr/lib/cyrus-imapd/ptdump
-/usr/lib/cyrus-imapd/ptexpire
-/usr/lib/cyrus-imapd/ptloader
-/usr/lib/cyrus-imapd/quota
-/usr/lib/cyrus-imapd/reconstruct
-/usr/lib/cyrus-imapd/sievec
-/usr/lib/cyrus-imapd/sieved
-/usr/lib/cyrus-imapd/smmapd
-/usr/lib/cyrus-imapd/squatter
-/usr/lib/cyrus-imapd/sync_client
-/usr/lib/cyrus-imapd/sync_reset
-/usr/lib/cyrus-imapd/sync_server
-/usr/lib/cyrus-imapd/timsieved
-/usr/lib/cyrus-imapd/tls_prune
-/usr/lib/cyrus-imapd/unexpunge
+usr/lib*/*.so
+usr/lib*/*.so.*
+usr/lib/cyrus-imapd/arbitron
+usr/lib/cyrus-imapd/chk_cyrus
+usr/lib/cyrus-imapd/ctl_cyrusdb
+usr/lib/cyrus-imapd/ctl_deliver
+usr/lib/cyrus-imapd/ctl_mboxlist
+usr/lib/cyrus-imapd/cvt_cyrusdb
+usr/lib/cyrus-imapd/cyr_dbtool
+usr/lib/cyrus-imapd/cyr_df
+usr/lib/cyrus-imapd/cyrdump
+usr/lib/cyrus-imapd/cyr_expire
+usr/lib/cyrus-imapd/cyr_sequence
+usr/lib/cyrus-imapd/cyr_synclog
+usr/lib/cyrus-imapd/cyr_userseen
+usr/lib/cyrus-imapd/cyrus-master
+usr/lib/cyrus-imapd/deliver
+usr/lib/cyrus-imapd/fud
+usr/lib/cyrus-imapd/idled
+usr/lib/cyrus-imapd/imapd
+usr/lib/cyrus-imapd/ipurge
+usr/lib/cyrus-imapd/lmtpd
+usr/lib/cyrus-imapd/lmtpproxyd
+usr/lib/cyrus-imapd/mbexamine
+usr/lib/cyrus-imapd/mbpath
+usr/lib/cyrus-imapd/mupdate
+usr/lib/cyrus-imapd/nntpd
+usr/lib/cyrus-imapd/notifyd
+usr/lib/cyrus-imapd/pop3d
+usr/lib/cyrus-imapd/proxyd
+usr/lib/cyrus-imapd/ptdump
+usr/lib/cyrus-imapd/ptexpire
+usr/lib/cyrus-imapd/ptloader
+usr/lib/cyrus-imapd/quota
+usr/lib/cyrus-imapd/reconstruct
+usr/lib/cyrus-imapd/sievec
+usr/lib/cyrus-imapd/sieved
+usr/lib/cyrus-imapd/smmapd
+usr/lib/cyrus-imapd/squatter
+usr/lib/cyrus-imapd/sync_client
+usr/lib/cyrus-imapd/sync_reset
+usr/lib/cyrus-imapd/sync_server
+usr/lib/cyrus-imapd/timsieved
+usr/lib/cyrus-imapd/tls_prune
+usr/lib/cyrus-imapd/unexpunge
 usr/lib/perl*
 usr/sbin/*
 usr/share/icons/*
 usr/share/man/man1/*
+usr/share/man/man3/*
 usr/share/man/man8/*
 usr/share/perl*
 usr/share/snmp

Changes of Revision 39