--- rpms/smeserver-dovecot/sme10/smeserver-dovecot.spec	2020/04/30 02:50:38	1.3
+++ rpms/smeserver-dovecot/sme10/smeserver-dovecot.spec	2020/12/07 06:11:06	1.14
@@ -1,5 +1,5 @@
 %define version 1.6.0
-%define release 3
+%define release 13
 %define name smeserver-dovecot
 
 
@@ -13,6 +13,10 @@ Source: %{name}-%{version}.tar.xz
 
 Patch0: smeserver-dovecot-1.6.0-set_cipher_list.patch
 Patch1: smeserver-dovecot-1.6.0-pop3.patch
+Patch2: smeserver-dovecot-1.6.0-bz10934-Ciphers-and-TLS.patch
+Patch3: smeserver-dovecot-1.6.0-bz9865-use-email-to-auth.patch
+Patch4: smeserver-dovecot-1.6.0-fix-createlinks-1.patch
+Patch5: smeserver-dovecot-1.6.0-bz11101-systemd.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -39,6 +43,33 @@ Configure the dovecot IMAP server with s
 quota, ACL, extended logging, master user
 
 %changelog
+* Sun Dec 06 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.6.0-13.sme
+- move service to systemd [SME: 11101]
+
+* Mon May 04 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.6.0-12.sme
+- fix typo in enabling TLSv1.2 as default [SME: 10934]
+
+* Mon May 04 2020 John Crisp <jcrisp@safeandsoundit.co.uk>  1.6.0-10.sme
+- fix typo in 35ssl template [SME: 10934]
+
+* Mon May 04 2020 John Crisp <jcrisp@safeandsoundit.co.uk>  1.6.0-9.sme
+- fix typo in createlinks [SME: 10932]
+ 
+* Sat May 02 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.6.0-8.sme
+- revert property names with period in it [SME: 10934]
+
+* Sat May 02 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.6.0-7.sme
+- add property AcceptFullEmail with enabled as default [SME: 9865]
+  * this allow to login using either username or username@domain.tld
+    dovecot get the username part.
+
+* Fri May 01 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.6.0-5.sme
+- set TLSv1 and TLSv1.1 disabled as default  [SME: 10934]
+  * Amend cipher list
+  * force cipher order
+  * 4096 default dh parameter
+  * property names without period to avoid issues
+
 * Sun Apr 26 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.6.0-3.sme
 - Use Dovecot for pop3 and pop3s [SME: 7510]
   *delete /etc/pam.d/pop3 if exists
@@ -127,6 +158,14 @@ quota, ACL, extended logging, master use
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+rm -rf root/var/service
+mkdir -p root/etc/dovecot/ssl
+mkdir -p root/usr/lib/systemd/system/dovecot.service.d
+mkdir -p root/etc/e-smith/templates/usr/lib/systemd/system/dovecot.service.d/50koozali.conf
 
 %build
 perl createlinks
@@ -136,6 +175,7 @@ perl createlinks
 (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
 /bin/rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+   --file /sbin/e-smith/systemd/dovecot-control 'attr(0554,root,root)'\
    --file /var/service/dovecot/run 'attr(0755,root,root)' \
    --file /var/service/dovecot/log/run 'attr(0755,root,root)' \
    --file /var/service/dovecot/control/1 'attr(0755,root,root)' \