--- rpms/smeserver-dovecot/sme10/smeserver-dovecot.spec 2016/02/05 23:44:07 1.1 +++ rpms/smeserver-dovecot/sme10/smeserver-dovecot.spec 2021/01/02 06:31:59 1.20 @@ -1,5 +1,5 @@ %define version 1.6.0 -%define release 1 +%define release 17 %define name smeserver-dovecot @@ -11,6 +11,14 @@ License: GPL Group: Networking/Daemons 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 +Patch6: smeserver-dovecot-1.6.0-bz10947-idle_notify.patch + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch BuildRequires: e-smith-devtools @@ -19,7 +27,9 @@ Requires: e-smith-base >= 5.2.0 Requires: dovecot >= 2.0.9 Provides: e-smith-imap +Provides: e-smith-pop3 Obsoletes: e-smith-imap +Obsoletes: e-smith-pop3 Obsoletes: e-smith-ssl-imap Obsoletes: e-smith-wu-imap Obsoletes: imap @@ -34,6 +44,60 @@ Configure the dovecot IMAP server with s quota, ACL, extended logging, master user %changelog +* Sat Jan 02 2021 Jean-Philipe Pialasse 1.6.0-17.sme +- add Restart=always [SME: 11101] + +* Mon Dec 14 2020 Jean-Philipe Pialasse 1.6.0-16.sme +- fix path for event -update [SME: 11101] + +* Tue Dec 08 2020 Jean-Philipe Pialasse 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 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 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 1.6.0-12.sme +- fix typo in enabling TLSv1.2 as default [SME: 10934] + +* Mon May 04 2020 John Crisp 1.6.0-10.sme +- fix typo in 35ssl template [SME: 10934] + +* Mon May 04 2020 John Crisp 1.6.0-9.sme +- fix typo in createlinks [SME: 10932] + +* Sat May 02 2020 Jean-Philipe Pialasse 1.6.0-8.sme +- revert property names with period in it [SME: 10934] + +* Sat May 02 2020 Jean-Philipe Pialasse 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 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 1.6.0-3.sme +- Use Dovecot for pop3 and pop3s [SME: 7510] + *delete /etc/pam.d/pop3 if exists + *listen on internal and external interface instead of * + *update the service on ip-change + *reuse the ListenIP prop in pop3* and added to imap* + *migrate pop3* MemLimit to pop3 ProcessMemoryLimit as per imap + *TODO make it ipv6 ready +- smeserver-dovecot-upgrade event for update without reboot [SME: 10932] + +* Thu Feb 23 2017 Daniel Berteaud 1.6.0-2.sme +- Better default cipher suite, and honor global suite [SME: 10110] + * Sat Feb 06 2016 stephane de Labrusse 1.6.0-1.sme - Initial release to sme10 @@ -107,6 +171,17 @@ quota, ACL, extended logging, master use %prep %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 +%patch6 -p1 %build perl createlinks @@ -116,9 +191,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 @@ -128,8 +201,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