--- rpms/e-smith-email/sme10/e-smith-email.spec 2016/05/12 17:31:09 1.3 +++ rpms/e-smith-email/sme10/e-smith-email.spec 2021/09/10 13:00:43 1.13 @@ -1,16 +1,25 @@ -# $Id: e-smith-email.spec,v 1.2 2016/04/22 21:26:31 vip-ire Exp $ +# $Id: e-smith-email.spec,v 1.12 2021/09/10 04:24:21 jpp Exp $ Summary: e-smith server and gateway - email module %define name e-smith-email Name: %{name} %define version 5.6.0 -%define release 3 +%define release 13 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz Patch0: e-smith-email-5.6.0-smtpd_to_qpsmtpd.patch +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 + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: e-smith-base >= 4.15.0-39 Requires: e-smith-tinydns >= 1.0.0-5 @@ -32,10 +41,85 @@ BuildRequires: e-smith-devtools >= 1.13. BuildArchitectures: noarch AutoReqProv: no +%prep +%setup +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +rm -rf root/var/service/ root/service +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 + +%build +perl createlinks + +%postun + +%install +rm -rf $RPM_BUILD_ROOT +(cd root ; find . -depth -print | cpio -dump $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/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)' \ + > %{name}-%{version}-%{release}-filelist +echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist + +%clean +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 +* 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-Philipe Pialasse 5.6.0-10.sme +- webmail is only SSL [SME: 11443] + +* Fri Dec 11 2020 Jean-Philipe Pialasse 5.6.0-9.sme +- create -update event [SME: 11133] +- move smtp-auth-proxy to systemd [SME: 11102] + +* Sat Jun 27 2020 Jean-Philipe Pialasse 5.6.0-7.sme +- allow creation of pseudonyms with setting of local only [SME: 3802] + +* Wed Jun 15 2016 Jean-Philipe 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 +- More change from smtpd to qpsmtpd in masq templates [SME: 9561] + +* Fri Jun 3 2016 Daniel Berteaud 5.6.0-4.sme +- Replace smtpd with qpsmtpd in smtp-auth-proxy [SME: 9554] + * Thu May 12 2016 Daniel Berteaud 5.6.0-3.sme - Rebuild for [SME: 9393] @@ -1422,39 +1506,3 @@ e-smith server and gateway software - em - [4.6.0-01] - Rolled version number to 4.6.0-01. Includes patches upto 4.5.0-20. -%prep -%setup -%patch0 -p1 - -%build -perl createlinks - -%postun - -%install -rm -rf $RPM_BUILD_ROOT -(cd root ; find . -depth -print | cpio -dump $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)' \ - > %{name}-%{version}-%{release}-filelist -echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -f %{name}-%{version}-%{release}-filelist -%defattr(-,root,root)