From 5993bbcc06eeb6338623220b8ff93ef9d0db0dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Wed, 14 Oct 2020 23:26:51 +0200 Subject: [PATCH] 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 --- .gitignore | 8 + README.rpm | 34 + cassandane.ini | 56 + cyrus-imapd-certs.patch | 428 +++++++ cyrus-imapd-init.service | 12 + cyrus-imapd.cron-daily | 36 + cyrus-imapd.logrotate | 7 + cyrus-imapd.magic | 9 + cyrus-imapd.pam-config | 5 + cyrus-imapd.service | 21 + cyrus-imapd.spec | 2136 ++++++++++++++++++++++++++++++++ cyrus-imapd.sysconfig | 5 + cyrus-imapd.tmpfiles.conf | 5 + patch-cassandane-fix-annotator | 14 + patch-cassandane-no-syslog | 41 + patch-cyrus-default-configs | 105 ++ patch-cyrus-perl-linking | 26 + patch-cyrus-rename-quota | 13 + patch-cyrus-testsuite-timeout | 13 + patch-vzic-proper-cflags | 25 + sources | 3 + 21 files changed, 3002 insertions(+) create mode 100644 README.rpm create mode 100644 cassandane.ini create mode 100644 cyrus-imapd-certs.patch create mode 100644 cyrus-imapd-init.service create mode 100644 cyrus-imapd.cron-daily create mode 100644 cyrus-imapd.logrotate create mode 100644 cyrus-imapd.magic create mode 100644 cyrus-imapd.pam-config create mode 100644 cyrus-imapd.service create mode 100644 cyrus-imapd.spec create mode 100644 cyrus-imapd.sysconfig create mode 100644 cyrus-imapd.tmpfiles.conf create mode 100644 patch-cassandane-fix-annotator create mode 100644 patch-cassandane-no-syslog create mode 100644 patch-cyrus-default-configs create mode 100644 patch-cyrus-perl-linking create mode 100644 patch-cyrus-rename-quota create mode 100644 patch-cyrus-testsuite-timeout create mode 100644 patch-vzic-proper-cflags create mode 100644 sources diff --git a/.gitignore b/.gitignore index e69de29..6bb6a26 100644 --- 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 diff --git a/README.rpm b/README.rpm new file mode 100644 index 0000000..1ed8fa0 --- /dev/null +++ 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! diff --git a/cassandane.ini b/cassandane.ini new file mode 100644 index 0000000..bbdb10c --- /dev/null +++ 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 = ... diff --git a/cyrus-imapd-certs.patch b/cyrus-imapd-certs.patch new file mode 100644 index 0000000..99f2fb4 --- /dev/null +++ b/cyrus-imapd-certs.patch @@ -0,0 +1,428 @@ +From 33deacb14251389587d352fefd55079afec5ebcb Mon Sep 17 00:00:00 2001 +From: ellie timoney +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----- +-MIICXAIBAAKBgQDyzJYnkpOtVpx4hWjQvQAAYnrVIrNU8EobvBiNfjcfy7AEq9iR +-VTfIiXkvlM0C0zQPScpogByLm75DxI+hUwSoNbeN2GfskjCJh1ULqZ1FN4iv6plk +-EZxewtWVF983I/EMdekLth6wgH2g2odsgD9zcvTUtF1UeAdr739/CgiEuwIDAQAB +-AoGAD31X0vx56WQOJW41aqO0HVIrDe/hyvhtcemFE3nK4H9pIlMoRNVP8r46efuf +-PJ/mwVbuz83khE+SStZ+Z0dZk5XPa+12Zm/Se9OEvTRlIO/Owph191HZN6UgvlQv +-hbMEpYd/olrVQGC37byf+sC8ZbBOeNgUJ4OsOd7t/7FQOCECQQD/4JB5jwxA+bQp +-GOtVva/Ff8LUe/7YKDI83J/wnbKJ6hdxltBJyCnf71w6IpCplVbstIuTs8esKFwl +-/P12uVmRAkEA8upqXanrYtpmDY+o+75wOM3QqZT9ZAlcE9ExGerDVCSuWWuHYVc/ +-a1QiLoZT/Ox1Q4//QFFnlFopIGb53z0ziwJAa1Vk5UjnJ/5W34JvfWjzaZJdRMq6 +-rSu3XyZhBQrxkL6clO5hcwG+5wu+ETjcm/ZkHyjg/9VDJelMNjc4j2vSsQJAKYVL +-/QqIQ3NVMkg1+CHLCMqVOgdPcIPxCyocnHN2Q7GpY3tvvoGtQ2k0FoO7Y2X/fTbl +-yFahv8fRc8pmN3Q8lQJBALHR6t9w5pHa4OykBGiho2HjnFJLgU0lbHfCr0jWZHgN +-dZ4rE6d7bq5NvjaKxUk5nO/Flx2A6AkkxtJwFr8VYsA= ++MIIJKQIBAAKCAgEAxXsnq+nsoM06mu6/1uhA2l3/I3V+t8eUd19loqZYGEzYtle1 ++7UbmLEXNCf+7JBt1FFTRlaPSmxNd3EzlIOsH0IYrHlMa+l7GApx0goxxZk175eaS ++m2hsUqHRzaYSuEQEnlXSkQX8g4ZHauPWubKmATwepseVkIE28Xly4QeXHKpBPTpg ++3Tssd266bcsniQmp28n+/5Wope/BfzC7pNnTr0QW1kUc+knjJhBV+rWhkZm8ef6O ++S5KkMMr0ICGsDf7GSmmMpYA+Z+n90gKRjErPLM5UfMt2+ufAoN7Q/NzpKCHN5CY6 ++U/29PqxRrqkxpD1tw6a1Ba8+wgI0CECW7tMRl9MKr1EOqQ/dASgbUVZEkXt1E3HD ++cT+GpsX0GGktU5/AhEKPnlVfXW/J6KlA2www9CCU5tg8tn/qX7On/ksDIY/1Mc7P ++wXe1PW5GYNzEcUwYaW5ita3v2vgdSfw/AG7Rrh4BlwxzgYlFYUc3fyKIWb+HWTnh ++xkK2BKatVWpTQZGgYNDHkHdXPZd6JpKm7Bo5sl6XpAha87OmmreE9zOYqhUU1vm5 ++vgqYhfji7uXJ3LUPMBuL+u+UOlmNA8tHBQd3R3xXL7MZD4JZuQWSym+hDilmUpl3 ++jT8HYRSvY+Suk20bLwOto/bkiTQlwce87zfjiP+SZ5GcopFq95u34GfE0dsCAwEA ++AQKCAgAA3J65s1WjBgJBdtVDfNP7n/ljEDozVx2gv7vTz+IGiR9Q/GUA2hRbERrp ++9kG80JncMtqPSp26q4T3VyaQ1DW+hTde9IHjodI/ZKtlfnNoPOJTiIQPRY9jdO1T ++dmwSfcl/X2SB2YLWmBlrr/7Z5Juw2bBQjgJrFQVGXH9R2BSivWN3fu+5R27UPpl1 ++rTNI98/T87e3KdIIl1lC0tWezIyN8UAgQ0DzHqttGRkm9O/1kLQv3BqG3eb1h401 ++LrBvhzMaVAeXGU4saer/pZ84+4KX8XaQ7NpiEezXRuGmmNgzoqIhYsFSaIMQ6POa ++TYa37sSx2+JiWfduJVBQ0OdXt3gWLY1kOHfWFcrRNqxlfGVvjky2/ByZjbd0SV+O ++z01MV8/CW5UnuUnAPiVOX2zy8GIv6sU5sN8HZBgU1Edx4ZnrYiwbkyt+FRindBBP ++iUytpaLZa9yieo6xG/rYhjIYXCtGbXilrtbSFr09hVDWV3pDihemh4r5gWvs6jFY ++mNl+MVloblDhHZceq+RQgcFfCnHVO4chETeXwQyq00Y/YgeHrzgwpTwzEc0kgwjM ++iU63+OU+UVfWzmu8+kJ59cFoQGJLZRyPSfmjzWu7Bnfq7XsTbnt8qldPm6pKoAek ++GCmS+uTADFjxBIykVjWrCsixp3R9GRQQGjCIpXixLTskVp+G8QKCAQEA/lHCwAGN ++nyyP4N5t3A/7/cv+krAzfwy6P7TJPVXgt5+GFudpd7jUT9uQlvKWX0H/U3fkPBmi ++/LJuHOEtnGidFYGbTUe2mzZ229ZQ1NP1wMDBEsPxEjNi0+F3DM9Kn4pK6U5Uy9GY ++nfu1iZJlS3DuXS09S3I2TpXshLo/pQMz5sFdGFI/VME/dMy6WmsfdCDRSV/NiTfz ++jm6bKhGXpEw0oneo5W7ujvftjeW369xJgcMvUkIzwZWPJKqqlFC/riyEFiRQ9xjQ ++5wuwyapgfhKiPij206hofO5Ar+MUAxpAIt4pl8QOJhE+Dp61edyMM7XuZ7nStTzm ++bh95XjToH/wxZwKCAQEAxsk9QHDdHYgoVeibKNIqUKm41LSo4ZaQe6Uv99QvrPXg ++U3pIKU88PPppUZH4S0EJbTWpA1MtXE5j1vqWdX7IbJXUBQ0v7bzw5P+jLVd3rrPN ++UNQrX5yLO4vupXu+hjTzi3VbxnKIpEel31ajZ450BDIq+Z71pBNC/eltUN5WT+2I ++cXedsZeMclq3WJEET2KRGHmK/3Dmge62NMUicdaPoUWUosCxDHHFA8YaPNUoIhjK ++jhIl0/81Df0BSW41bH7gkv6Yb/sSsTSR5uyI6mRuGsDOgAMa7vF7aCPrzi8NDZzZ ++eVklfP13I7uiRvOv3Kpsb2wcsNbuQlIS5YGQqJNPbQKCAQEAzOiLhbC6rvl0o7YT ++xi+K1Z67au1VUJSsrA+55RWAjfKWU3X44GGnjwBVq4mh5vaCBnqfBl2RmREa72Hv ++IgqYJm/a9ZVGaCCl+9LeJdzyMXAdIEWHwyZsBlOvXD7Y3VrLqNdYMzCZSxE337R4 ++sSQ4qhJ9RICtiPv7KaX3Cble5BoALEx4go2B11XtAFU3bpXSitAKBvlx39z2YBr0 ++l4hfEFhhWRrcU40ndiEU45EGGOtvAVQd52fdgamQ7xdwmaF8e2qfYbg4+S/OLW59 ++eJcC6hqPZVJXffFpZU4NHcLU0kM2N/XbgIh7+8OcbKdqv29iu2hZgXWkJC5v15vB ++O6QzGQKCAQEAxAXZ4tvpD6AetmiD6MMmexiCbS4hgyMoIuWH4clZoiNsLKVe122N ++J0x/4rIguITPuOO7YM364xViGrJNAFwfZARzaO/SHYu9uPPlg2bHXH1tr5EpnEUQ ++f43DrWfTPyCkMRdvgseauvT0OsKCrDGrch/OhQ0dich8vUocRCybzIGdlNaxqFib ++ZIDUX//Q0j+OeSYRzUcV53bwMiVbjApa5Ftq8Ps3G+BsuQX3BZnk04rC40o+B0mY ++lcyyIikNgYm0BwAMbhCWJCyE28TQVuLmOHd8qntlac6zNMSHWXDIXG4ZfjJMZ27C ++t3fl1DWla+Kav11LBY9MsBWjELKtZa6uGQKCAQBMoZNz23ZjHMaZ7nyBG8huDTPF ++6ll/3+7WvdL6o+YYmtcM8rKp2HAqr8xrh+QtKk1q3L55s8XyQbht82hdmXoXb08e ++eF3QNGoC/urQ1usMz+lKeET/LoAG7z3lNKBBYZPEUl4T644ZqgbiLShb4KDsL+Xi ++pIJAUut1YvOrcgiGP8fsjO43AcMev/dzfmfHL8YQ2JqVIMAZkVfdNnBP5lQ7mQ9y ++QnNK1BPKd+apevGp7Cf0SQHL1j5MZW5A3Zwt5c41ZoyiDnDVFJheoMCcNDOiQ/VL ++PyYckEI8JGkXj9TQiQaJCUNMx+cItxKTZWwsvA7XGl1eaFjjlpbVxhCjEQfh + -----END RSA PRIVATE KEY----- diff --git a/cyrus-imapd-init.service b/cyrus-imapd-init.service new file mode 100644 index 0000000..10823b7 --- /dev/null +++ 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 diff --git a/cyrus-imapd.cron-daily b/cyrus-imapd.cron-daily new file mode 100644 index 0000000..ca897c0 --- /dev/null +++ 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 diff --git a/cyrus-imapd.logrotate b/cyrus-imapd.logrotate new file mode 100644 index 0000000..2f55827 --- /dev/null +++ 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 +} diff --git a/cyrus-imapd.magic b/cyrus-imapd.magic new file mode 100644 index 0000000..85831fb --- /dev/null +++ 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 diff --git a/cyrus-imapd.pam-config b/cyrus-imapd.pam-config new file mode 100644 index 0000000..5b9f05f --- /dev/null +++ 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 diff --git a/cyrus-imapd.service b/cyrus-imapd.service new file mode 100644 index 0000000..d8f5bde --- /dev/null +++ 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 diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec new file mode 100644 index 0000000..a52c732 --- /dev/null +++ b/cyrus-imapd.spec @@ -0,0 +1,2136 @@ +%define scmt(l:) %(c=%1; echo ${c:0:%{-l:%{-l*}}%{!-l:7}}) + +# Cassandane commit hash. Cassandane doesn't have releases often, but it +# receives constant development. This was fetched on 20180518. +%global cocas 17d372f65470ba2073998f77fd2c89439992c1a0 +%global cocas_short %(echo %{cocas} | cut -c -8) + +%global testdata_commit ca669d4b76c71cbeb4fa840e263e2c031e19ea88 +%global testdata_short %(echo %{testdata_commit} | cut -c -8) + + +# Cassandane run by default. '--without cassandane' disables. +%bcond_without cassandane + +Name: cyrus-imapd +Version: 3.2.4 +Release: 2%{?dist} + +%define ssl_pem_file_prefix /etc/pki/%name/%name + +# UID/GID 76 have long been reserved for Cyrus +%define uid 76 +%define gid 76 + +%define cyrususer cyrus +%define cyrusgroup mail +%define cyrexecdir %_libexecdir/%name + +%global __provides_exclude ^perl\\(AnnotateInlinedCIDs\\)$ + +Summary: A high-performance email, contacts and calendar server +License: BSD +URL: http://www.cyrusimap.org/ + +Source0: https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-%version/cyrus-imapd-%version.tar.gz + + +# Adapt a timeout to handle our slower builders +Patch0: patch-cyrus-testsuite-timeout + +# Fedora-specific patch for the default configuration file +Patch1: patch-cyrus-default-configs + +# We rename quota to cyr_quota to avoid a conflict with /usr/bin/quota; one +# place in the source must be patched to match. +Patch2: patch-cyrus-rename-quota + + +# Workaround for some compiled Perl modules not being linked against +# libpcreposix, which causes them to fail to load. +# https://bugzilla.redhat.com/show_bug.cgi?id=1668723 +# https://github.com/cyrusimap/cyrus-imapd/issues/2629#issuecomment-456925909 +Patch4: patch-cyrus-perl-linking + + +Source10: cyrus-imapd.logrotate +Source11: cyrus-imapd.pam-config +Source12: cyrus-imapd.sysconfig +Source13: cyrus-imapd.magic +# XXX A systemd timer would probably be better +Source14: cyrus-imapd.cron-daily +Source15: README.rpm +Source16: cyrus-imapd.service +Source17: cyrus-imapd-init.service +Source18: cyrus-imapd.tmpfiles.conf + +# Source files for running the Cassandane test suite at build time. +Source80: https://github.com/cyrusimap/cassandane/archive/%cocas/cassandane-${cocas_short}.tar.gz#/cassandane-%{scmt %cocas}.tar.gz +Source81: https://github.com/brong/Net-CalDAVTalk/archive/%{testdata_commit}/cassandane-testdata-%{testdata_short}.tar.gz + +# A template config file for cassandane; we will substitute in varions values. +Source82: cassandane.ini + +# These are source files and not patches because you can't use autosetup to +# apply patches to secondary unpacked source files. + +# Prevent cassandane from trying to syslog things +Source91: patch-cassandane-no-syslog + +# Tell the annotator script to run as the current user/group +# Upstream ticket https://github.com/cyrusimap/cyrus-imapd/issues/1995 +Source92: patch-cassandane-fix-annotator + +BuildRequires: autoconf automake bison flex gcc gcc-c++ git glibc-langpack-en +BuildRequires: groff libtool pkgconfig rsync systemd transfig + +BuildRequires: perl-devel perl-generators perl(ExtUtils::MakeMaker) +BuildRequires: perl(Pod::Html) + +BuildRequires: CUnit-devel clamav-devel cyrus-sasl-devel glib2-devel +BuildRequires: jansson-devel krb5-devel libical-devel libicu-devel +BuildRequires: libnghttp2-devel libxml2-devel mariadb-devel net-snmp-devel +BuildRequires: openldap-devel openssl-devel libpq-devel shapelib-devel +BuildRequires: sqlite-devel xapian-core-devel + +# Miscellaneous modules needed for 'make check' to function: +BuildRequires: cyrus-sasl-plain cyrus-sasl-md5 + +%if %{with cassandane} +# Additional packages required for cassandane to function +BuildRequires: imaptest net-tools words +BuildRequires: perl-interpreter +BuildRequires: perl(AnyEvent) perl(AnyEvent::Handle) perl(AnyEvent::Socket) +BuildRequires: perl(AnyEvent::Util) perl(attributes) perl(base) +BuildRequires: perl(BSD::Resource) perl(bytes) perl(Carp) perl(charnames) +BuildRequires: perl(Clone) perl(Config) perl(Config::IniFiles) perl(constant) +BuildRequires: perl(Cwd) perl(Data::Dumper) perl(DateTime) +BuildRequires: perl(DateTime::Format::ISO8601) perl(Digest::MD5) perl(Encode) +BuildRequires: perl(Errno) perl(experimental) perl(Exporter) +BuildRequires: perl(File::Basename) perl(File::chdir) perl(File::Find) +BuildRequires: perl(File::Path) perl(File::Slurp) perl(File::stat) +BuildRequires: perl(File::Temp) perl(Getopt::Long) perl(HTTP::Tiny) +BuildRequires: perl(IO::File) perl(IO::Handle) perl(IO::Scalar) +BuildRequires: perl(IO::Socket::INET) perl(IO::Socket::INET6) +BuildRequires: perl(IO::Socket::UNIX) perl(JSON) perl(JSON::XS) perl(lib) +BuildRequires: perl(Mail::IMAPTalk) perl(Mail::JMAPTalk) >= 0.11 +BuildRequires: perl(Math::Int64) perl(MIME::Base64) +BuildRequires: perl(Net::CalDAVTalk) >= 0.12 perl(Net::CardDAVTalk) >= 0.05 +BuildRequires: perl(Net::CardDAVTalk::VCard) perl(Net::DAVTalk) +BuildRequires: perl(Net::POP3) perl(Net::Server::PreForkSimple) +BuildRequires: perl(News::NNTPClient) perl(overload) +BuildRequires: perl(POSIX) perl(Scalar::Util) perl(Storable) perl(strict) +BuildRequires: perl(String::CRC32) perl(Sys::Hostname) perl(Sys::Syslog) +BuildRequires: perl(Test::Unit::Exception) perl(Test::Unit::Listener) +BuildRequires: perl(Test::Unit::Result) perl(Test::Unit::Runner) +BuildRequires: perl(Test::Unit::TestCase) perl(Test::Unit::TestRunner) +BuildRequires: perl(Time::HiRes) perl(URI) perl(URI::Escape) perl(User::pwent) +BuildRequires: perl(utf8) perl(vars) perl(warnings) perl(XML::DOM) +BuildRequires: perl(XML::Generator) perl(XML::Spice) +BuildRequires: clamav-data perl(Unix::Syslog) +BuildRequires: perl(HTTP::Daemon) perl(DBI) perl(Net::LDAP::Constant) +BuildRequires: perl(Net::LDAP::Server) + +# These were only for JMAP-Tester +# perl(Moo), perl(Moose), perl(MooseX::Role::Parameterized) perl(Throwable), perl(Safe::Isa) +%endif + +Requires(pre): shadow-utils +%{?systemd_requires} + +Requires: %name-utils = %version-%release +Recommends: cyrus-timezones +Requires: file sscg +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +%{?perl_default_filter} + +%description +The Cyrus IMAP (Internet Message Access Protocol) server provides access to +personal mail, system-wide bulletin boards, news-feeds, calendar and contacts +through the IMAP, JMAP, NNTP, CalDAV and CardDAV protocols. The Cyrus IMAP +server is a scalable enterprise groupware system designed for use from small to +large enterprise environments using technologies based on well-established Open +Standards. + +A full Cyrus IMAP implementation allows a seamless mail and bulletin board +environment to be set up across one or more nodes. It differs from other IMAP +server implementations in that it is run on sealed nodes, where users are not +normally permitted to log in. The mailbox database is stored in parts of the +filesystem that are private to the Cyrus IMAP system. All user access to mail +is through software using the IMAP, IMAPS, JMAP, POP3, POP3S, KPOP, CalDAV +and/or CardDAV protocols. + +The private mailbox database design gives the Cyrus IMAP server large +advantages in efficiency, scalability, and administratability. Multiple +concurrent read/write connections to the same mailbox are permitted. The server +supports access control lists on mailboxes and storage quotas on mailbox +hierarchies. + + +%package devel +Summary: Cyrus IMAP server development files +Requires: %name%{?_isa} = %version-%release +Requires: pkgconfig + +%description devel +The %name-devel package contains header files and libraries +necessary for developing applications which use the imclient library. + + +%package doc-extra +Summary: Extra documentation for the Cyrus IMAP server +BuildArch: noarch + +%description doc-extra +This package contains the HTML documentation for the Cyrus IMAP server, as well +as some legacy and internal documentation not useful for normal operation of +the server. + + +%package libs +Summary: Runtime libraries for cyrus-imapd + +%description libs +The cyrus-imapd-libs package contains libraries shared by the Cyrus IMAP server +and the its utilities. + + +%package utils +Summary: Cyrus IMAP server administration utilities +Requires: cyrus-imapd = %{version}-%{release} + +%description utils +The cyrus-imapd-utils package contains administrative tools for the +Cyrus IMAP server. It can be installed on systems other than the +one running the server. + + +%package virusscan +Summary: Cyrus virus scanning utility + +%description virusscan +The cyrus-imapd-virusscan package contains the cyr_virusscan utility. It +exists in a separate package so that users who do not wish to install all of +the clamav suite don't have to. + +Install this package if you wish to use the internal cyrus virus scanning +utility. + + +%package -n perl-Cyrus +Summary: Perl libraries for interfacing with Cyrus IMAPd + +%description -n perl-Cyrus +This package contains Perl libraries used to interface with Cyrus IMAPd. + + +%prep +%autosetup -p1 +echo %version > VERSION + +# Install the Fedora-specific documentation file +install -m 644 %SOURCE15 doc/ + +# Unpack and prepare cassandane +tar xf %SOURCE80 +ln -s cassandane-%cocas cassandane +pushd cassandane +mkdir work +tar xf %SOURCE81 + +patch -p1 < %SOURCE91 +patch -p1 < %SOURCE92 + +cp %SOURCE82 cassandane.ini +# RF rpm-buildroot-usage +sed -i \ + -e "s!CASSDIR!$(pwd)!" \ + -e "s!BUILDROOT!%buildroot!" \ + cassandane.ini + +popd + +# The pm files have shebang lines for some reason +sed -i -e '1{/usr.bin.perl/d}' perl/annotator/{Message,Daemon}.pm + +# This one uses env +sed -i -e '1i#!/usr/bin/perl' -e '1d' tools/rehash + +# These files have a bizarre perl-in-shell shebang setup. The exec perl bit +# sometimes comes after a long comment block. All use magic to turn on -w. +# Some of these aren't installed, but we might as well fix them all just in +# case. +sed -i \ + -e '1i#!/usr/bin/perl -w' \ + -e '/^exec perl/d' \ + -e '/^#!perl -w/d' \ + -e '/^#!\/bin\/sh/d' \ + -e '/^#! \/bin\/sh/d' \ + snmp/snmpgen perl/sieve/scripts/installsieve.pl \ + perl/sieve/scripts/sieveshell.pl perl/imap/cyradm.sh tools/config2header \ + tools/masssievec tools/config2rst tools/mknewsgroups tools/config2sample \ + tools/mkimap tools/translatesieve + + +%build +# This package fails its testsuite on s390x when LTO is enabled. Root cause +# analysis has not yet been performed +%ifarch s390x +%define _lto_cflags %{nil} +%endif +# This is the test suite, which doesn't build much but does verify its dependencies. +# If this is done after the configure call, the one thing it does build fails +# because the configure macro puts some hardening flags into the environment. +%if %{with cassandane} +pushd cassandane +make +popd +%endif + +# Notes about configure options: +# --enable-objectstore +# It's experimental, and it doesn't appear that either openio or caringo are +# in Fedora. +# --with-cyrus-prefix and --with-service-path went away; use --with-libexecdir= +# instead. + +# Needed because of Patch4. +autoreconf -vi + +%configure \ + --disable-silent-rules \ + \ + --libexecdir=%cyrexecdir \ + --with-clamav \ + --with-extraident="%release Fedora" \ + --with-krbimpl=mit \ + --with-ldap=/usr \ + --with-libwrap=no \ + --with-mysql \ + --with-pgsql \ + --with-perl=%__perl \ + --with-snmp \ + --with-syslogfacility=MAIL \ + \ + --enable-autocreate \ + --enable-backup \ + --enable-calalarmd \ + --enable-http \ + --enable-idled \ + --enable-murder \ + --enable-nntp \ + --enable-replication \ + --enable-unit-tests \ + --enable-xapian \ +# + +# Try to get rid of RPATH.... +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +# The configure script will set up the Perl makefiles, but not in the way +# Fedora needs them. So regenerate them manually. +for i in perl/annotator perl/imap perl/sieve/managesieve; do + pushd $i + rm -f Makefile + perl Makefile.PL INSTALLDIRS=vendor # NO_PERLOCAL=1 NO_PACKLIST=1 + popd +done + +%make_build + +# This isn't built by default, but this package has always installed it. +make notifyd/notifytest + + +%install +make install DESTDIR=%buildroot + +# Create directories +install -d \ + %buildroot/etc/{rc.d/init.d,logrotate.d,pam.d,sysconfig,cron.daily} \ + %buildroot/%_libdir/sasl \ + %buildroot/var/spool/imap \ + %buildroot/var/lib/imap/{user,quota,proc,log,msg,socket,db,sieve,sync,md5,rpm,backup,meta} \ + %buildroot/var/lib/imap/ptclient \ + %buildroot/%_datadir/%name/rpm \ + %buildroot/%cyrexecdir \ + %buildroot/etc/pki/%name + +install -d -m 0750 \ + %buildroot/run/cyrus \ + %buildroot/run/cyrus/socket + +install -d -m 0700 \ + %buildroot/run/cyrus/db \ + %buildroot/run/cyrus/lock \ + %buildroot/run/cyrus/proc + +# Some tools which aren't installed by the makefile which we have always installed +install -m 755 notifyd/notifytest %buildroot%_bindir/ +install -m 755 perl/imap/cyradm %buildroot%_bindir/ +for i in arbitronsort.pl masssievec mkimap mknewsgroups rehash translatesieve; do + install -m 755 tools/$i %buildroot/%cyrexecdir/ +done + +install -p -m 644 %SOURCE10 %buildroot/etc/logrotate.d/%name + +# PAM configuration files. +install -p -m 644 %SOURCE11 %buildroot/etc/pam.d/csync +install -p -m 644 %SOURCE11 %buildroot/etc/pam.d/http +install -p -m 644 %SOURCE11 %buildroot/etc/pam.d/imap +install -p -m 644 %SOURCE11 %buildroot/etc/pam.d/lmtp +install -p -m 644 %SOURCE11 %buildroot/etc/pam.d/mupdate +install -p -m 644 %SOURCE11 %buildroot/etc/pam.d/nntp +install -p -m 644 %SOURCE11 %buildroot/etc/pam.d/pop +install -p -m 644 %SOURCE11 %buildroot/etc/pam.d/sieve + +install -p -m 644 %SOURCE12 %buildroot/etc/sysconfig/%name +install -p -m 644 %SOURCE13 %buildroot/%_datadir/%name/rpm/magic +install -p -m 755 %SOURCE14 %buildroot/etc/cron.daily/%name +install -p -m 644 doc/examples/cyrus_conf/prefork.conf %buildroot/etc/cyrus.conf +install -p -m 644 doc/examples/imapd_conf/normal.conf %buildroot/etc/imapd.conf +install -p -D -m 644 %SOURCE16 %buildroot/%_unitdir/cyrus-imapd.service +install -p -D -m 644 %SOURCE17 %buildroot/%_unitdir/cyrus-imapd-init.service +install -p -D -m 644 %SOURCE18 %buildroot/%_tmpfilesdir/cyrus-imapd.conf + +# Cleanup of doc dir +find doc perl -name CVS -type d -prune -exec rm -rf {} \; +find doc perl -name .cvsignore -type f -exec rm -f {} \; +rm -f doc/Makefile.dist* +rm -f doc/text/htmlstrip.c +rm -f doc/text/Makefile +rm -rf doc/man + +# fix permissions on perl .so files +find %buildroot/%_libdir/perl5/ -type f -name "*.so" -exec chmod 755 {} \; + +# Generate db config file +# XXX Is this still necessary? +( grep '^{' lib/imapoptions | grep _db | cut -d'"' -f 2,4 | \ + sed -e 's/^ *//' -e 's/-nosync//' -e 's/ *$//' -e 's/"/=/' + echo sieve_version=2.2.3 ) | sort > %buildroot/%_datadir/%name/rpm/db.cfg + +# Cyrus has various files with extremely conflicting names. Some of these are +# not unexpected ("imapd" itself) but some like "httpd" are rather surprising. + +# Where there are only conflicting manpages, they have been moved to a "8cyrus" +# section. If the binary was renamed, then the manpages are renamed to match +# but a internal replacement has not been done. This may lead to more +# confusion but involves modifying fewer upstream files. + +# Actual binary conflicts +# Rename 'fetchnews' binary and manpage to avoid clash with leafnode +mv %buildroot/%_sbindir/fetchnews %buildroot/%_sbindir/cyr_fetchnews +mv %buildroot/%_mandir/man8/fetchnews.8 %buildroot/%_mandir/man8/cyr_fetchnews.8 + +# Fix conflict with dump +mv %buildroot/%_sbindir/restore %buildroot/%_sbindir/cyr_restore +mv %buildroot/%_mandir/man8/restore.8 %buildroot/%_mandir/man8/cyr_restore.8 + +# Fix conceptual conflict with quota +mv %buildroot/%_sbindir/quota %buildroot/%_sbindir/cyr_quota +mv %buildroot/%_mandir/man8/quota.8 %buildroot/%_mandir/man8/cyr_quota.8 + +# fix conflicts with uw-imap +mv %buildroot/%_mandir/man8/imapd.8 %buildroot/%_mandir/man8/imapd.8cyrus +mv %buildroot/%_mandir/man8/pop3d.8 %buildroot/%_mandir/man8/pop3d.8cyrus + +# Rename 'master' manpage +mv %buildroot/%_mandir/man8/master.8 %buildroot/%_mandir/man8/master.8cyrus + +# Rename 'httpd' manpage to avoid clash with Apache +mv %buildroot/%_mandir/man8/httpd.8 %buildroot/%_mandir/man8/httpd.8cyrus + +# Old cyrus packages used to keep the deliver executable in +# /usr/lib/cyrus-imapd, and MTA configurations might rely on this. +# Remove this hack in the F30 timeframe. +# RF hardcoded-library-path in %%buildroot/usr/lib/cyrus-imapd +mkdir %buildroot/usr/lib/cyrus-imapd +pushd %buildroot/usr/lib/cyrus-imapd +ln -s ../../sbin/deliver +popd + +#remove executable bit from docs and Perl modules +for ddir in doc perl/imap/examples +do + find $ddir -type f -exec chmod -x {} \; +done + +# Remove pointless libtool archives +rm %buildroot/%_libdir/*.la + +# Remove installed but not packaged files +rm %buildroot/%cyrexecdir/pop3proxyd +find %buildroot -name "perllocal.pod" -exec rm {} \; +find %buildroot -name ".packlist" -exec rm {} \; + +# And this one gets installed with executable permission +chmod -x %buildroot/%perl_vendorlib/Cyrus/Annotator/Daemon.pm + + +%check +export LD_LIBRARY_PATH=%buildroot/%_libdir +export CYRUS_USER=$USER + +make %{?_smp_mflags} check || exit 1 + +%if %{without cassandane} +exit 0 +%endif + +# Run the Cassandane test suite. This will exhaustively test the various +# server components, but running it in a mock chroot is rather an exercise. +pushd cassandane + +mkdir -p imaptest/src +ln -s /usr/bin/imaptest imaptest/src +ln -s /usr/share/imaptest/tests imaptest/src + +# Construct the set of excluded tests to pass to Cassandane +# --------------------------------------------------------- +exclude=() +tests=( + # This exclusion list was verified on 2018-05-30. + + # This is more a test of system performance and according to upstream won't + # be reliable on shared hardware like our builders. + Metronome + + # This tests coredumping and won't work on a machine where systemd + # intercepts coredumps, which includes our builders. + Cassandane::Test::Core + + # Upstream recommends disabling this because it has an internal race and + # will fail randomly. https://github.com/cyrusimap/cassandane/issues/17 + Master.sighup_recycling + + # Fails because our Xapian is too old for proper CJK support. 1.5 will be + # OK, but it is not yet released. The alternative is to bundle. + SearchFuzzy.cjk_words + + # These additionally fail because Cyrus 3.0.7 no longer enables + # SNIPPET_EMPTY_WITHOUT_MATCH when the Cyrus-patched Xapian is not in use. + # https://github.com/cyrusimap/cyrus-imapd/commit/f008060cb53b3286fcedf7b8b4dd12c1980d665f + SearchFuzzy.normalize_snippets + SearchFuzzy.snippet_wildcard + SearchFuzzy.snippets_termcover + SearchFuzzy.snippets_escapehtml + SearchFuzzy.stem_verbs + + # Can't currently be run at build time because of compiled-in paths. See + # https://github.com/cyrusimap/cyrus-imapd/issues/2386 + Admin.imap_admins + + # Upstream on IRC indicates that these two are expected to fail on 3.0. + Carddav.sharing_contactpaths + Metadata.set_specialuse_twice + + # This one needs a patch to xapian. + # https://github.com/cyrusimap/cyrus-imapd/issues/2348 + SearchFuzzy.search_subjectsnippet + + # This test fails beginning with 3.0.11 because the old behavior of only + # preserving 20 nested folder deletions has been removed. + Delete.repeated_delete + + ## FIXME failed on 3.2 only + Rename.intermediate_cleanup + +) +for i in ${tests[@]}; do exclude+=("!$i"); done + +%if 0%{?fedora} <= 28 +# imaptest on F28 has bugs which make some additional tests fail +tests=( + # Three new failures with imaptest 20170719 + # https://github.com/cyrusimap/cyrus-imapd/issues/2087 + ImapTest.append-binary + ImapTest.fetch-binary-mime + ImapTest.urlauth-binary + + # This one seems to fail randomly. + ImapTest.urlauth2 +) +for i in ${tests[@]}; do exclude+=("!$i"); done +%endif + +%ifarch s390x +# This one test fails occasionally on s390x because the hosts are just too slow +# to complete it.D It's testing something valid (that the fork rate limiting +# settings work properly) but s390x can't fork quickly enough to exceeed the +# limits it's testing. +exclude+=("!Master.maxforkrate") +%endif + +# Add -vvv for too much output +./testrunner.pl %{?_smp_mflags} -v -f pretty ${exclude[@]} 2>&1 + + +%pre +# Create 'cyrus' user on target host +getent group saslauth >/dev/null || /usr/sbin/groupadd -g %gid -r saslauth +getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /var/lib/imap -g %cyrusgroup \ + -G saslauth -s /sbin/nologin -u %uid -r %cyrususer + +%post +%systemd_post cyrus-imapd.service + +%preun +%systemd_preun cyrus-imapd.service + +%postun +%systemd_postun_with_restart cyrus-imapd.service + + +%files +%doc README.md doc/README.* doc/examples doc/text + +%_sbindir/* +%_datadir/cyrus-imapd +%_mandir/man5/* +%_mandir/man8/* +%exclude %_sbindir/cyr_virusscan +%exclude %_mandir/man8/cyr_virusscan.8* + +# For the legacy symlink to the deliver binary +# RF hardcoded-library-path in /usr/lib/cyrus-imapd +/usr/lib/cyrus-imapd/ + + +%dir /etc/pki/cyrus-imapd +%attr(0644,root,%cyrusgroup) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %ssl_pem_file_prefix-ca.pem +%attr(0644,root,%cyrusgroup) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %ssl_pem_file_prefix.pem +%attr(0640,root,%cyrusgroup) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %ssl_pem_file_prefix-key.pem + +%config(noreplace) /etc/cyrus.conf +%config(noreplace) /etc/imapd.conf +%config(noreplace) /etc/logrotate.d/cyrus-imapd +%config(noreplace) /etc/sysconfig/cyrus-imapd +%config(noreplace) /etc/pam.d/* + +/etc/cron.daily/cyrus-imapd +%_unitdir/cyrus-imapd.service +%_unitdir/cyrus-imapd-init.service +%_tmpfilesdir/cyrus-imapd.conf + +%dir %cyrexecdir/ +%cyrexecdir/[a-uw-z]* + +# This creates some directories which in the default configuration cyrus will +# never use because they are placed under /run instead. However, old +# configurations or setup advice from the 'net might reference them, and so +# it's simpler to just leave them in the package. +%attr(0750,%cyrususer,%cyrusgroup) %dir /var/lib/imap/ +%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/backup/ +%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/db/ +%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/log/ +%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/meta/ +%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/md5/ +%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/msg/ +%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/proc/ +%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/ptclient/ +%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/quota/ +%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/rpm/ +%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/sieve/ +%attr(0750,%cyrususer,%cyrusgroup) /var/lib/imap/socket +%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/sync/ +%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/user/ +%attr(0700,%cyrususer,%cyrusgroup) /var/spool/imap/ + +# The new locations +%attr(0750,%cyrususer,%cyrusgroup) %dir /run/cyrus/ +%attr(0700,%cyrususer,%cyrusgroup) /run/cyrus/db/ +%attr(0700,%cyrususer,%cyrusgroup) /run/cyrus/lock/ +%attr(0700,%cyrususer,%cyrusgroup) /run/cyrus/proc/ +%attr(0750,%cyrususer,%cyrusgroup) /run/cyrus/socket/ + + +%files devel +%_includedir/cyrus/ +%_libdir/libcyrus*.so +%_libdir/pkgconfig/*.pc +%_mandir/man3/imclient.3* + + +%files doc-extra +%doc doc/html doc/internal doc/legacy + + +%files libs +%license COPYING +%_libdir/libcyrus*.so.* + + +%files utils +%{_bindir}/* +%_mandir/man1/* + + +%files virusscan +%_sbindir/cyr_virusscan +%_mandir/man8/cyr_virusscan.8* + + +%files -n perl-Cyrus +%license COPYING +%doc perl/imap/README +%doc perl/imap/Changes +%doc perl/imap/examples +%perl_vendorarch/auto/Cyrus +%perl_vendorarch/Cyrus +%perl_vendorlib/Cyrus +%_mandir/man3/*.3pm* + + +%changelog +* Thu Sep 3 2020 Pavel Zhukov - 3.2.3-1 +- New version v3.2.3 + +* Thu Aug 27 2020 Josef Řídký - 3.0.13-13 +- Rebuilt for new net-snmp release + +* Mon Aug 10 2020 Jeff Law - 3.0.13-12 +- Disable LTO on s390x for now + +* Sat Aug 01 2020 Fedora Release Engineering - 3.0.13-11 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 3.0.13-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 13 2020 Pavel Zhukov - 3.0.13-9 +- Fix FTBFS caused by weak certificates (#1852137) + +* Thu Jun 25 2020 Jitka Plesnikova - 3.0.13-8 +- Perl 5.32 rebuild + +* Sat May 16 2020 Pete Walter - 3.0.13-7 +- Rebuild for ICU 67 + +* Wed May 6 2020 Pavel Zhukov - 3.0.13-6 +- Add missed dependencies (#1819685) + +* Thu Apr 23 2020 Pavel Zhukov - 3.0.13-5 +- Specify version of cyrus-imapd for utils to avoid the need to test interoperability + +* Thu Apr 23 2020 Pavel Zhukov - 3.0.13-4 +- Fix pem files permission + +* Wed Apr 01 2020 Petr Pisar - 3.0.13-3 +- Specify all Perl dependencies of Cassandane + +* Tue Jan 28 2020 Fedora Release Engineering - 3.0.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Dec 16 2019 Jason L Tibbitts III - 3.0.13-1 +- Update to 3.0.13, fixing CVE-2019-19783. + +* Fri Nov 22 2019 Jason L Tibbitts III - 3.0.12-1 +- Update to 3.0.12, fixing CVE-2019-18928. + +* Tue Jul 30 2019 Jason L Tibbitts III - 3.0.11-1 +- Update to 3.0.11. + +* Wed Jul 24 2019 Fedora Release Engineering - 3.0.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 31 2019 Jitka Plesnikova - 3.0.10-2 +- Perl 5.30 rebuild + +* Tue May 28 2019 Jason L Tibbitts III - 3.0.10-1 +- Update to 3.0.10. +- Drop upstreamed patch. + +* Thu May 16 2019 Pavel Zhukov - 3.0.9-2 +- Run sscg as mail group for proper certs permissions + +* Thu Mar 14 2019 Jason L Tibbitts III - 3.0.9-1 +- Update to 3.0.9. + +* Mon Feb 11 2019 Jason L Tibbitts III - 3.0.8-10 +- Add pam configuration file for httpd auth. Thanks to Jeroen van Meeuwen. + +* Thu Jan 31 2019 Fedora Release Engineering - 3.0.8-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jan 24 2019 Jason L Tibbitts III - 3.0.8-8 +- Update Perl linkage patch. + +* Wed Jan 23 2019 Pete Walter - 3.0.8-7 +- Rebuild for ICU 63 + +* Wed Jan 23 2019 Jason L Tibbitts III - 3.0.8-6 +- Re-enable --as-needed, now that PCRE has been patched. +- Add workaround for improper linking of some Perl modules. + +* Tue Jan 15 2019 Jason L Tibbitts III - 3.0.8-5 +- Disable passing --as-needed to to the linker. This breaks cyrus horribly. +- Re-enable Cassandane run. + +* Tue Jan 15 2019 Jason L Tibbitts III - 3.0.8-4 +- Allow building against ClamAV 0.101. +- Add build dependency on glibc-langpack-en to slience some Perl complaints. + +* Thu Dec 13 2018 Pavel Zhukov - 3.0.8-3 +- Temporary disable cassandane in master branch + +* Sun Oct 28 2018 Nils Philippsen - 3.0.8-2 +- remove jmap from list of httpmodules + +* Sat Aug 11 2018 Jason L Tibbitts III - 3.0.8-1 +- Update to 3.0.8. +- Drop upstreamed patch. + +* Tue Jul 24 2018 Jason L Tibbitts III - 3.0.7-9 +- Rebuild for unannounced net-snmp soname bump. + +* Thu Jul 12 2018 Fedora Release Engineering - 3.0.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jul 10 2018 Pete Walter - 3.0.7-7 +- Rebuild for ICU 62 + +* Sat Jun 30 2018 Jitka Plesnikova - 3.0.7-6 +- Perl 5.28 rebuild + +* Wed Jun 13 2018 Jason L Tibbitts III - 3.0.7-5 +- Split out cyr_virusscan into a -virusscan subpackage. +- Split libraries into a -libs subpackage. +- Fix rpath issues in libraries. +- Split Perl module into a separate perl-Cyrus package. +- Move utilities in /usr/sbin from -utils package to main package. This + matches the way we packaged the 2.4 versions. +- Fix some odd Perl shebangs and an erroneous provided symbol. +- Moved deliver symlink to the main package as well. +- Drop cvt_cyrusdb_all and libdb-utils requirement. Cyrus 3 does not use + BerkeleyDB at all. + +* Thu Jun 07 2018 Jason L Tibbitts III - 3.0.7-4 +- Update Cassandane checkout. Drop upstreamed patch. +- Patch code for RECONSTRUCT implementation to use the renamed cyr_quota. +- Re-exclude maxforkrate test on s390x. + +* Wed May 30 2018 Jason L Tibbitts III - 3.0.7-3 +- Remove ldconfig scriptlets. +- Remove F26-specific test exclusions. +- Update Cassandane checkout. +- Add extra Cassandane patch from https://github.com/cyrusimap/cassandane/pull/57 +- Revalidate the excluded test list. + +* Fri May 18 2018 Jason L Tibbitts III - 3.0.7-2 +- Really enable mysql and clamav support. + +* Fri May 18 2018 Jason L Tibbitts III - 3.0.7-1 +- Update to 3.0.7. +- Update Cassandane checkout. +- Update excluded Cassandane test list. + +* Tue May 01 2018 Jason L Tibbitts III - 3.0.6-1 +- Update to 3.0.6. +- Remove upstreamed patches and renumber the rest. +- Disable one new failing test: + https://github.com/cyrusimap/cyrus-imapd/issues/2332 + +* Mon Apr 30 2018 Pete Walter - 3.0.5-15 +- Rebuild for ICU 61.1 + +* Tue Apr 17 2018 Jason L Tibbitts III - 3.0.5-14 +- Update Cassandane again, fixing a broken test. + +* Fri Apr 13 2018 Jason L Tibbitts III - 3.0.5-13 +- Update Cassandane, fixing a few tests and a class of weird random build + failures. + +* Fri Apr 06 2018 Jason L Tibbitts III - 3.0.5-12 +- Update list of excluded tests. +- Update Cassandane snapshot; use new base_port config setting. No need to + patch that in now. +- Add four new expected-to-fail tests from new Cassandane snapshot. +- Add patch to collect extra Cassandane logging in case we hit some of those + sporadic failures again. + +* Tue Apr 03 2018 Jason L Tibbitts III - 3.0.5-11 +- Re-enable imaptest on >= F29. +- F29's imaptest fixes several bugs, allowing all tests to be run there. +- Relocate cassandane base port to hopefully work better in koji. + +* Mon Apr 02 2018 Jason L Tibbitts III - 3.0.5-10 +- Update cassandane checkout to fix a test that was broken by DST. +- Add patch to fix sieve scripts for usernames containing a dot. +- Disable imaptest in cassandane until + https://bugzilla.redhat.com/show_bug.cgi?id=1562970 is fixed. +- Re-enable tests on s390; it seems to be better now. + +* Thu Mar 15 2018 Jason L Tibbitts III - 3.0.5-9 +- Re-enable clamav on ppc64. + +* Thu Mar 01 2018 Jason L Tibbitts III - 3.0.5-8 +- Bump client_timeout value in test suite. + +* Thu Mar 01 2018 Jason L Tibbitts III - 3.0.5-7 +- Add patch to fix imtest (rhbz#1543481). +- Fix vzic makefile to use proper cflags (rhbz#1550543). + +* Mon Feb 26 2018 Jason L Tibbitts III - 3.0.5-6 +- Update cassandane checkout. +- Add two new build dependencies. +- Remove all JMAP-related tests from the exclusion lists, since cassandane no + longer runs any JMAP tests on cyrus 3.0. +- Collapse unused test skip lists. +- Add ten additional skipped tests, after consultation with upstream. + +* Mon Feb 26 2018 Jason L Tibbitts III - 3.0.5-5 +- Add patch to fix segfaults in squatter. +- Exclude one test on all releases instead of just F28+. +- Remove --cleanup from cassandane invocation. + +* Wed Feb 07 2018 Fedora Release Engineering - 3.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Jan 09 2018 Jason L Tibbitts III - 3.0.5-3 +- Re-enable clamav and mariadb support as those are now built with openssl 1.1. +- But no clamav on ppc64 because of + https://bugzilla.redhat.com/show_bug.cgi?id=1534071 + +* Thu Jan 04 2018 Jason L Tibbitts III - 3.0.5-2 +- Reorganize some test exclusions so things build on all releases. + +* Thu Jan 04 2018 Jason L Tibbitts III - 3.0.5-1 +- Update to 3.0.5. +- Add one new failing test. +- Remove one now-passing test on rawhide. + +* Mon Dec 18 2017 Pavel Zhukov - 3.0.4-6 +- Rebuild with new net-snmp + +* Thu Nov 30 2017 Pete Walter - 3.0.4-5 +- Rebuild for ICU 60.1 + +* Wed Nov 29 2017 Pavel Zhukov - 3.0.4-4 +- Do not require tcp_wrappers (#1518759) + +* Tue Nov 14 2017 Jason L Tibbitts III - 3.0.4-3 +- Rebuild for new libical. +- Add patch to fix compilation error with new libical. +- Disable two tests which fail due to the new libical. + +* Tue Oct 24 2017 Jason L Tibbitts III - 3.0.4-2 +- Fix typo in default config; + https://bugzilla.redhat.com/show_bug.cgi?id=1506000 + +* Tue Sep 05 2017 Pavel Zhukov - 3.0.4-1 +- Update to 3.0.4 +- Patched cassandane for new behaviour. It should be updated idealy. +- Disable ImapTest.urlauth2 test; it seems to fail randomly regardless of + architecture. + +* Fri Aug 11 2017 Jason L Tibbitts III - 3.0.3-1 +- Update to 3.0.3, which contains an important security fix. The fix is not + embargoed but no CVE has been assigned yet. +- Drop patches merged upstream. +- An update of imaptest has resulted in three additional cassandane failures, + reported upstream as https://github.com/cyrusimap/cyrus-imapd/issues/2087. + In order to get the security fix out without delay, those three tests have been + disabled. + +* Fri Aug 11 2017 Igor Gnatenko - 3.0.2-9 +- Rebuilt after RPM update (№ 3) + +* Thu Aug 10 2017 Igor Gnatenko - 3.0.2-8 +- Rebuilt for RPM soname bump + +* Wed Aug 02 2017 Fedora Release Engineering - 3.0.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.0.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jun 30 2017 Jason L Tibbitts III - 3.0.2-5 +- Add two patches from upstream which fix JMAPCalendars issues on 32-bit and + big-endian architectures. +- Clean up test invocation and exclusion list. More tests pass now. + +* Wed Jun 28 2017 Jason L Tibbitts III - 3.0.2-4 +- Explicitly set specialusealways: 1 in the default config. + +* Tue Jun 27 2017 Jason L Tibbitts III - 3.0.2-3 +- Patch the provided imapd.conf and cyrus.conf to more closely match previous + Fedora defaults and directories included in this package and to enable + features which are supported by the Fedora build. +- Add tmpfiles.d configuration file for directories in /run. + +* Tue Jun 27 2017 Jason L Tibbitts III - 3.0.2-2 +- Exclude one more test from 32-bit arches. Looks like this failure crept in + with the Cassandane update. + +* Thu Jun 22 2017 Jason L Tibbitts III - 3.0.2-1 +- Update to 3.0.2. +- New Cassandane snapshot, with more tests (all of which are passing). + +* Tue Jun 20 2017 Jason L Tibbitts III - 3.0.1-7 +- Add old /usr/lib/cyrus-imapd directory to the utils package and add a symlink + there to the deliver binary. This should help a bit with migrations. +- Add upstream patch to fix reconstruct failures on 32-bit architectures. + Re-enable those five Cassandane tests. + +* Thu Jun 15 2017 Jason L Tibbitts III - 3.0.1-6 +- Rename two commands: quota -> cyr_quota, restore -> cyr_restore. +- Fix Cassandane to handle those renames. +- Fix location of cyr_fetchnews. +- Fix Perl 5.26-related module linking issue which caused a test failure. + Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1461669 + +* Tue Jun 06 2017 Jason L Tibbitts III - 3.0.1-5 +- Use proper path to ctl_mboxlist in cron file. +- Add patch to increase individual test timeout. Sometimes armv7hl can't + complete a single test in 20 seconds. +- Disable the Metronome tests; upstream says that they just won't reliably on + shared hardware. +- Don't bother running Cassandane on s390x for now. The machines are simply + too slow. + +* Tue Jun 06 2017 Jitka Plesnikova - 3.0.1-4 +- Perl 5.26 rebuild + +* Fri Jun 02 2017 Jason L Tibbitts III - 3.0.1-3 +- Remove clamav from build requirements. +- Add --cleanup to Cassandane call to hopefully reduce build disk usage. +- Disable maxforkrate test on s390x; our builders are too slow to run it. + +* Fri Jun 02 2017 Jason L Tibbitts III - 3.0.1-2 +- Add patch to fix up some endianness issues. +- Enable both test suites on all architectures. +- Add arch-specific excludes for a few Cassandane tests. + +* Thu Apr 20 2017 Jason L Tibbitts III - 3.0.1-1 +- Initial attempt at importing 3.0. Many new dependencies. +- Use a stock sample imapd.conf file instead of a Fedora-provided one. + +* Fri Feb 10 2017 Fedora Release Engineering - 2.5.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Jan 09 2017 Jason L Tibbitts III - 2.5.10-2 +- Rename httpd manpage to "cyrhttpd" to avoid conflict with the httpd package. + +* Wed Nov 23 2016 Jason L Tibbitts III - 2.5.10-1 +- Initial update to the 2.5 series. +- Significant spec cleanups. +- Add sscg dep and follow + https://fedoraproject.org/wiki/Packaging:Initial_Service_Setup for initial + cert generation. +- Change default conf to use the system crypto policy. + +* Tue May 17 2016 Jitka Plesnikova - 2.4.18-3 +- Perl 5.24 rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 2.4.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Oct 01 2015 Jason L Tibbitts III - 2.4.18-1 +- Update to 2.4.18, rhbz#1267871 and rhbz#1267878 +- Backport ff4e6c71d932b3e6bbfa67d76f095e27ff21bad0 to fix issues from + http://seclists.org/oss-sec/2015/q3/651 + +* Wed Sep 09 2015 Jason L Tibbitts III - 2.4.17-14 +- Use %%license tag +- Have -devel require the base package +- Minor cleanups + +* Sat Aug 08 2015 Jason L Tibbitts III - 2.4.17-13 +- Remove invalid Patch0: URL. +- Use HTTP for upstream source. +- pod2html was split out of the main perl package, breaking cyrus. + Add a build dep for it. + +* Wed Jul 29 2015 Kevin Fenzi 2.4.17-12 +- Rebuild for new librpm + +* Wed Jun 17 2015 Fedora Release Engineering - 2.4.17-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Jun 05 2015 Jitka Plesnikova - 2.4.17-10 +- Perl 5.22 rebuild + +* Wed Aug 27 2014 Jitka Plesnikova - 2.4.17-9 +- Perl 5.20 rebuild + +* Sat Aug 16 2014 Fedora Release Engineering - 2.4.17-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 2.4.17-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 2.4.17-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Jul 18 2013 Petr Pisar - 2.4.17-5 +- Perl 5.18 rebuild + +* Fri Jul 12 2013 Michal Hlavinka - 2.4.17-4 +- spec clean up + +* Thu Apr 18 2013 Michal Hlavinka - 2.4.17-3 +- make sure binaries are hardened + +* Wed Feb 13 2013 Fedora Release Engineering - 2.4.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Dec 1 2012 Jeroen van Meeuwen - 2.4.17-1 +- New upstream version, fixes upstream bugs: +- reconstruct doesn't retain internaldate correctly (#3733) +- Race condition in maibox rename (#3696) +- DBERROR db4: Transaction not specified for a transactional database (#3715) +- performance degradation on huge indexes in 2.4 branch (#3717) +- typo fix in imapd.conf man page (#3729) +- quota does not find all quotaroots if quotalegacy, fulldirhash and prefix are used and virtdomains is off (#3735) +- Mail delivered during XFER was lost (#3737) +- replication does not work on RENAME (#3742) +- Failed asserting during APPEND (#3754) + +* Fri Nov 30 2012 Michal Hlavinka - 2.4.16-5 +- do not use strict aliasing + +* Tue Aug 21 2012 Michal Hlavinka - 2.4.16-4 +- use new systemd rpm macros (#850079) + +* Wed Jul 18 2012 Fedora Release Engineering - 2.4.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jun 11 2012 Petr Pisar - 2.4.16-2 +- Perl 5.16 rebuild + +* Thu Apr 19 2012 Jeroen van Meeuwen - 2.4.16-1 +- New upstream release + +* Wed Apr 18 2012 Jeroen van Meeuwen - 2.4.15-1 +- New upstream release + +* Wed Apr 11 2012 Michal Hlavinka - 2.4.14-2 +- rebuilt because of new libdb + +* Wed Mar 14 2012 Michal Hlavinka - 2.4.14-1 +- updated to 2.4.14 + +* Tue Feb 07 2012 Michal Hlavinka - 2.4.13-3 +- use PraveTmp in systemd unit file + +* Fri Jan 13 2012 Fedora Release Engineering - 2.4.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jan 02 2012 Jeroen van Meeuwen - 2.4.13-1 +- New upstream release + +* Wed Dec 07 2011 Michal Hlavinka - 2.4.12-5 +- do not use digest-md5 as part of default auth mechanisms, + it does not coop with pam + +* Tue Nov 22 2011 Michal Hlavinka - 2.4.12-4 +- reduce noisy logging, add option to turn on LOG_DEBUG syslog + messages again (thanks Philip Prindeville) (#754940) + +* Mon Oct 24 2011 Michal Hlavinka - 2.4.12-3 +- add login and digest-md5 as part of default auth mechanisms (#748278) + +* Tue Oct 11 2011 Michal Hlavinka - 2.4.12-2 +- do not hide errors if cyrus user can't be added + +* Wed Oct 05 2011 Michal Hlavinka - 2.4.12-1 +- cyrus-imapd updated to 2.4.12 +- fixes incomplete authentication checks in nntpd (Secunia SA46093) + +* Fri Sep 9 2011 Jeroen van Meeuwen - 2.4.11-1 +- update to 2.4.11 +- Fix CVE-2011-3208 (#734926, #736838) + +* Tue Aug 16 2011 Michal Hlavinka - 2.4.10-4 +- rebuild with db5 + +* Thu Jul 21 2011 Petr Sabata - 2.4.10-3 +- Perl mass rebuild + +* Wed Jul 20 2011 Petr Sabata - 2.4.10-2 +- Perl mass rebuild + +* Wed Jul 6 2011 Jeroen van Meeuwen - 2.4.10-1 +- New upstream release + +* Wed Jun 22 2011 Iain Arnell 2.4.8-5 +- Patch to work with Perl 5.14 + +* Mon Jun 20 2011 Marcela Mašláňová - 2.4.8-4 +- Perl mass rebuild + +* Fri Jun 10 2011 Marcela Mašláňová - 2.4.8-3 +- Perl 5.14 mass rebuild + +* Mon May 09 2011 Michal Hlavinka - 2.4.8-2 +- fixed: systemd commands in %%post (thanks Bill Nottingham) + +* Thu Apr 14 2011 Michal Hlavinka - 2.4.8-1 +- cyrus-imapd updated to 2.4.8 +- fixed: cannot set unlimited quota through proxy +- fixed: reconstruct tries to set timestamps again and again +- fixed: response for LIST "" user is wrong +- fixed: THREAD command doesn't support quoted charset +- fixed crashes in mupdatetest and cyr_expire when using -x + +* Mon Apr 04 2011 Michal Hlaivnka - 2.4.7-2 +- now using systemd + +* Thu Mar 31 2011 Michal Hlavinka - 2.4.7-1 +- updated to 2.4.7 + +* Fri Feb 11 2011 Michal Hlavinka - 2.4.6-1 +- updated to 2.4.6 +- "autocreate" and "autosieve" features were removed + +* Tue Feb 08 2011 Fedora Release Engineering - 2.3.16-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jan 21 2011 Michal Hlavinka - 2.3.16-7 +- don't force sync io for all filesystems + +* Fri Jul 09 2010 Michal Hlavinka - 2.3.16-6 +- follow licensing guideline update +- devel sub-package has to have virtual static provides (#609604) + +* Mon Jun 07 2010 Michal Hlavinka - 2.3.16-5 +- spec cleanup +- simplified packaging (merge -perl in -utils) +- remove obsoleted and/or unmaintained additional sources/patches +- remove long time not used files from the cvs/srpm +- update additional sources/patches from their upstream + +* Tue Jun 01 2010 Marcela Maslanova - 2.3.16-4 +- Mass rebuild with perl-5.12.0 + +* Tue Apr 20 2010 Michal Hlavinka - 2.3.16-3 +- add support for QoS marked traffic (#576652) + +* Thu Jan 14 2010 Michal Hlavinka - 2.3.16-2 +- ignore user_denny.db if missing (#553011) +- fix location of certificates in default imapd.conf + +* Tue Dec 22 2009 Michal Hlavinka - 2.3.16-1 +- updated to 2.3.16 + +* Fri Dec 04 2009 Michal Hlavinka - 2.3.15-10 +- fix shell for daily cron job (#544182) + +* Fri Dec 04 2009 Stepan Kasal - 2.3.15-9 +- rebuild against perl 5.10.1 + +* Thu Nov 26 2009 Michal Hlavinka - 2.3.15-8 +- spec cleanup + +* Tue Nov 24 2009 Michal Hlavinka - 2.3.15-7 +- rebuild with new db4 (#540093) +- spec cleanup + +* Fri Nov 06 2009 Michal Hlavinka - 2.3.15-6 +- fix sourcing of /etc/sysconfig/cyrus-imapd (#533320) + +* Thu Nov 05 2009 Michal Hlavinka - 2.3.15-5 +- do not fill logs with mail (de)compression messages (#528093) + +* Thu Oct 29 2009 Michal Hlavinka - 2.3.15-4 +- spec cleanup + +* Fri Oct 09 2009 Michal Hlavinka - 2.3.15-3 +- fix cyrus user shell for db import (#528126) + +* Fri Sep 18 2009 Michal Hlavinka - 2.3.15-2 +- make init script LSB-compliant (#523227) + +* Fri Sep 18 2009 Michal Hlavinka - 2.3.15-1 +- fix buffer overflow in cyrus sieve (CVE-2009-3235) + +* Wed Sep 16 2009 Tomas Mraz - 2.3.14-6 +- use password-auth common PAM configuration instead of system-auth + +* Mon Sep 07 2009 Michal Hlavinka - 2.3.14-5 +- fix buffer overflow in cyrus sieve (#521010) + +* Fri Aug 21 2009 Tomas Mraz - 2.3.14-4 +- rebuilt with new openssl + +* Fri Jul 24 2009 Fedora Release Engineering - 2.3.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon May 25 2009 Michal Hlavinka - 2.3.14-2 +- rebuild because of changed dependencies + +* Thu Apr 02 2009 Michal Hlavinka - 2.3.14-1 +- updated to 2.3.14 + +* Wed Apr 01 2009 Michael Schwendt - 2.3.13-5 +- fix unowned directory (#483336). + +* Tue Feb 24 2009 Fedora Release Engineering - 2.3.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 02 2009 Michal Hlavinka - 2.3.13-3 +- fix directory ownership + +* Wed Jan 21 2009 Michal Hlavinka - 2.3.13-2 +- fix: #480138 - assertion failed: libcyr_cfg.c: cyrus_options[opt].opt == opt + +* Tue Jan 13 2009 Michal Hlavinka - 2.3.13-1 +- updated to 2.3.13 + +* Fri Sep 26 2008 Dan Horák - 2.3.11-1 +- update to latest upstream +- (temporarily) dropped the rmquota+deletemailbox patch (doesn't apply) + +* Wed Mar 19 2008 Rex Dieter - 2.3.9-12 +- cyrus-imapd conflicts with uw-imap (#222506) + +* Tue Mar 18 2008 Tom "spot" Callaway - 2.3.9-11 +- add Requires for versioned perl (libperl.so) + +* Wed Feb 20 2008 Fedora Release Engineering - 2.3.9-10 +- Autorebuild for GCC 4.3 + +* Fri Feb 08 2008 Tomas Janousek - 2.3.9-9 +- don't run cronjob if cyrus-imapd has never been started (#418191) + +* Tue Dec 04 2007 Tomas Janousek - 2.3.9-8 +- move certificate creation from -utils postinst to main package +- rebuild with newer openssl and openldap + +* Sun Sep 23 2007 Tomas Janousek - 2.3.9-7 +- updated the getgrouplist patch +- fixed a few undeclared functions (and int to pointer conversions) + +* Wed Aug 22 2007 Tomas Janousek - 2.3.9-6 +- update to latest upstream +- updated all patches from uoa and reenabled rmquota+deletemailbox + +* Thu Aug 16 2007 Tomas Janousek - 2.3.9-5.rc2 +- update to latest upstream beta + +* Tue Aug 14 2007 Tomas Janousek - 2.3.9-4.rc1 +- update to latest upstream beta +- temporarily dropped the rmquota+deletemailbox patch (doesn't apply) +- fixed to compile with newer glibc +- added the getgrouplist patch from RHEL-4, dropped groupcache patch +- dropped the allow_auth_plain patch +- buildrequire perl-devel + +* Mon Jul 23 2007 Tomas Janousek - 2.3.8-3.2 +- removed the lm_sensors-devel dependency, since it's properly required in + net-snmp-devel +- #248984 - cyrus-imapd.logrotate updated for rsyslog + +* Mon Apr 23 2007 Tomas Janousek - 2.3.8-3.1 +- the -devel subpackage no longer requires the main one + +* Wed Apr 11 2007 Tomas Janousek - 2.3.8-3 +- updated the no-bare-nl patch (#235569), thanks to Matthias Hensler + +* Wed Apr 04 2007 Tomas Janousek - 2.3.8-2 +- fixed mboxlist backup rotation (#197054) + +* Mon Mar 12 2007 Tomas Janousek - 2.3.8-1 +- update to latest upstream + +* Wed Jan 24 2007 Tomas Janousek - 2.3.7-8 +- compile with kerberos support + +* Wed Jan 24 2007 Tomas Janousek - 2.3.7-7 +- fixed Makefile typo (caused multiarch conflict) + +* Mon Jan 08 2007 Tomas Janousek - 2.3.7-6 +- #218046: applied patches to compile with db4-4.5 + +* Tue Dec 5 2006 John Dennis - 2.3.7-5 +- Resolves: bug# 218046: Cyrus-imapd in rawhide needs to be rebuilt + against new snmp package + +* Thu Oct 05 2006 Christian Iseli 2.3.7-4 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Mon Sep 18 2006 John Dennis - 2.3.7-3 +- bump rev for rebuild + +* Fri Aug 04 2006 Petr Rockai - 2.3.7-2 +- only buildrequire lm_sensors on i386 and x86_64, since it is not + available elsewhere + +* Sun Jul 23 2006 Petr Rockai - 2.3.7-1 +- update to latest upstream version, fixes a fair amount of issues +- forward-port the autocreate and rmquota patches (used latest + upstream patches, those are for 2.3.3) + +* Tue Jul 18 2006 Petr Rockai - 2.3.1-3 +- install perl modules into vendor_perl instead of site_perl +- change mode of perl .so files to 755 instead of 555 +- update pam configuration to use include directive instead + of deprecated pam_stack +- change prereq on cyrus-imapd-utils to requires + +* Tue Jul 11 2006 Petr Rockai - 2.3.1-2.99.test1 +- address bunch of rpmlint errors and warnings +- rename perl-Cyrus to cyrus-imapd-perl to be consistent with rest + of package (the cyrus modules are not part of cpan) +- added provides on cyrus-nntp and cyrus-murder (the functionality + is part of main package now) +- removed generation of README.buildoptions +- the two above made it possible to get rid of most build-time parameter + guessing from environment +- get rid of internal autoconf (iew) +- don't strip binaries, renders -debuginfo useless... +- remove prereq's in favour of newly added requires(...) + +* Tue Feb 28 2006 John Dennis - 2.3.1-2 +- bring up to Simon Matter's 2.3.1-2 release +- fix bug #173319, require cyrus-sasl-lib instead of cyrus-sasl +- fix bug #176470, hardcoded disttag +- add backend_sigsegv patch +- add replication_policycheck patch + +* Mon Jan 23 2006 Simon Matter 2.3.1-1 +- update to official autocreate and autosievefolder patches + +* Thu Jan 19 2006 Simon Matter 2.3.1-0.18 +- update rpm_set_permissions script +- add snmp support as build time option, disabled by default + because it doesn't build on older distributions + +* Wed Jan 18 2006 Simon Matter 2.3.1-0.15 +- add make_md5 patch + +* Mon Jan 16 2006 Simon Matter 2.3.1-0.13 +- add autosievefolder patch +- add rmquota+deletemailbox patch +- change default path for make_md5, add md5 directory + +* Fri Jan 13 2006 Simon Matter 2.3.1-0.10 +- spec file cleanup +- add more cvt_cyrusdb_all fixes +- fix pre/post scripts +- fix requirements +- add patch to set Invoca RPM config defaults +- add sync directory used for replication +- add autocreate patch + +* Thu Jan 12 2006 Simon Matter 2.3.1-0.8 +- update cvt_cyrusdb_all script +- build db.cfg on the fly + +* Thu Jan 05 2006 Simon Matter 2.3.1-0.5 +- create ptclient directory if ldap enabled + +* Wed Jan 04 2006 Simon Matter 2.3.1-0.4 +- build without ldap support if openldap is linked against SASLv1 + +* Tue Jan 03 2006 Simon Matter 2.3.1-0.3 +- fix ldap support + +* Mon Jan 02 2006 Simon Matter 2.3.1-0.2 +- add openldap-devel to buildprereq, build with ldap support + +* Wed Dec 21 2005 Simon Matter 2.3.1-0.1 +- update to 2.3.1, officially called BETA-quality release + +* Fri Dec 16 2005 Simon Matter 2.3.0-0.4 +- add skiplist.py to contrib/ +- port authid_normalize patch + +* Thu Dec 15 2005 Simon Matter 2.3.0-0.3 +- reintroduce subpackage utils, fix requirements +- move some utils to %%{_bindir}/ + +* Wed Dec 14 2005 Simon Matter 2.3.0-0.2 +- integrate subpackages murder, nntp, replication, utils + +* Tue Dec 13 2005 Simon Matter 2.3.0-0.1 +- update to 2.3.0, officially called BETA-quality release +- add replication subpackage + +* Fri Dec 09 2005 Simon Matter 2.2.12-15.1 +- add missing automake to buildprereq +- change package description + +* Tue Dec 06 2005 Simon Matter 2.2.12-15 +- update cvt_cyrusdb_all script +- update autocreate patches + +* Mon Dec 05 2005 Simon Matter 2.2.12-14 +- update cvt_cyrusdb_all script + +* Mon Nov 14 2005 Simon Matter 2.2.12-13 +- add 64bit quota support backported from 2.3 + +* Fri Nov 11 2005 Simon Matter 2.2.12-12 +- add quickstart/stop option to init script to bypass db import/export +- add authid_normalize patch +- add allow_auth_plain_proxying patch +- update gcc4 patch +- remove useless fdatasync patch +- add private autoconf used for build, remove autoconf dependency +- generate correct docs including man pages +- remove unneeded files from doc directory + +* Fri Nov 04 2005 Simon Matter 2.2.12-11 +- add mupdate thread-safe patch + +* Mon Oct 24 2005 Simon Matter 2.2.12-9.4 +- add spool patch, which is already fixed in CVS + +* Tue Aug 30 2005 Simon Matter 2.2.12-9.2 +- pull in CPPFLAGS and LDFLAGS from openssl's pkg-config data, if it exists + +* Wed Aug 24 2005 Simon Matter 2.2.12-9.1 +- add timsieved_reset_sasl_conn patch + +* Mon Aug 22 2005 Simon Matter 2.2.12-9 +- cosmetic changes in pre and post scripts + +* Fri Aug 19 2005 Simon Matter 2.2.12-8 +- add more pki dir fixes for inplace upgrades + +* Thu Aug 18 2005 Simon Matter 2.2.12-7 +- include requirement for Berkeley DB utils + +* Thu Aug 18 2005 Simon Matter 2.2.12-6 +- fix recovery problems with db4, which do not exist with db3 +- fix logic for handling ssl certs +- remove initlog from init script + +* Wed Aug 17 2005 Simon Matter 2.2.12-5 +- add notifytest to the distribution +- add functionality to convert all berkeley databases to skiplist + on shutdown and convert them back as needed on startup. This should + solve the upgrade problems with Berkeley databases. + +* Tue Aug 16 2005 Simon Matter 2.2.12-4.14 +- add gcc4 patch +- determine and handle pki directory for openssl correctly +- add skiplist recovery docs +- add notify_sms patch + +* Mon Jul 18 2005 Simon Matter 2.2.12-4.10 +- update cvt_cyrusdb_all script +- update autocreate patches + +* Fri Jul 15 2005 Simon Matter 2.2.12-4.9 +- add patch to remove ACLs with invalid identifier +- update cvt_cyrusdb_all script + +* Sat Jun 18 2005 Simon Matter 2.2.12-4.1 +- update munge8bit patch + +* Wed Jun 08 2005 Simon Matter 2.2.12-4 +- updated seenstate patch + +* Thu Jun 02 2005 Simon Matter +- removed nolinkimapspool patch, added singleinstancestore patch instead + +* Thu Jun 02 2005 Simon Matter +- added nolinkimapspool patch +- fix debug_package macro, it was still being expanded, + comments don't hide macro expansion +- change license field to BSD, its not exact BSD, but BSD is the closest + +* Fri Apr 22 2005 John Dennis - 2.2.12-6.fc4 +- the openssl package moved all its certs, CA, Makefile, etc. to /etc/pki + now we are consistent with the openssl directory changes. + +* Thu Apr 21 2005 John Dennis - 2.2.12-5.fc4 +- we finally have a common directory, /etc/pki for certs, so create + /etc/pki/cyrus-imapd and put the ssl pem file there. The /etc/cyrus-imapd + location will not be used, this change supercedes that. + +* Mon Apr 18 2005 John Dennis - 2.2.12-4.fc4 +- fix bug #141479, move ssl pem file from /usr/share/ssl/certs to /etc/cyrus-imapd/cyrus-imapd.pem +- change license field to BSD, its not exact BSD, but BSD is the closest. + +* Fri Apr 15 2005 John Dennis - 2.2.12-3.fc4 +- fix release field to be single digit + +* Fri Apr 15 2005 John Dennis - 2.2.12-1.2.fc4 +- fix debug_package macro, it was still being expanded, + comments don't hide macro expansion +- fix changelog chronological order +- fix bug 118832, cyrus-imapd is modifying /etc/services + +* Mon Apr 4 2005 John Dennis - 2.2.12-1.1.fc4 +- bring up to 2.2.12, includes security fix for CAN-2005-0546 + +* Mon Mar 07 2005 Simon Matter +- updated rmquota+deletemailbox patches + +* Fri Mar 4 2005 John Dennis - 2.2.10-11.4.fc4 +- fix gcc4 build problems + +* Thu Mar 3 2005 John Dennis 2.2.10-11.3.fc4 +- bump rev for build + +* Mon Feb 14 2005 Simon Matter +- updated to 2.2.12 +- updated autocreate and autosievefolder patches + +* Fri Feb 11 2005 John Dennis - 2.2.10-11.2.fc4 +- make _contribdir identical to Simon's, + I had been getting burned by rpm's bizarre handling of macros in comments + +* Thu Feb 10 2005 John Dennis - 2.2.10-11.1.fc4 +- bring up to date with Simon Matter's 2.2.10-11 rpm + +* Sat Feb 05 2005 Simon Matter +- updated autosievefolder patch + +* Tue Feb 01 2005 Simon Matter +- remove special ownership and permissions from deliver +- enable deliver-wrapper per default +- enable OutlookExpress seenstate patch per default + +* Wed Jan 19 2005 Simon Matter +- updated autocreate patch + +* Fri Jan 14 2005 Simon Matter +- spec file cleanup + +* Tue Jan 11 2005 Simon Matter +- updated autocreate patch + +* Fri Jan 07 2005 Simon Matter +- moved contrib dir into doc, made scripts not executable + +* Thu Jan 06 2005 Simon Matter +- added more fixes to the autocreate patch +- don't use %%_libdir for %%_cyrexecdir, it's a mess on x86_64 +- don't use %%_libdir for symlinks +- remove %%_libdir pachtes +- change pam configs to work on x86_64 +- changed default build option for IDLED to on +- changed rpm_set_permissions to honor partitions in /etc/imapd.conf + +* Tue Jan 04 2005 Simon Matter +- updated autocreate patch + +* Mon Dec 20 2004 Simon Matter +- remove idled docs when disabled, fixes RedHat's bug #142345 + +* Fri Dec 17 2004 Simon Matter +- removed allnumeric patch, not needed anymore +- made groupcache a compile time option +- rename nntp's pam service, fixes RedHat's bug #142672 + +* Thu Dec 16 2004 Simon Matter +- updated groupcache patch +- updated cvt_cyrusdb_all to use runuser instead of su if available +- added upd_groupcache tool + +* Wed Dec 15 2004 Simon Matter +- added groupfile patch to help those using nss_ldap + +* Thu Dec 02 2004 Simon Matter +- modified config directives and removed verify options + +* Thu Dec 2 2004 John Dennis 2.2.10-3.devel +- fix bug #141673, dup of bug #141470 + Also make cyrus.conf noreplace in addition to imapd.conf + Remove the verify overrides on the noreplace config files, + we do want config file changes visible when verifying + +* Wed Dec 1 2004 John Dennis 2.2.10-2.devel +- fix bug #141470, make imapd.conf a noreplace config file + +* Wed Dec 1 2004 John Dennis 2.2.10-1.devel +- update to Simon Matter's 2.2.10 RPM, + fixes bug #139382, + security advisories: CAN-2004-1011 CAN-2004-1012 CAN-2004-1013 CAN-2004-1015 + +* Wed Nov 24 2004 Simon Matter +- updated to 2.2.10 + +* Tue Nov 23 2004 Simon Matter +- updated to 2.2.9 + +* Fri Nov 19 2004 Simon Matter +- changed scripts to use runuser instead of su if available + +* Thu Nov 18 2004 Simon Matter +- changed requirement for file >= 3.35-1 from BuildPrereq to + Requires, fixes RedHat's bug #124991 +- added acceptinvalidfrom patch to fix RedHat's bug #137705 + +* Mon Oct 4 2004 Dan Walsh 2.2.6-2.FC3.6 +- Change cyrus init scripts and cron job to use runuser instead of su + +* Fri Aug 6 2004 John Dennis 2.2.6-2.FC3.5 +- remove obsoletes tag, fixes bugs #127448, #129274 + +* Wed Aug 4 2004 John Dennis +- replace commas in release field with dots, bump build number + +* Tue Aug 03 2004 Simon Matter +- fixed symlinks for x86_64, now uses the _libdir macro + reported by John Dennis, fixes RedHat's bug #128964 +- removed obsoletes tag, fixes RedHat's bugs #127448, #129274 + +* Mon Aug 2 2004 John Dennis 2.2.6-2,FC3,3 +- fix bug #128964, lib symlinks wrong on x86_64 + +* Thu Jul 29 2004 Simon Matter +- updated to 2.2.8 + +* Thu Jul 29 2004 Simon Matter +- updated autocreate and autosieve patches +- made authorization a compile time option +- added sieve-bc_eval patch + +* Tue Jul 27 2004 Simon Matter +- updated to 2.2.7 +- modified autocreate patch or 2.2.7 +- removed snmpargs patch which was needed for RedHat 6.2 + +* Tue Jul 13 2004 Simon Matter +- added mboxlist / mboxname patches from CVS + +* Tue Jul 06 2004 Simon Matter +- updated rmquota+deletemailbox patch + +* Sat Jul 3 2004 John Dennis - 2.2.6-2,FC3,1 +- bring up to date with Simon Matter's latest upstream rpm 2.2.6-2 +- comment out illegal tags Packager, Vendor, Distribution + build for FC3 + +* Wed Jun 30 2004 Simon Matter +- added quota patches from CVS + +* Fri Jun 25 2004 Simon Matter +- updated autocreate patch + +* Fri Jun 18 2004 Simon Matter +- updated to 2.2.6 + +* Fri Jun 11 2004 Simon Matter +- updated autocreate and autosieve patches + +* Tue Jun 01 2004 Simon Matter +- updated autocreate, autosieve and rmquota patches +- fixed rmquota patch to build on gcc v3.3.x +- added lmtp_sieve patch + +* Sat May 29 2004 Simon Matter +- updated to 2.2.5 + +* Fri May 28 2004 Simon Matter +- updated to 2.2.5 pre-release + +* Mon May 24 2004 Simon Matter +- added hash patch to fix a sig11 problem +- added noncritical typo patch + +* Fri May 21 2004 Simon Matter +- include OutlookExpress seenstate patch +- fixed allnumeric patch + +* Thu May 20 2004 Simon Matter +- don't enable cyrus-imapd per default +- rename fetchnews to cyrfetchnews to avoid namespace conflicts with leafnode +- replace fetchnews with cyrfetchnews in man pages +- replace master with cyrus-master in man pages + +* Tue May 18 2004 Simon Matter +- updated to 2.2.4 + +* Fri Apr 30 2004 Simon Matter +- Don't provides: imap + +* Wed Mar 17 2004 Simon Matter +- fix init script + +* Thu Mar 04 2004 Simon Matter +- strip binaries + +* Tue Mar 02 2004 Simon Matter +- add more SELinux fixes + +* Wed Feb 25 2004 Simon Matter +- add makedepend to path, thank you Andreas Piesk for reporting it + +* Mon Feb 23 2004 Dan Walsh +- change su within init script to get input from /dev/null + this prevents hang when running in SELinux +- don't use -fpie as default, it breaks different distributions + +* Thu Feb 19 2004 Simon Matter +- merged in most changes from Karsten Hopp's RedHat package +- fixed permissions of files in contrib, thank you + Edward Rudd for reporting it. +- modified snmp patch to make it build on RedHat 6.2 again + +* Tue Feb 03 2004 Karsten Hopp +- switch to Simon Matter's cyrus-imapd package, which has + some major improvements over the old Red Hat package. + - configdirectory moved from /var/imap to /var/lib/imap + - sasl_pwcheck_method changed to saslauthd +- needed to delete package/vendor tags for buildsystem. +- added USEPIE variable for linking with -fpie flag +- removed rpath from linker arguments +- removed email header from README.HOWTO-recover-mailboxes +- added lib64 patch +- use CFLAGS from specfile in imtest subdir +- disable -pie on ppc for now + +* Tue Feb 03 2004 Simon Matter +- added tls_ca_file: to imapd.conf +- updated autocreate patch which fixes a small sig11 problem + +* Thu Jan 29 2004 Simon Matter +- convert sieve scripts to UTF-8 only if sievec failed before +- add note to the readme about limiting loggin on busy servers +- added build time option to chose the syslog facility + +* Wed Jan 28 2004 Simon Matter +- sieve scripts are now converted to UTF-8 with cvt_cyrusdb_all + +* Tue Jan 27 2004 Simon Matter +- fixed problems with masssievec +- lots of small fixes in the init scripts + +* Fri Jan 23 2004 Simon Matter +- updated auto db converting functionality +- added auto masssievec functionality + +* Thu Jan 22 2004 Simon Matter +- updated autocreate/autosievefolder patches + +* Fri Jan 16 2004 Simon Matter +- updated to 2.2.3 + +* Wed Jan 14 2004 Simon Matter +- number of mailbox list dumps can now be configured + +* Fri Jan 02 2004 Simon Matter +- updated autosievefolder patch + +* Thu Dec 18 2003 Simon Matter +- updated autocreate/autosievefolder/rmquota patches + +* Tue Oct 28 2003 Simon Matter +- updated to 2.2.2-BETA + +* Tue Aug 05 2003 Simon Matter +- add sendmail m4 macro, some people were looking for it +- just one source for pam default configuration (they were all the same) +- added /etc/pam.d/lmtp +- added build support for RedHat Beta severn + +* Wed Jul 30 2003 Simon Matter +- updated autocreate patch to 0.8.1 +- removed creation of spool/config dirs, not needed anymore +- added cyrus_sharedbackup to contrib + +* Fri Jul 18 2003 Simon Matter +- modified for 2.2.1-BETA + +* Wed Jul 09 2003 Simon Matter +- modified rpm_set_permissions script + +* Mon Jul 07 2003 Simon Matter +- changed permissions on config and spool dirs +- modified init script + +* Thu Jul 03 2003 Simon Matter +- upgraded to 2.1.14 +- removed now obsolete forcedowncase patch +- use --with-extraident to add extra version information +- updated munge8bit patch + +* Wed Jun 04 2003 Simon Matter +- added RedHat 2.1ES support to the perlhack detection + +* Tue May 20 2003 Simon Matter +- upgraded autocreate patch + +* Fri May 09 2003 Simon Matter +- upgraded autocreate patch +- modified init script + +* Mon May 05 2003 Simon Matter +- upgraded to 2.1.13 +- replaced commands with macros, cleaned up spec file + +* Fri May 02 2003 Simon Matter +- added murder subpackage +- changed exec path to /usr/lib/cyrus-imapd + +* Thu May 01 2003 Simon Matter +- included modified munge8bit patch again + +* Tue Apr 29 2003 Simon Matter +- added new 8bit header patch +- upgraded IPv6 patch +- upgraded autocreate patch to 0.7 + +* Mon Apr 28 2003 Simon Matter +- added new autocreate patch + +* Mon Mar 31 2003 H-E Sandstrom +- added munge8bit patch + +* Mon Mar 24 2003 Simon Matter +- added createonpost fix patch + +* Thu Mar 20 2003 Simon Matter +- added functionality to patch the IPv6 patch on the fly if + autoconf > 2.13, we can now use newer autoconf again. + +* Tue Mar 18 2003 Paul Bender +- fixed spec file so that autoconf 2.13 will always be used, + since the IPv6 patch requires autoconf <= 2.13 + +* Fri Mar 14 2003 Simon Matter +- fixed problems with new file package + +* Thu Mar 13 2003 Simon Matter +- added kerberos include for RedHat Beta phoebe 2 +- added Henrique's forcedowncase patch + +* Mon Mar 03 2003 Simon Matter +- corrected imapd.conf + +* Sat Mar 01 2003 Simon Matter +- added note about lmtp socket in sendmail +- added flock patches + +* Fri Feb 07 2003 Simon Matter +- added build time option for fulldirhash + +* Wed Feb 05 2003 Simon Matter +- added IPV6 patch to source rpm +- fixed build on RedHat 6.2 + +* Tue Feb 04 2003 Simon Matter +- update to 2.1.12 +- added logrotate entry for /var/log/auth.log +- modified init script to use builtin daemon mode + +* Fri Jan 10 2003 Simon Matter +- small change in mboxlist backup script + +* Fri Jan 10 2003 Simon Matter +- fixed a cosmetic bug in cvt_cyrusdb_all +- added cron.daily job to backup mailboxes.db + +* Mon Jan 06 2003 Simon Matter +- add more entries to /etc/services + +* Wed Jan 01 2003 Simon Matter +- include snmpargs patch for build on RedHat 6.2 +- added build support for RedHat 6.2 + +* Mon Dec 30 2002 Simon Matter +- removed autoconf hack, not needed anymore +- enabled build on RedHat Beta Phoebe +- added services entry for lmtp +- cleanup spec file + +* Thu Dec 26 2002 Simon Matter +- removed BuildPrereq for e2fsprogs-devel + +* Thu Dec 12 2002 Simon Matter +- modified RedHat release detection +- added BuildPrereq for file + +* Thu Dec 05 2002 Simon Matter +- upgraded to cyrus-imapd 2.1.11 +- upgrade IPV6 patch to 20021205 + +* Thu Nov 28 2002 Simon Matter +- Fixed some default attributes + +* Thu Nov 28 2002 Troels Arvin +- Explicitly changed files-section to + - use defattr for simple (root-owned 0644) files + - explictly set root as user/group owner where + the user/group ownership was previously indicated + as "-"; this allows building valid packages without + having to being root when building + +* Mon Nov 25 2002 Simon Matter +- changed default build option for IDLED to off +- included some useful info in README.* + +* Thu Nov 21 2002 Simon Matter +- added build time option for IDLED, thank you Roland Pope + +* Tue Nov 19 2002 Simon Matter +- fixed spec to really use fdatasync patch +- added createonpost patch + +* Thu Nov 14 2002 Simon Matter +- upgraded to cyrus-imapd 2.1.10 +- build without IPv6 support by default + +* Tue Nov 12 2002 Simon Matter +- fixed db detection in .spec + +* Mon Oct 21 2002 Simon Matter +- updated cvt_cyrusdb_all script + +* Fri Oct 18 2002 Simon Matter +- added fdatasync patch + +* Thu Oct 03 2002 Simon Matter +- add RPM version 4.1 compatibility, which means remove installed + but not packaged files + +* Wed Sep 18 2002 Simon Matter +- added auto db converting functionality +- changed default for MBOXLIST_DB and SEEN_DB to skiplist + +* Mon Sep 16 2002 Simon Matter +- remove creation of cyrus user at build time +- added scripts from ftp://kalamazoolinux.org/pub/projects/awilliam/cyrus/ + +* Mon Sep 02 2002 Simon Matter +- upgraded to cyrus-imapd 2.1.9 + +* Fri Aug 30 2002 Simon Matter +- included extra ident string + +* Thu Aug 29 2002 Simon Matter +- modified path in deliver-wrapper, thank you Richard L. Phipps +- added RedHat 2.1AS support to the perlhack detection +- added build time option to force syncronous updates on ext3 + +* Wed Aug 28 2002 Simon Matter +- added updated IPv6 patch from Hajimu UMEMOTO + +* Wed Aug 28 2002 Simon Matter +- upgraded to cyrus-imapd 2.1.8 + +* Thu Aug 22 2002 Simon Matter +- included IPv6 patch from Hajimu UMEMOTO + +* Wed Aug 21 2002 Simon Matter +- upgraded to cyrus-imapd 2.1.7 because of wrong version info + +* Wed Aug 21 2002 Simon Matter +- upgraded to cyrus-imapd 2.1.6 + +* Mon Aug 19 2002 Simon Matter +- change db version detection, thank you Chris for reporting + +* Tue Aug 13 2002 Simon Matter +- fixed autoconf detection + +* Mon Aug 12 2002 Simon Matter +- included support for different autoconf versions +- modified the perl build and install process +- made some .spec changes to build on RedHat 7.x and limbo + +* Fri Aug 09 2002 Simon Matter +- included sieve matching patch + +* Thu Jun 27 2002 Simon Matter +- fixed %%post script where %%F was expanded to file.file + +* Wed Jun 26 2002 Simon Matter +- fixed missing man page + +* Tue Jun 25 2002 Simon Matter +- upgraded to cyrus-imapd 2.1.5 + +* Mon Jun 24 2002 Simon Matter +- added compile time parameters to configure the package based on + the idea from Luca Olivetti +- make deliver-wrapper a compile time option + +* Fri May 03 2002 Simon Matter +- upgraded to cyrus-imapd 2.1.4 + +* Mon Apr 22 2002 Simon Matter +- small initscript fix + +* Fri Mar 08 2002 Simon Matter +- upgraded to cyrus-imapd 2.1.3 +- removed some stuff that was cleaned up in the sources +- added compile time options for db backends + +* Wed Mar 06 2002 Simon Matter +- removed requires perl-File-Temp for utils package, it's in the RedHat + perl RPM now + +* Fri Feb 22 2002 Simon Matter +- removed deliverdb/db + +* Wed Feb 20 2002 Simon Matter +- upgraded to cyrus-imapd 2.1.2 + +* Mon Feb 11 2002 Simon Matter +- changed sasl_mech_list: PLAIN in /etc/imapd.conf +- added sieve to /etc/pam.d + +* Fri Feb 08 2002 Simon Matter +- added requires perl-File-Temp for utils package + +* Wed Feb 06 2002 Simon Matter +- added some %%dir flags +- removed /usr/lib/sasl/Cyrus.conf +- added conf templates +- build time option for usage of saslauth group + +* Tue Feb 05 2002 Simon Matter +- upgraded to cyrus-imapd 2.1.1 +- dependency of cyrus-sasl >= 2.1.0-1 + +* Sun Feb 03 2002 Simon Matter +- saslauth group is only deleted on uninstall if there is no other + member in this group + +* Sat Feb 02 2002 Simon Matter +- changed start/stop level in init file + +* Tue Jan 29 2002 Simon Matter +- dependency of cyrus-sasl >= 1.5.24-22 +- dotstuffing patch for sendmail calls made by sieve for outgoing + mails +- patch for ability to force ipurge to traverse personal folders + +* Mon Jan 28 2002 Simon Matter +- minor spec file changes + +* Sat Jan 19 2002 Simon Matter +- changed default auth to pam +- remove several %%dir from %%files sections +- change from /usr/lib/cyrus -> /usr/libexec/cyrus +- rename source files to something like cyrus... +- added rehash tool +- changed to hashed spool + +* Fri Jan 18 2002 Simon Matter +- fixed init script +- fixed %%post section in spec + +* Thu Jan 17 2002 Simon Matter +- ready for first build + +* Wed Jan 09 2002 Simon Matter +- initial package, with help from other packages out there diff --git a/cyrus-imapd.sysconfig b/cyrus-imapd.sysconfig new file mode 100644 index 0000000..ad8bec5 --- /dev/null +++ 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 diff --git a/cyrus-imapd.tmpfiles.conf b/cyrus-imapd.tmpfiles.conf new file mode 100644 index 0000000..14a2791 --- /dev/null +++ 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 - diff --git a/patch-cassandane-fix-annotator b/patch-cassandane-fix-annotator new file mode 100644 index 0000000..406813e --- /dev/null +++ b/patch-cassandane-fix-annotator @@ -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"; diff --git a/patch-cassandane-no-syslog b/patch-cassandane-no-syslog new file mode 100644 index 0000000..c93059b --- /dev/null +++ b/patch-cassandane-no-syslog @@ -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; diff --git a/patch-cyrus-default-configs b/patch-cyrus-default-configs new file mode 100644 index 0000000..c59d61c --- /dev/null +++ b/patch-cyrus-default-configs @@ -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 diff --git a/patch-cyrus-perl-linking b/patch-cyrus-perl-linking new file mode 100644 index 0000000..853d05f --- /dev/null +++ b/patch-cyrus-perl-linking @@ -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], diff --git a/patch-cyrus-rename-quota b/patch-cyrus-rename-quota new file mode 100644 index 0000000..8ee854e --- /dev/null +++ b/patch-cyrus-rename-quota @@ -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); diff --git a/patch-cyrus-testsuite-timeout b/patch-cyrus-testsuite-timeout new file mode 100644 index 0000000..74fa4f8 --- /dev/null +++ b/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; diff --git a/patch-vzic-proper-cflags b/patch-vzic-proper-cflags new file mode 100644 index 0000000..0e299b3 --- /dev/null +++ b/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 diff --git a/sources b/sources new file mode 100644 index 0000000..12c58cf --- /dev/null +++ b/sources @@ -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