diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index d4b82de..3a9ba8e 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -9,7 +9,7 @@ Name: cyrus-imapd Version: 3.0.2 -Release: 3%{?dist} +Release: 4%{?dist} %define ssl_pem_file /etc/pki/%name/%name.pem @@ -649,6 +649,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v %changelog +* 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 diff --git a/patch-cyrus-default-configs b/patch-cyrus-default-configs index 6a7be9e..a4edf10 100644 --- a/patch-cyrus-default-configs +++ b/patch-cyrus-default-configs @@ -23,7 +23,7 @@ index 4ce2c0f..3b1e6d7 100644 EVENTS { diff --git a/doc/examples/imapd_conf/normal.conf b/doc/examples/imapd_conf/normal.conf -index 95b54e9..0eaae55 100644 +index 95b54e9..3935b77 100644 --- a/doc/examples/imapd_conf/normal.conf +++ b/doc/examples/imapd_conf/normal.conf @@ -10,7 +10,7 @@ admins: cyrus @@ -84,18 +84,22 @@ index 95b54e9..0eaae55 100644 ################################################################### ## User experience settings -@@ -72,6 +69,10 @@ defaultdomain: localhost +@@ -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 +100,12 @@ sasl_auto_transition: no +@@ -99,6 +104,12 @@ sasl_auto_transition: no ## SSL/TLS Options ###################################################################