Hello community, here is the log from the commit of package cyrus-imapd for openSUSE:Factory checked in at 2017-06-22 10:40:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old) and /work/SRC/openSUSE:Factory/.cyrus-imapd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cyrus-imapd" Thu Jun 22 10:40:46 2017 rev:66 rq:505525 version:2.4.19 Changes: -------- --- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes 2016-06-23 13:35:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 2017-06-22 10:40:49.309995002 +0200 @@ -1,0 +2,38 @@ +Wed Jun 21 15:38:32 UTC 2017 - a...@ajaissle.de + +- Rebased patch: + * cyrus-imapd-2.4.18-implicit_definitions.patch as cyrus-imapd-2.4.19-implicit_definitions.patch + Add fix for implicit-fortify-decl in ldap.c + +------------------------------------------------------------------- +Wed Jun 14 18:20:42 UTC 2017 - a...@ajaissle.de + +- Update to 2.4.19 + * Complete backport of the new (2.5 and later) IMAP IDLE implementation (thanks Thomas Jarosh). This fixes a bunch of bugs and race conditions that were inherent to the older implementation + * New option “imapidletimeout” overrides “timeout” specifically for connections in IDLE state + * OpenSSL 1.1.0 is now supported + * Fixed: imap ENABLED doesn’t print * ENABLED when nothing new enabled + * Fixed: mailbox lock management over rename (thanks Thomas Jarosh) + * Fixed: added overflow protection to urlfetch range checks + * Fixed: lmtpd can now deliver when mupdate server isn’t available (thanks Michael Menge) + * Fixed task 227: service processes no longer divide by zero when invoked with -T 0 argument (thanks Ian Batten and Jens Erat) + * Fixed task 229: ctl_cyrusdb now uses database paths from imapd.conf (thanks Simon Matter) + * Fixed bug #3862: mailbox database changes now rolled back on mupdate failure during rename (thanks Michael Menge) + * Fixed: XFER to 2.5 and later no longer downgrades index to oldest version + * Fixed: nonsensical “TEXT.MIME” section now handled as “HEADER” + * Fixed: added missing ‘auditlog: ‘ prefix to backend connections (thanks Wolfgang Breyha) + * Fixed: IMAP SEARCH crash on some platforms + * Fixed: memory leaks in IMAP SEARCH and IMAP APPEND + * Fixed Issue #1967: EXISTS count reported earlier if fetching past size of previous message set + +- Rebased patches: + * cyrus-imapd-2.4.17_drac_auth.patch as cyrus-imapd-2.4.19_drac_auth.patch + * cyrus-imapd-2.4.17_autocreate-0.10-0.patch as cyrus-imapd-2.4.19_autocreate-0.10-0.patch + +- Removed patches: + - cyrus-imapd-2.4.18-CVE-2015-8077.patch (upstream) + - cyrus-imapd-2.4.18-CVE-2015-8078.patch (upstream) + +- Added cyrus-imapd-2.4.19.tar.gz.sig + +------------------------------------------------------------------- Old: ---- cyrus-imapd-2.4.17_autocreate-0.10-0.patch cyrus-imapd-2.4.17_drac_auth.patch cyrus-imapd-2.4.18-CVE-2015-8077.patch cyrus-imapd-2.4.18-CVE-2015-8078.patch cyrus-imapd-2.4.18-implicit_definitions.patch cyrus-imapd-2.4.18.tar.gz New: ---- cyrus-imapd-2.4.19-implicit_definitions.patch cyrus-imapd-2.4.19.tar.gz cyrus-imapd-2.4.19.tar.gz.sig cyrus-imapd-2.4.19_autocreate-0.10-0.patch cyrus-imapd-2.4.19_drac_auth.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cyrus-imapd.spec ++++++ --- /var/tmp/diff_new_pack.SM39kQ/_old 2017-06-22 10:40:50.153876021 +0200 +++ /var/tmp/diff_new_pack.SM39kQ/_new 2017-06-22 10:40:50.157875457 +0200 @@ -1,7 +1,7 @@ # # spec file for package cyrus-imapd # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,7 +30,7 @@ %global _servicename cyrus %endif Name: cyrus-imapd -Version: 2.4.18 +Version: 2.4.19 Release: 0 Summary: The Cyrus IMAP and POP Mail Server License: BSD-3-Clause @@ -38,13 +38,14 @@ Url: http://www.cyrusimap.org # Upstream sources Source0: http://cyrusimap.org/releases/%{name}-%{version}.tar.gz +Source90: http://cyrusimap.org/releases/%{name}-%{version}.tar.gz.sig Source1: http://ftp.andrew.cmu.edu/pub/mibs/cmu/cmu.mib # Distribution specific sources Source10: cyrus-imapd-rc-2.tar.gz # PATCH-FEATURE-UPSTREAM -- Add support for Dynamic Relay Authorization Control -Patch0: cyrus-imapd-2.4.17_drac_auth.patch +Patch0: cyrus-imapd-2.4.19_drac_auth.patch # PATCH-FEATURE-UPSTREAM -- Autocreate INBOX folders // included in 2.5 -Patch1: cyrus-imapd-2.4.17_autocreate-0.10-0.patch +Patch1: cyrus-imapd-2.4.19_autocreate-0.10-0.patch # PATCH-FEATURE-UPSTREAM -- Add support to define a catchall mailbox Patch4: cyrus-imapd-2.4.17_lmtp_catchall_mailbox.patch # PATCH-FIX-OPENSUSE -- Use the right syslog facility in docs @@ -58,11 +59,7 @@ # PATCH-FEATURE-UPSTREAM -- Allow a result attribute to be specified with ptclient/ldap.c // included in 2.5 Patch27: cyrus-imapd-2.4.17_ptloader-ldap_user_attribute.patch # PATCH-FIX-UPSTREAM -- Have the correct #include when using implicit definitions -Patch28: cyrus-imapd-2.4.18-implicit_definitions.patch -# PATCH-FIX-UPSTREAM -- Fix for CVE-2015-8077 -Patch29: cyrus-imapd-2.4.18-CVE-2015-8077.patch -# PATCH-FIX-UPSTREAM -- Fix for CVE-2015-8078 -Patch30: cyrus-imapd-2.4.18-CVE-2015-8078.patch +Patch28: cyrus-imapd-2.4.19-implicit_definitions.patch # PATCH-FIX-UPSTREAM -- Outlook 2013-compatible XLIST behaviour Patch31: cyrus-imapd-2.4.18-D19-Outlook_2013_XLIST.patch BuildRequires: autoconf @@ -220,8 +217,6 @@ %patch25 -p1 %patch27 -p1 %patch28 -p1 -%patch29 -p1 -%patch30 -p1 %patch31 -p1 # remove executable bit from docs @@ -262,7 +257,10 @@ --with-zlib make depend %{?_smp_mflags} -make %{?_smp_mflags} + +# unpredictable parallel build; fails, if sieve_err.h isn't ready in time +#make %%{?_smp_mflags} +make -j1 %install # Cyrus IMAP ++++++ cyrus-imapd-2.4.18-implicit_definitions.patch -> cyrus-imapd-2.4.19-implicit_definitions.patch ++++++ --- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd-2.4.18-implicit_definitions.patch 2015-09-08 18:12:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd-2.4.19-implicit_definitions.patch 2017-06-22 10:40:46.838343483 +0200 @@ -20,3 +20,14 @@ #include "util.h" #include "xmalloc.h" +diff -Ppru cyrus-imapd-2.4.19.orig/ptclient/ldap.c cyrus-imapd-2.4.19.ldap/ptclient/ldap.c +--- cyrus-imapd-2.4.19.orig/ptclient/ldap.c 2017-05-15 07:43:30.000000000 +0200 ++++ cyrus-imapd-2.4.19.ldap/ptclient/ldap.c 2017-06-21 17:56:18.831138260 +0200 +@@ -77,6 +77,7 @@ + #include "auth_pts.h" + #include "strhash.h" + #include "xmalloc.h" ++#include "xstrlcat.h" + + /* xxx this just uses the UNIX canonicalization semantics, which is + * most likely wrong */ ++++++ cyrus-imapd-2.4.18.tar.gz -> cyrus-imapd-2.4.19.tar.gz ++++++ ++++ 16982 lines of diff (skipped) ++++++ cyrus-imapd-2.4.17_autocreate-0.10-0.patch -> cyrus-imapd-2.4.19_autocreate-0.10-0.patch ++++++ --- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd-2.4.17_autocreate-0.10-0.patch 2014-03-09 18:21:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd-2.4.19_autocreate-0.10-0.patch 2017-06-22 10:40:48.138160220 +0200 @@ -215,10 +215,10 @@ + +For more information and updates please visit http://email.uoa.gr/projects/cyrus/autocreate + -diff -Naur cyrus-imapd-2.4.4.orig/imap/Makefile.in cyrus-imapd-2.4.4/imap/Makefile.in ---- cyrus-imapd-2.4.4.orig/imap/Makefile.in 2010-11-16 08:48:20.817612092 +0100 -+++ cyrus-imapd-2.4.4/imap/Makefile.in 2010-11-16 08:49:21.892354019 +0100 -@@ -67,7 +67,7 @@ IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@ +diff -Ppru cyrus-imapd-2.4.19.orig/imap/Makefile.in cyrus-imapd-2.4.19.autocreate/imap/Makefile.in +--- cyrus-imapd-2.4.19.orig/imap/Makefile.in 2017-05-15 07:43:30.000000000 +0200 ++++ cyrus-imapd-2.4.19.autocreate/imap/Makefile.in 2017-06-14 20:06:17.326953196 +0200 +@@ -66,7 +66,7 @@ SIEVE_LIBS = @SIEVE_LIBS@ LIB_WRAP = @LIB_WRAP@ DRAC_LIBS = @DRACLIBS@ LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS) @@ -227,8 +227,8 @@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@ -@@ -102,7 +102,7 @@ - imapparse.o telemetry.o user.o notify.o idle.o quota_db.o \ +@@ -102,7 +102,7 @@ LOBJS= append.o mailbox.o mboxlist.o mup + imapparse.o telemetry.o user.o notify.o idle.o idlemsg.o quota_db.o \ sync_log.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \ statuscache_db.o userdeny_db.o sequence.o upgrade_index.o \ - dlist.o version.o @@ -236,7 +236,7 @@ IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o -@@ -118,7 +118,7 @@ +@@ -118,7 +118,7 @@ PROGS = imapd lmtpd pop3d \ fud smmapd reconstruct quota mbpath ipurge cyr_dbtool cyr_synclog \ cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \ ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \ @@ -245,19 +245,19 @@ BUILTSOURCES = imap_err.c imap_err.h pushstats.c pushstats.h \ lmtpstats.c lmtpstats.h mupdate_err.c mupdate_err.h \ -@@ -180,9 +180,9 @@ +@@ -180,9 +180,9 @@ mupdate_err.c: mupdate_err.et mupdate_err.h: mupdate_err.c ### Services --idled: idled.o mutex_fake.o libimap.a $(DEPLIBS) -+idled: idled.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) +-idled: idled.o idlemsg.o mutex_fake.o libimap.a $(DEPLIBS) ++idled: idled.o idlemsg.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(CC) $(LDFLAGS) -o idled \ -- idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) -+ idled.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) +- idled.o idlemsg.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) ++ idled.o idlemsg.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) -@@ -365,6 +365,10 @@ +@@ -359,6 +359,10 @@ sync_reset: sync_reset.o sync_support.o sync_reset sync_reset.o sync_support.o \ libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) ++++++ cyrus-imapd-2.4.17_drac_auth.patch -> cyrus-imapd-2.4.19_drac_auth.patch ++++++ --- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd-2.4.17_drac_auth.patch 2014-03-09 18:21:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd-2.4.19_drac_auth.patch 2017-06-22 10:40:49.170014737 +0200 @@ -1,7 +1,7 @@ -diff -Ppru cyrus-imapd-2.4.17.orig/configure.in cyrus-imapd-2.4.17/configure.in ---- cyrus-imapd-2.4.17.orig/configure.in 2012-12-01 20:57:54.000000000 +0100 -+++ cyrus-imapd-2.4.17/configure.in 2014-01-27 14:26:18.500280589 +0100 -@@ -1229,6 +1229,19 @@ dnl (agentx was depricated, but SNMP_SUB +diff -Ppru cyrus-imapd-2.4.19.orig/configure.in cyrus-imapd-2.4.19.DRAC/configure.in +--- cyrus-imapd-2.4.19.orig/configure.in 2017-05-15 07:43:30.000000000 +0200 ++++ cyrus-imapd-2.4.19.DRAC/configure.in 2017-06-21 13:35:16.250144618 +0200 +@@ -1239,6 +1239,19 @@ dnl (agentx was depricated, but SNMP_SUB SNMP_SUBDIRS="" AC_SUBST(SNMP_SUBDIRS) @@ -21,11 +21,10 @@ CMU_LIBWRAP CMU_UCDSNMP -Only in cyrus-imapd-2.4.17.orig/contrib: .drac_auth.patch.kate-swp -diff -Ppru cyrus-imapd-2.4.17.orig/imap/imapd.c cyrus-imapd-2.4.17/imap/imapd.c ---- cyrus-imapd-2.4.17.orig/imap/imapd.c 2012-12-01 20:57:54.000000000 +0100 -+++ cyrus-imapd-2.4.17/imap/imapd.c 2014-01-27 14:39:35.999446812 +0100 -@@ -193,6 +193,18 @@ static struct proxy_context imapd_proxyc +diff -Ppru cyrus-imapd-2.4.19.orig/imap/imapd.c cyrus-imapd-2.4.19.DRAC/imap/imapd.c +--- cyrus-imapd-2.4.19.orig/imap/imapd.c 2017-05-15 07:43:30.000000000 +0200 ++++ cyrus-imapd-2.4.19.DRAC/imap/imapd.c 2017-06-21 12:47:45.251013903 +0200 +@@ -195,6 +195,18 @@ static struct proxy_context imapd_proxyc 1, 1, &imapd_authstate, &imapd_userisadmin, &imapd_userisproxyadmin }; @@ -44,9 +43,9 @@ /* current sub-user state */ struct index_state *imapd_index; -@@ -795,6 +807,23 @@ int service_init(int argc, char **argv, +@@ -796,6 +808,23 @@ int service_init(int argc, char **argv, /* setup for sending IMAP IDLE notifications */ - idle_enabled(); + idle_init(); +#ifdef DRAC_AUTH + /* setup for sending DRAC "pings" */ @@ -54,21 +53,21 @@ + drac.interval = config_getint(IMAPOPT_DRACINTERVAL); + if (drac.interval < 0) drac.interval = 0; + if (drac.interval) { -+ char *err; ++ char *err; + -+ if (dracconn((char*) config_getstring(IMAPOPT_DRACHOST), &err) != 0) { -+ /* disable DRAC */ -+ drac.interval = 0; -+ syslog(LOG_ERR, "dracconn: %s", err); -+ syslog(LOG_ERR, "DRAC notifications disabled"); -+ } ++ if (dracconn((char*) config_getstring(IMAPOPT_DRACHOST), &err) != 0) { ++ /* disable DRAC */ ++ drac.interval = 0; ++ syslog(LOG_ERR, "dracconn: %s", err); ++ syslog(LOG_ERR, "DRAC notifications disabled"); ++ } + } +#endif /* DRAC_AUTH */ + /* create connection to the SNMP listener, if available. */ snmp_connect(); /* ignore return code */ snmp_set_str(SERVER_NAME_VERSION,cyrus_version()); -@@ -905,6 +934,14 @@ int service_main(int argc __attribute__( +@@ -906,6 +935,14 @@ int service_main(int argc __attribute__( imapd_haveaddr = 1; } } @@ -83,7 +82,7 @@ } /* create the SASL connection */ -@@ -949,6 +986,11 @@ int service_main(int argc __attribute__( +@@ -950,6 +987,11 @@ int service_main(int argc __attribute__( prot_flush(imapd_out); snmp_increment(ACTIVE_CONNECTIONS, -1); @@ -95,7 +94,7 @@ /* cleanup */ imapd_reset(); -@@ -1061,6 +1103,10 @@ void shut_down(int code) +@@ -1064,6 +1106,10 @@ void shut_down(int code) cyrus_done(); @@ -167,9 +166,9 @@ authentication_success(); } -diff -Ppru cyrus-imapd-2.4.17.orig/imap/Makefile.in cyrus-imapd-2.4.17/imap/Makefile.in ---- cyrus-imapd-2.4.17.orig/imap/Makefile.in 2012-12-01 20:57:54.000000000 +0100 -+++ cyrus-imapd-2.4.17/imap/Makefile.in 2014-01-27 14:28:18.393629551 +0100 +diff -Ppru cyrus-imapd-2.4.19.orig/imap/Makefile.in cyrus-imapd-2.4.19.DRAC/imap/Makefile.in +--- cyrus-imapd-2.4.19.orig/imap/Makefile.in 2017-05-15 07:43:30.000000000 +0200 ++++ cyrus-imapd-2.4.19.DRAC/imap/Makefile.in 2017-06-21 12:49:10.859017519 +0200 @@ -65,6 +65,7 @@ SIEVE_OBJS = @SIEVE_OBJS@ SIEVE_LIBS = @SIEVE_LIBS@ IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@ @@ -208,22 +207,22 @@ nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \ mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE) -diff -Ppru cyrus-imapd-2.4.17.orig/imap/pop3d.c cyrus-imapd-2.4.17/imap/pop3d.c ---- cyrus-imapd-2.4.17.orig/imap/pop3d.c 2012-12-01 20:57:54.000000000 +0100 -+++ cyrus-imapd-2.4.17/imap/pop3d.c 2014-01-27 14:42:59.437592923 +0100 -@@ -109,7 +109,10 @@ extern int optind; - extern char *optarg; - extern int opterr; +diff -Ppru cyrus-imapd-2.4.19.orig/imap/pop3d.c cyrus-imapd-2.4.19.DRAC/imap/pop3d.c +--- cyrus-imapd-2.4.19.orig/imap/pop3d.c 2017-05-15 07:43:30.000000000 +0200 ++++ cyrus-imapd-2.4.19.DRAC/imap/pop3d.c 2017-06-21 13:28:59.390244042 +0200 +@@ -111,6 +111,11 @@ extern int opterr; + + -- +#ifdef DRAC_AUTH +static int drac_enabled; +extern int dracauth(char *server, unsigned long userip, char **errmsg); +#endif /* DRAC_AUTH */ - ++ #ifdef HAVE_SSL static SSL *tls_conn; -@@ -121,6 +124,7 @@ int popd_timeout; + #endif /* HAVE_SSL */ +@@ -121,6 +126,7 @@ int popd_timeout; char *popd_userid = 0, *popd_subfolder = 0; struct mailbox *popd_mailbox = NULL; struct auth_state *popd_authstate = 0; @@ -231,7 +230,7 @@ int config_popuseacl, config_popuseimapflags; struct sockaddr_storage popd_localaddr, popd_remoteaddr; int popd_haveaddr = 0; -@@ -149,7 +153,7 @@ static int popd_myrights; +@@ -149,7 +155,7 @@ static int popd_myrights; /* the sasl proxy policy context */ static struct proxy_context popd_proxyctx = { @@ -240,7 +239,7 @@ }; /* signal to config.c */ -@@ -573,6 +577,10 @@ int service_main(int argc __attribute__( +@@ -573,6 +579,10 @@ int service_main(int argc __attribute__( prot_settimeout(popd_in, popd_timeout); prot_setflushonread(popd_in, popd_out); @@ -251,7 +250,7 @@ if (kflag) kpop(); /* we were connected on pop3s port so we should do -@@ -1780,6 +1788,21 @@ int openinbox(void) +@@ -1782,6 +1792,21 @@ int openinbox(void) goto fail; } @@ -273,9 +272,9 @@ if (mbentry.mbtype & MBTYPE_REMOTE) { /* remote mailbox */ char *server = mbentry.partition; -diff -Ppru cyrus-imapd-2.4.17.orig/imap/version.c cyrus-imapd-2.4.17/imap/version.c ---- cyrus-imapd-2.4.17.orig/imap/version.c 2012-12-01 20:57:54.000000000 +0100 -+++ cyrus-imapd-2.4.17/imap/version.c 2014-01-27 14:43:43.310898321 +0100 +diff -Ppru cyrus-imapd-2.4.19.orig/imap/version.c cyrus-imapd-2.4.19.DRAC/imap/version.c +--- cyrus-imapd-2.4.19.orig/imap/version.c 2017-05-15 07:43:30.000000000 +0200 ++++ cyrus-imapd-2.4.19.DRAC/imap/version.c 2017-06-21 13:33:09.252478917 +0200 @@ -175,6 +175,10 @@ void id_response(struct protstream *pout snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf), "; %s", SIEVE_VERSION); @@ -287,14 +286,13 @@ #ifdef HAVE_LIBWRAP snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf), "; TCP Wrappers"); -diff -Ppru cyrus-imapd-2.4.17.orig/lib/imapoptions cyrus-imapd-2.4.17/lib/imapoptions ---- cyrus-imapd-2.4.17.orig/lib/imapoptions 2012-12-01 20:57:54.000000000 +0100 -+++ cyrus-imapd-2.4.17/lib/imapoptions 2014-01-27 14:44:48.881365112 +0100 -@@ -315,6 +315,14 @@ Blank lines and lines beginning with ``# - server if the currently selected mailbox is (re)moved by another +diff -Ppru cyrus-imapd-2.4.19.orig/lib/imapoptions cyrus-imapd-2.4.19.DRAC/lib/imapoptions +--- cyrus-imapd-2.4.19.orig/lib/imapoptions 2017-05-15 07:43:30.000000000 +0200 ++++ cyrus-imapd-2.4.19.DRAC/lib/imapoptions 2017-06-21 13:34:29.184482292 +0200 +@@ -316,6 +316,14 @@ Blank lines and lines beginning with ``# session. Otherwise, the missing mailbox is treated as empty while in use by the client.*/ -+ + +{ "dracinterval", 5, INT } +/* If nonzero, enables the use of DRAC (Dynamic Relay Authorization + Control) by the pop3d and imapd daemons. Also sets the interval @@ -302,6 +300,7 @@ + +{ "drachost", "localhost", STRING } +/* Hostname of the RPC dracd server. */ - ++ { "duplicate_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql")} /* The cyrusdb backend to use for the duplicate delivery suppression + and sieve. */