From patchwork Fri Dec 25 12:07:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3756 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 RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4D2QgH0HnZz3wx8 for ; Fri, 25 Dec 2020 12:07:39 +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 4D2Qg34hFFz1V4; Fri, 25 Dec 2020 12:07:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4D2Qg14DV0z2xX3; Fri, 25 Dec 2020 12:07:25 +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 RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4D2Qg04Ybhz2xTN for ; Fri, 25 Dec 2020 12:07:24 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4D2Qfz55Y2zy1 for ; Fri, 25 Dec 2020 12:07:23 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1608898043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=s/x6Qu8r43twIr8y87FPXNmf8B9kUs3Hou1Ch90OyGU=; b=QMA6wRhN6WJqEB6RVbFVjuMyqfix+9+JVhNj7ttzPBCMUih6qapLqnLEFXT3ge1ZmHLa8Q /2jz4ifSjE2vtCCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1608898043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=s/x6Qu8r43twIr8y87FPXNmf8B9kUs3Hou1Ch90OyGU=; b=tMljajr3bH5QdlDwcUlpBZQ/qt8TcL0HFCrAGNYq+FaWIiUAdQbHfwz5LJ91H8s9yunVoa /hyGOoit9hUz8B+ReRbDLlWI471P4482UanqARJ5OTDqbKH/My6dolfVxdd02VdWPABHjx 9FhFoUqGh2qERlGL0AYdbwbEdI22nwCH8jpz2oxh5wPdV3E0J38eSPwA5AaoMVjplqpnOH 3Gw+XR+pOYuuaO/btU44L0IrPdX8CXmxOIlh284UvRGRfPyRUxbO78gChFGUjh6cSDgFuG lSLuoDVek3uASCyWX3hLk9RpRsgC59nnwBbybNpd5GRSRvi5HBXIKe7hUydIVA== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] logwatch: Fix unmatched entries from clamav Date: Fri, 25 Dec 2020 13:07:18 +0100 Message-Id: <20201225120718.23616-1-matthias.fischer@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: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This - cosmetic - patch fixes the unnecessary unmatched "Activating the newly loaded database..."-entries introduced with 'clamav 0.103.0'. Signed-off-by: Matthias Fischer --- lfs/logwatch | 1 + .../logwatch-7.5.4-clamav_fix_unmatch_entries.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch diff --git a/lfs/logwatch b/lfs/logwatch index 7aa145121..0ad9a83f5 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch/logwatch-7.3.6-date_manip6.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch @cd $(DIR_APP) && chmod 755 install_logwatch.sh cd $(DIR_APP) && yes "" | ./install_logwatch.sh diff --git a/src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch b/src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch new file mode 100644 index 000000000..10fb8afcf --- /dev/null +++ b/src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch @@ -0,0 +1,11 @@ +diff -U 3 a/scripts/services/clamav b/scripts/services/clamav +--- a/scripts/services/clamav Fri Sep 21 00:46:14 2020 ++++ b/scripts/services/clamav Mon Dec 25 09:26:26 2020 +@@ -77,6 +77,7 @@ + ( $ThisLine =~ /Bytecode: Security mode set to /) or + ( $ThisLine =~ /^No stats for Database check/ ) or + ( $ThisLine =~ /^Received \d+ file descriptor\(s\) from systemd\.$/) or ++ ( $ThisLine =~ /^Activating the newly loaded database.../ ) or + 0 # This line prevents blame shifting as lines are added above + ) { + # We do not care about these.