--- rpms/smeserver-dovecot/sme10/smeserver-dovecot.spec	2020/05/03 02:05:08	1.8
+++ rpms/smeserver-dovecot/sme10/smeserver-dovecot.spec	2021/05/31 03:42:20	1.22
@@ -1,5 +1,5 @@
 %define version 1.6.0
-%define release 8
+%define release 19
 %define name smeserver-dovecot
 
 
@@ -15,6 +15,10 @@ Patch0: smeserver-dovecot-1.6.0-set_ciph
 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
+Patch6: smeserver-dovecot-1.6.0-bz10947-idle_notify.patch
+Patch7: smeserver-dovecot-1.6.0-bz11601-ssl-templated.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -41,6 +45,38 @@ Configure the dovecot IMAP server with s
 quota, ACL, extended logging, master user
 
 %changelog
+* Sun May 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.6.0-19.sme
+- ssl pem update via template expand in place of copy [SME: 11601]
+
+* Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.6.0-18.sme
+- clean rsyslog syntax for dovecot [SME: 11422]
+
+* Sat Jan 02 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.6.0-17.sme
+- add Restart=always [SME: 11101]
+
+* Mon Dec 14 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.6.0-16.sme
+- fix path for event -update [SME: 11101]
+
+* Tue Dec 08 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.6.0-15.sme
+- cleanup /var/service/dovecot [SME: 11101]
+  close logger and service from previous runit instance before starting systemd one
+
+* Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.6.0-14.sme
+- add systemd drop-in expand in bootstrap-console-save, console-save, post-install, post-upgrade  [SME: 11101]
+
+* Sun Dec 06 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.6.0-13.sme
+- move service to systemd [SME: 11101]
+- add imap idle notify interval setting [SME: 10947]
+
+* 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]
 
@@ -146,7 +182,14 @@ quota, ACL, extended logging, master use
 %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
+%patch6 -p1
+%patch7 -p1
 
 %build
 perl createlinks
@@ -156,9 +199,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 /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)' \
+   --file /sbin/e-smith/systemd/dovecot-control 'attr(0554,root,root)'\
    --dir /var/log/dovecot 'attr(0750,smelog,smelog)' \
   > %{name}-%{version}-filelist
 
@@ -168,8 +209,24 @@ perl createlinks
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %pre
+if [ $1 -gt 1 ] ; then
+  if [ -e /var/service/dovecot/run ] ; then
+        /usr/bin/sv d dovecot
+        /usr/bin/sv d dovecot/log
+  fi
+  if [ -e /var/service/dovecot ] ; then
+        rm -rf /var/service/dovecot
+  fi
+  if [ -e /var/service/pop3 ] ; then
+        rm -rf /var/service/pop3
+  fi
+  if [ -e /var/service/pop3s ] ; then
+        rm -rf /var/service/pop3s
+  fi
 
+fi
 %post
 
 %preun