--- rpms/e-smith-email/sme10/e-smith-email.spec 2016/06/15 08:30:29 1.6 +++ rpms/e-smith-email/sme10/e-smith-email.spec 2022/08/01 18:04:52 1.20 @@ -1,10 +1,10 @@ -# $Id: e-smith-email.spec,v 1.5 2016/06/07 06:57:30 vip-ire Exp $ +# $Id: e-smith-email.spec,v 1.19 2022/07/30 02:28:01 jpp Exp $ Summary: e-smith server and gateway - email module %define name e-smith-email Name: %{name} %define version 5.6.0 -%define release 6 +%define release 19 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -14,6 +14,16 @@ Patch0: e-smith-email-5.6.0-smtpd_to_qps Patch1: e-smith-email-5.6.0-qpsmtpd_in_auth_proxy.patch Patch2: e-smith-email-5.6.0-qpsmtpd_in_masq_templates.patch Patch3: e-smith-email-5.6.0-mysqld2mariadb.patch +Patch4: e-smith-email-5.6.0-bz3802-create-local-pseudo.patch +Patch5: e-smith-email-5.6.0-bz11133-bz11102-systemd-update.patch +Patch6: e-smith-email-5.6.0-bz11443-webmailOnlySSL.patch +Patch7: e-smith-email-5.6.0-bz11265-rar.patch +Patch8: e-smith-email-5.6.0-bz11634-lock.patch +Patch9: e-smith-email-5.6.0-bz11690-fixtypo.patch +Patch10: e-smith-email-5.6.0-bz11716-untaint.patch +Patch11: e-smith-email-5.6.0-bz11799.patch +Patch12: e-smith-email-5.6.0-bz12131-fetchids.patch + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: e-smith-base >= 4.15.0-39 Requires: e-smith-tinydns >= 1.0.0-5 @@ -31,6 +41,7 @@ Requires: runit Requires: e-smith-formmagick >= 1.4.0-12 Obsoletes: e-smith-smtp-authentication Obsoletes: e-smith-securemail +Conflicts: smeserver-fetchmail < 1.6-24 BuildRequires: e-smith-devtools >= 1.13.0-03 BuildArchitectures: noarch AutoReqProv: no @@ -41,6 +52,17 @@ AutoReqProv: no %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 +rm -rf root/var/service/ root/service +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +mkdir -p root/var/lib/fetchmail +%patch12 -p1 %build perl createlinks @@ -53,19 +75,13 @@ rm -rf $RPM_BUILD_ROOT rm -f %{name}-%{version}-%{release}-filelist /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ --dir /var/lock/fetchmail 'attr(755,qmailr,qmail)' \ - --dir '/var/service/smtp-auth-proxy' 'attr(1755,root,root)' \ - --file '/var/service/smtp-auth-proxy/down' 'attr(0644,root,root)' \ - --file '/var/service/smtp-auth-proxy/run' 'attr(0755,root,root)' \ - --dir '/var/service/smtp-auth-proxy/supervise' 'attr(0700,root,root)' \ - --dir '/var/service/smtp-auth-proxy/log' 'attr(0755,root,root)' \ - --file '/var/service/smtp-auth-proxy/log/run' 'attr(0755,root,root)' \ - --file '/var/service/smtp-auth-proxy/log/supervise' 'attr(0700,root,root)' \ --dir '/var/log/smtp-auth-proxy' 'attr(2750,smelog,nofiles)' \ --file '/usr/local/sbin/smtp-auth-proxy.pl' 'attr(0755,root,root)' \ --dir '/home/e-smith/Maildir/.junkmail' 'attr(0700,admin,admin)' \ --dir '/home/e-smith/Maildir/.junkmail/tmp' 'attr(0700,admin,admin)' \ --dir '/home/e-smith/Maildir/.junkmail/new' 'attr(0700,admin,admin)' \ --dir '/home/e-smith/Maildir/.junkmail/cur' 'attr(0700,admin,admin)' \ + --dir '/var/lib/fetchmail' 'attr(0750,qmailr,qmail)' \ > %{name}-%{version}-%{release}-filelist echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist @@ -75,12 +91,58 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}-%{version}-%{release}-filelist %defattr(-,root,root) +%pre +if [ $1 -gt 1 ] ; then + if [ -e /var/service/smtp-auth-proxy/run ] ; then + /usr/bin/sv d smtp-auth-proxy + /usr/bin/sv d smtp-auth-proxy/log + fi +fi %description e-smith server and gateway software - email module. %changelog -* Wed Jun 15 2016 Jean-Philipe Pialasse 5.6.0-6.sme +* Mon Aug 01 2022 Jean-Philippe Pialasse 5.6.0-19.sme +- add quote around filename to .fetchids moving script [SME: 12131] + +* Fri Jul 29 2022 Jean-Philippe Pialasse 5.6.0-18.sme +- move fetchids from /run and avoid its loss on reboot [SME: 12131] + similar changes in contrib smesevrer-fetchmail + +* Thu May 19 2022 Jean-Philippe Pialasse 5.6.0-17.sme +- fix typo in regex [SME: 11799] + +* Sat Apr 16 2022 Jean-Philippe Pialasse 5.6.0-16.sme +- fix missing dot in regex for untainting [SME: 11799] + would delete any account named with the string before the dot + +* Mon Nov 15 2021 Jean-Philippe Pialasse 5.6.0-15.sme +- untainting string correctly [SME: 11716] + +* Thu Sep 16 2021 Jean-Philippe Pialasse 5.6.0-14.sme +- fix typo for mailpattern for rar files [SME: 11690] + +* Fri Sep 10 2021 Jean-Philippe Pialasse 5.6.0-13.sme +- fix perms for /var/lock/fetchmail [SME: 11634] + +* Fri Sep 10 2021 Jean-Philippe Pialasse 5.6.0-12.sme +- make /var/lock/fetchmail dir permanent [SME: 11634] + +* Tue Mar 30 2021 Jean-Philippe Pialasse 5.6.0-11.sme +- add new RAR file signatures to default mailpatterns database [SME: 11265] + +* Thu Mar 11 2021 Jean-Philippe Pialasse 5.6.0-10.sme +- webmail is only SSL [SME: 11443] + +* Fri Dec 11 2020 Jean-Philippe Pialasse 5.6.0-9.sme +- create -update event [SME: 11133] +- move smtp-auth-proxy to systemd [SME: 11102] + +* Sat Jun 27 2020 Jean-Philippe Pialasse 5.6.0-7.sme +- allow creation of pseudonyms with setting of local only [SME: 3802] + +* Wed Jun 15 2016 Jean-Philippe Pialasse 5.6.0-6.sme - fix webmail status not displaying correctly in manager [SME: 9594] * Tue Jun 7 2016 Daniel Berteaud 5.6.0-5.sme @@ -164,10 +226,12 @@ e-smith server and gateway software - em * Mon Oct 4 2010 Shad L. Lords 5.2.0-11.sme - Enable auth for smtp traffic and migrate if necessary [SME: 5575] -* Sun Sep 25 2010 Shad L. Lords 5.2.0-10.sme +* Sat Sep 25 2010 Shad L. Lords 5.2.0-10.sme + Sun Sep 25 2010 --> Sun Sep 19 2010 or Sat Sep 25 2010 or Sun Sep 26 2010 or .... - Change enabled to transparent for mail proxy [SME: 5574] -* Tue May 8 2010 Jonathan Martens 5.2.0-9.sme +* Sat May 08 2010 Jonathan Martens 5.2.0-9.sme + Tue May 08 2010 --> Tue May 04 2010 or Sat May 08 2010 or Tue May 11 2010 or .... - Fix migrate fragment [SME: 5922] * Tue May 4 2010 Jonathan Martens 5.2.0-8.sme @@ -281,7 +345,8 @@ e-smith server and gateway software - em * Tue Sep 26 2006 Gavin Weight 4.16.0-09 - Incorrect quoting in purge-junkmail-folders diagnostic. [SME: 1936] -* Tue Sep 20 2006 Gavin Weight 4.16.0-08 +* Wed Sep 20 2006 Gavin Weight 4.16.0-08 + Tue Sep 20 2006 --> Tue Sep 19 2006 or Wed Sep 20 2006 or Tue Sep 26 2006 or .... - Updated virus description in panel. [SME: 1729] * Wed Jun 21 2006 Gordon Rowell 4.16.0-07