From: Matthias Fischer <matthias.fischer@ipfire.org>
Date: Fri, 25 Dec 2020 12:07:18 +0000 (+0100)
Subject: logwatch: Fix unmatched entries from clamav
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e49289c9ea0d1ccd1462aa0012d00f434e8ac259;p=people%2Fmfischer%2Fipfire-2.x.git

logwatch: Fix unmatched entries from clamav

This - cosmetic - patch fixes the unnecessary unmatched "Activating the newly
loaded database..."-entries introduced with 'clamav 0.103.0'.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/logwatch b/lfs/logwatch
index 7aa1451219..0ad9a83f5b 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 0000000000..10fb8afcf7
--- /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.