use the system crypto policy (#1109114)

This commit is contained in:
Michal Hlavinka 2015-08-24 17:12:10 +02:00
parent c761f78337
commit e8c10d3eba
2 changed files with 19 additions and 8 deletions

View File

@ -1,7 +1,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 diff -up dovecot-2.2.18/doc/example-config/conf.d/10-mail.conf.default-settings dovecot-2.2.18/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.2.18/doc/example-config/conf.d/10-mail.conf.default-settings 2014-06-02 13:50:10.000000000 +0200
+++ dovecot-2.1.rc1/doc/example-config/conf.d/10-mail.conf 2011-12-14 14:46:41.808749847 +0100 +++ dovecot-2.2.18/doc/example-config/conf.d/10-mail.conf 2015-08-24 17:09:03.866648631 +0200
@@ -277,6 +277,7 @@ @@ -283,6 +283,7 @@ namespace inbox {
# them simultaneously. # them simultaneously.
#mbox_read_locks = fcntl #mbox_read_locks = fcntl
#mbox_write_locks = dotlock fcntl #mbox_write_locks = dotlock fcntl
@ -9,9 +9,9 @@ diff -up dovecot-2.1.rc1/doc/example-config/conf.d/10-mail.conf.default-settings
# Maximum time to wait for lock (all of them) before aborting. # Maximum time to wait for lock (all of them) before aborting.
#mbox_lock_timeout = 5 mins #mbox_lock_timeout = 5 mins
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 diff -up dovecot-2.2.18/doc/example-config/conf.d/10-ssl.conf.default-settings dovecot-2.2.18/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.2.18/doc/example-config/conf.d/10-ssl.conf.default-settings 2014-10-03 16:36:00.000000000 +0200
+++ dovecot-2.1.rc1/doc/example-config/conf.d/10-ssl.conf 2011-12-14 14:51:10.413786253 +0100 +++ dovecot-2.2.18/doc/example-config/conf.d/10-ssl.conf 2015-08-24 17:10:49.536071649 +0200
@@ -3,7 +3,9 @@ @@ -3,7 +3,9 @@
## ##
@ -23,3 +23,11 @@ diff -up dovecot-2.1.rc1/doc/example-config/conf.d/10-ssl.conf.default-settings
# PEM encoded X.509 SSL/TLS certificate and private key. They're opened before # 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 # dropping root privileges, so keep the key file unreadable by anyone but
@@ -50,6 +52,7 @@ ssl_key = </etc/ssl/private/dovecot.pem
# SSL ciphers to use
#ssl_cipher_list = ALL:!LOW:!SSLv2:!EXP:!aNULL
+ssl_cipher_list = PROFILE=SYSTEM
# Prefer the server's order of ciphers over client's.
#ssl_prefer_server_ciphers = no

View File

@ -5,7 +5,7 @@ Name: dovecot
Epoch: 1 Epoch: 1
Version: 2.2.18 Version: 2.2.18
%global prever %{nil} %global prever %{nil}
Release: 4%{?dist} Release: 5%{?dist}
#dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
License: MIT and LGPLv2 License: MIT and LGPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
@ -497,6 +497,9 @@ make check
%{_libdir}/%{name}/dict/libdriver_pgsql.so %{_libdir}/%{name}/dict/libdriver_pgsql.so
%changelog %changelog
* Mon Aug 24 2015 Michal Hlavinka <mhlavink@redhat.com> - 1:2.2.18-5
- use the system crypto policy (#1109114)
* Fri Jun 19 2015 Michal Hlavinka <mhlavink@redhat.com> - 1:2.2.18-4 * Fri Jun 19 2015 Michal Hlavinka <mhlavink@redhat.com> - 1:2.2.18-4
- fix build for s390x and ppc64 (#1232650) - fix build for s390x and ppc64 (#1232650)