webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

logwatch: Added upstream patch for Bug #12242

Browse Source 
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>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Matthias Fischer
2020-09-16 20:44:45 +02:00
committed by Michael Tremer
parent 8a2105b284
commit 5e11ef0f67
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lfs/logwatch
View File

@@ -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

15
src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch Normal file
View File

@@ -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+//) {