From: Marcin Krol <hawk@tld-linux.org>
Date: Fri, 19 Jan 2018 10:40:47 +0000 (+0000)
Subject: - updated to 2.3.0, not tested
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=7356a9e841f97ac1b381cb661ba4e57c145a10e7;p=packages%2Fdovecot.git

- updated to 2.3.0, not tested
---

diff --git a/dovecot-am.patch b/dovecot-am.patch
deleted file mode 100644
index f420ae4..0000000
--- a/dovecot-am.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- dovecot-2.0.16/Makefile.am~	2012-01-31 14:21:23.717655182 +0100
-+++ dovecot-2.0.16/Makefile.am	2012-01-31 14:24:01.384328961 +0100
-@@ -21,7 +21,8 @@
- 	dovecot-config
- 
- nodist_pkginclude_HEADERS = config.h
--pkglib_DATA = $(datafiles)
-+pkgdatadir = $(pkglibdir)
-+pkgdata_DATA = $(datafiles)
- 
- if MAINTAINER_MODE
- ChangeLog: .hg/dirstate
-@@ -61,7 +61,7 @@
- EXTRA_DIST += dovecot.socket dovecot.service.in
- endif
- 
--install-exec-hook:
-+install-data-hook:
- 	rm $(DESTDIR)$(pkglibdir)/dovecot-config && \
- 	grep -v '^LIBDOVECOT_.*_INCLUDE' dovecot-config | \
- 	grep -v '^LIBDOVECOT.*_DEPS' | sed \
diff --git a/dovecot-config.patch b/dovecot-config.patch
index c5c40a3..a1d90ef 100644
--- a/dovecot-config.patch
+++ b/dovecot-config.patch
@@ -1,6 +1,6 @@
-diff -urN dovecot-2.0.3.org/doc/example-config/conf.d/10-ssl.conf dovecot-2.0.3/doc/example-config/conf.d/10-ssl.conf
---- dovecot-2.0.3.org/doc/example-config/conf.d/10-ssl.conf	2010-05-24 16:35:40.000000000 +0200
-+++ dovecot-2.0.3/doc/example-config/conf.d/10-ssl.conf	2010-09-18 22:05:37.079775811 +0200
+diff -urNpa dovecot-ce-2.3.0.orig/doc/example-config/conf.d/10-ssl.conf dovecot-ce-2.3.0/doc/example-config/conf.d/10-ssl.conf
+--- dovecot-ce-2.3.0.orig/doc/example-config/conf.d/10-ssl.conf	2017-12-22 13:53:36.000000000 +0000
++++ dovecot-ce-2.3.0/doc/example-config/conf.d/10-ssl.conf	2018-01-19 10:16:36.961648643 +0000
 @@ -3,14 +3,14 @@
  ##
  
diff --git a/dovecot-disableSSLv3.patch b/dovecot-disableSSLv3.patch
deleted file mode 100644
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-rpath.patch b/dovecot-rpath.patch
index 89f885f..07395fb 100644
--- a/dovecot-rpath.patch
+++ b/dovecot-rpath.patch
@@ -1,6 +1,7 @@
---- dovecot-2.2.18/Makefile.am~	2015-02-19 12:44:40.000000000 +0100
-+++ dovecot-2.2.18/Makefile.am	2015-05-17 08:43:25.681245560 +0200
-@@ -64,7 +64,7 @@ install-exec-hook:
+diff -urNpa dovecot-ce-2.3.0.orig/Makefile.am dovecot-ce-2.3.0/Makefile.am
+--- dovecot-ce-2.3.0.orig/Makefile.am	2017-12-22 13:53:36.000000000 +0000
++++ dovecot-ce-2.3.0/Makefile.am	2018-01-19 10:17:38.305644987 +0000
+@@ -73,7 +73,7 @@ install-exec-hook:
  	grep -v '^LIBDOVECOT_.*_INCLUDE' dovecot-config | \
  	grep -v '^LIBDOVECOT.*_DEPS' | sed \
  	-e "s|^\(DOVECOT_INSTALLED\)=.*$$|\1=yes|" \
diff --git a/dovecot.spec b/dovecot.spec
index f1055b7..0578f89 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -11,19 +11,18 @@
 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.33.2
-Release:	1
+Version:	2.3.0
+Release:	0.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:	85c3e903870aee914be93889a6ea98ea
+Source0:	http://dovecot.org/releases/2.3/%{name}-%{version}.tar.gz
+# Source0-md5:	a8802617ddf68972f5f97bd8677e5856
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-rpath.patch
-Patch2:		%{name}-disableSSLv3.patch
 URL:		http://dovecot.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -156,10 +155,9 @@ Development package for Dovecot plugins.
 Pakiet programistyczny do tworzenia wtyczek dla Dovecota.
 
 %prep
-%setup -q
+%setup -q -n %{name}-ce-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf
 
@@ -334,8 +332,10 @@ 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}/submission
+%attr(755,root,root) %{_libexecdir}/%{name}/submission-login
 %attr(755,root,root) %{_libexecdir}/%{name}/stats
+%attr(755,root,root) %{_libexecdir}/%{name}/old-stats
 %attr(755,root,root) %{_libexecdir}/%{name}/xml2text
 %attr(755,root,root) %{_libdir}/%{name}/libdcrypt_openssl.so
 %dir %{_libdir}/%{name}/plugins
@@ -346,8 +346,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
 %dir /var/lib/dovecot
 %dir /var/run/dovecot