Accepting request 220894 from security

- Improve handling of /var/run/clamav.

OBS-URL: https://build.opensuse.org/request/show/220894
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/clamav?expand=0&rev=63

clamav.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb  4 14:19:01 UTC 2014 - max@suse.com
+
+- Improve handling of /var/run/clamav.
+
+-------------------------------------------------------------------
 Fri Jan 24 15:40:03 UTC 2014 - max@suse.com
 
 - Version 0.98.1:
@@ -16,12 +22,14 @@ Fri Jan 24 15:40:03 UTC 2014 - max@suse.com
   * Various improvements to ClamAV configuration, support of third
     party libraries, and unit tests.
 
+-------------------------------------------------------------------
 Sun Dec 15 16:03:46 UTC 2013 - uweigand@de.ibm.com
 
 - fix build failures on ppc64le:
   * fanotify is only supported on x86 platforms
   * building tomsfastmath on (non-x86) 64-bit platforms requires -DFP_64BIT
 
+-------------------------------------------------------------------
 Sat Sep 28 07:35:34 UTC 2013 - meissner@suse.com
 
 - Version 0.98 (bnc#841815)

clamav.spec

@@ -16,6 +16,8 @@
 #
 
 
+%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
+
 Name:           clamav
 BuildRequires:  ncurses-devel
 BuildRequires:  sed
@@ -134,8 +136,8 @@ install -m755 %SOURCE5 %buildroot/etc/init.d/clamav-milter
 ln -s /etc/init.d/clamav-milter %buildroot%_sbindir/rcclamav-milter
 install -m755 %SOURCE3 %buildroot%_sbindir/updateclamconf
 install -d -m755 %buildroot/var/{lib,run}/clamav
-install -d -m755 %buildroot/usr/lib/tmpfiles.d
+install -d -m755 %buildroot/%_tmpfilesdir
-install -m644 %SOURCE6 %buildroot/usr/lib/tmpfiles.d/clamav.conf
+install -m644 %SOURCE6 %buildroot%_tmpfilesdir/clamav.conf
 mkdir -p %buildroot/var/spool/amavis
 %if 0%{?suse_version} > 1020
 rm %buildroot/%_libdir/*.la
@@ -161,8 +163,7 @@ VALGRIND_GENSUP=1 make check
 %defattr(-,root,root,-)
 %config(noreplace) %_sysconfdir/*.conf
 %config %attr(744,root,root)/etc/init.d/*
-%dir /usr/lib/tmpfiles.d
+%_tmpfilesdir
-/usr/lib/tmpfiles.d/clamav.conf
 %doc AUTHORS BUGS ChangeLog COPYING FAQ NEWS README UPGRADE
 %doc docs/*.pdf docs/html
 %doc %_mandir/*/*
@@ -174,7 +175,7 @@ VALGRIND_GENSUP=1 make check
 %defattr(-,vscan,vscan)
 %dir %attr(750,vscan,vscan) /var/spool/amavis
 %dir /var/lib/clamav
-%dir %attr(755,vscan,vscan) /var/run/clamav
+%ghost %dir %attr(755,vscan,vscan) /var/run/clamav
 
 %pre
 %_sbindir/groupadd -r vscan 2> /dev/null || :
@@ -198,6 +199,7 @@ for f in /etc/clamd.conf /etc/freshclam.conf /etc/clamav-milter.conf; do
     fi
   fi
 done
+systemd-tmpfiles --create %_tmpfilesdir/clamav.conf
 
 %preun
 %stop_on_removal clamd freshclam