import cyrus-imapd-3.0.7-15.el8

.cyrus-imapd.metadata

@@ -0,0 +1,4 @@
+e39754f688d98ac0040df85e8850a2e330c6235d SOURCES/README.rpm
+b3157c127c9cc404ecb2672e0eb4f18cac2a2a73 SOURCES/cassandane-00bfe01.tar.gz
+fdbc28a259af65792e23ce8da16faf323039139c SOURCES/cassandane-testdata-20170523.tar.gz
+49e3f8bbecd391513b81e3ccf49ea2df84be522f SOURCES/cyrus-imapd-3.0.7.tar.gz

.gitignore

@@ -0,0 +1,4 @@
+SOURCES/README.rpm
+SOURCES/cassandane-00bfe01.tar.gz
+SOURCES/cassandane-testdata-20170523.tar.gz
+SOURCES/cyrus-imapd-3.0.7.tar.gz

SOURCES/cassandane.ini

@@ -0,0 +1,56 @@
+# A basic cassandane.ini file for running cassandane as part of the Fedora
+# package build process.
+
+# The idea here is to run tests on the just-compiled version of cyrus-imapd.
+# However, many of the build locations are just random temporary directories, and
+# so this requires some finesse.
+
+[cassandane]
+rootdir = CASSDIR/work
+pwcheck = alwaystrue # This is enabled in Fedora builds
+cleanup = no
+maxworkers = 1
+base_port = 19100
+
+#[valgrind]
+#enabled = no
+
+# The installed copy
+[cyrus default]
+prefix = /usr
+destdir = BUILDROOT
+quota = cyr_quota
+
+# Replication testing disabled
+# [cyrus replica]
+# [cyrus murder]
+
+# Don't enable any of the gdb options but leave them here in case someone ever
+# needs to do so
+#[gdb]
+# imapd = yes
+# sync_server = yes
+# lntpd = yes
+# timsieved = yes
+# backupd = yes
+
+[config]
+altnamespace = no
+unixhierarchysep = no
+client_timeout = 60
+
+#[caldavtalk]
+#basedir = CASSDIR/cassandane/testdata
+
+[imaptest]
+# Cassandane wants this to not be installed.  Don't know why.  To use it we
+# have to make a directory and link things into it.
+basedir = imaptest
+
+# [jmaptester]
+# basedir = JMAP-Tester
+# The JMAP modules end up needing JSON-Typist (which I could bundle) and CryptX (which is a bit too much to bundle)
+
+# [caldavtester]
+# XXX Would need to include the source in the cyrus package just as cassandane is, and get it built before running tests
+# basedir = ...

SOURCES/cyrus-imapd-close_backup_fd_on_error.patch

@@ -0,0 +1,23 @@
+From 725e1efbd923c6d15ba639e17bfd0baabc619daa Mon Sep 17 00:00:00 2001
+From: Pavel Zhukov <pzhukov@redhat.com>
+Date: Mon, 1 Oct 2018 15:55:35 +0200
+Subject: [PATCH] Close file descriptior in case of error
+
+Make static code analizers happy.
+If stat() failed for some reason it may lead backup fd unclosed.
+---
+ backup/lcb.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/backup/lcb.c b/backup/lcb.c
+index 8c4a0e31a..9a04b08f2 100644
+--- a/backup/lcb.c
++++ b/backup/lcb.c
+@@ -182,6 +182,7 @@ HIDDEN int backup_real_open(struct backup **backupp,
+         if (r) {
+             syslog(LOG_ERR, "IOERROR: (f)stat %s: %m", backup->data_fname);
+             r = IMAP_IOERROR;
++            close(fd);
+             goto error;
+         }
+ 

SOURCES/cyrus-imapd-close_backup_on_failure.patch

@@ -0,0 +1,38 @@
+From 5d00f649b4d2a599905d1b9290c91a769909741d Mon Sep 17 00:00:00 2001
+From: Pavel Zhukov <pzhukov@redhat.com>
+Date: Mon, 24 Sep 2018 17:24:48 +0200
+Subject: [PATCH] Close backup on failure.
+
+Static analizers report this as memory leak issue.
+---
+ backup/ctl_backups.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/backup/ctl_backups.c b/backup/ctl_backups.c
+index 3d817e743..e532eedb7 100644
+--- a/backup/ctl_backups.c
++++ b/backup/ctl_backups.c
+@@ -955,6 +955,7 @@ static int lock_run_pipe(const char *userid, const char *fname,
+ 
+     if (r) {
+         printf("NO failed (%s)\n", error_message(r));
++        r = backup_close(&backup);
+         return EC_SOFTWARE; // FIXME would something else be more appropriate?
+     }
+ 
+@@ -993,6 +994,7 @@ static int lock_run_sqlite(const char *userid, const char *fname,
+         fprintf(stderr, "unable to lock %s: %s\n",
+                 userid ? userid : fname,
+                 error_message(r));
++        r = backup_close(&backup);
+         return EC_SOFTWARE;
+     }
+ 
+@@ -1053,6 +1055,7 @@ static int lock_run_exec(const char *userid, const char *fname,
+         fprintf(stderr, "unable to lock %s: %s\n",
+                 userid ? userid : fname,
+                 error_message(r));
++        r = backup_close(&backup);
+         return EC_SOFTWARE;
+     }
+ 

SOURCES/cyrus-imapd-init.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=One-time configuration for cyrus-imapd
+
+ConditionPathExists=!/etc/pki/cyrus-imapd/cyrus-imapd.pem
+ConditionPathExists=!/etc/pki/cyrus-imapd/cyrus-imapd-key.pem
+ConditionPathExists=!/etc/pki/cyrus-imapd/cyrus-imapd-ca.pem
+
+[Service]
+Type=oneshot
+RemainAfterExit=no
+ExecStart=/usr/bin/sscg --package cyrus-imapd --cert-file /etc/pki/cyrus-imapd/cyrus-imapd.pem --cert-key-file /etc/pki/cyrus-imapd/cyrus-imapd-key.pem --ca-file /etc/pki/cyrus-imapd/cyrus-imapd-ca.pem

SOURCES/cyrus-imapd-master_rename.patch

@@ -0,0 +1,66 @@
+diff --git a/Cassandane/Instance.pm b/cassandane/Cassandane/Instance.pm
+index 1561143..c60396e 100644
+--- a/Cassandane/Instance.pm
++++ b/Cassandane/Instance.pm
+@@ -166,7 +166,7 @@ sub get_version
+     my $cyrus_master;
+     foreach my $d (qw( bin sbin libexec libexec/cyrus-imapd lib cyrus/bin ))
+     {
+-	my $try = "$cyrus_destdir$cyrus_prefix/$d/master";
++	my $try = "$cyrus_destdir$cyrus_prefix/$d/cyrus-master";
+ 	if (-x $try) {
+ 	    $cyrus_master = $try;
+ 	    last;
+diff --git a/Cassandane/Instance.pm b/Cassandane/Instance.pm
+index c60396e..7b2883a 100644
+--- a/Cassandane/Instance.pm
++++ b/Cassandane/Instance.pm
+@@ -546,7 +546,7 @@ sub _pid_file
+ {
+     my ($self, $name) = @_;
+ 
+-    $name ||= 'master';
++    $name ||= 'cyrus-master';
+ 
+     return $self->{basedir} . "/run/$name.pid";
+ }
+@@ -569,7 +569,7 @@ sub _list_pid_files
+     closedir(RUNDIR);
+ 
+     @pidfiles = sort { $a cmp $b } @pidfiles;
+-    @pidfiles = ( 'master', grep { $_ ne 'master' } @pidfiles );
++    @pidfiles = ( 'cyrus-master', grep { $_ ne 'cyrus-master' } @pidfiles );
+ 
+     return @pidfiles;
+ }
+@@ -877,7 +877,7 @@ sub _start_master
+     # Now start the master process.
+     my @cmd =
+     (
+-	'master',
++	'cyrus-master',
+ 	# The following is added automatically by _fork_command:
+ 	# '-C', $self->_imapd_conf(),
+ 	'-l', '255',
+@@ -886,7 +886,7 @@ sub _start_master
+ 	'-M', $self->_master_conf(),
+     );
+     if (get_verbose) {
+-	my $logfile = $self->{basedir} . '/conf/master.log';
++	my $logfile = $self->{basedir} . '/conf/cyrus-master.log';
+ 	xlog "_start_master: logging to $logfile";
+ 	push(@cmd, '-L', $logfile);
+     }
+diff --git a/Cassandane/Instance.pm b/Cassandane/Instance.pm
+index 7b2883a..0c1e5fb 100644
+--- a/Cassandane/Instance.pm
++++ b/Cassandane/Instance.pm
+@@ -1301,7 +1301,7 @@ sub send_sighup
+     return if ($self->{_stopped});
+     xlog "sighup";
+ 
+-    my $pid = $self->_read_pid_file('master') or return;
++    my $pid = $self->_read_pid_file('cyrus-master') or return;
+     kill(SIGHUP, $pid) or die "Can't send signal SIGHUP to pid $pid: $!";
+     return 1;
+ }

SOURCES/cyrus-imapd-memory_leak_on_cleanup.patch

@@ -0,0 +1,73 @@
+From acfc393638ad1b81a4234173b060bb63907ee52c Mon Sep 17 00:00:00 2001
+From: Pavel Zhukov <pzhukov@redhat.com>
+Date: Mon, 1 Oct 2018 15:51:01 +0200
+Subject: [PATCH] Replace simple return with cleanup flow
+
+Make cleanup more consistence to prevent leaks of memory pointed by
+filter/base/res
+---
+ ptclient/ldap.c | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/ptclient/ldap.c b/ptclient/ldap.c
+index 0b82d2c6b..65bae7bd6 100644
+--- a/ptclient/ldap.c
++++ b/ptclient/ldap.c
+@@ -1388,13 +1388,14 @@ static int ptsmodule_make_authstate_group(
+ 
+     if (strncmp(canon_id, "group:", 6))  { // Sanity check
+         *reply = "not a group identifier";
+-        return PTSM_FAIL;
++        rc = PTSM_FAIL;
++        goto done;
+     }
+ 
+     rc = ptsmodule_connect();
+     if (rc != PTSM_OK) {
+         *reply = "ptsmodule_connect() failed";
+-        return rc;
++        goto done;;
+     }
+ 
+     rc = ptsmodule_expand_tokens(ptsm->group_filter, canon_id+6, NULL, &filter);
+@@ -1425,17 +1426,19 @@ static int ptsmodule_make_authstate_group(
+ 
+         if (rc != LDAP_SUCCESS) {
+             syslog(LOG_DEBUG, "(groups) Result from domain query not OK");
+-            return rc;
++            goto done;
+         } else {
+             syslog(LOG_DEBUG, "(groups) Result from domain query OK");
+         }
+ 
+         if (ldap_count_entries(ptsm->ld, res) < 1) {
+             syslog(LOG_ERR, "(groups) No domain %s found", domain);
+-            return PTSM_FAIL;
++            rc = PTSM_FAIL;
++            goto done;
+         } else if (ldap_count_entries(ptsm->ld, res) > 1) {
+             syslog(LOG_ERR, "(groups) Multiple domains %s found", domain);
+-            return PTSM_FAIL;
++            rc = PTSM_FAIL;
++            goto done;
+         } else {
+             syslog(LOG_DEBUG, "(groups) Domain %s found", domain);
+             if ((entry = ldap_first_entry(ptsm->ld, res)) != NULL) {
+@@ -1452,7 +1455,7 @@ static int ptsmodule_make_authstate_group(
+                 }
+ 
+                 if (rc != PTSM_OK) {
+-                    return rc;
++                    goto done;
+                 } else {
+                     base = xstrdup(ptsm->group_base);
+                     syslog(LOG_DEBUG, "Continuing with ptsm->group_base: %s", ptsm->group_base);
+@@ -1462,7 +1465,7 @@ static int ptsmodule_make_authstate_group(
+     } else {
+         rc = ptsmodule_expand_tokens(ptsm->group_base, canon_id, NULL, &base);
+         if (rc != PTSM_OK)
+-            return rc;
++            goto done;
+     }
+ 
+     syslog(LOG_DEBUG, "(groups) about to search %s for %s", base, filter);

SOURCES/cyrus-imapd-memory_leak_on_cleanup_2.patch

@@ -0,0 +1,102 @@
+diff --git a/ptclient/ldap.c b/ptclient/ldap.c
+index 7e48879..dafa724 100644
+--- a/ptclient/ldap.c
++++ b/ptclient/ldap.c
+@@ -932,7 +932,7 @@ static int ptsmodule_get_dn(
+     {
+         rc = ptsmodule_expand_tokens(ptsm->filter, canon_id, NULL, &filter);
+         if (rc != PTSM_OK)
+-            return rc;
++            goto done;
+ 
+         if (ptsm->domain_base_dn && ptsm->domain_base_dn[0] != '\0' && (strrchr(canon_id, '@') != NULL)) {
+             syslog(LOG_DEBUG, "Attempting to get domain for %s from %s", canon_id, ptsm->domain_base_dn);
+@@ -955,19 +955,23 @@ static int ptsmodule_get_dn(
+                     ldap_unbind(ptsm->ld);
+                     ptsm->ld = NULL;
+                     syslog(LOG_ERR, "LDAP not available: %s", ldap_err2string(rc));
+-                    return PTSM_RETRY;
++                    rc = PTSM_RETRY;
++                    goto done;
+                 }
+ 
+                 syslog(LOG_ERR, "LDAP search for domain failed: %s", ldap_err2string(rc));
+-                return PTSM_FAIL;
++                rc = PTSM_FAIL;
++                goto done;
+             }
+ 
+             if (ldap_count_entries(ptsm->ld, res) < 1) {
+                 syslog(LOG_ERR, "No domain %s found", domain);
+-                return PTSM_FAIL;
++                rc = PTSM_FAIL;
++                goto done;
+             } else if (ldap_count_entries(ptsm->ld, res) > 1) {
+                 syslog(LOG_ERR, "Multiple domains %s found", domain);
+-                return PTSM_FAIL;
++                rc = PTSM_FAIL;
++                goto done;
+             } else {
+                 if ((entry = ldap_first_entry(ptsm->ld, res)) != NULL) {
+                     if ((vals = ldap_get_values(ptsm->ld, entry, ptsm->domain_result_attribute)) != NULL) {
+@@ -982,7 +986,7 @@ static int ptsmodule_get_dn(
+                     }
+ 
+                     if (rc != PTSM_OK) {
+-                        return rc;
++                        goto done;
+                     } else {
+                         base = xstrdup(ptsm->base);
+                         syslog(LOG_DEBUG, "Continuing with ptsm->base: %s", ptsm->base);
+@@ -993,23 +997,23 @@ static int ptsmodule_get_dn(
+         } else {
+             rc = ptsmodule_expand_tokens(ptsm->base, canon_id, NULL, &base);
+             if (rc != PTSM_OK)
+-                return rc;
++                goto done;
+         }
+ 
+         rc = ldap_search_st(ptsm->ld, base, ptsm->scope, filter, attrs, 0, &(ptsm->timeout), &res);
+ 
+         if (rc != LDAP_SUCCESS) {
+             syslog(LOG_DEBUG, "Searching %s with %s failed", base, base);
+-            free(filter);
+-            free(base);
+ 
+             if (rc == LDAP_SERVER_DOWN) {
+                 ldap_unbind(ptsm->ld);
+                 ptsm->ld = NULL;
+-                return PTSM_RETRY;
++                rc = PTSM_RETRY;
++                goto done;
+             }
+ 
+-            return PTSM_FAIL;
++            rc = PTSM_FAIL;
++            goto done;
+         }
+ 
+         free(filter);
+@@ -1035,6 +1039,13 @@ static int ptsmodule_get_dn(
+     }
+ 
+     return (*ret ? PTSM_OK : PTSM_FAIL);
++
++ done:
++    if (filter)
++        free(filter);
++    if (base)
++        free(base);
++    return rc;
+ }
+ 
+ 
+@@ -1344,7 +1355,7 @@ static int ptsmodule_make_authstate_group(
+     rc = ptsmodule_connect();
+     if (rc != PTSM_OK) {
+         *reply = "ptsmodule_connect() failed";
+-        goto done;;
++        goto done;
+     }
+ 
+     rc = ptsmodule_expand_tokens(ptsm->group_filter, canon_id+6, NULL, &filter);

SOURCES/cyrus-imapd.cron-daily

@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# This file is run on a daily basis to perform a backup of your
+# mailbox list which can be used to recreate mailboxes.db from backup.
+# Restore is done using ctl_mboxlist after uncompressing the file.
+
+BACKDIR="/var/lib/imap/backup"
+MBOXLIST="${BACKDIR}/mboxlist"
+ROTATE=6
+
+# fallback to su if runuser not available
+if [ -x /sbin/runuser ]; then
+  RUNUSER=runuser
+else
+  RUNUSER=su
+fi
+
+# source custom configuration
+if [ -f /etc/sysconfig/cyrus-imapd ]; then
+  . /etc/sysconfig/cyrus-imapd
+fi
+
+[ -x /usr/sbin/ctl_mboxlist ] || exit 0
+[ -f /var/lib/imap/db/skipstamp ] || exit 0
+
+# rotate mailbox lists
+seq $[ $ROTATE - 1 ] -1 1 | while read i; do
+  [ -f ${MBOXLIST}.${i}.gz ] && mv -f ${MBOXLIST}.${i}.gz ${MBOXLIST}.$[ $i + 1 ].gz
+done
+[ -f ${MBOXLIST}.gz ] && mv -f ${MBOXLIST}.gz ${MBOXLIST}.1.gz
+
+# export mailboxes.db
+$RUNUSER - cyrus -s /bin/sh -c "umask 077 < /dev/null ; /usr/sbin/ctl_mboxlist -d | gzip > ${MBOXLIST}.gz"
+
+exit 0
+# EOF

SOURCES/cyrus-imapd.cvt_cyrusdb_all

@@ -0,0 +1,409 @@
+#!/bin/bash
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+# This script converts all db files of a cyrus installation from their
+# existing format to the format required by the current installation.
+# The format of current db files is determined using the 'file' command
+# with a magic file added for skiplist db, the new format is read from
+# a config file usually in /usr/share/cyrus-imapd/rpm/db.cfg, which is
+# created while compiling. After converting, the db.cfg file is
+# copied to a cache file usually at /var/lib/imap/rpm/db.cfg.cache to
+# allow bypassing this converting script if both files are identical.
+# While this is a bit less secure, it may be useful on big server where
+# db converting is done automatically.
+#
+# This script can safely be run as root, it will reexec itself as user
+# cyrus if needed.
+#
+# author: Simon Matter, Invoca Systems <simon.matter@invoca.ch>
+
+# changelog
+# v1.0.1, Oct 22 2002 Simon Matter <simon.matter@invoca.ch>
+# - added two-step conversion method
+#
+# v1.0.2, Jan 10 2003 Simon Matter <simon.matter@invoca.ch>
+# - fixed a bug where cvt_cyrusdb was called to convert empty or
+#   nonexistent files
+#
+# v1.0.3, Mar 14 2003 Simon Matter <simon.matter@invoca.ch>
+# - fixed a problem with new versions of the file command
+#
+# v1.0.4
+# - added GPL license
+#
+# v1.0.5, May 02 2003 Simon Matter <simon.matter@invoca.ch>
+# - modified exec path
+#
+# v1.0.6, Jul 18 2003 Simon Matter <simon.matter@invoca.ch>
+# - changed db3 to berkeley
+# - added new db backends for 2.2
+#
+# v1.0.7, Jan 23 2004 Simon Matter <simon.matter@invoca.ch>
+# - included some modifications from Luca Olivetti <luca@olivetti.cjb.net>
+# - added masssievec functionality
+#
+# v1.0.8, Jan 28 2004 Simon Matter <simon.matter@invoca.ch>
+# - convert sieve scripts to UTF-8 before calling masssievec
+#
+# v1.0.9, Jan 29 2004 Simon Matter <simon.matter@invoca.ch>
+# - convert sieve scripts to UTF-8 only if sievec failed before
+#
+# v1.0.10, Feb 24 2004 Simon Matter <simon.matter@invoca.ch>
+# - change su within init script to get input from
+#   /dev/null, this prevents hang when running in SELinux
+#
+# v1.0.11, Mar 02 2004 Simon Matter <simon.matter@invoca.ch>
+# - fixed SELinux fix
+#
+# v1.0.12, Dec 16 2004 Simon Matter <simon.matter@invoca.ch>
+# - use runuser instead of su if available
+#
+# v1.0.13, Jul 15 2005 Simon Matter <simon.matter@invoca.ch>
+# - don't use flat in the two step conversion, use skiplist instead
+#
+# v1.0.14, Jul 18 2005 Simon Matter <simon.matter@invoca.ch>
+# - replace the order of the magic files in the file call to make
+#   sure skiplist is detected correctly.
+#
+# v1.0.15, Aug 17 2005 Simon Matter <simon.matter@invoca.ch>
+# - add functionality to export all berkeley db files to skiplist
+#
+# v1.1.0, Aug 18 2005 Simon Matter <simon.matter@invoca.ch>
+# - fix export functionality, try to recover Berkeley databases
+#   as much as possible before any conversion.
+#
+# v1.1.1, Dec 05 2005 Simon Matter <simon.matter@invoca.ch>
+# - run db_checkpoint in background with a timeout to prevent
+#   that cyrus-imapd doesn't start at all if it hangs.
+#
+# v1.1.2, Dec 06 2005 Simon Matter <simon.matter@invoca.ch>
+# - make handling of db_checkpoint more robust
+#
+# v1.2.0, Jan 12 2006 Simon Matter <simon.matter@invoca.ch>
+# - adopt for cyrus-imapd-2.3
+#
+# v1.2.1, Jan 13 2006 Simon Matter <simon.matter@invoca.ch>
+# - code cleanup
+#
+# v1.2.2, Nov 29 2007 Simon Matter <simon.matter@invoca.ch>
+# - add ability to handle "@include" options in imapd.conf, patch
+#   provided by Tim Bannister
+#
+# v1.2.3, Feb 07 2008 Simon Matter <simon.matter@invoca.ch>
+# - add ability to handle tabs in imapd.conf, patch provided
+#   by Franz Knipp
+# - disable default values for some config options like sievedir
+#
+# v1.2.4, Apr 23 2008 Simon Matter <simon.matter@invoca.ch>
+# - add support for statuscache.db
+#
+# v1.3.0, Sep 29 2008 Simon Matter <simon.matter@invoca.ch>
+# - add multi-instance support
+#
+# v1.3.1, Oct 09 2008 Simon Matter <simon.matter@invoca.ch>
+# - improve variable handling
+#
+# v1.3.2, May 26 2009 Simon Matter <simon.matter@invoca.ch>
+# - add some sanity checks to multi-instance support
+#
+# v1.3.3, May 27 2009 Simon Matter <simon.matter@invoca.ch>
+# - make some cosmetic changes
+#
+# v1.3.4, Dec 22 2009 Simon Matter <simon.matter@invoca.ch>
+# - add support for user_deny.db
+
+VERSION=1.3.4
+
+PIDFILE=/var/run/cyrus-master${INSTANCE}.pid
+
+# instance config
+CYRUSCONF=/etc/cyrus${INSTANCE}.conf
+IMAPDCONF=/etc/imapd${INSTANCE}.conf
+
+# make sure what we have is a valid instance
+# and that config files are present
+if [ -n "$INSTANCE" ]; then
+  [ -L /etc/rc.d/init.d/${BASENAME} ] || exit 0
+fi
+[ -f $CYRUSCONF ] || exit 0
+[ -f $IMAPDCONF ] || exit 0
+
+if [ -f $PIDFILE ]; then
+  read CYRUS_PID < $PIDFILE
+  if [ -n "$CYRUS_PID" ]; then
+    if ps -p $CYRUS_PID > /dev/null 2>&1; then
+      echo "ERROR: cyrus-master is running, unable to convert mailboxes!"
+      exit 1
+    fi
+  fi
+fi
+
+if [ ! -f $IMAPDCONF ]; then
+  echo "ERROR: configuration file '${IMAPDCONF}' not found, exiting!"
+  exit 1
+fi
+
+# fallback to su if runuser not available
+if [ -x /sbin/runuser ]; then
+  RUNUSER=runuser
+else
+  RUNUSER=su
+fi
+
+# force cyrus user for security reasons
+if [ ! $(whoami) = "cyrus" ]; then
+  exec $RUNUSER - cyrus -c "cd $PWD < /dev/null ; INSTANCE=$INSTANCE $0 $*"
+fi
+
+# special function for migration
+EXPORT=$1
+
+# files get mode 0600
+umask 166
+
+# show version info in log files
+echo "cvt_cyrusdb_all version: $VERSION"
+
+# expand_config <path>
+# handle "@include" sections from imapd style config file
+expand_config() {
+  while read line; do
+    if printf "%s\n" "${line}" | grep -q '^@include:'; then
+      expand_config "$( printf "%s\n" "${line}" | cut -d : -f 2- | sed -e 's/^[\t ]*//' )"
+    else
+      printf "%s\n" "${line}"
+    fi
+  done < $1
+}
+
+# get_config <config> [<default>]
+# extracts config option from config file
+get_config() {
+  searchstr=$1
+  if config="$(expand_config $IMAPDCONF | egrep "^${searchstr}:")"; then
+    CFGVAL="$(printf "%s\n" "$config" | cut -d : -f 2- | sed -e 's/^[\t ]*//')"
+  else
+    if [ -z "$2" ]; then
+      echo "ERROR: config option '$1' not found in ${IMAPDCONF}, exiting!" 1>&2
+      return 1
+    fi
+    CFGVAL="$2"
+  fi
+  echo "get_config ${1}: $CFGVAL" 1>&2
+  echo "$CFGVAL"
+}
+
+# where to find files and directories
+data_dir=/usr/share/cyrus-imapd/rpm
+lib_dir=/usr/lib/cyrus-imapd
+system_magic=$(file --version | awk '/magic file/ {print $4}')
+cyrus_magic=${data_dir}/magic
+cvt_cyrusdb=${lib_dir}/cvt_cyrusdb
+sievec=${lib_dir}/sievec
+masssievec=${lib_dir}/masssievec
+imap_prefix=$(get_config configdirectory) || exit 1
+sieve_dir=$(get_config sievedir) || exit 1
+db_cfg=${data_dir}/db.cfg
+db_current=${imap_prefix}/rpm/db.cfg.current
+db_cache=${imap_prefix}/rpm/db.cfg.cache
+
+# source default db backend config
+. $db_cfg
+
+# get configured db backend config
+duplicate_db=$(get_config duplicate_db $duplicate_db) || exit 1
+mboxlist_db=$(get_config mboxlist_db $mboxlist_db) || exit 1
+seenstate_db=$(get_config seenstate_db $seenstate_db) || exit 1
+subscription_db=$(get_config subscription_db $subscription_db) || exit 1
+tlscache_db=$(get_config tlscache_db $tlscache_db) || exit 1
+annotation_db=$(get_config annotation_db $annotation_db) || exit 1
+mboxkey_db=$(get_config mboxkey_db $mboxkey_db) || exit 1
+ptscache_db=$(get_config ptscache_db $ptscache_db) || exit 1
+quota_db=$(get_config quota_db $quota_db) || exit 1
+statuscache_db=$(get_config statuscache_db $statuscache_db) || exit 1
+userdeny_db=$(get_config userdeny_db $userdeny_db) || exit 1
+
+# remember current db backend config
+{
+echo "duplicate_db=${duplicate_db}"
+echo "mboxlist_db=${mboxlist_db}"
+echo "seenstate_db=${seenstate_db}"
+echo "subscription_db=${subscription_db}"
+echo "tlscache_db=${tlscache_db}"
+echo "annotation_db=${annotation_db}"
+echo "mboxkey_db=${mboxkey_db}"
+echo "ptscache_db=${ptscache_db}"
+echo "quota_db=${quota_db}"
+echo "statuscache_db=${statuscache_db}"
+echo "userdeny_db=${userdeny_db}"
+echo "sieve_version=${sieve_version}"
+} | sort > $db_current
+
+# file_type <file>
+file_type() {
+  this_type=$(file -b -m "${cyrus_magic}:${system_magic}" "$1" 2> /dev/null)
+  if echo "$this_type" | grep -qi skip > /dev/null 2>&1; then
+    echo skiplist
+  elif echo "$this_type" | grep -qi text > /dev/null 2>&1; then
+    echo flat
+  else
+    echo berkeley
+  fi
+}
+
+# cvt_file <file> <db>
+cvt_file() {
+  target="$1"
+  new_db="$2"
+  if [ -s "$target" ]; then
+    old_db=$(file_type "$target")
+    if [ ! "$old_db" = "$new_db" ]; then
+      # The two-step conversion is paranoia against the filenames being encoded
+      # inside the database or logfiles (berkeley does this, for example).
+      rm -f "${target}.skiplist"
+      if [ "$old_db" = "skiplist" ]; then
+        cp -a "$target" "${target}.skiplist"
+      else
+        $cvt_cyrusdb -C $IMAPDCONF "$target" "$old_db" "${target}.skiplist" skiplist
+      fi
+      RETVAL=$?
+      ERRVAL=$(( $ERRVAL + $RETVAL ))
+      if [ $RETVAL -eq 0 ]; then
+        rm -f "$target"
+        if [ -s "${target}.skiplist" ]; then
+          if [ "$new_db" = "skiplist" ]; then
+            cp -a "${target}.skiplist" "$target"
+          else
+            $cvt_cyrusdb -C $IMAPDCONF "${target}.skiplist" skiplist "$target" "$new_db"
+          fi
+        fi
+        RETVAL=$?
+        ERRVAL=$(( $ERRVAL + $RETVAL ))
+        if [ $RETVAL -eq 0 ]; then
+          rm -f "${target}.skiplist"
+        else
+          echo "ERROR: unable to convert ${target}.skiplist from skiplist to $new_db"
+        fi
+      else
+        echo "ERROR: unable to convert $target from $old_db to skiplist"
+      fi
+    fi
+  fi
+}
+
+# cvt_to_utf8 <file>
+cvt_to_utf8() {
+  target="$1"
+  if [ -s "$target" ]; then
+    if ! $sievec -C $IMAPDCONF "$target" "${target}.sievec"; then
+      iconv --from-code=ISO-8859-1 --to-code=UTF-8 --output="${target}.UTF-8" "$target"
+      if [ -s "${target}.UTF-8" ]; then
+        # preserve timestamp
+        touch --reference="${target}" "${target}.UTF-8"
+        mv -f "${target}.UTF-8" "$target"
+      else
+        ERRVAL=$(( $ERRVAL + 1 ))
+      fi
+    fi
+    rm -f "${target}.sievec"
+  fi
+}
+
+ERRVAL=0
+
+# make sure our Berkeley databases are in a sane state
+# wait for db_checkpoint to end successfully or kill it after a timeout
+db_checkpoint -v -1 -h ${imap_prefix}/db &
+DB_CHECK_PID=$!
+CNT=0
+while [ $CNT -lt 60 ]; do
+  if ! kill -0 $DB_CHECK_PID > /dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+  let CNT+=1
+done
+if kill -0 $DB_CHECK_PID > /dev/null 2>&1; then
+  kill -USR1 $DB_CHECK_PID > /dev/null 2>&1
+  sleep 1
+  kill -KILL $DB_CHECK_PID > /dev/null 2>&1
+  wait $DB_CHECK_PID > /dev/null 2>&1
+fi
+
+# do a normal recovery
+db_recover -v -h ${imap_prefix}/db
+RETVAL=$?
+if [ $RETVAL -ne 0 ]; then
+  # try a catastrophic recovery instead of normal recovery
+  db_recover -v -c -h ${imap_prefix}/db
+  RETVAL=$?
+  ERRVAL=$(( $ERRVAL + $RETVAL ))
+  if [ $RETVAL -ne 0 ]; then
+    echo "ERROR: catastrophic recovery of Berkeley databases failed"
+  fi
+fi
+
+if [ "$EXPORT" = "export" ]; then
+  # convert all db files to portable format for migration
+  # TODO: quota_db, we don't touch it for now
+  cvt_file ${imap_prefix}/deliver.db           "skiplist"
+  cvt_file ${imap_prefix}/mailboxes.db         "skiplist"
+  cvt_file ${imap_prefix}/tls_sessions.db      "skiplist"
+  cvt_file ${imap_prefix}/annotations.db       "skiplist"
+  cvt_file ${imap_prefix}/ptclient/ptscache.db "skiplist"
+  cvt_file ${imap_prefix}/statuscache.db       "skiplist"
+  cvt_file ${imap_prefix}/user_deny.db         "flat"
+  rm -vf ${imap_prefix}/db/log.*
+  rm -vf ${imap_prefix}/db/__db.*
+else
+  # always convert db files which have been converted to skiplist
+  # TODO: quota_db, we don't touch it for now
+  cvt_file ${imap_prefix}/deliver.db           "$duplicate_db"
+  cvt_file ${imap_prefix}/mailboxes.db         "$mboxlist_db"
+  cvt_file ${imap_prefix}/tls_sessions.db      "$tlscache_db"
+  cvt_file ${imap_prefix}/annotations.db       "$annotation_db"
+  cvt_file ${imap_prefix}/ptclient/ptscache.db "$ptscache_db"
+  cvt_file ${imap_prefix}/statuscache.db       "$statuscache_db"
+  cvt_file ${imap_prefix}/user_deny.db         "$userdeny_db"
+  # do we have to convert all databases?
+  if ! cmp -s $db_current $db_cache; then
+    # we treat sieve scripts the same way like db files
+    find ${sieve_dir}/ -name "*.script" -type f | while read db_file trash; do
+      cvt_to_utf8 "$db_file"
+    done
+    $masssievec $sievec $IMAPDCONF
+    # convert all db files left
+    find ${imap_prefix}/user/ -name "*.seen" -type f | while read db_file trash; do
+      cvt_file "$db_file" "$seenstate_db"
+    done
+    find ${imap_prefix}/user/ -name "*.sub" -type f | while read db_file trash; do
+      cvt_file "$db_file" "$subscription_db"
+    done
+    find ${imap_prefix}/user/ -name "*.mboxkey" -type f | while read db_file trash; do
+      cvt_file "$db_file" "$mboxkey_db"
+    done
+  fi
+fi
+
+# update the config cache file so we can check whether something has changed
+if [ $ERRVAL -eq 0 ]; then
+  mv -f $db_current $db_cache
+else
+  rm -f $db_cache
+  rm -f $db_current
+fi
+
+exit $ERRVAL

SOURCES/cyrus-imapd.logrotate

@@ -0,0 +1,7 @@
+/var/log/imapd.log /var/log/auth.log {
+    missingok
+    sharedscripts
+    postrotate
+        /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
+    endscript
+}

SOURCES/cyrus-imapd.magic

@@ -0,0 +1,9 @@
+# Magic
+# Magic data for file(1) command.
+# Format is described in magic(files), where:
+# files is 5 on V7 and BSD, 4 on SV, and ?? in the SVID.
+
+#------------------------------------------------------------------------------
+# skiplist:  file(1) magic Cyrus skiplist DB
+#
+0	string		\241\002\213\015skiplist\ file\0\0\0	Cyrus skiplist DB

SOURCES/cyrus-imapd.pam-config

@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       required     pam_nologin.so
+auth       include      password-auth
+account    include      password-auth
+session    include      password-auth

SOURCES/cyrus-imapd.service

@@ -0,0 +1,21 @@
+[Unit]
+Description=Cyrus-imapd IMAP/POP3 email server
+After=local-fs.target network.target
+
+Requires=cyrus-imapd-init.service
+After=cyrus-imapd-init.service
+
+[Service]
+Type=simple
+EnvironmentFile=/etc/sysconfig/cyrus-imapd
+ExecStart=/usr/libexec/cyrus-imapd/cyrus-master $CYRUSOPTIONS
+PrivateTmp=true
+
+# Cyrus may spawn many processes in normal operation.  These figures are higher
+# than the defaults, but may still need to be tuned for your local
+# configuration.
+TasksMax=2048
+LimitNOFILE=16384
+
+[Install]
+WantedBy=multi-user.target

SOURCES/cyrus-imapd.sysconfig

@@ -0,0 +1,5 @@
+# Options to cyrus-master
+CYRUSOPTIONS=""
+
+# Mailbox list dumps are rotated n times via cron.daily
+#ROTATE=6

SOURCES/cyrus-imapd.tmpfiles.conf

@@ -0,0 +1,5 @@
+d /run/cyrus        0750 cyrus mail -
+d /run/cyrus/db     0700 cyrus mail -
+d /run/cyrus/lock   0700 cyrus mail -
+d /run/cyrus/proc   0700 cyrus mail -
+d /run/cyrus/socket 0750 cyrus mail -

SOURCES/patch-cassandane-fix-annotator

@@ -0,0 +1,14 @@
+diff --git a/utils/annotator.pl b/utils/annotator.pl
+index 94b84a2..0208831 100755
+--- a/utils/annotator.pl
++++ b/utils/annotator.pl
+@@ -140,6 +140,8 @@ GetOptions(
+ xlog "annotator $$ starting";
+ Cassandane::AnnotatorDaemon->run(
+ 	pid_file => $pidfile,
+-	port => $port
++	port => $port,
++    user => (getpwuid($<))[0],
++    group => (getgrgid($())[0],
+     );
+ xlog "annotator $$ exiting";

SOURCES/patch-cassandane-no-syslog

@@ -0,0 +1,21 @@
+diff --git a/Cassandane/Util/Log.pm b/Cassandane/Util/Log.pm
+index 9cd93d5..8d3b3c1 100644
+--- a/Cassandane/Util/Log.pm
++++ b/Cassandane/Util/Log.pm
+@@ -52,16 +52,12 @@ our @EXPORT = qw(
+ 
+ my $verbose = 0;
+ 
+-openlog('cassandane', '', LOG_LOCAL6)
+-    or die "Cannot openlog";
+-
+ sub xlog
+ {
+     my ($pkg, $file, $line) = caller;
+     $pkg =~ s/^Cassandane:://;
+     my $msg = "=====> " . $pkg . "[" . $line . "] " . join(' ', @_);
+     print STDERR "$msg\n";
+-    syslog(LOG_ERR, "$msg");
+ }
+ 
+ sub set_verbose

SOURCES/patch-cyrus-default-configs

@@ -0,0 +1,114 @@
+diff --git a/doc/examples/cyrus_conf/prefork.conf b/doc/examples/cyrus_conf/prefork.conf
+index 4ce2c0f..3b1e6d7 100644
+--- a/doc/examples/cyrus_conf/prefork.conf
++++ b/doc/examples/cyrus_conf/prefork.conf
+@@ -19,15 +19,15 @@ SERVICES {
+ #  nntps         cmd="nntpd -s" listen="nntps" prefork=1
+ 
+   # these are only necessary if using HTTP for CalDAV, CardDAV, or RSS
+-#  http          cmd="httpd" listen="http" prefork=3
+-#  https         cmd="httpd -s" listen="https" prefork=1
++  http          cmd="httpd" listen="http" prefork=3
++  https         cmd="httpd -s" listen="https" prefork=1
+ 
+   # at least one LMTP is required for delivery
+ #  lmtp          cmd="lmtpd" listen="lmtp" prefork=0
+-  lmtpunix      cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=1
++  lmtpunix      cmd="lmtpd" listen="/run/cyrus/socket/lmtp" prefork=1
+ 
+   # this is only necessary if using notifications
+-#  notify        cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1
++#  notify        cmd="notifyd" listen="/run/cyrus/socket/notify" proto="udp" prefork=1
+ }
+ 
+ EVENTS {
+diff --git a/doc/examples/imapd_conf/normal.conf b/doc/examples/imapd_conf/normal.conf
+index 95b54e9..3935b77 100644
+--- a/doc/examples/imapd_conf/normal.conf
++++ b/doc/examples/imapd_conf/normal.conf
+@@ -10,7 +10,7 @@ admins: cyrus
+ ###################################################################
+ 
+ # Configuration directory
+-configdirectory: /var/lib/cyrus
++configdirectory: /var/lib/imap
+ 
+ # Directories for proc and lock files
+ proc_path: /run/cyrus/proc
+@@ -19,18 +19,18 @@ mboxname_lockpath: /run/cyrus/lock
+ # Locations for DB files
+ # The following DB are recreated upon initialization, so should live in
+ # ephemeral storage for best performance.
+-duplicate_db_path: /run/cyrus/deliver.db
+-ptscache_db_path:  /run/cyrus/ptscache.db
+-statuscache_db_path: /run/cyrus/statuscache.db
+-tls_sessions_db_path: /run/cyrus/tls_sessions.db
++duplicate_db_path: /run/cyrus/db/deliver.db
++ptscache_db_path:  /run/cyrus/db/ptscache.db
++statuscache_db_path: /run/cyrus/db/statuscache.db
++tls_sessions_db_path: /run/cyrus/db/tls_sessions.db
+ 
+ # Which partition to use for default mailboxes
+ defaultpartition: default
+-partition-default: /var/spool/cyrus/mail
++partition-default: /var/spool/imap
+ 
+ # If sieveusehomedir is false (the default), this directory is searched
+ # for Sieve scripts.
+-sievedir: /var/spool/sieve
++sievedir: /var/lib/imap/sieve
+ 
+ ###################################################################
+ ## Important: KEEP THESE IN SYNC WITH cyrus.conf
+@@ -51,19 +51,16 @@ syslog_prefix: cyrus
+ # Space-separated list of HTTP modules that will be enabled in
+ # httpd(8).  This option has no effect on modules that are disabled at
+ # compile time due to missing dependencies (e.g. libical).
+-#
+-# Allowed values: caldav, carddav, domainkey, ischedule, rss
+-httpmodules: caldav carddav
++# Enable supported modules
++httpmodules: caldav carddav
+ 
+ # If enabled, the partitions will also be hashed, in addition to the
+ # hashing done on configuration directories. This is recommended if one
+ # partition has a very bushy mailbox tree.
+ hashimapspool: true
+ 
+-# Enable virtual domains
+-# and set default domain to localhost
+-virtdomains: yes
+-defaultdomain: localhost
++# Disable virtual domains by default
++virtdomains: off
+ 
+ ###################################################################
+ ## User experience settings
+@@ -72,6 +69,14 @@ defaultdomain: localhost
+ # Minimum time between POP mail fetches in minutes
+ popminpoll: 1
+ 
++# Conversation support is required for jmap
++conversations: 1
++conversations_db: twoskip
++
++# This will default to on in 3.1, and improves compatibility with some Apple
++# devices.  Upstream https://github.com/cyrusimap/cyrus-imapd/issues/1556
++specialusealways: 1
++
+ ###################################################################
+ ## User Authentication settings
+ ###################################################################
+@@ -99,6 +104,12 @@ sasl_auto_transition: no
+ ## SSL/TLS Options
+ ###################################################################
+ 
++# These three files will automatically be generated by the systemd unit when
++# the service starts for the first time.
++tls_server_cert: /etc/pki/cyrus-imapd/cyrus-imapd.pem
++tls_server_key: /etc/pki/cyrus-imapd/cyrus-imapd-key.pem
++tls_client_ca_file: /etc/pki/cyrus-imapd/cyrus-imapd-ca.pem
++
+ # File containing the global certificate used for ALL services (imap,
+ # pop3, lmtp, sieve)
+ #tls_server_cert: /etc/ssl/certs/ssl-cert-snakeoil.pem

SOURCES/patch-cyrus-managesieve-linking

@@ -0,0 +1,13 @@
+diff --git a/perl/sieve/managesieve/Makefile.PL.in b/perl/sieve/managesieve/Makefile.PL.in
+index 2bb715d..422504d 100644
+--- a/perl/sieve/managesieve/Makefile.PL.in
++++ b/perl/sieve/managesieve/Makefile.PL.in
+@@ -69,7 +69,7 @@ WriteMakefile(
+     'ABSTRACT'  => 'Cyrus Sieve management interface',
+     'VERSION_FROM' => "@top_srcdir@/perl/sieve/managesieve/managesieve.pm", # finds $VERSION
+     'MYEXTLIB'  => '../lib/.libs/libisieve.a @top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
+-    'LIBS'	=> ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@"],
++    'LIBS'	=> ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ -lsqlite3 -lpq -lmariadb"],
+     'CCFLAGS'	=> '@GCOV_CFLAGS@',
+     'DEFINE'	=> '-DPERL_POLLUTE',     # e.g., '-DHAVE_SOMETHING' 
+     'INC'	=> "-I@top_srcdir@/lib -I@top_srcdir@/perl/sieve -I@top_srcdir@/perl/sieve/lib @SASLFLAGS@ @SSL_CPPFLAGS@",

SOURCES/patch-cyrus-testsuite-timeout

@@ -0,0 +1,13 @@
+diff --git a/cunit/unit.c b/cunit/unit.c
+index 46dc358..ca37f22 100644
+--- a/cunit/unit.c
++++ b/cunit/unit.c
+@@ -97,7 +97,7 @@ EXPORTED void fatal(const char *s, int code)
+ }
+ 
+ /* Each test gets a maximum of 20 seconds. */
+-#define TEST_TIMEOUT_MS (20*1000)
++#define TEST_TIMEOUT_MS (30*1000)
+ 
+ static jmp_buf jbuf;
+ static const char *code;

SOURCES/patch-vzic-proper-cflags

@@ -0,0 +1,25 @@
+diff --git a/tools/vzic/Makefile b/tools/vzic/Makefile
+index 8ae6afa..3882998 100644
+--- a/tools/vzic/Makefile
++++ b/tools/vzic/Makefile
+@@ -45,17 +45,17 @@ LIBICAL_LDADD = -lical
+ GLIB_CFLAGS = `pkg-config --cflags glib-2.0`
+ GLIB_LDADD = `pkg-config --libs glib-2.0`
+ 
+-CFLAGS = -g -I../.. -DOLSON_DIR=\"$(OLSON_DIR)\" -DPRODUCT_ID='"$(PRODUCT_ID)"' -DTZID_PREFIX='"$(TZID_PREFIX)"' $(GLIB_CFLAGS) $(LIBICAL_CFLAGS)
++CFLAGS += -I../.. -DOLSON_DIR=\"$(OLSON_DIR)\" -DPRODUCT_ID='"$(PRODUCT_ID)"' -DTZID_PREFIX='"$(TZID_PREFIX)"' $(GLIB_CFLAGS) $(LIBICAL_CFLAGS)
+ 
+ OBJECTS = vzic.o vzic-parse.o vzic-dump.o vzic-output.o
+ 
+ all: vzic
+ 
+ vzic: $(OBJECTS)
+-	$(CC) $(OBJECTS) $(GLIB_LDADD) -o vzic
++	$(CC) $(LDFLAGS) $(OBJECTS) $(GLIB_LDADD) -o vzic
+ 
+ test-vzic: test-vzic.o
+-	$(CC) test-vzic.o $(LIBICAL_LDADD) -o test-vzic
++	$(CC) $(LDFLAGS) test-vzic.o $(LIBICAL_LDADD) -o test-vzic
+ 
+ # Dependencies.
+ $(OBJECTS): vzic.h