- up to 2.3.2.1

diff --git a/dovecot-disableSSLv3.patch b/dovecot-disableSSLv3.patch
deleted file mode 100644 (file)
index 00be874..0000000
--- a/dovecot-disableSSLv3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- dovecot-2.2.27/doc/example-config/conf.d/10-ssl.conf~      2016-12-03 21:37:57.000000000 +0100
-+++ dovecot-2.2.27/doc/example-config/conf.d/10-ssl.conf       2016-12-03 21:38:42.082007401 +0100
-@@ -47,9 +47,10 @@ ssl = no
- 
- # SSL protocols to use
- #ssl_protocols = !SSLv3
-+ssl_protocols = !SSLv2 !SSLv3
- 
- # SSL ciphers to use
--#ssl_cipher_list = ALL:!LOW:!SSLv2:!EXP:!aNULL
-+ssl_cipher_list = ALL:!LOW:!SSLv2:!EXP:!aNULL:!SSLv3
- 
- # Prefer the server's order of ciphers over client's.
- #ssl_prefer_server_ciphers = no

diff --git a/dovecot.spec b/dovecot.spec
index 05233d5a03004bb51e24101bc7410a14b895ffab..79e150075c17656c0b56affb38d9d05246d65a19 100644 (file)
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -11,21 +11,19 @@
 Summary:       IMAP and POP3 server written with security primarily in mind
 Summary(pl.UTF-8):     Serwer IMAP i POP3 pisany głównie z myślą o bezpieczeństwie
 Name:          dovecot
-Version:       2.2.36
+Version:       2.3.2.1
 Release:       1
 Epoch:         1
 License:       MIT (libraries), LGPL v2.1 (the rest)
 Group:         Networking/Daemons
-Source0:       http://dovecot.org/releases/2.2/%{name}-%{version}.tar.gz
-# Source0-md5: a8d6492584025b2413e82ea48de3cd5f
+Source0:       http://dovecot.org/releases/2.3/%{name}-%{version}.tar.gz
+# Source0-md5: 77a7fa95b38bd6686e6191b2b3f2b87b
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Source4:       %{name}.tmpfiles
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-rpath.patch
-
-Patch3:                %{name}-disableSSLv3.patch
 URL:           http://dovecot.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -163,8 +161,6 @@ Pakiet programistyczny do tworzenia wtyczek dla Dovecota.
 %patch0 -p1
 %patch1 -p1
 
-%patch3 -p1
-
 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf
 
 %build
@@ -340,6 +336,7 @@ fi
 %attr(755,root,root) %{_libexecdir}/%{name}/lmtp
 %attr(755,root,root) %{_libexecdir}/%{name}/log
 %attr(755,root,root) %{_libexecdir}/%{name}/maildirlock
+%attr(755,root,root) %{_libexecdir}/%{name}/old-stats
 %attr(755,root,root) %{_libexecdir}/%{name}/pop3
 %attr(755,root,root) %{_libexecdir}/%{name}/pop3-login
 %attr(755,root,root) %{_libexecdir}/%{name}/quota-status
@@ -347,8 +344,9 @@ fi
 %attr(755,root,root) %{_libexecdir}/%{name}/replicator
 %attr(755,root,root) %{_libexecdir}/%{name}/script
 %attr(755,root,root) %{_libexecdir}/%{name}/script-login
-%attr(755,root,root) %{_libexecdir}/%{name}/ssl-params
 %attr(755,root,root) %{_libexecdir}/%{name}/stats
+%attr(755,root,root) %{_libexecdir}/%{name}/submission
+%attr(755,root,root) %{_libexecdir}/%{name}/submission-login
 %attr(755,root,root) %{_libexecdir}/%{name}/xml2text
 %attr(755,root,root) %{_libdir}/%{name}/libdcrypt_openssl.so
 %dir %{_libdir}/%{name}/plugins
@@ -359,8 +357,8 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/plugins/dict/*.so
 %dir %{_libdir}/%{name}/plugins/doveadm
 %attr(755,root,root) %{_libdir}/%{name}/plugins/doveadm/*.so
-%dir %{_libdir}/%{name}/plugins/stats
-%attr(755,root,root) %{_libdir}/%{name}/plugins/stats/*.so
+%dir %{_libdir}/%{name}/plugins/old-stats
+%attr(755,root,root) %{_libdir}/%{name}/plugins/old-stats/*.so
 %{_datadir}/dovecot
 %{systemdunitdir}/dovecot.service
 %{systemdunitdir}/dovecot.socket