Set specialusealways: 1 in the default config.

Upstream will be changing the default for this soon.  Making this
explicit in our configuration may save confusion down the line.
This commit is contained in:
Jason Tibbitts 2017-06-28 15:56:07 -05:00
parent 31ed5b9607
commit a52db49073
2 changed files with 11 additions and 4 deletions

View File

@ -9,7 +9,7 @@
Name: cyrus-imapd Name: cyrus-imapd
Version: 3.0.2 Version: 3.0.2
Release: 3%{?dist} Release: 4%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem %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 %changelog
* Wed Jun 28 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.2-4
- Explicitly set specialusealways: 1 in the default config.
* Tue Jun 27 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.2-3 * Tue Jun 27 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.2-3
- Patch the provided imapd.conf and cyrus.conf to more closely match previous - Patch the provided imapd.conf and cyrus.conf to more closely match previous
Fedora defaults and directories included in this package and to enable Fedora defaults and directories included in this package and to enable

View File

@ -23,7 +23,7 @@ index 4ce2c0f..3b1e6d7 100644
EVENTS { EVENTS {
diff --git a/doc/examples/imapd_conf/normal.conf b/doc/examples/imapd_conf/normal.conf 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 --- a/doc/examples/imapd_conf/normal.conf
+++ b/doc/examples/imapd_conf/normal.conf +++ b/doc/examples/imapd_conf/normal.conf
@@ -10,7 +10,7 @@ admins: cyrus @@ -10,7 +10,7 @@ admins: cyrus
@ -84,18 +84,22 @@ index 95b54e9..0eaae55 100644
################################################################### ###################################################################
## User experience settings ## User experience settings
@@ -72,6 +69,10 @@ defaultdomain: localhost @@ -72,6 +69,14 @@ defaultdomain: localhost
# Minimum time between POP mail fetches in minutes # Minimum time between POP mail fetches in minutes
popminpoll: 1 popminpoll: 1
+# Conversation support is required for jmap +# Conversation support is required for jmap
+conversations: 1 +conversations: 1
+conversations_db: twoskip +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 ## User Authentication settings
################################################################### ###################################################################
@@ -99,6 +100,12 @@ sasl_auto_transition: no @@ -99,6 +104,12 @@ sasl_auto_transition: no
## SSL/TLS Options ## SSL/TLS Options
################################################################### ###################################################################