clamav: fix database present check

the mame of main.cvd has changed to main.cld on my system.
Add both types and also ad bytecode.c?d

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/lfs/clamav b/lfs/clamav
index be6f5155d098d5a3c618d40b98fbfb94c240f910..4688f0fb8fc345a3365364bc81b54d9c053ad1b7 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 49
+PAK_VER    = 50
 
 DEPS       =
 

diff --git a/src/initscripts/packages/clamav b/src/initscripts/packages/clamav
index d2f63a9108dadff9b284218b63cfa53b9c5bfa2b..439c20579f5ea7c0691ba814e1fa4e371802ec6e 100644 (file)
--- a/src/initscripts/packages/clamav
+++ b/src/initscripts/packages/clamav
@@ -12,9 +12,12 @@ case "$1" in
 
                        COUNTER=0
                        while [ "$COUNTER" -lt "61" ]; do
+                               [ -e "/var/lib/clamav/main.cld" ] || \
                                [ -e "/var/lib/clamav/main.cvd" ] && \
-                                       [ -e "/var/lib/clamav/daily.cvd" ] || \
-                                       [ -e "/var/lib/clamav/daily.cld" ] && \
+                               [ -e "/var/lib/clamav/bytecode.cld" ] || \
+                               [ -e "/var/lib/clamav/bytecode.cvd" ] && \
+                               [ -e "/var/lib/clamav/daily.cld" ] || \
+                               [ -e "/var/lib/clamav/daily.cvd" ] && \
                                break
                                if [ "$COUNTER" -lt "1" ]; then
                                        boot_mesg -n "Downloading database"