RHEL 9.0.0 Alpha bootstrap

The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/cyrus-imapd#79a1bb4589ce3ebd85ad9ee1ea6256b11b79707c
2020-10-14 23:26:51 +02:00 · 2020-10-14 23:26:51 +02:00 · 5993bbcc06
parent 3b95eea68e
commit 5993bbcc06
21 changed files with 3002 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,8 @@
+/*.src.rpm
+/.build-*.log
+/.*.swp
+/results_cyrus-imapd/
+/cyrus-imapd-*/
+/cassandane-testdata-ca669d4b.tar.gz
+/cassandane-17d372f.tar.gz
+/cyrus-imapd-3.2.4.tar.gz
--- a/README.rpm
+++ b/README.rpm
@ -0,0 +1,34 @@
+---------------
+Cyrus IMAPd RPM
+---------------
+
+This is a _very_ 'quick and dirty' install howto.
+
+The following steps should lead you to a running Cyrus IMAP server:
+
+1)  Install on a distribution which is supported by this RPM. Don't install
+    on a dirty system, where you have previously installed from source.
+2)  Don't install if you have a previous Cyrus IMAPd installation <=2.1.x on
+    your box. Upgrading any Invoca rpm based installation should be fine.
+3)  Make sure you understand that this RPM installs in FHS compliant
+    directories, like /var/lib/imap and /var/spool/imap
+4)  Make sure cyrus-sasl is installed.
+5)  Make sure saslauthd is running. If not, edit /etc/sysconfig/saslauthd as
+    needed and do 'chkconfig saslauthd on ; service saslauthd start'
+6)  Install the cyrus-imapd RPMs.
+7)  If it's your first install of Cyrus IMAPd, then set a password for the
+    cyrus user in whatever database you are using to authenticate. When
+    using a local account, this should be 'passwd cyrus'.
+8)  Make sure your MTA delivers to Cyrus IMAPd, I recommend LMTP for this.
+9)  Start Cyrus IMAPd with 'service cyrus-imapd start'
+10) Run cyradm and create a user. Usually it's something like this:
+    'cyradm --user=cyrus --auth=login localhost'
+11) If you're using sendmail, be aware that cyrusv2.m4 included in standard
+    sendmail distribution uses socket /var/imap/socket/lmtp while this rpm
+    uses /var/lib/imap/socket/lmtp.
+12) Check your syslog configuration. This RPM uses the mail facility to log
+    messages. On busy sites you may want to limit the mail facility to the
+    info priority with something like 'mail.info    /var/log/maillog' in
+    /etc/syslog.conf.
+
+Enjoy!
--- a/cassandane.ini
+++ b/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 = ...
--- a/cyrus-imapd-certs.patch
+++ b/cyrus-imapd-certs.patch
@ -0,0 +1,428 @@
+From 33deacb14251389587d352fefd55079afec5ebcb Mon Sep 17 00:00:00 2001
+From: ellie timoney <ellie@fastmail.com>
+Date: Wed, 6 May 2020 10:58:25 +1000
+Subject: [PATCH] cunit: fresh self-signed certificate files
+
+4096 bit, and don't expire until 2030
+---
+ cunit/cacert.pem | 160 +++++++++++++++++++++++++++++++----------------
+ cunit/cert.pem   | 156 +++++++++++++++++++++++++++++----------------
+ cunit/key.pem    |  62 ++++++++++++++----
+ 3 files changed, 258 insertions(+), 120 deletions(-)
+
+diff --git a/cunit/cacert.pem b/cunit/cacert.pem
+index ea5c565ad..3583045b0 100644
+--- a/cunit/cacert.pem
+++ b/cunit/cacert.pem
+@@ -2,65 +2,119 @@ Certificate:
+     Data:
+         Version: 3 (0x2)
+         Serial Number:
+-            dc:ff:1e:12:b0:0b:b6:a0
+-        Signature Algorithm: sha1WithRSAEncryption
+-        Issuer: C=AU, ST=Victoria, O=Cyrus IMAP Testers, Inc., OU=SSL Wrangling, CN=Greg Banks/emailAddress=gnb@fastmail.fm
+            d8:8f:9f:11:01:4d:34:da
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: O = Cyrus, CN = Cunit Test CA, emailAddress = ellie@fastmail.com
+         Validity
+-            Not Before: Feb  1 06:35:58 2011 GMT
+-            Not After : Jan 31 06:35:58 2014 GMT
+-        Subject: C=AU, ST=Victoria, O=Cyrus IMAP Testers, Inc., OU=SSL Wrangling, CN=Greg Banks/emailAddress=gnb@fastmail.fm
+            Not Before: May  6 00:39:56 2020 GMT
+            Not After : May  4 00:39:56 2030 GMT
+        Subject: O = Cyrus, CN = Cunit Test CA, emailAddress = ellie@fastmail.com
+         Subject Public Key Info:
+             Public Key Algorithm: rsaEncryption
+-            RSA Public Key: (1024 bit)
+-                Modulus (1024 bit):
+-                    00:da:e4:ec:8f:ef:07:6d:58:b3:13:3e:d0:25:30:
+-                    07:11:35:88:df:70:5c:f5:0d:10:5c:a6:96:4b:e4:
+-                    9c:f3:df:3f:8f:54:fa:00:1b:a2:b9:e8:5f:17:19:
+-                    ee:a8:9a:5d:40:59:6b:d3:90:1b:6f:6c:3b:27:0c:
+-                    be:e0:32:1a:a6:31:bc:57:e5:20:86:c8:c2:2f:b1:
+-                    7c:a0:fe:a9:d7:57:7e:6c:3e:ee:92:b7:f7:7a:fe:
+-                    20:e1:4e:46:91:0a:4a:c2:5b:23:1c:f2:03:0a:8d:
+-                    cc:c9:e4:9b:d8:02:fb:97:6e:38:ee:ce:8d:1f:6b:
+-                    d6:45:70:f8:b9:3b:6e:d3:a7
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:ad:93:cc:8d:90:4b:d7:7d:2e:e4:8e:2a:d4:6e:
+                    0c:31:cc:f3:0a:f0:01:be:6d:24:c8:c4:c7:9a:8a:
+                    c5:0e:05:6a:86:62:14:b9:94:43:28:2d:43:ba:e2:
+                    9e:ab:e5:81:be:b5:93:fc:0b:c8:eb:f0:43:0a:74:
+                    9a:4d:67:69:86:0a:71:50:ac:fa:d4:6c:0a:fb:76:
+                    0a:28:bd:51:50:0b:8b:a6:38:6e:b5:a6:c3:78:33:
+                    89:32:cb:9a:0a:6b:03:82:5e:a3:1f:ad:0a:18:77:
+                    3e:8b:2a:88:32:d6:03:fc:96:d8:82:cc:f4:65:89:
+                    ea:d8:ea:a6:65:21:e8:26:7b:46:05:2a:a3:d9:1d:
+                    68:e9:18:ee:e5:77:92:20:74:da:e7:42:24:35:e5:
+                    6b:63:b6:80:fa:dc:9e:42:80:ae:2d:3f:71:03:64:
+                    6a:b8:2a:1d:bf:f9:0e:33:f1:88:8a:a1:51:fe:62:
+                    0a:9b:5c:0c:9d:2a:c4:75:98:fe:40:32:d2:19:bf:
+                    3f:27:ec:15:06:87:62:e0:de:dd:85:5b:46:1d:b0:
+                    b1:1f:90:4e:e7:38:5d:b9:00:7d:95:bb:da:fb:2a:
+                    03:ef:4e:2f:b0:44:8a:92:eb:09:82:38:52:8c:8a:
+                    b7:70:14:f8:61:36:2c:da:81:08:ba:37:ea:bc:ba:
+                    99:4f:51:3e:6d:d3:01:a4:c4:7e:6c:47:8f:f3:47:
+                    9c:eb:16:a1:c3:f7:23:b8:35:98:a4:69:a2:02:c4:
+                    35:ad:8a:3a:8c:55:01:74:a4:45:20:99:db:de:dc:
+                    d2:6a:42:bb:16:5e:c4:47:e7:4f:95:ab:49:4a:64:
+                    91:3b:97:d2:6e:92:92:ad:14:00:78:4c:e5:3e:bc:
+                    3d:36:c3:0c:2a:e9:dc:bd:83:27:d3:83:47:33:95:
+                    85:dc:34:2f:b9:de:e9:b0:46:c0:b5:26:5c:52:87:
+                    7d:cd:57:7c:04:dd:ce:01:20:a5:3d:9b:77:65:31:
+                    44:bb:c4:81:78:1e:63:59:14:9f:1c:3f:70:18:18:
+                    87:94:79:b2:a3:e7:da:96:ee:38:88:55:0c:ae:ef:
+                    a0:75:c9:e7:4f:89:c8:09:a9:8f:eb:9a:00:c9:ae:
+                    ba:dd:2e:c3:e6:3a:bc:13:f0:d7:8a:2f:43:e4:d5:
+                    ed:70:6a:b3:2c:70:13:e4:1b:02:e8:e5:cf:a3:3d:
+                    96:a7:f3:3b:86:5e:c4:dc:dc:e3:f5:90:ca:c9:0e:
+                    ee:08:cf:ac:4f:81:f1:5e:46:94:d7:b2:3c:de:3e:
+                    0b:e5:e4:c5:28:d5:1e:04:e1:8d:c5:4b:d0:62:c4:
+                    3d:46:1d:6d:27:5a:4f:f4:8f:9b:1c:bc:cd:e3:2b:
+                    8d:bb:21
+                 Exponent: 65537 (0x10001)
+         X509v3 extensions:
+-            X509v3 Subject Key Identifier:
+-                D3:8D:00:56:9B:71:99:CE:00:44:F4:86:98:AE:A9:78:AB:20:17:8A
+-            X509v3 Authority Key Identifier:
+-                keyid:D3:8D:00:56:9B:71:99:CE:00:44:F4:86:98:AE:A9:78:AB:20:17:8A
+-                DirName:/C=AU/ST=Victoria/O=Cyrus IMAP Testers, Inc./OU=SSL Wrangling/CN=Greg Banks/emailAddress=gnb@fastmail.fm
+-                serial:DC:FF:1E:12:B0:0B:B6:A0
+            X509v3 Subject Key Identifier: 
+                39:6F:8D:DF:ED:88:34:6D:F3:C3:9A:AC:4A:B5:49:43:AB:74:AB:0A
+            X509v3 Authority Key Identifier: 
+                keyid:39:6F:8D:DF:ED:88:34:6D:F3:C3:9A:AC:4A:B5:49:43:AB:74:AB:0A
+ 
+-            X509v3 Basic Constraints:
+            X509v3 Basic Constraints: critical
+                 CA:TRUE
+-    Signature Algorithm: sha1WithRSAEncryption
+-        6f:ec:eb:37:40:53:b0:af:c7:db:28:64:6f:5d:49:80:7d:2f:
+-        98:59:3b:18:c4:f9:19:57:5d:04:80:97:0e:9e:dc:d5:fe:da:
+-        93:d9:55:38:ec:33:f7:e2:e2:c0:ba:9c:13:4d:15:1b:52:40:
+-        af:93:1b:6c:97:74:7a:cc:1d:8d:31:ec:cd:b0:ba:31:5e:18:
+-        44:45:7a:80:3d:e4:6d:18:dc:87:95:f9:2b:8e:3c:1f:64:04:
+-        b1:8e:10:fb:6b:db:60:ed:62:75:d5:08:ab:55:03:ff:a5:7c:
+-        33:0a:66:07:35:37:b2:49:93:e7:8a:80:c7:0d:e9:c0:fe:9b:
+-        80:2a
+    Signature Algorithm: sha256WithRSAEncryption
+         0f:25:56:f2:34:9a:3c:bc:37:6c:79:36:70:f5:6b:9b:d9:b6:
+         58:eb:1e:ba:f9:08:d7:15:59:db:3c:aa:85:c4:54:6b:81:2a:
+         15:fe:24:91:48:66:b4:23:bf:b9:ee:12:ac:19:f0:84:35:d4:
+         f4:99:b6:90:0a:67:54:22:40:ea:91:e7:97:75:96:b9:40:4f:
+         d0:b1:6a:07:24:b0:23:66:07:0c:4b:70:24:38:6c:bd:64:3c:
+         e2:a7:2a:5c:00:e6:cc:51:95:2c:54:c3:d1:8a:82:96:8e:82:
+         75:80:52:cb:2b:e0:b5:bc:a3:d2:55:3c:9b:f8:c6:17:0c:a2:
+         d5:e7:a9:32:ba:e7:5e:ab:00:a2:4b:85:52:3e:15:95:3c:84:
+         a2:d9:8e:02:96:7e:c9:45:00:da:e0:b0:d9:c2:9a:9a:1c:18:
+         aa:4f:b6:29:02:d9:39:44:19:a6:f5:51:c9:15:88:c2:6d:87:
+         42:7d:3c:1e:0d:05:a3:96:96:e9:7c:1e:47:84:90:f6:fe:89:
+         47:59:ae:c7:84:86:ae:85:e7:d2:12:61:ed:72:18:27:68:c8:
+         f4:86:90:cb:63:f7:4b:5c:d9:98:0e:9b:c7:bc:be:82:aa:d7:
+         d8:a2:a8:48:36:8e:c2:7e:a2:19:2b:3b:2b:4b:08:3b:cf:b7:
+         34:6e:4a:10:8e:4a:54:f5:bb:93:2d:a5:00:0f:b3:92:df:74:
+         14:d0:8c:5f:3f:5b:78:94:33:bd:bd:69:8d:06:71:54:d8:1b:
+         64:fc:11:44:08:95:c1:f0:24:55:7d:93:a7:0e:e0:cc:0a:7a:
+         d9:70:9f:48:f6:b1:38:e4:2d:9d:b7:3d:c1:52:7b:6a:89:cd:
+         7d:1e:9d:3d:62:73:72:b0:39:11:04:3a:4a:95:37:97:71:5e:
+         24:c5:4d:83:ba:9b:08:e0:99:ae:d0:76:dd:8f:c4:ee:66:1b:
+         c0:4c:57:da:1b:14:83:d8:78:74:27:00:b5:4d:58:19:1e:73:
+         ce:75:1f:a7:44:ce:98:31:89:10:5a:92:cb:78:93:9e:bc:28:
+         2e:25:a7:d1:76:cf:11:8b:4d:be:54:11:92:4f:a2:19:59:a3:
+         f1:c1:65:16:d2:dc:ef:41:00:ed:f8:6e:3b:f1:37:b7:b8:4b:
+         6f:53:e5:6e:d9:88:1b:c9:0b:ca:58:32:bc:6c:30:ea:42:12:
+         e7:16:03:7a:2c:24:d8:f9:d0:ff:35:f2:87:92:2c:6d:d3:38:
+         58:77:ec:61:a5:42:e7:aa:c3:7c:3d:c3:d2:fb:f3:7f:03:35:
+         45:08:76:18:8b:16:1f:6c:e6:86:97:39:56:f5:09:a2:58:82:
+         bb:79:05:67:1d:5b:4d:c8
+ -----BEGIN CERTIFICATE-----
+-MIIDmTCCAwKgAwIBAgIJANz/HhKwC7agMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
+-VQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExITAfBgNVBAoTGEN5cnVzIElNQVAg
+-VGVzdGVycywgSW5jLjEWMBQGA1UECxMNU1NMIFdyYW5nbGluZzETMBEGA1UEAxMK
+-R3JlZyBCYW5rczEeMBwGCSqGSIb3DQEJARYPZ25iQGZhc3RtYWlsLmZtMB4XDTEx
+-MDIwMTA2MzU1OFoXDTE0MDEzMTA2MzU1OFowgZAxCzAJBgNVBAYTAkFVMREwDwYD
+-VQQIEwhWaWN0b3JpYTEhMB8GA1UEChMYQ3lydXMgSU1BUCBUZXN0ZXJzLCBJbmMu
+-MRYwFAYDVQQLEw1TU0wgV3JhbmdsaW5nMRMwEQYDVQQDEwpHcmVnIEJhbmtzMR4w
+-HAYJKoZIhvcNAQkBFg9nbmJAZmFzdG1haWwuZm0wgZ8wDQYJKoZIhvcNAQEBBQAD
+-gY0AMIGJAoGBANrk7I/vB21YsxM+0CUwBxE1iN9wXPUNEFymlkvknPPfP49U+gAb
+-ornoXxcZ7qiaXUBZa9OQG29sOycMvuAyGqYxvFflIIbIwi+xfKD+qddXfmw+7pK3
+-93r+IOFORpEKSsJbIxzyAwqNzMnkm9gC+5duOO7OjR9r1kVw+Lk7btOnAgMBAAGj
+-gfgwgfUwHQYDVR0OBBYEFNONAFabcZnOAET0hpiuqXirIBeKMIHFBgNVHSMEgb0w
+-gbqAFNONAFabcZnOAET0hpiuqXirIBeKoYGWpIGTMIGQMQswCQYDVQQGEwJBVTER
+-MA8GA1UECBMIVmljdG9yaWExITAfBgNVBAoTGEN5cnVzIElNQVAgVGVzdGVycywg
+-SW5jLjEWMBQGA1UECxMNU1NMIFdyYW5nbGluZzETMBEGA1UEAxMKR3JlZyBCYW5r
+-czEeMBwGCSqGSIb3DQEJARYPZ25iQGZhc3RtYWlsLmZtggkA3P8eErALtqAwDAYD
+-VR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBv7Os3QFOwr8fbKGRvXUmAfS+Y
+-WTsYxPkZV10EgJcOntzV/tqT2VU47DP34uLAupwTTRUbUkCvkxtsl3R6zB2NMezN
+-sLoxXhhERXqAPeRtGNyHlfkrjjwfZASxjhD7a9tg7WJ11QirVQP/pXwzCmYHNTey
+-SZPnioDHDenA/puAKg==
+MIIFbDCCA1SgAwIBAgIJANiPnxEBTTTaMA0GCSqGSIb3DQEBCwUAMEsxDjAMBgNV
+BAoMBUN5cnVzMRYwFAYDVQQDDA1DdW5pdCBUZXN0IENBMSEwHwYJKoZIhvcNAQkB
+FhJlbGxpZUBmYXN0bWFpbC5jb20wHhcNMjAwNTA2MDAzOTU2WhcNMzAwNTA0MDAz
+OTU2WjBLMQ4wDAYDVQQKDAVDeXJ1czEWMBQGA1UEAwwNQ3VuaXQgVGVzdCBDQTEh
+MB8GCSqGSIb3DQEJARYSZWxsaWVAZmFzdG1haWwuY29tMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEArZPMjZBL130u5I4q1G4MMczzCvABvm0kyMTHmorF
+DgVqhmIUuZRDKC1DuuKeq+WBvrWT/AvI6/BDCnSaTWdphgpxUKz61GwK+3YKKL1R
+UAuLpjhutabDeDOJMsuaCmsDgl6jH60KGHc+iyqIMtYD/JbYgsz0ZYnq2OqmZSHo
+JntGBSqj2R1o6Rju5XeSIHTa50IkNeVrY7aA+tyeQoCuLT9xA2RquCodv/kOM/GI
+iqFR/mIKm1wMnSrEdZj+QDLSGb8/J+wVBodi4N7dhVtGHbCxH5BO5zhduQB9lbva
++yoD704vsESKkusJgjhSjIq3cBT4YTYs2oEIujfqvLqZT1E+bdMBpMR+bEeP80ec
+6xahw/cjuDWYpGmiAsQ1rYo6jFUBdKRFIJnb3tzSakK7Fl7ER+dPlatJSmSRO5fS
+bpKSrRQAeEzlPrw9NsMMKuncvYMn04NHM5WF3DQvud7psEbAtSZcUod9zVd8BN3O
+ASClPZt3ZTFEu8SBeB5jWRSfHD9wGBiHlHmyo+falu44iFUMru+gdcnnT4nICamP
+65oAya663S7D5jq8E/DXii9D5NXtcGqzLHAT5BsC6OXPoz2Wp/M7hl7E3Nzj9ZDK
+yQ7uCM+sT4HxXkaU17I83j4L5eTFKNUeBOGNxUvQYsQ9Rh1tJ1pP9I+bHLzN4yuN
+uyECAwEAAaNTMFEwHQYDVR0OBBYEFDlvjd/tiDRt88OarEq1SUOrdKsKMB8GA1Ud
+IwQYMBaAFDlvjd/tiDRt88OarEq1SUOrdKsKMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQELBQADggIBAA8lVvI0mjy8N2x5NnD1a5vZtljrHrr5CNcVWds8qoXE
+VGuBKhX+JJFIZrQjv7nuEqwZ8IQ11PSZtpAKZ1QiQOqR55d1lrlAT9CxagcksCNm
+BwxLcCQ4bL1kPOKnKlwA5sxRlSxUw9GKgpaOgnWAUssr4LW8o9JVPJv4xhcMotXn
+qTK6516rAKJLhVI+FZU8hKLZjgKWfslFANrgsNnCmpocGKpPtikC2TlEGab1UckV
+iMJth0J9PB4NBaOWlul8HkeEkPb+iUdZrseEhq6F59ISYe1yGCdoyPSGkMtj90tc
+2ZgOm8e8voKq19iiqEg2jsJ+ohkrOytLCDvPtzRuShCOSlT1u5MtpQAPs5LfdBTQ
+jF8/W3iUM729aY0GcVTYG2T8EUQIlcHwJFV9k6cO4MwKetlwn0j2sTjkLZ23PcFS
+e2qJzX0enT1ic3KwOREEOkqVN5dxXiTFTYO6mwjgma7Qdt2PxO5mG8BMV9obFIPY
+eHQnALVNWBkec851H6dEzpgxiRBakst4k568KC4lp9F2zxGLTb5UEZJPohlZo/HB
+ZRbS3O9BAO34bjvxN7e4S29T5W7ZiBvJC8pYMrxsMOpCEucWA3osJNj50P818oeS
+LG3TOFh37GGlQueqw3w9w9L7838DNUUIdhiLFh9s5oaXOVb1CaJYgrt5BWcdW03I
+ -----END CERTIFICATE-----
+diff --git a/cunit/cert.pem b/cunit/cert.pem
+index cb7959d31..95856758d 100644
+--- a/cunit/cert.pem
+++ b/cunit/cert.pem
+@@ -1,63 +1,111 @@
+ Certificate:
+     Data:
+-        Version: 3 (0x2)
+        Version: 1 (0x0)
+         Serial Number:
+-            dc:ff:1e:12:b0:0b:b6:a1
+-        Signature Algorithm: sha1WithRSAEncryption
+-        Issuer: C=AU, ST=Victoria, O=Cyrus IMAP Testers, Inc., OU=SSL Wrangling, CN=Greg Banks/emailAddress=gnb@fastmail.fm
+            b1:9a:bb:97:c3:6c:2f:03
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: O = Cyrus, CN = Cunit Test CA, emailAddress = ellie@fastmail.com
+         Validity
+-            Not Before: Feb  1 07:40:55 2011 GMT
+-            Not After : Feb  1 07:40:55 2012 GMT
+-        Subject: C=AU, ST=Victoria, O=Cyrus IMAP Testers, Inc., OU=SSL Wranglers, CN=Greg Banks/emailAddress=gnb@fastmail.fm
+            Not Before: May  6 00:51:14 2020 GMT
+            Not After : May  4 00:51:14 2030 GMT
+        Subject: O = Cyrus, CN = Cunit Test Certificate, emailAddress = ellie@fastmail.com
+         Subject Public Key Info:
+             Public Key Algorithm: rsaEncryption
+-            RSA Public Key: (1024 bit)
+-                Modulus (1024 bit):
+-                    00:f2:cc:96:27:92:93:ad:56:9c:78:85:68:d0:bd:
+-                    00:00:62:7a:d5:22:b3:54:f0:4a:1b:bc:18:8d:7e:
+-                    37:1f:cb:b0:04:ab:d8:91:55:37:c8:89:79:2f:94:
+-                    cd:02:d3:34:0f:49:ca:68:80:1c:8b:9b:be:43:c4:
+-                    8f:a1:53:04:a8:35:b7:8d:d8:67:ec:92:30:89:87:
+-                    55:0b:a9:9d:45:37:88:af:ea:99:64:11:9c:5e:c2:
+-                    d5:95:17:df:37:23:f1:0c:75:e9:0b:b6:1e:b0:80:
+-                    7d:a0:da:87:6c:80:3f:73:72:f4:d4:b4:5d:54:78:
+-                    07:6b:ef:7f:7f:0a:08:84:bb
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:c5:7b:27:ab:e9:ec:a0:cd:3a:9a:ee:bf:d6:e8:
+                    40:da:5d:ff:23:75:7e:b7:c7:94:77:5f:65:a2:a6:
+                    58:18:4c:d8:b6:57:b5:ed:46:e6:2c:45:cd:09:ff:
+                    bb:24:1b:75:14:54:d1:95:a3:d2:9b:13:5d:dc:4c:
+                    e5:20:eb:07:d0:86:2b:1e:53:1a:fa:5e:c6:02:9c:
+                    74:82:8c:71:66:4d:7b:e5:e6:92:9b:68:6c:52:a1:
+                    d1:cd:a6:12:b8:44:04:9e:55:d2:91:05:fc:83:86:
+                    47:6a:e3:d6:b9:b2:a6:01:3c:1e:a6:c7:95:90:81:
+                    36:f1:79:72:e1:07:97:1c:aa:41:3d:3a:60:dd:3b:
+                    2c:77:6e:ba:6d:cb:27:89:09:a9:db:c9:fe:ff:95:
+                    a8:a5:ef:c1:7f:30:bb:a4:d9:d3:af:44:16:d6:45:
+                    1c:fa:49:e3:26:10:55:fa:b5:a1:91:99:bc:79:fe:
+                    8e:4b:92:a4:30:ca:f4:20:21:ac:0d:fe:c6:4a:69:
+                    8c:a5:80:3e:67:e9:fd:d2:02:91:8c:4a:cf:2c:ce:
+                    54:7c:cb:76:fa:e7:c0:a0:de:d0:fc:dc:e9:28:21:
+                    cd:e4:26:3a:53:fd:bd:3e:ac:51:ae:a9:31:a4:3d:
+                    6d:c3:a6:b5:05:af:3e:c2:02:34:08:40:96:ee:d3:
+                    11:97:d3:0a:af:51:0e:a9:0f:dd:01:28:1b:51:56:
+                    44:91:7b:75:13:71:c3:71:3f:86:a6:c5:f4:18:69:
+                    2d:53:9f:c0:84:42:8f:9e:55:5f:5d:6f:c9:e8:a9:
+                    40:db:0c:30:f4:20:94:e6:d8:3c:b6:7f:ea:5f:b3:
+                    a7:fe:4b:03:21:8f:f5:31:ce:cf:c1:77:b5:3d:6e:
+                    46:60:dc:c4:71:4c:18:69:6e:62:b5:ad:ef:da:f8:
+                    1d:49:fc:3f:00:6e:d1:ae:1e:01:97:0c:73:81:89:
+                    45:61:47:37:7f:22:88:59:bf:87:59:39:e1:c6:42:
+                    b6:04:a6:ad:55:6a:53:41:91:a0:60:d0:c7:90:77:
+                    57:3d:97:7a:26:92:a6:ec:1a:39:b2:5e:97:a4:08:
+                    5a:f3:b3:a6:9a:b7:84:f7:33:98:aa:15:14:d6:f9:
+                    b9:be:0a:98:85:f8:e2:ee:e5:c9:dc:b5:0f:30:1b:
+                    8b:fa:ef:94:3a:59:8d:03:cb:47:05:07:77:47:7c:
+                    57:2f:b3:19:0f:82:59:b9:05:92:ca:6f:a1:0e:29:
+                    66:52:99:77:8d:3f:07:61:14:af:63:e4:ae:93:6d:
+                    1b:2f:03:ad:a3:f6:e4:89:34:25:c1:c7:bc:ef:37:
+                    e3:88:ff:92:67:91:9c:a2:91:6a:f7:9b:b7:e0:67:
+                    c4:d1:db
+                 Exponent: 65537 (0x10001)
+-        X509v3 extensions:
+-            X509v3 Basic Constraints:
+-                CA:FALSE
+-            Netscape Comment:
+-                OpenSSL Generated Certificate
+-            X509v3 Subject Key Identifier:
+-                96:48:A2:12:B6:AD:DC:B8:94:D4:4E:46:94:C4:1E:AF:32:4C:B9:01
+-            X509v3 Authority Key Identifier:
+-                keyid:D3:8D:00:56:9B:71:99:CE:00:44:F4:86:98:AE:A9:78:AB:20:17:8A
+-
+-    Signature Algorithm: sha1WithRSAEncryption
+-        7a:4c:82:b7:55:31:76:89:44:08:57:0d:c9:df:82:e7:1f:94:
+-        b1:5f:a6:bc:93:63:d7:90:74:25:b0:0b:5b:eb:b6:d0:46:e3:
+-        59:34:8c:e8:46:7a:33:af:b6:4d:3f:b8:0a:dd:89:51:22:f2:
+-        f8:26:97:9e:4b:62:8a:10:f4:87:0c:cb:53:ff:c8:2b:a2:95:
+-        0e:02:65:e5:97:b5:ad:c6:87:25:c9:dc:35:b5:c7:e2:4d:d5:
+-        cb:dd:a7:2a:e4:0f:7e:e1:a3:b8:fa:11:02:61:0e:04:2b:3a:
+-        a7:73:80:e1:26:24:24:6c:fb:35:50:31:6e:ce:15:53:c7:43:
+-        1a:60
+    Signature Algorithm: sha256WithRSAEncryption
+         01:e9:6b:c7:a2:f7:20:0b:a1:ae:ef:7e:0f:73:8d:9f:4d:c0:
+         9e:ce:0c:be:88:a0:d9:07:2e:3b:af:73:79:90:79:6d:67:e5:
+         45:8d:cb:96:4f:db:f2:49:f6:5c:22:94:60:a9:0c:05:22:9f:
+         e3:4b:7c:b7:5c:e9:25:bf:25:63:f4:b9:f6:bc:dc:8d:ae:2e:
+         34:b2:de:68:50:99:00:dd:b4:3f:ee:cf:f5:94:25:51:57:95:
+         83:5b:d0:2f:98:80:d8:75:8f:b7:73:e1:18:37:85:70:6c:20:
+         96:f7:3a:d7:79:e6:e1:cb:30:40:42:5c:74:34:8a:47:2c:d2:
+         8f:a4:ba:54:4c:8c:00:9e:52:d7:af:88:63:a6:d0:35:c8:9a:
+         f1:04:87:65:7c:44:f6:9d:7e:83:ee:3e:62:23:21:05:b2:4b:
+         da:fa:dc:55:9b:bd:d7:58:08:6a:a1:85:6c:f6:2a:28:09:bc:
+         07:ed:32:1a:95:e1:a2:3c:23:26:5b:b4:01:49:0f:87:e3:c3:
+         16:75:f5:28:64:b8:b8:a4:68:b8:9e:8c:4b:80:7a:20:60:74:
+         bc:72:aa:96:7e:28:77:ed:00:7a:ac:51:13:34:c4:6e:6b:f7:
+         ae:9e:83:cb:0e:41:fc:51:f3:61:ff:fd:14:a2:15:da:2f:6a:
+         18:2f:5f:01:0a:e9:ae:be:d6:44:37:70:d8:4c:e1:6b:b0:4f:
+         34:3d:7b:f8:1f:f4:97:ea:c4:1c:af:c2:7f:50:8a:d1:55:b5:
+         1c:b2:c0:9f:e4:1e:45:42:49:ef:05:8d:c2:fe:27:d8:e5:ec:
+         e9:d3:65:73:2d:7e:ad:34:05:93:e2:9c:bc:6a:f8:9c:75:09:
+         1d:5b:60:e8:b6:15:a4:35:6a:55:38:3e:4e:dc:07:13:82:6f:
+         0a:95:7d:fc:44:29:8f:d5:4b:f8:64:dd:54:5c:02:e7:be:84:
+         de:46:ad:65:5b:31:b4:7f:f0:de:03:a3:7c:e6:53:12:21:ed:
+         df:18:98:ef:7f:aa:59:ee:78:cc:1f:3b:b1:9b:67:75:1e:a5:
+         8e:ad:ac:21:c9:b5:55:08:76:7a:24:d5:7a:87:ba:64:11:c3:
+         a7:89:35:8f:55:90:aa:e5:ed:7e:ee:c5:94:33:59:ad:ef:62:
+         98:88:ae:d1:38:7d:25:56:ee:d0:9b:9d:cc:9a:fa:27:9f:83:
+         59:7f:39:a7:06:b1:1e:f6:6e:5d:42:4d:48:02:ce:a8:6e:0f:
+         78:f4:f0:b3:c7:0d:c3:26:a2:ff:ac:ea:6a:0d:6b:75:c2:72:
+         49:c5:a7:36:47:90:23:da:f9:84:9c:c7:a6:6b:49:02:4d:a6:
+         dd:8e:e9:27:d2:4c:51:1b
+ -----BEGIN CERTIFICATE-----
+-MIIDGzCCAoSgAwIBAgIJANz/HhKwC7ahMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
+-VQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExITAfBgNVBAoTGEN5cnVzIElNQVAg
+-VGVzdGVycywgSW5jLjEWMBQGA1UECxMNU1NMIFdyYW5nbGluZzETMBEGA1UEAxMK
+-R3JlZyBCYW5rczEeMBwGCSqGSIb3DQEJARYPZ25iQGZhc3RtYWlsLmZtMB4XDTEx
+-MDIwMTA3NDA1NVoXDTEyMDIwMTA3NDA1NVowgZAxCzAJBgNVBAYTAkFVMREwDwYD
+-VQQIEwhWaWN0b3JpYTEhMB8GA1UEChMYQ3lydXMgSU1BUCBUZXN0ZXJzLCBJbmMu
+-MRYwFAYDVQQLEw1TU0wgV3JhbmdsZXJzMRMwEQYDVQQDEwpHcmVnIEJhbmtzMR4w
+-HAYJKoZIhvcNAQkBFg9nbmJAZmFzdG1haWwuZm0wgZ8wDQYJKoZIhvcNAQEBBQAD
+-gY0AMIGJAoGBAPLMlieSk61WnHiFaNC9AABietUis1TwShu8GI1+Nx/LsASr2JFV
+-N8iJeS+UzQLTNA9JymiAHIubvkPEj6FTBKg1t43YZ+ySMImHVQupnUU3iK/qmWQR
+-nF7C1ZUX3zcj8Qx16Qu2HrCAfaDah2yAP3Ny9NS0XVR4B2vvf38KCIS7AgMBAAGj
+-ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
+-IENlcnRpZmljYXRlMB0GA1UdDgQWBBSWSKIStq3cuJTUTkaUxB6vMky5ATAfBgNV
+-HSMEGDAWgBTTjQBWm3GZzgBE9IaYrql4qyAXijANBgkqhkiG9w0BAQUFAAOBgQB6
+-TIK3VTF2iUQIVw3J34LnH5SxX6a8k2PXkHQlsAtb67bQRuNZNIzoRnozr7ZNP7gK
+-3YlRIvL4JpeeS2KKEPSHDMtT/8gropUOAmXll7Wtxoclydw1tcfiTdXL3acq5A9+
+-4aO4+hECYQ4EKzqnc4DhJiQkbPs1UDFuzhVTx0MaYA==
+MIIFGzCCAwMCCQCxmruXw2wvAzANBgkqhkiG9w0BAQsFADBLMQ4wDAYDVQQKDAVD
+eXJ1czEWMBQGA1UEAwwNQ3VuaXQgVGVzdCBDQTEhMB8GCSqGSIb3DQEJARYSZWxs
+aWVAZmFzdG1haWwuY29tMB4XDTIwMDUwNjAwNTExNFoXDTMwMDUwNDAwNTExNFow
+VDEOMAwGA1UECgwFQ3lydXMxHzAdBgNVBAMMFkN1bml0IFRlc3QgQ2VydGlmaWNh
+dGUxITAfBgkqhkiG9w0BCQEWEmVsbGllQGZhc3RtYWlsLmNvbTCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBAMV7J6vp7KDNOpruv9boQNpd/yN1frfHlHdf
+ZaKmWBhM2LZXte1G5ixFzQn/uyQbdRRU0ZWj0psTXdxM5SDrB9CGKx5TGvpexgKc
+dIKMcWZNe+XmkptobFKh0c2mErhEBJ5V0pEF/IOGR2rj1rmypgE8HqbHlZCBNvF5
+cuEHlxyqQT06YN07LHduum3LJ4kJqdvJ/v+VqKXvwX8wu6TZ069EFtZFHPpJ4yYQ
+Vfq1oZGZvHn+jkuSpDDK9CAhrA3+xkppjKWAPmfp/dICkYxKzyzOVHzLdvrnwKDe
+0Pzc6SghzeQmOlP9vT6sUa6pMaQ9bcOmtQWvPsICNAhAlu7TEZfTCq9RDqkP3QEo
+G1FWRJF7dRNxw3E/hqbF9BhpLVOfwIRCj55VX11vyeipQNsMMPQglObYPLZ/6l+z
+p/5LAyGP9THOz8F3tT1uRmDcxHFMGGluYrWt79r4HUn8PwBu0a4eAZcMc4GJRWFH
+N38iiFm/h1k54cZCtgSmrVVqU0GRoGDQx5B3Vz2XeiaSpuwaObJel6QIWvOzppq3
+hPczmKoVFNb5ub4KmIX44u7lydy1DzAbi/rvlDpZjQPLRwUHd0d8Vy+zGQ+CWbkF
+kspvoQ4pZlKZd40/B2EUr2PkrpNtGy8DraP25Ik0JcHHvO8344j/kmeRnKKRaveb
+t+BnxNHbAgMBAAEwDQYJKoZIhvcNAQELBQADggIBAAHpa8ei9yALoa7vfg9zjZ9N
+wJ7ODL6IoNkHLjuvc3mQeW1n5UWNy5ZP2/JJ9lwilGCpDAUin+NLfLdc6SW/JWP0
+ufa83I2uLjSy3mhQmQDdtD/uz/WUJVFXlYNb0C+YgNh1j7dz4Rg3hXBsIJb3Otd5
+5uHLMEBCXHQ0ikcs0o+kulRMjACeUteviGOm0DXImvEEh2V8RPadfoPuPmIjIQWy
+S9r63FWbvddYCGqhhWz2KigJvAftMhqV4aI8IyZbtAFJD4fjwxZ19ShkuLikaLie
+jEuAeiBgdLxyqpZ+KHftAHqsURM0xG5r966eg8sOQfxR82H//RSiFdovahgvXwEK
+6a6+1kQ3cNhM4WuwTzQ9e/gf9JfqxByvwn9QitFVtRyywJ/kHkVCSe8FjcL+J9jl
+7OnTZXMtfq00BZPinLxq+Jx1CR1bYOi2FaQ1alU4Pk7cBxOCbwqVffxEKY/VS/hk
+3VRcAue+hN5GrWVbMbR/8N4Do3zmUxIh7d8YmO9/qlnueMwfO7GbZ3UepY6trCHJ
+tVUIdnok1XqHumQRw6eJNY9VkKrl7X7uxZQzWa3vYpiIrtE4fSVW7tCbncya+ief
+g1l/OacGsR72bl1CTUgCzqhuD3j08LPHDcMmov+s6moNa3XCcknFpzZHkCPa+YSc
+x6ZrSQJNpt2O6SfSTFEb
+ -----END CERTIFICATE-----
+diff --git a/cunit/key.pem b/cunit/key.pem
+index c4655452e..2ad85a442 100644
+--- a/cunit/key.pem
+++ b/cunit/key.pem
+@@ -1,15 +1,51 @@
+ -----BEGIN RSA PRIVATE KEY-----
+-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
+ -----END RSA PRIVATE KEY-----
--- a/cyrus-imapd-init.service
+++ b/cyrus-imapd-init.service
@ -0,0 +1,12 @@
+[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
+Group=mail
+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 --cert-key-mode=0640 
--- a/cyrus-imapd.cron-daily
+++ b/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
--- a/cyrus-imapd.logrotate
+++ b/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
+}
--- a/cyrus-imapd.magic
+++ b/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
--- a/cyrus-imapd.pam-config
+++ b/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
--- a/cyrus-imapd.service
+++ b/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/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
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
--- a/cyrus-imapd.sysconfig
+++ b/cyrus-imapd.sysconfig
@ -0,0 +1,5 @@
+# Options to cyrus-master
+CYRUSOPTIONS=""
+
+# Mailbox list dumps are rotated n times via cron.daily
+#ROTATE=6
--- a/cyrus-imapd.tmpfiles.conf
+++ b/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 -
--- a/14
+++ b/14
@ -0,0 +1,14 @@
+diff --git a/utils/annotator.pl b/utils/annotator.pl
+index 265c73f..8af3d58 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";
--- a/41
+++ b/41
@ -0,0 +1,41 @@
+diff --git a/Cassandane/Util/Log.pm b/Cassandane/Util/Log.pm
+index 17d2cc7..11b747f 100644
+--- a/Cassandane/Util/Log.pm
+++ b/Cassandane/Util/Log.pm
+@@ -51,9 +51,6 @@ our @EXPORT = qw(
+ 
+ my $verbose = 0;
+ 
+-openlog('cassandane', '', LOG_LOCAL6)
+-    or die "Cannot openlog";
+-
+ sub xlog
+ {
+     my $id;
+@@ -70,7 +67,6 @@ sub xlog
+     $msg .= "($id) " if $id;
+     $msg .= join(' ', @_);
+     print STDERR "$msg\n";
+-    syslog(LOG_ERR, "$msg");
+ }
+ 
+ sub set_verbose
+diff --git a/Cassandane/Instance.pm b/Cassandane/Instance.pm
+index bdfa44f..e852599 100644
+--- a/Cassandane/Instance.pm
+++ b/Cassandane/Instance.pm
+@@ -2030,12 +2030,8 @@ sub setup_syslog_replacement
+ {
+     my ($self) = @_;
+ 
+-    if (not(-e 'utils/syslog.so') || not(-e 'utils/syslog_probe')) {
+-        xlog "utils/syslog.so not found (do you need to run 'make'?)";
+-        xlog "tests will not examine syslog output";
+-        $self->{have_syslog_replacement} = 0;
+-        return;
+-    }
+    $self->{have_syslog_replacement} = 0;
+    return;
+ 
+     $self->{syslog_fname} = "$self->{basedir}/conf/log/syslog";
+     $self->{have_syslog_replacement} = 1;
--- a/105
+++ b/105
@ -0,0 +1,105 @@
+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
+# Fedora default: enable all modules besides admin
+httpmodules: caldav carddav domainkey freebusy ischedule rss tzdist webdav
+ 
+ # 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
+diff --git a/doc/examples/cyrus_conf/prefork.conf b/doc/examples/cyrus_conf/prefork.conf
+index 186fe66..ab97848 100644
+--- a/doc/examples/cyrus_conf/prefork.conf
+++ b/doc/examples/cyrus_conf/prefork.conf
+@@ -19,8 +19,8 @@ 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
--- a/26
+++ b/26
@ -0,0 +1,26 @@
+diff --git a/perl/sieve/managesieve/Makefile.PL.in b/perl/sieve/managesieve/Makefile.PL.in
+index 7180b98..d589ebe 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@ @LIB_REGEX@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_LIBADD@"],
+    'LIBS'	=> ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @LIB_REGEX@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_LIBADD@ -lpcreposix"],
+     '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@",
+diff --git a/perl/imap/Makefile.PL.in b/perl/imap/Makefile.PL.in
+index 71416cc..f76cda6 100644
+--- a/perl/imap/Makefile.PL.in
+++ b/perl/imap/Makefile.PL.in
+@@ -91,7 +91,7 @@ WriteMakefile(
+     'LD'       => $Config{ld} . ' @GCOV_LDFLAGS@',
+     'OBJECT'    => 'IMAP.o',
+     'MYEXTLIB'  => '@top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
+-    'LIBS'	=> [ "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @GCOV_LIBS@ @LIBCAP_LIBS@"],
+    'LIBS'	=> [ "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @GCOV_LIBS@ @LIBCAP_LIBS@ -lpcreposix"],
+     'DEFINE'	=> '-DPERL_POLLUTE',    # e.g., '-DHAVE_SOMETHING'
+     'INC'	=> "-I@top_srcdir@ -I@top_srcdir@/com_err/et @SASLFLAGS@ @SSL_CPPFLAGS@ @GCOV_CFLAGS@ -I@top_srcdir@/perl/imap",
+     'EXE_FILES' => [cyradm],
--- a/13
+++ b/13
@ -0,0 +1,13 @@
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 3cc75f5..a22a356 100644
+--- a/imap/imapd.c
+++ b/imap/imapd.c
+@@ -8022,7 +8022,7 @@ static void cmd_reconstruct(const char *tag, const char *name, int recursive)
+             fclose(stdout);
+             fclose(stderr);
+ 
+-            ret = snprintf(buf, sizeof(buf), "%s/quota", SBIN_DIR);
+            ret = snprintf(buf, sizeof(buf), "%s/cyr_quota", SBIN_DIR);
+             if(ret < 0 || ret >= (int) sizeof(buf)) {
+                 /* in child, so fatailing won't disconnect our user */
+                 fatal("quota buffer not sufficiently big", EX_CONFIG);
--- a/13
+++ b/13
@ -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;
--- a/25
+++ b/25
@ -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
--- a/3
+++ b/3
@ -0,0 +1,3 @@
+SHA512 (cassandane-testdata-ca669d4b.tar.gz) = c153ab0a57d04d9deeabc5ef724eaecc05030c23b170abaa44eaea2e7df409efcdeb24871f7896759e85d64193fb9f289a470b0af9a593a740ffcc45c80033ff
+SHA512 (cassandane-17d372f.tar.gz) = 39f069b14c797d2c03a96b135babb4039445167ab4acb21c7380d4880eb61551a85b926ac2bc0cf05384b1a145d9eeffccbfedbd51047aa78b0492a7b5e7cfd6
+SHA512 (cyrus-imapd-3.2.4.tar.gz) = 68df1154e48fa8aa0b1c09ab8b9fb6026a77e5473599ef229f6fe99b097a05bd9b923dde756dd5e455bc7db0af1e59d8fd282f42f37d83edd6bdf84da0750425