From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] logwatch: Fix unmatched entries from clamav
Date: Fri, 25 Dec 2020 13:07:18 +0100 [thread overview]
Message-ID: <20201225120718.23616-1-matthias.fischer@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2128 bytes --]
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(a)ipfire.org>
---
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.
--
2.18.0
reply other threads:[~2020-12-25 12:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201225120718.23616-1-matthias.fischer@ipfire.org \
--to=matthias.fischer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox