Accepting request 414589 from home:jengelh:branches:security

- Trim useless words from description and fix spellos.
  Test for user/group existence before adding and always show
  errors when they occur.

OBS-URL: https://build.opensuse.org/request/show/414589
OBS-URL: https://build.opensuse.org/package/show/security/clamav?expand=0&rev=137
This commit is contained in:
Marcus Meissner 2016-07-29 11:05:50 +00:00 committed by Git OBS Bridge
parent 87325daaab
commit 03195f5e0f
2 changed files with 20 additions and 11 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jul 21 14:09:26 UTC 2016 - jengelh@inai.de
- Trim useless words from description and fix spellos.
Test for user/group existence before adding and always show
errors when they occur.
-------------------------------------------------------------------
Thu Jun 30 13:42:20 UTC 2016 - fweiss@suse.com

View File

@ -61,14 +61,14 @@ BuildRequires: systemd-rpm-macros
%systemd_requires
%description
ClamAV is an open source (GPL) antivirus engine designed for detecting
Trojans, viruses, malware and other malicious threats. It is the de
facto standard for mail gateway scanning. It provides a high
performance mutli-threaded scanning daemon, command line utilities for
on demand file scanning, and an intelligent tool for automatic
signature updates. The core ClamAV library provides numerous file
format detection mechanisms, file unpacking support, archive support,
and multiple signature languages for detecting threats.
ClamAV is an antivirus engine designed for detecting trojans,
viruses, malware and other malicious threats. It is the de-facto
standard for mail gateway scanning. It provides a multi-threaded
scanning daemon, command line utilities for on-demand file scanning,
and a tool for automatic signature updates. The core ClamAV library
provides numerous file format detection mechanisms, file unpacking
support, archive support, and multiple signature languages for
detecting threats.
%prep
%setup -q
@ -97,7 +97,7 @@ CFLAGS="$CFLAGS -DFP_64BIT"
--enable-clamdtop \
--disable-timestamps
make V=1 %{?jobs:-j%jobs}
make V=1 %{?_smp_mflags}
%install
%makeinstall
@ -160,8 +160,10 @@ VALGRIND_GENSUP=1 make check
%ghost %attr(755,vscan,vscan) /run/clamav
%pre
%_sbindir/groupadd -r vscan 2> /dev/null || :
%_sbindir/useradd -r -o -g vscan -u 65 -s /bin/false -c "Vscan account" -d /var/spool/amavis vscan 2> /dev/null || :
getent group vscan >/dev/null || %_sbindir/groupadd -r vscan || :
getent passwd vscan >/dev/null || \
%_sbindir/useradd -r -o -g vscan -u 65 -s /bin/false \
-c "Vscan account" -d /var/spool/amavis vscan || :
%_sbindir/usermod vscan -g vscan 2> /dev/null || :
%service_add_pre clamd.service freshclam.service clamav-milter.service