do not use obsolete settings in default configuration (#743444)

This commit is contained in:
Michal Hlavinka 2011-10-24 10:09:56 +02:00
parent 0793b6f487
commit 6e31462661
2 changed files with 26 additions and 17 deletions

View File

@ -1,6 +1,6 @@
diff -up dovecot-2.0.14/doc/example-config/conf.d/10-mail.conf.default-settings dovecot-2.0.14/doc/example-config/conf.d/10-mail.conf
--- dovecot-2.0.14/doc/example-config/conf.d/10-mail.conf.default-settings 2010-12-30 10:42:54.000000000 +0100
+++ dovecot-2.0.14/doc/example-config/conf.d/10-mail.conf 2011-09-13 16:53:45.692814486 +0200
diff -up dovecot-2.0.15/doc/example-config/conf.d/10-mail.conf.default-settings dovecot-2.0.15/doc/example-config/conf.d/10-mail.conf
--- dovecot-2.0.15/doc/example-config/conf.d/10-mail.conf.default-settings 2010-12-30 10:42:54.000000000 +0100
+++ dovecot-2.0.15/doc/example-config/conf.d/10-mail.conf 2011-10-06 15:22:23.891599837 +0200
@@ -267,6 +267,7 @@
# them simultaneously.
#mbox_read_locks = fcntl
@ -9,16 +9,22 @@ diff -up dovecot-2.0.14/doc/example-config/conf.d/10-mail.conf.default-settings
# Maximum time to wait for lock (all of them) before aborting.
#mbox_lock_timeout = 5 mins
diff -up dovecot-2.0.14/doc/example-config/dovecot.conf.default-settings dovecot-2.0.14/doc/example-config/dovecot.conf
--- dovecot-2.0.14/doc/example-config/dovecot.conf.default-settings 2011-09-13 16:53:59.810895551 +0200
+++ dovecot-2.0.14/doc/example-config/dovecot.conf 2011-09-13 16:54:07.496939845 +0200
@@ -17,7 +17,8 @@
# --sysconfdir=/etc --localstatedir=/var
# Protocols we want to be serving.
-#protocols = imap pop3 lmtp
+#protocols = imap imaps pop3 pop3s lmtp
+protocols = imaps pop3s lmtp
# A comma separated list of IPs or hosts where to listen in for connections.
# "*" listens in all IPv4 interfaces, "::" listens in all IPv6 interfaces.
diff -up dovecot-2.0.15/doc/example-config/conf.d/10-master.conf.default-settings dovecot-2.0.15/doc/example-config/conf.d/10-master.conf
--- dovecot-2.0.15/doc/example-config/conf.d/10-master.conf.default-settings 2011-10-06 15:25:19.361965665 +0200
+++ dovecot-2.0.15/doc/example-config/conf.d/10-master.conf 2011-10-06 16:59:08.209863733 +0200
@@ -17,6 +17,7 @@
service imap-login {
inet_listener imap {
#port = 143
+ address = localhost # allow plain imap only on localhost
}
inet_listener imaps {
#port = 993
@@ -38,6 +39,7 @@ service imap-login {
service pop3-login {
inet_listener pop3 {
#port = 110
+ address = localhost # allow plain imap only on localhost
}
inet_listener pop3s {
#port = 995

View File

@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
Name: dovecot
Epoch: 1
Version: 2.0.15
Release: 1%{?dist}
Release: 2%{?dist}
#dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
License: MIT and LGPLv2
Group: System Environment/Daemons
@ -399,6 +399,9 @@ make check
%{_libdir}/%{name}/dict/libdriver_pgsql.so
%changelog
* Mon Oct 24 2011 Michal Hlavinka <mhlavink@redhat.com> - 1:2.0.15-2
- do not use obsolete settings in default configuration (#743444)
* Mon Sep 19 2011 Michal Hlavinka <mhlavink@redhat.com> - 1:2.0.15-1
- dovecot updated to 2.0.15
- v2.0.14: Index reading could have eaten a lot of memory in some