Added upstream patch from:

https://sourceforge.net/p/logwatch/mailman/message/37106642/

and

https://sourceforge.net/p/logwatch/mailman/message/37106883/

Fixes the display of "Unknown Entries: reuse_lease: ... " in dhpcd-logs.

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org --- lfs/logwatch | 1 + ...logwatch-7.5.4-dhcpd_reuse_lease_entries.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch

diff --git a/lfs/logwatch b/lfs/logwatch index 509201743..abf1ba02f 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && sed -e "s/^TEMPDIR=.*/TEMPDIR="/tmp"/g" -i install_logwatch.sh

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) && chmod 755 install_logwatch.sh cd $(DIR_APP) && yes "" | ./install_logwatch.sh diff --git a/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch b/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch new file mode 100644 index 000000000..a66170ae5 --- /dev/null +++ b/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch @@ -0,0 +1,15 @@ +diff --git a/scripts/services/dhcpd b/scripts/services/dhcpd +index 87312f7..bb5cd4c 100644 +--- a/scripts/services/dhcpd ++++ b/scripts/services/dhcpd +@@ -79,7 +79,9 @@ while (my $line = <STDIN>) { + ($line =~ /^Solicit message from/) or + ($line =~ /^Sending Advertise to/) or + ($line =~ /^pool [0-9a-f]+ /) or +- ($line =~ /^[^ ]* file: /) ++ ($line =~ /^[^ ]* file: /) or ++ ($line =~ /^reuse_lease: lease age \d+ (secs) under \d+% threshold, reply with unaltered, existing lease for/) or ++ 0 # noop, but makes diffs easier when appending ignore statements + ) { + # Ignore these lines + } elsif ($line =~ s/Listening on\s+//) {