Merge branch 'master' into epel8

clamav.spec

@@ -46,7 +46,7 @@
 Summary:    End-user tools for the Clam Antivirus scanner
 Name:       clamav
 Version:    0.102.2
-Release:    3%{?dist}
+Release:    4%{?dist}
 License:    %{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 URL:        https://www.clamav.net/
 %if %{with unrar}
@@ -105,12 +105,15 @@ BuildRequires:  openssl-devel
 BuildRequires:  pcre2-devel
 BuildRequires:  zlib-devel
 #BuildRequires:  %%_includedir/tcpd.h
-BuildRequires:  bc tcl groff graphviz
+BuildRequires:  bc
+BuildRequires:  tcl
+BuildRequires:  groff
+BuildRequires:  graphviz
 %{?have_ocaml:BuildRequires: ocaml}
 # nc required for tests
-BuildRequires: nc
+BuildRequires:  nc
 %{?systemd_requires}
-BuildRequires: systemd-devel
+BuildRequires:  systemd-devel
 #for milter
 BuildRequires:  sendmail-devel
 
@@ -212,8 +215,6 @@ Provides: clamav-server-systemd = %{version}-%{release}
 Obsoletes: clamav-scanner-systemd < %{version}-%{release}
 Obsoletes: clamav-server-systemd < %{version}-%{release}
 
-
-
 %description -n clamd
 The Clam AntiVirus Daemon
 See the README file how this can be done with a minimum of effort.
@@ -302,10 +303,8 @@ install -d -m 0755 \
     $RPM_BUILD_ROOT%homedir \
     $RPM_BUILD_ROOT%scanstatedir
 
-
 rm -f $RPM_BUILD_ROOT%_libdir/*.la
 
-
 touch $RPM_BUILD_ROOT%homedir/{daily,main,bytecode}.cld
 touch $RPM_BUILD_ROOT%homedir/mirrors.dat
 
@@ -596,6 +595,9 @@ fi
 
 
 %changelog
+* Mon Mar 16 2020 Orion Poplawski <orion@cora.nwra.com> - 0.102.2-4
+- Quiet freshclam-sleep when used with proxy
+
 * Sat Feb 29 2020 Orion Poplawski <orion@nwra.com> - 0.102.2-3
 - Add missingok to clamav-update.logrotate (bz#1807701)
 

freshclam-sleep

@@ -49,4 +49,4 @@ WARNING: update of clamav database is disabled; please see
 	;;
 esac
 
-/usr/bin/freshclam --quiet
+/usr/bin/freshclam --quiet > /dev/null