diff --git a/exim-clamav-tmpfiles.conf b/exim-clamav-tmpfiles.conf new file mode 100644 index 0000000..df45687 --- /dev/null +++ b/exim-clamav-tmpfiles.conf @@ -0,0 +1 @@ +D /var/run/clamd.exim 0750 exim exim - diff --git a/exim.spec b/exim.spec index d92a282..26efce9 100644 --- a/exim.spec +++ b/exim.spec @@ -12,13 +12,13 @@ Summary: The exim mail transfer agent Name: exim Version: 4.76 -Release: 2%{?dist} +Release: 2%{?dist}.1 License: GPLv2+ Url: http://www.exim.org/ Group: System Environment/Daemons Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: MTA smtpd smtpdaemon server(smtp) -Requires(post): /sbin/chkconfig /sbin/service %{_sbindir}/alternatives +Requires(post): /sbin/chkconfig /sbin/service /sbin/restorecon %{_sbindir}/alternatives Requires(preun): /sbin/chkconfig /sbin/service %{_sbindir}/alternatives Requires(pre): %{_sbindir}/groupadd, %{_sbindir}/useradd %if 0%{?buildclam} @@ -30,6 +30,9 @@ Source3: exim.sysconfig Source4: exim.logrotate Source5: exim-tidydb.sh Source11: exim.pam +%if 0%{?buildclam} +Source12: exim-clamav-tmpfiles.conf +%endif %if 0%{?buildsa} Source13: http://marc.merlins.org/linux/exim/files/sa-exim-4.2.tar.gz %endif @@ -317,6 +320,8 @@ CLAMD_SOCKET=%{_var}/run/clamd.exim/clamd.sock EOF ln -sf clamd $RPM_BUILD_ROOT/usr/sbin/clamd.exim +mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d +install -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/tmpfiles.d/exim-clamav.conf mkdir -p $RPM_BUILD_ROOT%{_var}/run/clamd.exim mkdir -p $RPM_BUILD_ROOT%{_var}/log touch $RPM_BUILD_ROOT%{_var}/log/clamd.exim @@ -470,8 +475,11 @@ fi %if 0%{?buildclam} %post clamav +/bin/mkdir -p 0750 %{_var}/run/clamd.exim +/bin/chown exim:exim %{_var}/run/clamd.exim /bin/touch %{_var}/log/clamd.exim /bin/chown exim.exim %{_var}/log/clamd.exim +/sbin/restorecon %{_var}/log/clamd.exim /sbin/chkconfig --add clamd.exim %preun clamav @@ -488,7 +496,8 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || : %config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/exim.conf %config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamd.exim %config(noreplace) %verify(not mtime) %{_sysconfdir}/logrotate.d/clamd.exim -%attr(0750,exim,exim) %dir %{_var}/run/clamd.exim +%config(noreplace) %{_sysconfdir}/tmpfiles.d/exim-clamav.conf +%ghost %attr(0750,exim,exim) %dir %{_var}/run/clamd.exim %ghost %attr(0644,exim,exim) %{_var}/log/clamd.exim %endif @@ -500,6 +509,9 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Fri Feb 24 2012 Jaroslav Škarvada - 4.76-2.1 +- Backported fix for exim-clamav to work with /var/run on tmpfs + * Mon May 09 2011 David Woodhouse - 4.76-2 - Update to 4.76 (fixes CVE-2011-1407, CVE-2011-1764) (#702474)