From patchwork Thu Apr 30 10:50:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Fitzenreiter X-Patchwork-Id: 3031 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49CXH93h3xz3xQx for ; Thu, 30 Apr 2020 10:51:01 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 49CXH75gC7z2b0; Thu, 30 Apr 2020 10:50:59 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49CXH70zcbz2yC8; Thu, 30 Apr 2020 10:50:59 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 49CXH538b7z2xMq for ; Thu, 30 Apr 2020 10:50:57 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 49CXH45tQlz286; Thu, 30 Apr 2020 10:50:56 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1588243857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=d1TMO5oNfBnFI/hyCn+elWgc1affqjirKyxIPfF/BTQ=; b=J8depX1s2qsMmCebmGDCzEYd+cRREr9AdrjkBkxbTrNKQ0OUk3nddJMevQ1ax9Damo1KhU 6h1nqKT3WAVGGeAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1588243857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=d1TMO5oNfBnFI/hyCn+elWgc1affqjirKyxIPfF/BTQ=; b=KJgQeZzEX04J4zzqTAYPfnDxUJ2CQk97fsCQJaP4Db2MnH0Mv9guFAFPISxLMmQRMSVvlX mhvY1jL/aaYgl7tpcgP3Jqzup20OyzZBNSdCiEIOWwfwQwH06VZJHGYZtOVnLNwA+TCIH2 GMQm+M6daKvsdJIo6OyX/vFdDiUEWA23HUxVWNHUbit2n3dDAnOUfvuvOaxU+UDmHUX2PF EQBkqwnHsZUZNjwEX2/FHG5YsJihjRQ1/9xorEWwlAaqV9ZDjwiLb0S4h4zJvZc9/APd+z 6t/ekpegLIpiibI4AWLJNntuMuak6LiaEtqcsFmXxdgffDRXElGnQkhiQbjLVQ== From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH] clamav: fix database present check Date: Thu, 30 Apr 2020 12:50:41 +0200 Message-Id: <20200430105041.9818-1-arne_f@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=arne_f@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arne Fitzenreiter Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- lfs/clamav | 4 ++-- src/initscripts/packages/clamav | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lfs/clamav b/lfs/clamav index be6f5155d..4688f0fb8 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team # +# Copyright (C) 2007-2020 IPFire Team # # # # 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 d2f63a910..439c20579 100644 --- 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"