logwatch 7.5.5: Deleted no longer needed patch for clamav 0.103.0

I've should have read the changelog from opensuse more thoroughly:

...
4a862fa [clamav] Ignore new "Activating the newly loaded database" message
...

Sorry for the noise.

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 501903edad749883596fe726bcd0638ef570943f..8baaef2ce4c830aec4bfe0727056fdd540dfe2cd 100644 (file)
--- a/lfs/logwatch
+++ b/lfs/logwatch
@@ -74,7 +74,6 @@ $(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-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
deleted file mode 100644 (file)
index 10fb8af..0000000
--- a/src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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.