pool/clamav
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 412543 from home:faweiss:branches:security

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/412543
OBS-URL: https://build.opensuse.org/package/show/security/clamav?expand=0&rev=135
This commit is contained in:
Reinhard Max 2016-07-21 14:03:06 +00:00 committed by Git OBS Bridge
parent 6a684a8b5a
commit 87325daaab
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clamav-tmpfiles.conf
View File

@ -1,2 +1,2 @@
# clamav needs a directory in /var/run: # clamav needs a directory in /run:
d /var/run/clamav 0755 vscan vscan - d /run/clamav 0755 vscan vscan -

8
clamav.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jun 30 13:42:20 UTC 2016 - fweiss@suse.com
- Added BuildRequires systemd-rpm-macros
- Added %ghost entry for /run/clamav
- Use /run instead of /var/run because it is a symlink nowadays
(clamav-tmpfiles.conf)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 23 07:30:49 UTC 2016 - fweiss@suse.com Thu Jun 23 07:30:49 UTC 2016 - fweiss@suse.com

14
clamav.spec
View File

@ -57,6 +57,7 @@ Source9: service.clamav-milter
Patch1: clamav-conf.patch Patch1: clamav-conf.patch
Patch3: clamav-gcc47.patch Patch3: clamav-gcc47.patch
BuildRequires: systemd BuildRequires: systemd
BuildRequires: systemd-rpm-macros
%systemd_requires %systemd_requires
%description %description
@ -102,8 +103,9 @@ make V=1 %{?jobs:-j%jobs}
%makeinstall %makeinstall
install -d -m755 %buildroot/var/lib/clamav install -d -m755 %buildroot/var/lib/clamav
install -d -m755 %buildroot/%_tmpfilesdir install -d -m755 %buildroot/%_tmpfilesdir
install -m644 %SOURCE6 %buildroot%_tmpfilesdir/clamav.conf install -m644 %{S:6} %buildroot%_tmpfilesdir/clamav.conf
mkdir -p %buildroot/var/spool/amavis mkdir -p %buildroot/var/spool/amavis
mkdir -p -m 0755 %buildroot/run/clamav
rm %buildroot/%_libdir/*.la rm %buildroot/%_libdir/*.la
# Remove bogus dependencies from libclamav.pc # Remove bogus dependencies from libclamav.pc
sed -i 's/^Libs: .*/Libs: -lclamav/' %buildroot%_libdir/pkgconfig/libclamav.pc sed -i 's/^Libs: .*/Libs: -lclamav/' %buildroot%_libdir/pkgconfig/libclamav.pc
@ -117,9 +119,12 @@ popd
# Systemd... # Systemd...
install -d -m 0755 %buildroot/%{_unitdir} install -d -m 0755 %buildroot/%{_unitdir}
install -m 0644 %{SOURCE7} %buildroot/%{_unitdir}/clamd.service install -m 0644 %{S:7} %buildroot/%{_unitdir}/clamd.service
install -m 0644 %{SOURCE8} %buildroot/%{_unitdir}/freshclam.service install -m 0644 %{S:8} %buildroot/%{_unitdir}/freshclam.service
install -m 0644 %{SOURCE9} %buildroot/%{_unitdir}/clamav-milter.service install -m 0644 %{S:9} %buildroot/%{_unitdir}/clamav-milter.service
rm -f %buildroot/%{_unitdir}/clamav-daemon.service
rm -f %buildroot/%{_unitdir}/clamav-daemon.socket
rm -f %buildroot/%{_unitdir}/clamav-freshclam.service
# this is broken if system does not have systemd so don't # this is broken if system does not have systemd so don't
# use it at all on systems without mandatory systemd # use it at all on systems without mandatory systemd
for srvname in clamd freshclam clamav-milter;do for srvname in clamd freshclam clamav-milter;do
@ -152,6 +157,7 @@ VALGRIND_GENSUP=1 make check
%defattr(-,vscan,vscan) %defattr(-,vscan,vscan)
%dir %attr(750,vscan,vscan) /var/spool/amavis %dir %attr(750,vscan,vscan) /var/spool/amavis
%dir /var/lib/clamav %dir /var/lib/clamav
%ghost %attr(755,vscan,vscan) /run/clamav
%pre %pre
%_sbindir/groupadd -r vscan 2> /dev/null || : %_sbindir/groupadd -r vscan 2> /dev/null || :