[dovecot: 1/2] allow imap+TLS and pop3+TLS by default

[Michal Hlavinka]

commit 31231a5a1e8e5eaab739dabb7f4a95761136754a
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Wed Dec 14 14:53:03 2011 +0100

    allow imap+TLS and pop3+TLS by default

 dovecot-2.0-defaultconfig.patch |   41 +++++++++++++++++---------------------
 dovecot.spec                    |    5 +++-
 2 files changed, 22 insertions(+), 24 deletions(-)
---
diff --git a/dovecot-2.0-defaultconfig.patch b/dovecot-2.0-defaultconfig.patch
index dbd13b4..3f40d82 100644
--- a/dovecot-2.0-defaultconfig.patch
+++ b/dovecot-2.0-defaultconfig.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -up dovecot-2.1.rc1/doc/example-config/conf.d/10-mail.conf.default-settings dovecot-2.1.rc1/doc/example-config/conf.d/10-mail.conf
+--- dovecot-2.1.rc1/doc/example-config/conf.d/10-mail.conf.default-settings	2011-11-15 21:24:30.000000000 +0100
++++ dovecot-2.1.rc1/doc/example-config/conf.d/10-mail.conf	2011-12-14 14:46:41.808749847 +0100
+@@ -277,6 +277,7 @@
  # them simultaneously.
  #mbox_read_locks = fcntl
  #mbox_write_locks = dotlock fcntl
@@ -9,22 +9,17 @@ diff -up dovecot-2.0.15/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.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
+diff -up dovecot-2.1.rc1/doc/example-config/conf.d/10-ssl.conf.default-settings dovecot-2.1.rc1/doc/example-config/conf.d/10-ssl.conf
+--- dovecot-2.1.rc1/doc/example-config/conf.d/10-ssl.conf.default-settings	2011-12-14 14:48:19.967721153 +0100
++++ dovecot-2.1.rc1/doc/example-config/conf.d/10-ssl.conf	2011-12-14 14:51:10.413786253 +0100
+@@ -3,7 +3,9 @@
+ ##
+ 
+ # SSL/TLS support: yes, no, required. <doc/wiki/SSL.txt>
+-#ssl = yes
++# disable plain pop3 and imap, allowed are only pop3+TLS, pop3s, imap+TLS and imaps
++# plain imap and pop3 are still allowed for local connections
++ssl = required
+ 
+ # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
+ # dropping root privileges, so keep the key file unreadable by anyone but
diff --git a/dovecot.spec b/dovecot.spec
index e8ad3ce..a009340 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -3,7 +3,7 @@ Name: dovecot
 Epoch: 1
 Version: 2.1
 %global prever .rc1
-Release: 0.1%{prever}%{?dist}
+Release: 0.2%{prever}%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 Group: System Environment/Daemons
@@ -403,6 +403,9 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Wed Dec 14 2011 Michal Hlavinka <mhlavink at redhat.com> - 1:2.1-0.2.rc1
+- allow imap+TLS and pop3+TLS by default
+
 * Wed Nov 30 2011 Michal Hlavinka <mhlavink at redhat.com> - 1:2.1-0.1.rc1
 - updated to 2.1.rc1
 - major changes since 2.0.x: