From mboxrd@z Thu Jan 1 00:00:00 1970 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> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8674982024754438200==" List-Id: --===============8674982024754438200== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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_en= tries.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 =20 @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.p= atch 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 =3D~ /Bytecode: Security mode set to /) or + ( $ThisLine =3D~ /^No stats for Database check/ ) or + ( $ThisLine =3D~ /^Received \d+ file descriptor\(s\) from systemd\.$= /) or ++ ( $ThisLine =3D~ /^Activating the newly loaded database.../ ) or + 0 # This line prevents blame shifting as lines are added above + ) { + # We do not care about these. --=20 2.18.0 --===============8674982024754438200==--